diff --git a/app/build.gradle b/app/build.gradle
index e3d2526b6..567517ef8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -138,7 +138,7 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    def kotlin_coroutines_version = '1.5.2-native-mt'
+    def kotlin_coroutines_version = '1.5.2'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 8a999c3eb..c0d939ffa 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -30,7 +30,5 @@
         <item name="colorSurface">@color/darkColorSurface</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="bottomSheetTint">@color/bottomSheetColor</item>
-        <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles_parents.xml b/app/src/main/res/values-v27/styles_parents.xml
index 3ef2b2de9..3c238d1ee 100644
--- a/app/src/main/res/values-v27/styles_parents.xml
+++ b/app/src/main/res/values-v27/styles_parents.xml
@@ -14,7 +14,7 @@
 
 <resources>
 
-    <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.RetroMusic.Base.MD3.DayNight">
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
         <item name="windowActionBarOverlay">true</item>
@@ -27,11 +27,9 @@
         <item name="bottomNavigationStyle">@style/Widget.Material3.BottomNavigationView</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="bottomSheetTint">@color/bottomSheetColor</item>
-        <item name="elevationOverlayColor">@color/elevationOverlay</item>
     </style>
 
-    <style name="Theme.RetroMusic.Base" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.RetroMusic.Base" parent="Theme.RetroMusic.Base.MD3.Dark">
         <item name="md_background_color">@color/darkColorPrimary</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
@@ -49,11 +47,9 @@
         <item name="bottomNavigationStyle">@style/Widget.Material3.BottomNavigationView</item>
         <item name="android:windowBackground">@color/window_color_dark</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="bottomSheetTint">@color/bottomSheetColorDark</item>
-        <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
     </style>
 
-    <style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
+    <style name="Theme.RetroMusic.Base.Light" parent="Theme.RetroMusic.Base.MD3.Light">
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
         <item name="roundSelector">@drawable/round_selector</item>
@@ -68,7 +64,5 @@
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="bottomNavigationStyle">@style/Widget.Material3.BottomNavigationView</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="bottomSheetTint">@color/bottomSheetColorLight</item>
-        <item name="elevationOverlayColor">@color/elevationOverlayLight</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/colors_md3.xml b/app/src/main/res/values-v31/colors_md3.xml
deleted file mode 100644
index 92a586af6..000000000
--- a/app/src/main/res/values-v31/colors_md3.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="elevationOverlayLight">@android:color/system_accent1_100</color>
-    <color name="elevationOverlayDark">@android:color/system_accent1_900</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/styles_parents.xml b/app/src/main/res/values-v31/styles_parents.xml
new file mode 100644
index 000000000..dfc349150
--- /dev/null
+++ b/app/src/main/res/values-v31/styles_parents.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.RetroMusic.Base.MD3.Light" parent="Theme.Material3.Light.NoActionBar" />
+
+    <style name="Theme.RetroMusic.Base.MD3.DayNight" parent="Theme.Material3.DayNight.NoActionBar" />
+
+    <style name="Theme.RetroMusic.Base.MD3.Dark" parent="Theme.Material3.DayNight.NoActionBar" />
+
+    <style name="Theme.RetroMusic.Base.MD3.Black" parent="Theme.Material3.DayNight.NoActionBar" />
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors_md3.xml b/app/src/main/res/values/colors_md3.xml
index c1144310f..ac30fc82d 100644
--- a/app/src/main/res/values/colors_md3.xml
+++ b/app/src/main/res/values/colors_md3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="elevationOverlayLight">@color/md_grey_600</color>
-    <color name="elevationOverlayDark">@color/md_grey_700</color>
+    <color name="elevationOverlayLight">@color/md_grey_700</color>
+    <color name="elevationOverlayDark">@color/md_grey_500</color>
     <color name="elevationOverlay">@color/elevationOverlayLight</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 6be8a9879..48ee48a6c 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.RetroMusic.Base.MD3.DayNight">
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
         <item name="windowActionBarOverlay">true</item>
@@ -15,11 +15,9 @@
         <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
         <item name="popupWindowStyle">@style/MaterialPopupMenuStyle</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="bottomSheetTint">@color/bottomSheetColor</item>
-        <item name="elevationOverlayColor">@color/elevationOverlay</item>
     </style>
 
-    <style name="Theme.RetroMusic.Base" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.RetroMusic.Base" parent="Theme.RetroMusic.Base.MD3.Dark">
         <item name="md_background_color">@color/darkColorSurface</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
@@ -36,11 +34,9 @@
         <item name="android:windowBackground">@color/window_color_dark</item>
         <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="bottomSheetTint">@color/bottomSheetColorDark</item>
-        <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
     </style>
 
-    <style name="Theme.RetroMusic.Base.Black" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.RetroMusic.Base.Black" parent="Theme.RetroMusic.Base.MD3.Black">
         <item name="md_background_color">@color/blackColorSurface</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
@@ -55,11 +51,9 @@
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="bottomSheetTint">@color/bottomSheetColorBlack</item>
-        <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
     </style>
 
-    <style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
+    <style name="Theme.RetroMusic.Base.Light" parent="Theme.RetroMusic.Base.MD3.Light">
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
         <item name="roundSelector">@drawable/round_selector</item>
@@ -74,10 +68,32 @@
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
+    </style>
+
+    <!-- Base Themes -->
+    <style name="Theme.RetroMusic.Base.MD3" parent="Theme.RetroMusic.Base" />
+
+    <style name="Theme.RetroMusic.Base.MD3.Light" parent="Theme.Material3.Light.NoActionBar">
         <item name="bottomSheetTint">@color/bottomSheetColorLight</item>
         <item name="elevationOverlayColor">@color/elevationOverlayLight</item>
     </style>
 
+    <style name="Theme.RetroMusic.Base.MD3.DayNight" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="bottomSheetTint">@color/bottomSheetColor</item>
+        <item name="elevationOverlayColor">@color/elevationOverlay</item>
+    </style>
+
+    <style name="Theme.RetroMusic.Base.MD3.Dark" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="bottomSheetTint">@color/bottomSheetColor</item>
+        <item name="elevationOverlayColor">@color/elevationOverlay</item>
+    </style>
+
+    <style name="Theme.RetroMusic.Base.MD3.Black" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="bottomSheetTint">@color/bottomSheetColorDark</item>
+        <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
+    </style>
+
+
     <style name="MusicProgressSliderParent">
         <item name="android:progressDrawable">@android:color/transparent</item>
         <item name="android:layout_width">match_parent</item>
diff --git a/app/src/main/res/xml/pref_audio.xml b/app/src/main/res/xml/pref_audio.xml
index d9a02bb4b..9004f1a89 100755
--- a/app/src/main/res/xml/pref_audio.xml
+++ b/app/src/main/res/xml/pref_audio.xml
@@ -46,7 +46,7 @@
         android:layout="@layout/list_item_view_switch"
         android:summary="@string/pref_summary_toggle_headset"
         android:title="@string/pref_title_toggle_toggle_headset"
-        app:icon="@drawable/ic_play_arrow_white_32dp" />
+        app:icon="@drawable/ic_play_arrow" />
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="false"
diff --git a/app/src/main/res/xml/pref_now_playing_screen.xml b/app/src/main/res/xml/pref_now_playing_screen.xml
index d01bd1cd8..8f48955ce 100644
--- a/app/src/main/res/xml/pref_now_playing_screen.xml
+++ b/app/src/main/res/xml/pref_now_playing_screen.xml
@@ -56,7 +56,7 @@
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:layout="@layout/list_item_view_switch"
             app:defaultValue="false"
-            app:icon="@drawable/ic_play_arrow_white_32dp"
+            app:icon="@drawable/ic_play_arrow"
             app:key="toggle_add_controls"
             app:summary="@string/pref_summary_extra_controls"
             app:title="@string/pref_title_extra_controls" />