diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html
index 5ca12ddd..c3041fbd 100644
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@@ -1 +1 @@
-<html><head>    <style type="text/css">        * {        word-wrap: break-word;        }        {style-placeholder}        a {        color: {link-color};        }        a:active {        color: {link-color-active};        }        ol {        list-style-position: inside;        padding-left: 0;        padding-right: 0;        }        li {        padding-top: 8px;        }    </style></head><body><h4>v3.4.800</h4><ul>    <li>Improved dark theme colors and Follow system theme</li>    <li>Rounded rectangle ripple for BottomNavigationView</li>    <li>Follow sleep timer dialog checkbox color as accent</li>    <li>Added song list selection for Alum and Artist details</li>    <li></li></ul><h4>v3.4.700</h4><ul>    <li>Added splash screen(for app loading time)</li>    <li>Updated dark theme colors</li>    <li>Added circular progress view</li>    <li>Hiding year if not showing</li></ul><h4>v3.4.600</h4><ul>    <li>Fix notification layout height</li>    <li>Fix folder list last item not showing</li>    <li>Added auto hide/ show controls according to first and last item</li></ul><h4>v3.4.500</h4><ul>    <li>Added peak theme</li>    <li>Added app rating dialog</li>    <li>Fix song name scrolling in now playing themes if it's long</li>    <li>Fix playing queue last item hiding FAB</li>    <li>Added desaturated color option for dark mode</li>    <li>Fix slow search loading</li>    <li>Fix last added slow loading</li>    <li>Fix home banner toolbar corner</li>    <li>Fix home crashing when switching between two tabs</li>    <li>Fix remaining time in playing queue</li>    <li>Fix font not applied for some components</li>    <li>Fix crashing on album details sorting</li>    <li>Fixed lot of internal bugs</li>    <li>Fix dialog expand</li>    <li>Fix list card color</li>    <li>Removed SlidingUpPanel to replace with BottomSheet</li>    <li>Removed color theme as per material design guidelines</li>    <li>Removed classic theme(We're bringing back)</li>    <li>Replace line switch to Material Switch in settings</li>    <li>Performance improved</li>    <li>Updated internal libraries</li>    <li>Updated translation</li>    <li>Limiting the use of Theme engine for making use of system colors</li>    <li>Change home icon from the user icon</li>    <li>Corrected all toolbar with elevation when scrolling</li></ul><h4>v3.3.200</h4><ul>    <li>Fix fullscreen bottom tabs icons squash</li>    <li>Improved tiny theme colors</li>    <li>Android auto support</li>    <li>New notification icon</li>    <li>Favorite icon in mini player</li></ul><h4>v.3.3.100</h4><ul>    <li>Improved Now playing controls alignment</li>    <li>Lot internal changes to improve performance</li>    <li>Fix playlist adding crash</li>    <li>Fix color corrections</li>    <li>Fix file editing crash</li></ul><h4>v3.3.000</h4><ul>    <li>SD card support for deleting and editing</li></ul><h4>v3.2.240</h4><ul>    <li>Improved options dialog with selected color and title icon</li>    <li>Fix dialog color on dark theme</li></ul><h4>v3.2.220</h4><ul>    <li>Fix Notification SeekBar position (Need Android Q test)</li>    <li>Rolled back settings tint icons</li>    <li>Changed preference category title style according Android Q</li>    <li>Fix tabs options not working</li></ul><h4>v3.2.203</h4><ul>    <li>Carousel effect improved</li>    <li>Settings icons are now tint accent color</li>    <li>Settings title, back arrow and icons are now tint accent color</li>    <li>Equalizer is removed</li>    <li>Fix keyboard not popping on Search</li>    <li>Curated the main options</li>    <li>Folder toolbar outlined, folder icon background fix and separate line removed</li>    <li>Edit text input handles are colored</li></ul><h4>v3.2.135</h4><ul>    <li>Fix crashing on sharing song</li></ul><h4>v3.2.125</h4><ul>    <li>Fix crashing on selecting profile picture</li>    <li>Semi transparent color fix(s) on now playing themes</li></ul><h4>v3.2.120</h4><ul>    <li>Fix crashing on choosing a theme</li>    <li>Fix color theme selection without pro enabled</li>    <li>Fix icon tint some places</li></ul><h4>v3.2.105</h4><ul>    <li>Fix color notifications</li></ul><h4>v3.2.100</h4><ul>    <li>Fix crashing on Sleep timer</li>    <li>Toolbar elevation removed added stroke instead</li>    <li>Show empty indication for home</li></ul><h4>v3.2.000</h4><ul>    <li>Implemented Artist image loading all thanks to <a            href="https://github.com/AdrienPoupa/VinylMusicPlayer"> VinylMusicPlayer</a></li>    <li>Fixed buttons in Genre details</li>    <li>Fixed color buttons in Album and Artist details screen</li></ul><h4>v3.1.900</h4><ul>    <li>Added Play and Shuffle buttons on Songs list, Album Details, Artist Details, Playlist        Details etc.    </li>    <li>Home toolbar is semi transparent in Banner mode</li>    <li>Added new Buy Retro Music pro in settings</li>    <li>Improved dark color in Dark theme</li></ul><h4>v3.1.850</h4><ul>    <li>Toolbar will be clickable for Search</li></ul><h4>v3.1.800</h4><ul>    <li>Search bar CardView background</li>    <li>Improve volume zero</li>    <li>Now playing and Album theme picker rollback to dialog</li>    <li>Fix sharing app link</li>    <li>Fix scanning dialog</li>    <li>Added settings icons for options</li></ul><h4>v3.1.700</h4><ul>    <li>Cleaned internal code</li>    <li>Removed full screen option</li>    <li>Added Toolbar elevation</li>    <li>To access menu either tap on Toolbar or Hamburger icon</li>    <li>Fix back button not working on playing queue</li>    <li>Fix crashing on What's New screen</li>    <li>Fix lyrics dialog</li>    <li>Changed toggles to line icons</li>    <li>Fix crashing on artist list for number format error</li>    <li>Fix blacklist dialog crashing</li>    <li>Rearranged icons and main menu access</li>    <li>Fix some crashes when device is locked or background</li>    <li>Folder screen have main options access</li>    <li>Dialogs are now using Material Dialogs v3(BottomSheet)</li>    <li>Fix Shuffle icon for Artist, Album, Genre and Playlist details</li></ul><h4>v3.1.400</h4><ul>    <li>Removed sync lyrics for Android 5</li>    <li>Fix Seek-bar color in settings</li>    <li>Added keyboard to popup on search</li>    <li>Added keyboard to popup on search</li>    <li>Improved lock-screen behavior and UI</li>    <li>Improved text appearance</li>    <li>Fix bio text not showing in settings</li>    <li>Fix not showing slider(blur, filter song) amount in settings</li>    <li>Fix setting ringtone</li>    <li>Fix file sharing crash</li>    <li>Fix some crashes</li>    <li>Fix playlist icon on small devices</li>    <li>Fix empty lyrics text color</li>    <li>Fix album cover background purple color in color theme</li></ul><h4>v3.1.300</h4><ul>    <li>Fix rename playlist text color</li>    <li>Fix same album showing in details page</li>    <li>Fix lyrics text alignment on sync and lyrics reading improved</li>    <li>Improved home sections loading</li>    <li>Removed library options which are duplicated (it's available from profile menu)</li>    <li>Replaced collapsing Fab with Android Floating Extended Fab</li>    <li>Replaced home with for you</li>    <li>Fixed profile image not loading in about</li>    <li>Improved selecting user profile image</li>    <li>Added bio to enter custom message</li>    <li>Improved some UI screens</li></ul><p>If you see entire app white or dark or black select same theme in settings to fix </p><p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a></p><p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its    not working try to    uninstall and install again. </p></body>
\ No newline at end of file
+<html><head>    <style type="text/css">        * {        word-wrap: break-word;        }        {style-placeholder}        a {        color: {link-color};        }        a:active {        color: {link-color-active};        }        ol {        list-style-position: inside;        padding-left: 0;        padding-right: 0;        }        li {        padding-top: 8px;        }    </style></head><body><h4>v3.4.800</h4><ul>    <li>Improved dark theme colors and Follow system theme</li>    <li>Rounded rectangle ripple for BottomNavigationView</li>    <li>Follow sleep timer dialog checkbox color as accent</li>    <li>Added song list selection for Alum and Artist details</li>    <li>Fixed Toolbar popup text color when selecting songs</li></ul><h4>v3.4.700</h4><ul>    <li>Added splash screen(for app loading time)</li>    <li>Updated dark theme colors</li>    <li>Added circular progress view</li>    <li>Hiding year if not showing</li></ul><h4>v3.4.600</h4><ul>    <li>Fix notification layout height</li>    <li>Fix folder list last item not showing</li>    <li>Added auto hide/ show controls according to first and last item</li></ul><h4>v3.4.500</h4><ul>    <li>Added peak theme</li>    <li>Added app rating dialog</li>    <li>Fix song name scrolling in now playing themes if it's long</li>    <li>Fix playing queue last item hiding FAB</li>    <li>Added desaturated color option for dark mode</li>    <li>Fix slow search loading</li>    <li>Fix last added slow loading</li>    <li>Fix home banner toolbar corner</li>    <li>Fix home crashing when switching between two tabs</li>    <li>Fix remaining time in playing queue</li>    <li>Fix font not applied for some components</li>    <li>Fix crashing on album details sorting</li>    <li>Fixed lot of internal bugs</li>    <li>Fix dialog expand</li>    <li>Fix list card color</li>    <li>Removed SlidingUpPanel to replace with BottomSheet</li>    <li>Removed color theme as per material design guidelines</li>    <li>Removed classic theme(We're bringing back)</li>    <li>Replace line switch to Material Switch in settings</li>    <li>Performance improved</li>    <li>Updated internal libraries</li>    <li>Updated translation</li>    <li>Limiting the use of Theme engine for making use of system colors</li>    <li>Change home icon from the user icon</li>    <li>Corrected all toolbar with elevation when scrolling</li></ul><h4>v3.3.200</h4><ul>    <li>Fix fullscreen bottom tabs icons squash</li>    <li>Improved tiny theme colors</li>    <li>Android auto support</li>    <li>New notification icon</li>    <li>Favorite icon in mini player</li></ul><h4>v.3.3.100</h4><ul>    <li>Improved Now playing controls alignment</li>    <li>Lot internal changes to improve performance</li>    <li>Fix playlist adding crash</li>    <li>Fix color corrections</li>    <li>Fix file editing crash</li></ul><h4>v3.3.000</h4><ul>    <li>SD card support for deleting and editing</li></ul><h4>v3.2.240</h4><ul>    <li>Improved options dialog with selected color and title icon</li>    <li>Fix dialog color on dark theme</li></ul><h4>v3.2.220</h4><ul>    <li>Fix Notification SeekBar position (Need Android Q test)</li>    <li>Rolled back settings tint icons</li>    <li>Changed preference category title style according Android Q</li>    <li>Fix tabs options not working</li></ul><h4>v3.2.203</h4><ul>    <li>Carousel effect improved</li>    <li>Settings icons are now tint accent color</li>    <li>Settings title, back arrow and icons are now tint accent color</li>    <li>Equalizer is removed</li>    <li>Fix keyboard not popping on Search</li>    <li>Curated the main options</li>    <li>Folder toolbar outlined, folder icon background fix and separate line removed</li>    <li>Edit text input handles are colored</li></ul><h4>v3.2.135</h4><ul>    <li>Fix crashing on sharing song</li></ul><h4>v3.2.125</h4><ul>    <li>Fix crashing on selecting profile picture</li>    <li>Semi transparent color fix(s) on now playing themes</li></ul><h4>v3.2.120</h4><ul>    <li>Fix crashing on choosing a theme</li>    <li>Fix color theme selection without pro enabled</li>    <li>Fix icon tint some places</li></ul><h4>v3.2.105</h4><ul>    <li>Fix color notifications</li></ul><h4>v3.2.100</h4><ul>    <li>Fix crashing on Sleep timer</li>    <li>Toolbar elevation removed added stroke instead</li>    <li>Show empty indication for home</li></ul><h4>v3.2.000</h4><ul>    <li>Implemented Artist image loading all thanks to <a            href="https://github.com/AdrienPoupa/VinylMusicPlayer"> VinylMusicPlayer</a></li>    <li>Fixed buttons in Genre details</li>    <li>Fixed color buttons in Album and Artist details screen</li></ul><h4>v3.1.900</h4><ul>    <li>Added Play and Shuffle buttons on Songs list, Album Details, Artist Details, Playlist        Details etc.    </li>    <li>Home toolbar is semi transparent in Banner mode</li>    <li>Added new Buy Retro Music pro in settings</li>    <li>Improved dark color in Dark theme</li></ul><h4>v3.1.850</h4><ul>    <li>Toolbar will be clickable for Search</li></ul><h4>v3.1.800</h4><ul>    <li>Search bar CardView background</li>    <li>Improve volume zero</li>    <li>Now playing and Album theme picker rollback to dialog</li>    <li>Fix sharing app link</li>    <li>Fix scanning dialog</li>    <li>Added settings icons for options</li></ul><h4>v3.1.700</h4><ul>    <li>Cleaned internal code</li>    <li>Removed full screen option</li>    <li>Added Toolbar elevation</li>    <li>To access menu either tap on Toolbar or Hamburger icon</li>    <li>Fix back button not working on playing queue</li>    <li>Fix crashing on What's New screen</li>    <li>Fix lyrics dialog</li>    <li>Changed toggles to line icons</li>    <li>Fix crashing on artist list for number format error</li>    <li>Fix blacklist dialog crashing</li>    <li>Rearranged icons and main menu access</li>    <li>Fix some crashes when device is locked or background</li>    <li>Folder screen have main options access</li>    <li>Dialogs are now using Material Dialogs v3(BottomSheet)</li>    <li>Fix Shuffle icon for Artist, Album, Genre and Playlist details</li></ul><h4>v3.1.400</h4><ul>    <li>Removed sync lyrics for Android 5</li>    <li>Fix Seek-bar color in settings</li>    <li>Added keyboard to popup on search</li>    <li>Added keyboard to popup on search</li>    <li>Improved lock-screen behavior and UI</li>    <li>Improved text appearance</li>    <li>Fix bio text not showing in settings</li>    <li>Fix not showing slider(blur, filter song) amount in settings</li>    <li>Fix setting ringtone</li>    <li>Fix file sharing crash</li>    <li>Fix some crashes</li>    <li>Fix playlist icon on small devices</li>    <li>Fix empty lyrics text color</li>    <li>Fix album cover background purple color in color theme</li></ul><h4>v3.1.300</h4><ul>    <li>Fix rename playlist text color</li>    <li>Fix same album showing in details page</li>    <li>Fix lyrics text alignment on sync and lyrics reading improved</li>    <li>Improved home sections loading</li>    <li>Removed library options which are duplicated (it's available from profile menu)</li>    <li>Replaced collapsing Fab with Android Floating Extended Fab</li>    <li>Replaced home with for you</li>    <li>Fixed profile image not loading in about</li>    <li>Improved selecting user profile image</li>    <li>Added bio to enter custom message</li>    <li>Improved some UI screens</li></ul><p>If you see entire app white or dark or black select same theme in settings to fix </p><p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a></p><p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its    not working try to    uninstall and install again. </p></body>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/rect_selector.xml b/app/src/main/res/drawable-v21/rect_selector.xml
index 4263a760..a36f34b0 100644
--- a/app/src/main/res/drawable-v21/rect_selector.xml
+++ b/app/src/main/res/drawable-v21/rect_selector.xml
@@ -1,15 +1,19 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorOnSecondary">
-
-    <item
-        android:id="@android:id/mask"
-        android:drawable="@android:color/white" />
+    android:color="?attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape>
+            <corners android:radius="8dp" />
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
     <item>
         <selector>
-            <item
-                android:drawable="@color/ripple_material_light"
-                android:state_activated="true" />
+            <item android:state_activated="true">
+                <shape>
+                    <corners android:radius="8dp" />
+                    <solid android:color="?android:attr/colorControlHighlight" />
+                </shape>
+            </item>
         </selector>
     </item>
-
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/rect_selector_strong.xml b/app/src/main/res/drawable-v21/rect_selector_strong.xml
deleted file mode 100644
index 9dd19ae0..00000000
--- a/app/src/main/res/drawable-v21/rect_selector_strong.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorOnSecondary">
-
-    <item
-        android:id="@android:id/mask"
-        android:drawable="@android:color/white" />
-    <item>
-        <selector>
-            <item
-                android:drawable="@color/ate_control_normal_light"
-                android:state_activated="true" />
-        </selector>
-    </item>
-
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/round_selector.xml b/app/src/main/res/drawable-v21/round_selector.xml
index 6499f897..c38d4e9c 100644
--- a/app/src/main/res/drawable-v21/round_selector.xml
+++ b/app/src/main/res/drawable-v21/round_selector.xml
@@ -1,5 +1,5 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorOnSecondary">
+    android:color="?android:attr/colorControlHighlight">
 
     <item
         android:id="@android:id/mask"
diff --git a/app/src/main/res/drawable/rect_selector.xml b/app/src/main/res/drawable/rect_selector.xml
index b03bcafa..75e988c0 100644
--- a/app/src/main/res/drawable/rect_selector.xml
+++ b/app/src/main/res/drawable/rect_selector.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@color/ripple_material_light" android:state_activated="true" android:state_pressed="true"/>
-    <item android:drawable="@color/ripple_material_light" android:state_activated="true"/>
-    <item android:drawable="@color/ripple_material_light" android:state_pressed="true"/>
-    <item android:drawable="@android:color/transparent"/>
+    <item android:drawable="@color/ripple_material_light" android:state_activated="true" android:state_pressed="true" />
+    <item android:drawable="@color/ripple_material_light" android:state_activated="true" />
+    <item android:drawable="@color/ripple_material_light" android:state_pressed="true" />
+    <item android:drawable="@android:color/transparent" />
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_selector_strong.xml b/app/src/main/res/drawable/rect_selector_strong.xml
deleted file mode 100644
index 74866e66..00000000
--- a/app/src/main/res/drawable/rect_selector_strong.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@color/ate_control_normal_light" android:state_activated="true" android:state_pressed="true"/>
-    <item android:drawable="@color/ate_control_normal_light" android:state_activated="true"/>
-    <item android:drawable="@color/ate_control_normal_light" android:state_pressed="true"/>
-    <item android:drawable="@android:color/transparent"/>
-
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 00b8ce7d..bd0307ca 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -66,11 +66,11 @@
                         android:background="?colorSurface"
                         app:contentInsetStart="0dp"
                         app:contentInsetStartWithNavigation="0dp"
-                        app:popupTheme="?toolbarPopupTheme"
+                        app:popupTheme="?attr/toolbarPopupTheme"
                         app:title="@string/search_hint"
                         app:titleMarginStart="0dp"
                         app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
-                        app:titleTextColor="?colorOnSurface"
+                        app:titleTextColor="?android:attr/textColorSecondary"
                         tools:ignore="UnusedAttribute" />
 
                     <ViewStub
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index 0e0737ee..636b8f0b 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -4,37 +4,33 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?rectSelector"
+    android:layout_margin="4dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?rectSelector"
     tools:ignore="MissingPrefix">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:gravity="center"
         android:orientation="vertical"
         tools:ignore="UnusedAttribute,UselessParent">
 
-        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+        <code.name.monkey.retromusic.views.WidthFitSquareCardView
+            android:id="@+id/imageContainerCard"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            app:cardCornerRadius="8dp"
+            app:cardUseCompatPadding="true">
 
-            <com.google.android.material.card.MaterialCardView
-                android:id="@+id/imageContainerCard"
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/image"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:cardCornerRadius="8dp"
-                app:cardElevation="4dp"
-                app:cardUseCompatPadding="true">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/image"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    tools:ignore="ContentDescription"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic" />
-            </com.google.android.material.card.MaterialCardView>
-        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+                android:scaleType="centerCrop"
+                tools:ignore="ContentDescription"
+                tools:srcCompat="@tools:sample/backgrounds/scenic" />
+        </code.name.monkey.retromusic.views.WidthFitSquareCardView>
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index 3b574a26..358d488b 100755
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_margin="4dp"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?rectSelector"
@@ -28,7 +29,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_weight="0"
-        android:paddingLeft="16dp"
+        android:paddingStart="16dp"
         android:paddingEnd="0dp">
 
         <com.google.android.material.card.MaterialCardView
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index a5c2fee2..af453f29 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -13,23 +13,23 @@
   -->
 
 <resources>
+
     <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="md_font_title">@font/circular</item>
         <item name="md_font_body">@font/circular</item>
         <item name="md_font_button">@font/circular</item>
-
+        <item name="md_background_color">?attr/colorSurface</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
         <item name="android:fontFamily">@font/circular</item>
-
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="windowActionBarOverlay">true</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
-
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
-        <item name="rectSelectorStrong">@drawable/rect_selector_strong</item>
+        <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c27c949b..60eed367 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -3,7 +3,6 @@
 
     <attr name="roundSelector" format="reference" />
     <attr name="rectSelector" format="reference" />
-    <attr name="rectSelectorStrong" format="reference" />
 
     <attr name="defaultFooterColor" format="color" />
 
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index bebeecf9..9862c2ec 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -7,19 +7,16 @@
         <item name="md_font_button">@font/circular</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
-        <item name="android:fontFamily">@font/circular</item>
-
         <item name="windowActionBarOverlay">true</item>
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+        <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
-
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
-        <item name="rectSelectorStrong">@drawable/rect_selector_strong</item>
-
-
+        <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
     </style>
 
     <style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
@@ -29,45 +26,32 @@
         <item name="md_color_button_text">@color/md_white_1000</item>
         <item name="md_background_color">@color/darkColorPrimary</item>
         <item name="android:windowActionBarOverlay">true</item>
-        <item name="windowActionBarOverlay">true</item>
-        <item name="roundSelector">@drawable/round_selector_dark</item>
-        <item name="rectSelector">@drawable/rect_selector_dark</item>
-        <item name="rectSelectorStrong">@drawable/rect_selector_strong_dark</item>
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
-
-        <!-- necessary to find the overflow button later in the layout-->
-        <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
-
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-
         <item name="android:windowActivityTransitions">true</item>
         <item name="android:fontFamily">@font/circular</item>
-
+        <item name="windowActionBarOverlay">true</item>
+        <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="roundSelector">@drawable/round_selector_dark</item>
+        <item name="rectSelector">@drawable/rect_selector_dark</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
+        <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="windowActionBar">false</item>
-
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Black" parent="Theme.MaterialComponents.NoActionBar">
-
         <item name="md_font_title">@font/circular</item>
         <item name="md_font_body">@font/circular</item>
         <item name="md_font_button">@font/circular</item>
         <item name="md_background_color">@color/blackColorSurface</item>
-
-
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
-        <item name="rectSelectorStrong">@drawable/rect_selector_strong</item>
-
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
         <item name="android:fontFamily">@font/circular</item>
-
         <item name="windowActionBarOverlay">true</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="colorSurface">@color/blackColorSurface</item>
@@ -86,7 +70,6 @@
 
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
-        <item name="rectSelectorStrong">@drawable/rect_selector_strong</item>
 
         <item name="cardBackgroundColor">@color/md_white_1000</item>
 
