diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml
index e3267c670..91f9f3745 100644
--- a/app/src/main/res/values-v31/styles.xml
+++ b/app/src/main/res/values-v31/styles.xml
@@ -1,16 +1,15 @@
 <resources>
+
     <style name="Theme.RetroMusic.MD3" parent="@style/Theme.Material3.DayNight.NoActionBar">
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
-        <item name="popupWindowStyle">@style/MaterialPopupMenuStyle</item>
-        <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
         <item name="android:statusBarColor">@color/transparent</item>
         <item name="android:navigationBarColor">@color/transparent</item>
     </style>
-    <style name="BottomSheetStyle" parent="Widget.MaterialComponents.BottomSheet">
+
+    <style name="BottomSheetStyle" parent="Widget.Material3.BottomSheet">
         <item name="android:maxWidth">@empty</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 37de6fd11..58bac87fb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -26,11 +26,9 @@
     <style name="Theme.RetroMusic.MD3" parent="@style/Theme.Material3.DayNight.NoActionBar">
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
-        <item name="popupWindowStyle">@style/MaterialPopupMenuStyle</item>
-        <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
+        <item name="bottomSheetTint">?attr/colorSurface</item>
     </style>
 
     <style name="Theme.RetroMusic.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent" />
@@ -190,7 +188,7 @@
     </style>
 
 
-    <style name="BottomSheetStyle" parent="Widget.MaterialComponents.BottomSheet">
+    <style name="BottomSheetStyle" parent="Widget.Material3.BottomSheet">
         <item name="android:maxWidth">@empty</item>
         <item name="android:backgroundTint">?attr/bottomSheetTint</item>
     </style>