diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
index 23ae725a3..fed88d483 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
@@ -81,7 +81,6 @@ class SettingsActivity : AbsThemeActivity(), ColorCallback, OnThemeChangedListen
         ThemeStore.editTheme(this).accentColor(color).commit()
         if (VersionUtils.hasNougatMR())
             DynamicShortcutManager(this).updateDynamicShortcuts()
-
         restart()
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt b/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
index b95e5ddfc..c264d4e15 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
@@ -28,10 +28,8 @@ object ThemeManager {
     fun getNightMode(
         context: Context
     ): Int = when (context.generalThemeValue) {
-        LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
-        DARK,
-        BLACK -> AppCompatDelegate.MODE_NIGHT_YES
-        AUTO -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+        DARK -> AppCompatDelegate.MODE_NIGHT_YES
+        else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
     }
 }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt
index 14b96c288..509bb5d15 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt
@@ -16,13 +16,11 @@ package code.name.monkey.retromusic.views
 
 import android.content.Context
 import android.content.res.ColorStateList
-import android.graphics.drawable.ColorDrawable
 import android.util.AttributeSet
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.NavigationViewUtil
-import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.PreferenceUtil
 import com.google.android.material.bottomnavigation.BottomNavigationView
 
@@ -49,7 +47,6 @@ class BottomNavigationBarTinted @JvmOverloads constructor(
                 accentColor
             )
             itemRippleColor = ColorStateList.valueOf(accentColor.addAlpha(0.08F))
-            background = ColorDrawable(ATHUtil.resolveColor(context, R.attr.bottomSheetTint))
             itemActiveIndicatorColor = ColorStateList.valueOf(accentColor.addAlpha(0.12F))
         }
     }
diff --git a/app/src/main/res/layout/mcab_toolbar.xml b/app/src/main/res/layout/mcab_toolbar.xml
index 9efe854e6..0ad645b06 100644
--- a/app/src/main/res/layout/mcab_toolbar.xml
+++ b/app/src/main/res/layout/mcab_toolbar.xml
@@ -4,5 +4,5 @@
     android:layout_width="match_parent"
     android:layout_height="?actionBarSize"
     android:elevation="@dimen/mcab_toolbar_elevation"
-    android:theme="@style/ThemeOverlay.Material3.ActionBar"
+    android:theme="@style/mcab_theme"
     tools:ignore="UnusedAttribute" />
\ No newline at end of file
diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index 4666e03d8..17d658a0a 100644
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -29,7 +29,6 @@
         <item name="android:windowLightNavigationBar">false</item>
         <item name="colorSurface">@color/darkColorSurface</item>
         <item name="materialCardViewStyle">@style/Widget.MaterialComponents.CardView</item>
-        <item name="bottomSheetTint">@color/bottomSheetColor</item>
         <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
         <item name="floatingActionButtonStyle">
             @style/Widget.MaterialComponents.FloatingActionButton
diff --git a/app/src/main/res/values-v27/styles_parents.xml b/app/src/main/res/values-v27/styles_parents.xml
index 2aea8a247..c80f0d996 100644
--- a/app/src/main/res/values-v27/styles_parents.xml
+++ b/app/src/main/res/values-v27/styles_parents.xml
@@ -27,7 +27,6 @@
         <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>
         <item name="floatingActionButtonStyle">
             @style/Widget.MaterialComponents.FloatingActionButton
@@ -54,7 +53,6 @@
         <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/bottomSheetColor</item>
         <item name="elevationOverlayColor">@color/elevationOverlay</item>
         <item name="floatingActionButtonStyle">
             @style/Widget.MaterialComponents.FloatingActionButton
@@ -78,7 +76,6 @@
         <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>
         <item name="floatingActionButtonStyle">
             @style/Widget.MaterialComponents.FloatingActionButton
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 63e3c4278..d2db61cfb 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -6,7 +6,6 @@
     <attr name="defaultFooterColor" format="color" />
     <attr name="toolbarPopupTheme" format="reference" />
     <attr name="lineHeightHint" format="dimension" />
-    <attr name="bottomSheetTint" format="reference" />
 
     <declare-styleable name="NetworkImageView">
         <attr name="url_link" format="string" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 159bd3f86..cf607b8c6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,19 +1,10 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.RetroMusic" parent="Theme.RetroMusic.Base">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowSharedElementsUseOverlay">false</item>
-        <item name="android:textViewStyle">@style/TextViewStyleIm</item>
-        <item name="android:scrollbars">none</item>
-        <item name="dialogCornerRadius">16dp</item>
-        <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
-    </style>
+    <style name="Theme.RetroMusic" parent="Theme.RetroMusic.Base" />
 
     <style name="Theme.RetroMusic.Light" parent="Theme.RetroMusic.Base.Light" />
 
-    <style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black">
-        <item name="android:windowBackground">@color/window_color_dark</item>
-    </style>
+    <style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black" />
 
     <style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
         <item name="android:windowBackground">@color/window_color</item>
@@ -24,7 +15,6 @@
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
-        <item name="bottomSheetTint">?attr/colorSurface</item>
     </style>
 
     <style name="Theme.RetroMusic.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent" />
@@ -56,6 +46,13 @@
         <item name="titleMarginStart">16dp</item>
     </style>
 
+    <style name="mcab_theme" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
+        <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
+    </style>
+
+    <style name="mcab_overflow_style">
+        <item name="srcCompat">@drawable/ic_more_vert</item>
+    </style>
 
     <style name="ToolbarTextAppearanceNormal">
         <item name="android:textStyle">bold</item>
@@ -185,7 +182,6 @@
 
     <style name="BottomSheetStyle" parent="Widget.Material3.BottomSheet">
         <item name="android:maxWidth">@empty</item>
-        <item name="android:backgroundTint">?attr/bottomSheetTint</item>
     </style>
 
     <style name="MaterialCardViewStroke">
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 001b26ee6..6229dedbb 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -14,8 +14,7 @@
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <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="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>T
         <item name="elevationOverlayColor">@color/elevationOverlay</item>
         <item name="floatingActionButtonStyle">
             @style/Widget.MaterialComponents.FloatingActionButton
@@ -40,7 +39,6 @@
         <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/bottomSheetColor</item>
         <item name="elevationOverlayColor">@color/elevationOverlay</item>
         <item name="floatingActionButtonStyle">
             @style/Widget.MaterialComponents.FloatingActionButton
@@ -63,7 +61,6 @@
         <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>
         <item name="floatingActionButtonStyle">
             @style/Widget.MaterialComponents.FloatingActionButton
@@ -86,7 +83,6 @@
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="bottomSheetTint">@color/bottomSheetColorLight</item>
         <item name="elevationOverlayColor">@color/elevationOverlayLight</item>
         <item name="floatingActionButtonStyle">
             @style/Widget.MaterialComponents.FloatingActionButton