diff --git a/app/build.gradle b/app/build.gradle
index 8d41a597a..2376637c3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,7 +99,7 @@ dependencies {
     implementation "io.coil-kt:coil:2.1.0"
 
     // Material
-    implementation "com.google.android.material:material:1.6.1"
+    implementation "com.google.android.material:material:1.7.0-alpha02"
 
     // LeakCanary
     debugImplementation "com.squareup.leakcanary:leakcanary-android:2.9.1"
diff --git a/app/src/main/java/org/oxycblt/auxio/music/Music.kt b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
index a5c4a7d04..8b018ae6a 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/Music.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
@@ -112,7 +112,9 @@ data class Song(
         get() {
             var result = rawName.lowercase().hashCode().toLong()
             result = 31 * result + album.rawName.lowercase().hashCode()
-            result = 31 * result + (album.artist.rawName?.lowercase() ?: MediaStore.UNKNOWN_STRING).hashCode()
+            result =
+                31 * result +
+                    (album.artist.rawName?.lowercase() ?: MediaStore.UNKNOWN_STRING).hashCode()
             result = 31 * result + (track ?: 0)
             result = 31 * result + (disc ?: 0)
             result = 31 * result + durationMs
@@ -219,7 +221,8 @@ data class Album(
     override val id: Long
         get() {
             var result = rawName.lowercase().hashCode().toLong()
-            result = 31 * result + (artist.rawName?.lowercase() ?: MediaStore.UNKNOWN_STRING).hashCode()
+            result =
+                31 * result + (artist.rawName?.lowercase() ?: MediaStore.UNKNOWN_STRING).hashCode()
             result = 31 * result + (date?.year ?: 0)
             return result
         }
diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
index 3a5f57303..a30a6e628 100644
--- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
+++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
@@ -17,7 +17,6 @@
  
 package org.oxycblt.auxio.widgets
 
-import android.appwidget.AppWidgetHostView
 import android.appwidget.AppWidgetManager
 import android.appwidget.AppWidgetProvider
 import android.content.ComponentName
@@ -132,9 +131,7 @@ class WidgetProvider : AppWidgetProvider() {
 
             // Each widget has independent dimensions, so we iterate through them all
             // and do this for each.
-            val ids = getAppWidgetIds(name)
-
-            for (id in ids) {
+            for (id in getAppWidgetIds(name)) {
                 val options = getAppWidgetOptions(id)
 
                 val width: Int
diff --git a/app/src/main/res/color/sel_icon_button_ripple.xml b/app/src/main/res/color/sel_icon_button_ripple.xml
new file mode 100644
index 000000000..24d2f43cd
--- /dev/null
+++ b/app/src/main/res/color/sel_icon_button_ripple.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+     Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.12" android:color="?attr/colorOnSurfaceVariant" android:state_pressed="true" />
+    <item android:alpha="0.2" android:color="?attr/colorOnSurfaceVariant" android:state_focused="true" />
+    <item android:alpha="0.4" android:color="?attr/colorOnSurfaceVariant" android:state_hovered="true" />
+    <item android:alpha="0.16" android:color="?attr/colorOnSurfaceVariant" />
+</selector>
diff --git a/app/src/main/res/drawable/ic_play_24.xml b/app/src/main/res/drawable/ic_play_24.xml
index 7182e0579..cef334c5f 100644
--- a/app/src/main/res/drawable/ic_play_24.xml
+++ b/app/src/main/res/drawable/ic_play_24.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M8,19V5L19,12Z"/>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M8,19V5L19,12Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_skip_next_24.xml b/app/src/main/res/drawable/ic_skip_next_24.xml
index 1b658a7a0..080f6581f 100644
--- a/app/src/main/res/drawable/ic_skip_next_24.xml
+++ b/app/src/main/res/drawable/ic_skip_next_24.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M16.5,18V6H18.5V18ZM5.5,18V6L14.5,12Z"/>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16.5,18V6H18.5V18ZM5.5,18V6L14.5,12Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_skip_prev_24.xml b/app/src/main/res/drawable/ic_skip_prev_24.xml
index 8e8afc830..c1ac24bf3 100644
--- a/app/src/main/res/drawable/ic_skip_prev_24.xml
+++ b/app/src/main/res/drawable/ic_skip_prev_24.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5.5,18V6H7.5V18ZM18.5,18 L9.5,12 18.5,6Z"/>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M5.5,18V6H7.5V18ZM18.5,18 L9.5,12 18.5,6Z" />
 </vector>
diff --git a/app/src/main/res/layout/view_preference_switch.xml b/app/src/main/res/layout/view_preference_switch.xml
new file mode 100644
index 000000000..4721482d5
--- /dev/null
+++ b/app/src/main/res/layout/view_preference_switch.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.switchmaterial.SwitchMaterial xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/switchWidget"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:thumb="@drawable/ui_m3_switch_thumb"
+    app:thumbTint="@color/sel_m3_switch_thumb"
+    app:track="@drawable/ui_m3_switch_track"
+    app:trackTint="@color/sel_m3_switch_track" />
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles_core.xml b/app/src/main/res/values-v27/styles_core.xml
index 337189255..7d29bb215 100644
--- a/app/src/main/res/values-v27/styles_core.xml
+++ b/app/src/main/res/values-v27/styles_core.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="Theme.Auxio.V27" parent="Theme.Auxio">
         <item name="android:navigationBarColor">@color/chrome_transparent_ish</item>
         <item name="android:statusBarColor">@color/chrome_transparent_ish</item>
diff --git a/app/src/main/res/values/styles_android.xml b/app/src/main/res/values/styles_android.xml
index 669c65642..3dd7c0a39 100644
--- a/app/src/main/res/values/styles_android.xml
+++ b/app/src/main/res/values/styles_android.xml
@@ -39,6 +39,27 @@
         <item name="android:scrollIndicators" tools:ignore="NewApi">top|bottom</item>
     </style>
 
+    <style name="Preference.Auxio" parent="Preference.Material">
+        <item name="allowDividerBelow">false</item>
+        <item name="iconSpaceReserved">false</item>
+    </style>
+
+    <style name="Preference.Auxio.DialogPreference" parent="Preference.DialogPreference.Material">
+        <item name="allowDividerBelow">false</item>
+        <item name="iconSpaceReserved">false</item>
+    </style>
+
+    <style name="Preference.Auxio.PreferenceCategory" parent="Preference.Category.Material">
+        <item name="layout">@layout/item_header</item>
+        <item name="allowDividerBelow">false</item>
+        <item name="iconSpaceReserved">false</item>
+    </style>
+
+    <style name="Preference.Auxio.SwitchPreferenceCompat" parent="Preference.SwitchPreferenceCompat.Material">
+        <item name="widgetLayout">@layout/view_preference_switch</item>
+        <item name="allowDividerBelow">false</item>
+        <item name="iconSpaceReserved">false</item>
+    </style>
 
     <!-- Widget TextView that mimics the main Auxio Primary/Secondary TextViews. -->
     <style name="Widget.Auxio.TextView.AppWidget" parent="Widget.Auxio.TextView.Base">
diff --git a/app/src/main/res/values/styles_core.xml b/app/src/main/res/values/styles_core.xml
index a65b02856..11954d41a 100644
--- a/app/src/main/res/values/styles_core.xml
+++ b/app/src/main/res/values/styles_core.xml
@@ -7,6 +7,7 @@
         <item name="android:statusBarColor">@color/chrome_translucent</item>
         <item name="android:navigationBarColor">@color/chrome_translucent</item>
     </style>
+
     <style name="Theme.Auxio.V29" parent="Theme.Auxio.V27" />
 
     <!-- Base theme -->
@@ -17,8 +18,6 @@
         <item name="materialAlertDialogTheme">@style/Theme.Auxio.Dialog</item>
         <item name="sliderStyle">@style/Widget.Auxio.Slider</item>
         <item name="linearProgressIndicatorStyle">@style/Widget.Auxio.LinearProgressIndicator</item>
-        <item name="toolbarNavigationButtonStyle">@style/Widget.Auxio.Toolbar.Navigation</item>
-        <item name="actionOverflowButtonStyle">@style/Widget.Auxio.Button.Overflow</item>
 
         <item name="textAppearanceDisplayLarge">@style/TextAppearance.Auxio.DisplayLarge</item>
         <item name="textAppearanceDisplayMedium">@style/TextAppearance.Auxio.DisplayMedium</item>
@@ -47,11 +46,20 @@
         <item name="windowNoTitle">true</item>
         <item name="colorControlActivated">?attr/colorPrimary</item>
 
+        <item name="preferenceStyle">@style/Preference.Auxio</item>
+        <item name="preferenceCategoryStyle">@style/Preference.Auxio.PreferenceCategory</item>
+        <item name="dialogPreferenceStyle">@style/Preference.Auxio.DialogPreference</item>
+        <item name="switchPreferenceCompatStyle">@style/Preference.Auxio.SwitchPreferenceCompat
+        </item>
+        <item name="toolbarNavigationButtonStyle">@style/Widget.Auxio.Toolbar.Navigation</item>
+        <item name="actionOverflowButtonStyle">@style/Widget.Auxio.Button.Overflow</item>
+
         <!-- Work around hard-coded text highlight colors in the default Material3 theme -->
         <item name="android:textColorHighlight">@color/overlay_text_highlight</item>
         <item name="android:textColorHighlightInverse">@color/overlay_text_highlight_inverse</item>
     </style>
 
+
     <style name="Theme.Auxio.App" parent="@style/Theme.Auxio.Blue" />
 
     <!--
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index 595b20494..1302af9bc 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -171,10 +171,9 @@
 
     <style name="Widget.Auxio.Button.Secondary" parent="Widget.Material3.Button.OutlinedButton" />
 
-    <style name="Widget.Auxio.Button.Icon.Base" parent="Widget.Material3.Button.TextButton">
-        <item name="iconPadding">0dp</item>
+    <style name="Widget.Auxio.Button.Icon.Base" parent="Widget.Material3.Button.IconButton">
         <item name="iconTint">?attr/colorControlNormal</item>
-        <item name="rippleColor">?attr/colorControlHighlight</item>
+        <item name="rippleColor">@color/sel_icon_button_ripple</item>
     </style>
 
     <style name="Widget.Auxio.Button.Icon.Small" parent="Widget.Auxio.Button.Icon.Base">
@@ -205,11 +204,10 @@
         <item name="android:paddingBottom">@dimen/spacing_small</item>
     </style>
 
-    <style name="Widget.Auxio.Button.PlayPause" parent="Widget.Material3.Button.TonalButton">
+    <style name="Widget.Auxio.Button.PlayPause" parent="Widget.Material3.Button.IconButton.Filled.Tonal">
         <item name="android:minWidth">@dimen/size_play_pause_button</item>
         <item name="android:minHeight">@dimen/size_play_pause_button</item>
         <item name="iconSize">@dimen/size_icon_large</item>
-        <item name="iconPadding">0dp</item>
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:insetLeft">0dp</item>
diff --git a/app/src/main/res/values/themes_black.xml b/app/src/main/res/values/themes_black.xml
index 491d8a525..ed68ba1f9 100644
--- a/app/src/main/res/values/themes_black.xml
+++ b/app/src/main/res/values/themes_black.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="Theme.Auxio.Black" parent="Theme.Auxio.Base">
         <item name="colorSurface">@android:color/black</item>
     </style>
diff --git a/app/src/main/res/xml/prefs_main.xml b/app/src/main/res/xml/prefs_main.xml
index e2c36d027..418e000e7 100644
--- a/app/src/main/res/xml/prefs_main.xml
+++ b/app/src/main/res/xml/prefs_main.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory
-        app:layout="@layout/item_header"
-        app:title="@string/set_ui">
+    <PreferenceCategory app:title="@string/set_ui">
 
         <org.oxycblt.auxio.settings.ui.IntListPreference
             app:defaultValue="@integer/theme_auto"
@@ -10,7 +8,6 @@
             app:entryIcons="@array/icons_theme"
             app:entryValues="@array/values_theme"
             app:icon="@drawable/ic_light_24"
-            app:iconSpaceReserved="false"
             app:isPreferenceVisible="@bool/enable_theme_settings"
             app:key="@string/set_key_theme"
             app:title="@string/set_theme" />
@@ -20,52 +17,42 @@
             app:key="@string/set_key_accent"
             app:title="@string/set_accent" />
 
-        <org.oxycblt.auxio.settings.ui.M3SwitchPreference
-            app:allowDividerBelow="false"
+        <SwitchPreferenceCompat
             app:defaultValue="false"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_black_theme"
             app:summary="@string/set_black_mode_desc"
             app:title="@string/set_black_mode" />
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        app:layout="@layout/item_header"
-        app:title="@string/set_display">
+    <PreferenceCategory app:title="@string/set_display">
 
         <org.oxycblt.auxio.settings.ui.WrappedDialogPreference
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_lib_tabs"
             app:summary="@string/set_lib_tabs_desc"
             app:title="@string/set_lib_tabs" />
 
-        <org.oxycblt.auxio.settings.ui.M3SwitchPreference
+        <SwitchPreferenceCompat
             app:defaultValue="true"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_show_covers"
             app:summary="@string/set_show_covers_desc"
             app:title="@string/set_show_covers" />
 
-        <org.oxycblt.auxio.settings.ui.M3SwitchPreference
+        <SwitchPreferenceCompat
             app:defaultValue="false"
             app:dependency="@string/set_key_show_covers"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_quality_covers"
             app:summary="@string/set_quality_covers_desc"
             app:title="@string/set_quality_covers" />
 
-        <org.oxycblt.auxio.settings.ui.M3SwitchPreference
+        <SwitchPreferenceCompat
             app:defaultValue="false"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_round_mode"
             app:summary="@string/set_round_mode_desc"
             app:title="@string/set_round_mode" />
 
-        <org.oxycblt.auxio.settings.ui.M3SwitchPreference
-            app:allowDividerBelow="false"
+        <SwitchPreferenceCompat
             app:defaultValue="false"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_alt_notif_action"
             app:summaryOff="@string/set_alt_repeat"
             app:summaryOn="@string/set_alt_shuffle"
@@ -73,46 +60,35 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        app:layout="@layout/item_header"
-        app:title="@string/set_audio">
+    <PreferenceCategory app:title="@string/set_audio">
 
-        <org.oxycblt.auxio.settings.ui.M3SwitchPreference
-            app:defaultValue="false"
-            app:iconSpaceReserved="false"
+        <SwitchPreferenceCompat
             app:key="@string/set_key_headset_autoplay"
             app:summary="@string/set_headset_autoplay_desc"
             app:title="@string/set_headset_autoplay" />
 
         <org.oxycblt.auxio.settings.ui.IntListPreference
-            app:allowDividerBelow="false"
             app:defaultValue="@integer/replay_gain_off"
             app:entries="@array/entries_replay_gain"
             app:entryValues="@array/values_replay_gain"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_replay_gain"
             app:offValue="@integer/replay_gain_off"
             app:title="@string/set_replay_gain" />
 
         <org.oxycblt.auxio.settings.ui.WrappedDialogPreference
-            app:allowDividerBelow="false"
             app:dependency="@string/set_key_replay_gain"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_pre_amp"
             app:summary="@string/set_pre_amp_desc"
             app:title="@string/set_pre_amp" />
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        app:layout="@layout/item_header"
-        app:title="@string/set_behavior">
+    <PreferenceCategory app:title="@string/set_behavior">
 
         <org.oxycblt.auxio.settings.ui.IntListPreference
             app:defaultValue="@integer/play_mode_songs"
             app:entries="@array/entries_library_song_playback_mode"
             app:entryValues="@array/values_library_song_playback_mode"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_library_song_playback_mode"
             app:title="@string/set_library_song_playback_mode"
             app:useSimpleSummaryProvider="true" />
@@ -121,76 +97,60 @@
             app:defaultValue="@integer/play_mode_none"
             app:entries="@array/entries_detail_song_playback_mode"
             app:entryValues="@array/values_detail_song_playback_mode"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_detail_song_playback_mode"
             app:title="@string/set_detail_song_playback_mode"
             app:useSimpleSummaryProvider="true" />
 
-        <org.oxycblt.auxio.settings.ui.M3SwitchPreference
+        <SwitchPreferenceCompat
             app:defaultValue="true"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_keep_shuffle"
             app:summary="@string/set_keep_shuffle_desc"
             app:title="@string/set_keep_shuffle" />
 
-        <org.oxycblt.auxio.settings.ui.M3SwitchPreference
-            app:allowDividerBelow="false"
+        <SwitchPreferenceCompat
             app:defaultValue="true"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_rewind_prev"
             app:summary="@string/set_rewind_prev_desc"
             app:title="@string/set_rewind_prev" />
 
-        <org.oxycblt.auxio.settings.ui.M3SwitchPreference
-            app:allowDividerBelow="false"
+        <SwitchPreferenceCompat
             app:defaultValue="false"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_repeat_pause"
             app:summary="@string/set_repeat_pause_desc"
             app:title="@string/set_repeat_pause" />
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        app:layout="@layout/item_header"
-        app:title="@string/set_content">
+    <PreferenceCategory app:title="@string/set_content">
 
         <Preference
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_save_state"
             app:summary="@string/set_save_desc"
             app:title="@string/set_save" />
 
         <Preference
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_restore_state"
             app:summary="@string/set_restore_desc"
             app:title="@string/set_restore" />
 
         <Preference
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_reindex"
             app:summary="@string/set_reindex_desc"
             app:title="@string/set_reindex" />
 
         <org.oxycblt.auxio.settings.ui.WrappedDialogPreference
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_music_dirs"
             app:summary="@string/set_dirs_desc"
             app:title="@string/set_dirs" />
 
-        <org.oxycblt.auxio.settings.ui.M3SwitchPreference
-            app:allowDividerBelow="false"
+        <SwitchPreferenceCompat
             app:defaultValue="false"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_quality_tags"
             app:summary="@string/set_quality_tags_desc"
             app:title="@string/set_quality_tags" />
 
-        <org.oxycblt.auxio.settings.ui.M3SwitchPreference
-            app:allowDividerBelow="false"
+        <SwitchPreferenceCompat
             app:defaultValue="false"
-            app:iconSpaceReserved="false"
             app:key="@string/set_key_observing"
             app:summary="@string/set_observing_desc"
             app:title="@string/set_observing" />