diff --git a/app/src/main/java/org/lineageos/twelve/SettingsActivity.kt b/app/src/main/java/org/lineageos/twelve/SettingsActivity.kt
index 7708995dddbb8c4b870bab34b7de5742d09510f3..0aa8ad7ce0205bef7b0b34ad15ab4255a5917143 100644
--- a/app/src/main/java/org/lineageos/twelve/SettingsActivity.kt
+++ b/app/src/main/java/org/lineageos/twelve/SettingsActivity.kt
@@ -180,7 +180,7 @@ class SettingsActivity : AppCompatActivity(R.layout.activity_settings) {
 
         private fun showResetLocalStatsDialog() {
             val context = requireActivity()
-            MaterialAlertDialogBuilder(context)
+            MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_App_MaterialAlertDialog)
                 .setTitle(R.string.reset_local_stats_confirm_title)
                 .setMessage(R.string.reset_local_stats_confirm_message)
                 .setPositiveButton(R.string.reset_local_stats_confirm_positive) { _, _ ->
@@ -200,7 +200,7 @@ class SettingsActivity : AppCompatActivity(R.layout.activity_settings) {
 
         private fun showRescanMediaStoreDialog() {
             val context = requireActivity()
-            MaterialAlertDialogBuilder(context)
+            MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_App_MaterialAlertDialog)
                 .setTitle(R.string.rescan_media_store_confirm_title)
                 .setMessage(R.string.rescan_media_store_confirm_message)
                 .setPositiveButton(R.string.rescan_media_store_confirm_positive) { _, _ ->
diff --git a/app/src/main/java/org/lineageos/twelve/fragments/PlaybackControlBottomSheetDialogFragment.kt b/app/src/main/java/org/lineageos/twelve/fragments/PlaybackControlBottomSheetDialogFragment.kt
index 67f4274ce53f129e10e8d629b11560d08c44a181..a202cf0024ddc9b74f577a6e7b293222cf9647d7 100644
--- a/app/src/main/java/org/lineageos/twelve/fragments/PlaybackControlBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/lineageos/twelve/fragments/PlaybackControlBottomSheetDialogFragment.kt
@@ -9,6 +9,7 @@ import android.icu.text.DecimalFormat
 import android.icu.text.DecimalFormatSymbols
 import android.os.Bundle
 import android.view.View
+import android.widget.Switch
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
@@ -16,7 +17,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.button.MaterialButton
-import com.google.android.material.materialswitch.MaterialSwitch
 import com.google.android.material.slider.Slider
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
@@ -36,7 +36,7 @@ class PlaybackControlBottomSheetDialogFragment : BottomSheetDialogFragment(
     private val playbackSpeedMinusMaterialButton by getViewProperty<MaterialButton>(R.id.playbackSpeedMinusMaterialButton)
     private val playbackSpeedPlusMaterialButton by getViewProperty<MaterialButton>(R.id.playbackSpeedPlusMaterialButton)
     private val playbackPitchSlider by getViewProperty<Slider>(R.id.playbackPitchSlider)
-    private val playbackPitchUnlockMaterialSwitch by getViewProperty<MaterialSwitch>(R.id.playbackPitchUnlockMaterialSwitch)
+    private val playbackPitchUnlockMaterialSwitch by getViewProperty<Switch>(R.id.playbackPitchUnlockMaterialSwitch)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/res/drawable/bg_item_header_scrim.xml b/app/src/main/res/drawable/bg_item_header_scrim.xml
index c89b77b7bf9bd8d97f8719ffbd6e00075102b2b4..0ef4f18997bd8c7dc4a2d5656bb2dda931521848 100644
--- a/app/src/main/res/drawable/bg_item_header_scrim.xml
+++ b/app/src/main/res/drawable/bg_item_header_scrim.xml
@@ -8,6 +8,6 @@
         android:angle="90"
         android:centerColor="#00000000"
         android:endColor="#00000000"
-        android:startColor="?attr/colorSurface"
+        android:startColor="@color/e_background"
         android:type="linear" />
 </shape>
diff --git a/app/src/main/res/layout-land/fragment_now_playing.xml b/app/src/main/res/layout-land/fragment_now_playing.xml
index 4d0c10569e891206fda210d37baad9ffd3ca0e16..ef34b699f21ab19bd4dd9cda151cb7ea2d4d1a93 100644
--- a/app/src/main/res/layout-land/fragment_now_playing.xml
+++ b/app/src/main/res/layout-land/fragment_now_playing.xml
@@ -19,12 +19,12 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/e_action_bar"
             app:navigationIcon="@drawable/ic_keyboard_arrow_down"
             app:navigationIconTint="?attr/colorOnSurface"
             app:titleCentered="true"
             app:titleTextAppearance="?attr/textAppearanceTitleMedium"
-            tools:title="Eyes shut, mouth still"
-            style="@style/Widget.App.Toolbar">
+            tools:title="Eyes shut, mouth still" >
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/fileTypeMaterialCardView"
diff --git a/app/src/main/res/layout/album_labels.xml b/app/src/main/res/layout/album_labels.xml
index d5885758791f4a11cd59988ba73aaaf59dda314a..7fd8983d6ff04015902aa357b00a56bc3ec2fd84 100644
--- a/app/src/main/res/layout/album_labels.xml
+++ b/app/src/main/res/layout/album_labels.xml
@@ -73,7 +73,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:visibility="gone"
-            app:cardBackgroundColor="?attr/colorPrimaryContainer"
+            app:cardBackgroundColor="@color/e_accent"
             app:cardCornerRadius="4dp"
             app:contentPaddingLeft="4dp"
             app:contentPaddingRight="4dp"
@@ -86,7 +86,7 @@
                 android:gravity="center"
                 android:textAlignment="gravity"
                 android:textAppearance="?attr/textAppearanceLabelMedium"
-                android:textColor="?attr/colorOnPrimaryContainer"
+                android:textColor="@color/e_background"
                 tools:text="FLAC / MPEG" />
 
         </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/audio_track_index.xml b/app/src/main/res/layout/audio_track_index.xml
index 616563ae72c3730571fb53823d27892f49f2af50..bce5807241c1bb87a6cd52bf6b85cf84a401e931 100644
--- a/app/src/main/res/layout/audio_track_index.xml
+++ b/app/src/main/res/layout/audio_track_index.xml
@@ -9,7 +9,7 @@
     style="@style/Widget.Material3.CardView.Filled"
     android:layout_width="24dp"
     android:layout_height="24dp"
-    app:cardBackgroundColor="?attr/colorPrimaryContainer"
+    app:cardBackgroundColor="@color/e_accent"
     app:cardCornerRadius="4dp">
 
     <TextView
@@ -19,7 +19,7 @@
         android:gravity="center"
         android:textAlignment="gravity"
         android:textAppearance="?attr/textAppearanceLabelMedium"
-        android:textColor="?attr/colorOnPrimaryContainer"
+        android:textColor="@color/e_background"
         tools:text="99" />
 
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/fragment_album.xml b/app/src/main/res/layout/fragment_album.xml
index be53f9471b521e9a1bb58a314c408142f4275fc7..e00c02598291270cf10fb55b9eb96c43a54f6afc 100644
--- a/app/src/main/res/layout/fragment_album.xml
+++ b/app/src/main/res/layout/fragment_album.xml
@@ -54,7 +54,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:alpha="0.4"
-                    android:background="?attr/colorSurface"
+                    android:background="@color/e_background"
                     android:fitsSystemWindows="true"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_artist.xml b/app/src/main/res/layout/fragment_artist.xml
index 9d0da20ea4d59b31a4a3a0a96bb698e6d3d633de..816157a0d09d383f0420746ee9890b6cdf3e9fd5 100644
--- a/app/src/main/res/layout/fragment_artist.xml
+++ b/app/src/main/res/layout/fragment_artist.xml
@@ -55,7 +55,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:alpha="0.4"
-                    android:background="?attr/colorSurface"
+                    android:background="@color/e_background"
                     android:fitsSystemWindows="true"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_genre.xml b/app/src/main/res/layout/fragment_genre.xml
index d14fcf0f5d876a6cdba7a624534c9d00e4281fb7..392ce9e261e8623eee9d815eab96bc3916385826 100644
--- a/app/src/main/res/layout/fragment_genre.xml
+++ b/app/src/main/res/layout/fragment_genre.xml
@@ -55,7 +55,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:alpha="0.4"
-                    android:background="?attr/colorSurface"
+                    android:background="@color/e_background"
                     android:fitsSystemWindows="true"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_now_playing.xml b/app/src/main/res/layout/fragment_now_playing.xml
index 2a0bd2667cfcc4f3a824479c4aea5f2ef9dbfc06..dd0fd5b2f575fa7856f66d61db2e145c6e337d65 100644
--- a/app/src/main/res/layout/fragment_now_playing.xml
+++ b/app/src/main/res/layout/fragment_now_playing.xml
@@ -18,7 +18,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/Widget.App.Toolbar"
+            android:background="@color/e_action_bar"
             app:navigationIcon="@drawable/ic_keyboard_arrow_down"
             app:navigationIconTint="?attr/colorOnSurface"
             app:titleCentered="true"
diff --git a/app/src/main/res/layout/fragment_playback_control_bottom_sheet_dialog.xml b/app/src/main/res/layout/fragment_playback_control_bottom_sheet_dialog.xml
index 1c077421f8b8455686faebae7872fd0c35ee3e53..435752fb2b25f4e670196a9f88f7e7ec03015135 100644
--- a/app/src/main/res/layout/fragment_playback_control_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/fragment_playback_control_bottom_sheet_dialog.xml
@@ -47,8 +47,8 @@
             android:insetTop="0dp"
             android:insetBottom="0dp"
             android:textAppearance="?attr/textAppearanceTitleLarge"
-            android:textColor="?attr/colorOnPrimaryContainer"
-            app:backgroundTint="?attr/colorPrimaryContainer"
+            android:textColor="@color/e_primary_text_color"
+            app:backgroundTint="@color/e_floating_background_variant"
             app:cornerRadius="8dp"
             tool:text="1.5x" />
 
@@ -77,7 +77,7 @@
             android:text="@string/playbacl_pitch_unlock"
             android:textAppearance="?attr/textAppearanceBodyLarge" />
 
-        <com.google.android.material.materialswitch.MaterialSwitch
+        <Switch
             android:id="@+id/playbackPitchUnlockMaterialSwitch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/fragment_playlist.xml b/app/src/main/res/layout/fragment_playlist.xml
index 2dddda8a5ed9b6f21aba1b035f2bfb319e81be93..62145e0d9a52cbb1eaf1e5a96fa25328868cef9b 100644
--- a/app/src/main/res/layout/fragment_playlist.xml
+++ b/app/src/main/res/layout/fragment_playlist.xml
@@ -55,7 +55,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:alpha="0.4"
-                    android:background="?attr/colorSurface"
+                    android:background="@color/e_background"
                     android:fitsSystemWindows="true"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/play_buttons.xml b/app/src/main/res/layout/play_buttons.xml
index 9e9f2c13746837639f324e0da1f2f1887c421096..8d3e65815f3aee9006d55a154feef571ea8daa91 100644
--- a/app/src/main/res/layout/play_buttons.xml
+++ b/app/src/main/res/layout/play_buttons.xml
@@ -19,9 +19,11 @@
         android:tooltipText="@string/shuffle_play"
         android:layout_gravity="end"
         android:layout_marginBottom="12dp"
-        app:backgroundTint="?attr/colorTertiaryContainer"
+        android:textColor="@color/e_background"
+        app:backgroundTint="@color/e_accent"
         app:collapsedSize="46dp"
         app:icon="@drawable/ic_shuffle_play"
+        app:iconTint="@color/e_background"
         tools:visibility="visible" />
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
@@ -30,6 +32,9 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:text="@string/play_all"
+        android:textColor="@color/e_background"
+        app:backgroundTint="@color/e_accent"
         app:icon="@drawable/ic_play_arrow"
+        app:iconTint="@color/e_background"
         tools:visibility="visible" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_activity_tab.xml b/app/src/main/res/layout/view_activity_tab.xml
index 2b354d2eb39abebe605ccc0d9060e69c31925292..9a8f799ff60c969969fb4a1f7a02c449d266a3b8 100644
--- a/app/src/main/res/layout/view_activity_tab.xml
+++ b/app/src/main/res/layout/view_activity_tab.xml
@@ -11,6 +11,7 @@
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="16dp"
     android:layout_marginVertical="8dp"
+    app:cardBackgroundColor="@color/e_floating_background_variant"
     app:cardCornerRadius="16dp"
     app:contentPaddingBottom="16dp"
     app:contentPaddingTop="16dp">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index f79e27f0962915746796bd6de8c24d24e65a6d00..f3482747d213170d759f5e05d98d343cc9519415 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -16,6 +16,8 @@
         <item name="statusBarForeground">@color/e_action_bar</item>
         <item name="materialSearchViewStyle">@style/Widget.App.SearchView</item>
         <item name="tabStyle">@style/Widget.App.TabLayout</item>
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog</item>
     </style>
 
     <style name="Theme.Twelve.Dialog" parent="Theme.Material3.DayNight.Dialog.Alert">
@@ -157,4 +159,15 @@
         <item name="android:background">@color/e_action_bar</item>
     </style>
 
+    <style name="ThemeOverlay.App.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/ModalBottomSheetDialog</item>
+    </style>
+
+    <style name="ModalBottomSheetDialog" parent="Widget.Material3.BottomSheet.Modal">
+        <item name="backgroundTint">@color/e_floating_background</item>
+    </style>
+
+    <style name="ThemeOverlay.App.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="colorSurfaceContainerHigh">@color/e_floating_background</item>
+    </style>
 </resources>