diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt
index 14e6b31e..975a0104 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt
@@ -26,7 +26,6 @@ import android.widget.TextView
 import androidx.annotation.NonNull
 import androidx.fragment.app.DialogFragment
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.R.layout
 import code.name.monkey.retromusic.R.string
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
@@ -59,7 +58,7 @@ class SongDetailDialog : DialogFragment() {
 
         val materialDialog = MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT))
                 .show {
-                    customView(layout.dialog_file_details,
+                    customView(R.layout.dialog_file_details,
                             scrollable = true)
                     positiveButton(android.R.string.ok)
                     title(string.action_details)
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
index 7f7b69f9..fc456bfc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
@@ -29,19 +29,13 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.retromusic.R;
 
 public class RetroColorUtil {
     public static int toolbarColor(@NonNull Context context) {
-        int color = ThemeStore.Companion.primaryColor(context);
-        if (ATHUtil.INSTANCE.isWindowBackgroundDark(context)) {
-            return ATHUtil.INSTANCE.resolveColor(context, R.attr.cardBackgroundColor);
-        } else {
-            return color;
-        }
+        return ATHUtil.INSTANCE.resolveColor(context, R.attr.colorSurface);
     }
 
     @Nullable
diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml
index 27762bef..6609e3da 100644
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@@ -49,9 +49,7 @@
                 app:cardElevation="0dp"
                 app:cardUseCompatPadding="true"
                 app:layout_collapseMode="pin"
-                app:layout_scrollFlags="scroll|enterAlways"
-                app:strokeColor="?dividerColor"
-                app:strokeWidth="1dp">
+                app:layout_scrollFlags="scroll|enterAlways">
 
                 <com.google.android.material.appbar.MaterialToolbar
                     android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout-xlarge-land/fragment_home.xml b/app/src/main/res/layout-xlarge-land/fragment_home.xml
index aa2a71e9..d791b0c4 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_home.xml
@@ -51,9 +51,7 @@
                 app:cardElevation="0dp"
                 app:cardUseCompatPadding="true"
                 app:layout_collapseMode="pin"
-                app:layout_scrollFlags="scroll|enterAlways"
-                app:strokeColor="?dividerColor"
-                app:strokeWidth="1dp">
+                app:layout_scrollFlags="scroll|enterAlways">
 
                 <com.google.android.material.appbar.MaterialToolbar
                     android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout-xlarge/fragment_home.xml b/app/src/main/res/layout-xlarge/fragment_home.xml
index ff6949d8..879c794b 100644
--- a/app/src/main/res/layout-xlarge/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge/fragment_home.xml
@@ -50,11 +50,9 @@
                 android:layout_marginBottom="@dimen/toolbar_margin_vertical"
                 app:cardCornerRadius="8dp"
                 app:cardElevation="0dp"
-                app:layout_collapseMode="pin"
                 app:cardUseCompatPadding="true"
-                app:layout_scrollFlags="scroll|enterAlways"
-                app:strokeColor="?dividerColor"
-                app:strokeWidth="1dp">
+                app:layout_collapseMode="pin"
+                app:layout_scrollFlags="scroll|enterAlways">
 
                 <com.google.android.material.appbar.MaterialToolbar
                     android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml
index 0d8fd52a..bcaf381c 100644
--- a/app/src/main/res/layout/abs_playlists.xml
+++ b/app/src/main/res/layout/abs_playlists.xml
@@ -65,7 +65,7 @@
             app:iconBackgroundColor="@color/md_blue_500"
             app:srcCompat="@drawable/ic_access_time_white_24dp" />
 
-        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -93,12 +93,13 @@
             app:iconBackgroundColor="@color/md_red_500"
             app:srcCompat="@drawable/ic_library_add_white_24dp" />
 
-        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:paddingTop="8dp"
-            android:text="@string/last_added" />
+            android:text="@string/last_added"
+            android:textColor="?colorOnSecondary" />
 
     </LinearLayout>
 
@@ -121,12 +122,13 @@
             app:iconBackgroundColor="@color/md_deep_purple_500"
             app:srcCompat="@drawable/ic_trending_up_white_24dp" />
 
-        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:paddingTop="8dp"
-            android:text="@string/my_top_tracks" />
+            android:text="@string/my_top_tracks"
+            android:textColor="?colorOnSecondary" />
 
     </LinearLayout>
 
@@ -148,12 +150,13 @@
             app:iconBackgroundColor="@color/md_green_500"
             app:srcCompat="@drawable/ic_shuffle_white_24dp" />
 
-        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:paddingTop="8dp"
-            android:text="@string/shuffle" />
+            android:text="@string/shuffle"
+            android:textColor="?colorOnSecondary" />
 
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_playing_queue.xml b/app/src/main/res/layout/activity_playing_queue.xml
index e1ae1c4a..f5f35c21 100755
--- a/app/src/main/res/layout/activity_playing_queue.xml
+++ b/app/src/main/res/layout/activity_playing_queue.xml
@@ -51,14 +51,16 @@
         android:scrollbars="none"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@android:id/empty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:text="@string/empty"
         android:textAppearance="@style/TextViewNormal"
-        android:visibility="gone" />
+        android:textColor="?colorOnSecondary"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/clearQueue"
diff --git a/app/src/main/res/layout/dialog_file_details.xml b/app/src/main/res/layout/dialog_file_details.xml
index 89746624..a40e5f54 100644
--- a/app/src/main/res/layout/dialog_file_details.xml
+++ b/app/src/main/res/layout/dialog_file_details.xml
@@ -52,6 +52,7 @@
         android:paddingStart="16dp"
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
+        android:textAppearance="@style/TextViewNormal"
         android:textSize="16sp" />
 
     <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/dialog_sleep_timer.xml b/app/src/main/res/layout/dialog_sleep_timer.xml
index ca483479..8d4fe4da 100644
--- a/app/src/main/res/layout/dialog_sleep_timer.xml
+++ b/app/src/main/res/layout/dialog_sleep_timer.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/timerDisplay"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_banner_home.xml b/app/src/main/res/layout/fragment_banner_home.xml
index aaad8303..68e6c414 100644
--- a/app/src/main/res/layout/fragment_banner_home.xml
+++ b/app/src/main/res/layout/fragment_banner_home.xml
@@ -78,8 +78,7 @@
                     app:cardElevation="0dp"
                     app:cardUseCompatPadding="true"
                     app:layout_collapseMode="pin"
-                    app:layout_scrollFlags="scroll|enterAlways"
-                    app:strokeColor="?dividerColor">
+                    app:layout_scrollFlags="scroll|enterAlways">
 
                     <com.google.android.material.appbar.MaterialToolbar
                         android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
index 5a3b76be..9acb9a3d 100644
--- a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
@@ -104,7 +104,7 @@
             android:textAppearance="@style/TextViewHeadline6"
             tools:text="@string/bug_report_summary" />
 
-        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -121,6 +121,7 @@
             android:scrollHorizontally="true"
             android:singleLine="true"
             android:textAppearance="@style/TextViewNormal"
+            android:textColor="?colorOnSecondary"
             tools:text="@string/bug_report_summary" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
index 089bbe9f..9a120dcf 100644
--- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
@@ -14,7 +14,7 @@
         android:layout_height="@dimen/progress_container_height"
         android:background="@color/twenty_percent_black_overlay">
 
-        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/songCurrentProgress"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -22,11 +22,11 @@
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
-            android:textAppearance="@style/TextViewOverline"
+            android:textColor="?colorOnSecondary"
             android:textSize="12sp"
             tools:ignore="RtlHardcoded,RtlSymmetry" />
 
-        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/songTotalTime"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -34,7 +34,7 @@
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
-            android:textAppearance="@style/TextViewOverline"
+            android:textColor="?colorOnSecondary"
             android:textSize="12sp"
             tools:ignore="RtlHardcoded,RtlSymmetry" />
 
diff --git a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
index ba829819..b8de6b3a 100644
--- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
@@ -18,7 +18,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/songCurrentProgress"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -27,12 +27,11 @@
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
-            android:textAppearance="@style/TextViewOverline"
-            android:textColor="?android:textColorSecondary"
+            android:textColor="?colorOnSecondary"
             android:textSize="12sp"
             tools:ignore="RtlHardcoded,RtlSymmetry" />
 
-        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/songTotalTime"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -40,8 +39,7 @@
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
-            android:textAppearance="@style/TextViewOverline"
-            android:textColor="?android:textColorSecondary"
+            android:textColor="?colorOnSecondary"
             android:textSize="12sp"
             tools:ignore="RtlHardcoded,RtlSymmetry" />
 
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index f393a56c..b907abab 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -42,9 +42,7 @@
                 app:cardCornerRadius="8dp"
                 app:cardElevation="0dp"
                 app:cardUseCompatPadding="true"
-                app:layout_collapseMode="pin"
-                app:strokeColor="?dividerColor"
-                app:strokeWidth="1dp">
+                app:layout_collapseMode="pin">
 
                 <FrameLayout
                     android:layout_width="match_parent"
@@ -86,13 +84,14 @@
                 android:layoutAnimation="@anim/layout_animation_fall_down"
                 android:scrollbars="none" />
 
-            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@android:id/empty"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:text="@string/empty"
-                android:textAppearance="@style/TextViewNormal" />
+                android:textAppearance="@style/TextViewNormal"
+                android:textColor="?colorOnSecondary" />
 
         </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e8c23ecc..c7173377 100755
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -48,9 +48,7 @@
                 app:cardElevation="0dp"
                 app:cardUseCompatPadding="true"
                 app:layout_collapseMode="pin"
-                app:layout_scrollFlags="scroll|enterAlways"
-                app:strokeColor="?dividerColor"
-                app:strokeWidth="1dp">
+                app:layout_scrollFlags="scroll|enterAlways">
 
                 <com.google.android.material.appbar.MaterialToolbar
                     android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 67865e53..87fa8b7c 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -52,11 +52,8 @@
                 android:layout_marginBottom="@dimen/toolbar_margin_vertical"
                 app:cardBackgroundColor="?colorSurface"
                 app:cardCornerRadius="8dp"
-                app:cardElevation="0dp"
                 app:cardUseCompatPadding="true"
-                app:layout_collapseMode="pin"
-                app:strokeColor="?dividerColor"
-                app:strokeWidth="1dp">
+                app:layout_collapseMode="pin">
 
                 <FrameLayout
                     android:layout_width="match_parent"
@@ -73,6 +70,7 @@
                         app:title="@string/search_hint"
                         app:titleMarginStart="0dp"
                         app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                        app:titleTextColor="?colorOnSurface"
                         tools:ignore="UnusedAttribute" />
 
                     <ViewStub
diff --git a/app/src/main/res/layout/fragment_lyrics.xml b/app/src/main/res/layout/fragment_lyrics.xml
index ca719a32..1680df19 100644
--- a/app/src/main/res/layout/fragment_lyrics.xml
+++ b/app/src/main/res/layout/fragment_lyrics.xml
@@ -6,7 +6,8 @@
     android:fadingEdge="vertical"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+    <com.google.android.material.textview.MaterialTextView
+        android:textColor="?colorOnSecondary"
         android:id="@+id/offlineLyrics"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
index eedfff89..03112a17 100644
--- a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
+++ b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
@@ -21,20 +21,23 @@
         android:layout_gravity="center"
         android:gravity="center"
         android:orientation="vertical"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
-        <code.name.monkey.retromusic.views.IconImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="96dp"
             android:layout_height="96dp"
-            app:srcCompat="@drawable/ic_music_note_off_white_24dp" />
+            app:srcCompat="@drawable/ic_music_note_off_white_24dp"
+            app:tint="?colorOnSurface" />
 
-        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/emptyText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text="@string/empty"
             android:textAppearance="@style/TextViewNormal"
+            android:textColor="?colorOnSecondary"
             tools:visibility="visible" />
     </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0b14d9a0..6a10d75e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -40,7 +40,6 @@
     <style name="ToolbarTextAppearanceSearch" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
         <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">@font/circular_std_book</item>
-        <item name="android:textColor">?colorOnSurface</item>
     </style>
 
     <style name="ToolbarTextAppearanceNormal">
diff --git a/appthemehelper/src/main/res/layout/two_lines_list_preference_row.xml b/appthemehelper/src/main/res/layout/two_lines_list_preference_row.xml
index ac126f0c..e0a3d7c9 100644
--- a/appthemehelper/src/main/res/layout/two_lines_list_preference_row.xml
+++ b/appthemehelper/src/main/res/layout/two_lines_list_preference_row.xml
@@ -31,7 +31,7 @@
             android:gravity="center_vertical"
             android:textColor="#000000" />
 
-        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/custom_list_view_row_subtext_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"