diff --git a/app/build.gradle b/app/build.gradle
index 0c093ea9c..e1c9cdf6e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -106,7 +106,7 @@ dependencies {
     implementation 'io.coil-kt:coil:2.0.0-alpha06'
 
     // Material
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.0-alpha02'
 
     // --- DEBUG ---
 
diff --git a/app/src/main/java/org/oxycblt/auxio/home/AdaptiveFloatingActionButton.kt b/app/src/main/java/org/oxycblt/auxio/home/AdaptiveFloatingActionButton.kt
index 61a7afe11..a022a4964 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/AdaptiveFloatingActionButton.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/AdaptiveFloatingActionButton.kt
@@ -5,6 +5,10 @@ import android.util.AttributeSet
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.R as MaterialR
 
+/**
+ * A FloatingActionButton that automatically switches to a normal or large FAB depending on the
+ * screen size.
+ */
 @Suppress("PrivateResource")
 class AdaptiveFloatingActionButton @JvmOverloads constructor(
     context: Context,
diff --git a/app/src/main/java/org/oxycblt/auxio/home/AdaptiveTabStrategy.kt b/app/src/main/java/org/oxycblt/auxio/home/AdaptiveTabStrategy.kt
index 1faa95a88..d81da4d20 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/AdaptiveTabStrategy.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/AdaptiveTabStrategy.kt
@@ -4,6 +4,12 @@ import android.content.Context
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 
+/**
+ * A tag configuration strategy that automatically adapts the tab layout to the screen size.
+ * - On small screens, use only an icon
+ * - On medium screens, use only text
+ * - On large screens, use text and an icon
+ */
 class AdaptiveTabStrategy(
     context: Context,
     private val homeModel: HomeViewModel
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/pref/M3SwitchPreference.kt b/app/src/main/java/org/oxycblt/auxio/settings/pref/M3SwitchPreference.kt
index c3017a072..25bc1a598 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/pref/M3SwitchPreference.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/pref/M3SwitchPreference.kt
@@ -10,6 +10,10 @@ import org.oxycblt.auxio.R
 import org.oxycblt.auxio.util.resolveDrawable
 import org.oxycblt.auxio.util.resolveStateList
 
+/**
+ * A [SwitchPreferenceCompat] that emulates the M3 switches until the design team
+ * actually bothers to add them to MDC.
+ */
 class M3SwitchPreference @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
diff --git a/app/src/main/res/font/inter.ttf b/app/src/main/res/font/inter.ttf
index 96fd6a12d..cc73944ac 100644
Binary files a/app/src/main/res/font/inter.ttf and b/app/src/main/res/font/inter.ttf differ
diff --git a/app/src/main/res/font/inter_semibold.ttf b/app/src/main/res/font/inter_semibold.ttf
index ddb279290..278ceaa36 100644
Binary files a/app/src/main/res/font/inter_semibold.ttf and b/app/src/main/res/font/inter_semibold.ttf differ
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index 9099d89d7..2959d66bb 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -6,7 +6,6 @@
     <style name="Widget.Auxio.Toolbar" parent="">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:theme">@style/ThemeOverlay.Material3.ActionBar</item>
     </style>
 
     <!-- Toolbar sub-style with a nav icon -->
diff --git a/app/src/main/res/values/typography.xml b/app/src/main/res/values/typography.xml
index 6b4bc863f..e6fa3d64e 100644
--- a/app/src/main/res/values/typography.xml
+++ b/app/src/main/res/values/typography.xml
@@ -55,20 +55,20 @@
         <item name="android:textStyle">normal</item>
     </style>
 
-    <style name="TextAppearance.Auxio.LabelLarge" parent="TextAppearance.Material3.LabelLarge"> 
+    <style name="TextAppearance.Auxio.LabelLarge" parent="TextAppearance.Material3.LabelLarge">
         <item name="fontFamily">@font/inter_semibold</item>
         <item name="android:fontFamily">@font/inter_semibold</item>
         <item name="android:textStyle">bold</item>
         <item name="android:letterSpacing">0.01</item>
     </style>
-    
+
     <style name="TextAppearance.Auxio.LabelMedium" parent="TextAppearance.Material3.LabelMedium">
         <item name="fontFamily">@font/inter_semibold</item>
         <item name="android:fontFamily">@font/inter_semibold</item>
         <item name="android:textStyle">bold</item>
         <item name="android:letterSpacing">0.01</item>
     </style>
-    
+
     <style name="TextAppearance.Auxio.LabelSmall" parent="TextAppearance.Material3.LabelSmall">
         <item name="fontFamily">@font/inter_semibold</item>
         <item name="android:fontFamily">@font/inter_semibold</item>