diff --git a/app/build.gradle b/app/build.gradle
index c0f55200a..291976103 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@ dependencies {
     // --- SUPPORT ---
 
     // General
-    implementation "androidx.core:core-ktx:1.5.0"
+    implementation "androidx.core:core-ktx:1.6.0"
     implementation "androidx.activity:activity-ktx:1.2.3"
     implementation 'androidx.fragment:fragment-ktx:1.3.5'
 
@@ -97,7 +97,7 @@ dependencies {
     implementation 'io.coil-kt:coil:1.2.2'
 
     // Material
-    implementation "com.google.android.material:material:1.3.0"
+    implementation "com.google.android.material:material:1.4.0"
 
     // --- DEBUG ---
 
diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
index 11375c68e..f7b4d4f1b 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
@@ -13,7 +13,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavOptions
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.findNavController
-import com.google.android.material.bottomnavigation.LabelVisibilityMode
+import com.google.android.material.bottomnavigation.BottomNavigationView
 import org.oxycblt.auxio.databinding.FragmentMainBinding
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.music.Song
@@ -69,11 +69,11 @@ class MainFragment : Fragment() {
             itemTextColor = navTints
 
             if (isTablet(resources) && !isLandscape(resources)) {
-                labelVisibilityMode = LabelVisibilityMode.LABEL_VISIBILITY_LABELED
+                labelVisibilityMode = BottomNavigationView.LABEL_VISIBILITY_LABELED
             }
 
             navController?.let { controller ->
-                binding.navBar.setOnNavigationItemSelectedListener { item ->
+                binding.navBar.setOnItemSelectedListener { item ->
                     navigateWithItem(controller, item)
                 }
             }
diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicUtils.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicUtils.kt
index 8f5ff0101..471f13ff9 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicUtils.kt
@@ -72,7 +72,7 @@ fun String.getGenreNameCompat(): String? {
         }
     }
 
-    // ID3 v3+, current name is fine.
+    // Current name is fine.
     return null
 }
 
diff --git a/app/src/main/res/values/styles_core.xml b/app/src/main/res/values/styles_core.xml
index 478a8d0ab..ea2e8ddd5 100644
--- a/app/src/main/res/values/styles_core.xml
+++ b/app/src/main/res/values/styles_core.xml
@@ -39,6 +39,7 @@
 
     <!-- The basic black theme derived in all black accents. -->
     <style name="Theme.Base.Black" parent="Theme.Base">
+        <item name="android:textColorPrimary">@android:color/white</item>
         <item name="colorSurface">@color/surface_color_black</item>
         <item name="materialAlertDialogTheme">@style/Theme.CustomDialog.Black</item>
     </style>
diff --git a/build.gradle b/build.gradle
index 7ff99377b..92d9f33d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"