diff --git a/app/src/main/res/layout-land/activity_album.xml b/app/src/main/res/layout-land/activity_album.xml
index a1078fab..124a9c3f 100644
--- a/app/src/main/res/layout-land/activity_album.xml
+++ b/app/src/main/res/layout-land/activity_album.xml
@@ -26,7 +26,7 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48" />
+                style="@style/Toolbar" />
         </FrameLayout>
 
         <androidx.core.widget.NestedScrollView
@@ -66,7 +66,7 @@
 
                         <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                             android:id="@+id/albumTitle"
-                            fontPath="@string/circular_std_black"
+                            android:textStyle="bold"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:maxLines="2"
diff --git a/app/src/main/res/layout-land/activity_album_tag_editor.xml b/app/src/main/res/layout-land/activity_album_tag_editor.xml
index 9bf50ed8..c1aa3f66 100644
--- a/app/src/main/res/layout-land/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout-land/activity_album_tag_editor.xml
@@ -19,14 +19,14 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
-            style="@style/Toolbar48"
+            style="@style/Toolbar"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
             tools:ignore="UnusedAttribute">
 
 
             <TextView
                 android:id="@+id/title"
-                fontPath="@string/circular_std_black"
+                android:textStyle="bold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
diff --git a/app/src/main/res/layout-land/activity_artist_details.xml b/app/src/main/res/layout-land/activity_artist_details.xml
index c06c3a3a..5678c048 100644
--- a/app/src/main/res/layout-land/activity_artist_details.xml
+++ b/app/src/main/res/layout-land/activity_artist_details.xml
@@ -16,8 +16,8 @@
             android:layout_height="match_parent"
             android:layout_weight="1">
 
-            <ImageView
-                android:id="@+id/image"
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/artistImage"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
@@ -25,13 +25,13 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48" />
+                style="@style/Toolbar" />
 
 
         </FrameLayout>
 
         <androidx.core.widget.NestedScrollView
-            android:id="@+id/content"
+            android:id="@+id/contentContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -66,8 +66,8 @@
                             android:padding="16dp">
 
                             <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                                android:id="@+id/title"
-                                fontPath="@string/circular_std_black"
+                                android:id="@+id/artistTitle"
+                                android:textStyle="bold"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:maxLines="2"
@@ -106,7 +106,7 @@
         android:background="@drawable/shadow_down_strong" />
 
     <code.name.monkey.retromusic.views.CollapsingFAB
-        android:id="@+id/action_shuffle_all"
+        android:id="@+id/actionShuffleAll"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
diff --git a/app/src/main/res/layout-land/activity_settings.xml b/app/src/main/res/layout-land/activity_settings.xml
index 339ce3bf..9dfec2a5 100644
--- a/app/src/main/res/layout-land/activity_settings.xml
+++ b/app/src/main/res/layout-land/activity_settings.xml
@@ -5,27 +5,26 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:elevation="0dp">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:titleEnabled="false">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48"
+                style="@style/Toolbar"
                 app:layout_collapseMode="pin"
                 app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
                 app:title="">
 
                 <TextView
-                    android:id="@+id/title"
+                    android:id="@+id/settingsTitle"
                     style="@style/BigTitleTextAppearance"
                     android:text="@string/action_settings" />
 
@@ -45,13 +44,13 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <FrameLayout
-            android:id="@+id/content_frame"
+            android:id="@+id/contentFrame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1" />
 
         <FrameLayout
-            android:id="@+id/detail_content_frame"
+            android:id="@+id/detailContentFrame"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1" />
diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml
index 11ebac07..a500740b 100644
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@@ -2,18 +2,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_fragment_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
@@ -30,13 +27,13 @@
                 app:titleEnabled="false">
 
                 <FrameLayout
-                    android:id="@+id/image_container"
+                    android:id="@+id/imageContainer"
                     android:layout_width="match_parent"
                     android:layout_height="182dp"
                     app:layout_collapseMode="pin">
 
                     <ImageView
-                        android:id="@+id/image"
+                        android:id="@+id/bannerImage"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:scaleType="centerCrop"
@@ -59,39 +56,34 @@
                         <include layout="@layout/status_bar" />
                     </FrameLayout>
 
-                    <FrameLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                    <androidx.appcompat.widget.Toolbar
+                        android:id="@+id/toolbar"
+                        style="@style/Toolbar"
+                        android:layout_gravity="center_vertical"
+                        app:layout_collapseMode="pin"
+                        app:layout_scrollFlags="scroll|enterAlways"
                         tools:ignore="UnusedAttribute">
 
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:id="@+id/searchIcon"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:padding="16dp"
-                            app:srcCompat="@drawable/ic_search_white_24dp"
-                            app:tint="@color/md_white_1000" />
-
                         <TextView
+                            android:id="@+id/bannerTitle"
                             style="@style/BigTitleTextAppearanceToolbar"
                             android:text="@string/app_name"
-                            android:textColor="@color/md_white_1000" />
+                            tools:ignore="MissingPrefix" />
 
                         <code.name.monkey.retromusic.views.CircularImageView
-                            android:id="@+id/user_image"
+                            android:id="@+id/userImage"
                             android:layout_width="32dp"
                             android:layout_height="32dp"
                             android:layout_gravity="end|center_vertical"
                             android:layout_marginEnd="16dp"
                             app:civ_border="false" />
-                    </FrameLayout>
+                    </androidx.appcompat.widget.Toolbar>
                 </LinearLayout>
             </com.google.android.material.appbar.CollapsingToolbarLayout>
 
         </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.core.widget.NestedScrollView
-            android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginStart="64dp"
@@ -105,7 +97,7 @@
                 app:cardCornerRadius="12dp">
 
                 <LinearLayout
-                    android:id="@+id/content_container"
+                    android:id="@+id/contentContainer"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:descendantFocusability="blocksDescendants"
diff --git a/app/src/main/res/layout-land/fragment_blur.xml b/app/src/main/res/layout-land/fragment_blur.xml
index 988456f0..d4504a2c 100644
--- a/app/src/main/res/layout-land/fragment_blur.xml
+++ b/app/src/main/res/layout-land/fragment_blur.xml
@@ -8,7 +8,7 @@
     android:focusable="true">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/gradient_background"
+        android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop" />
@@ -83,8 +83,8 @@
                         tools:background="@color/md_red_A700">
 
                         <androidx.appcompat.widget.Toolbar
-                            android:id="@+id/player_toolbar"
-                            style="@style/Toolbar48"
+                            android:id="@+id/playerToolbar"
+                            style="@style/Toolbar"
                             android:layout_height="48dp"
                             android:navigationIcon="@drawable/ic_close_white_24dp"
                             app:navigationIcon="@drawable/ic_close_white_24dp" />
diff --git a/app/src/main/res/layout-land/fragment_card_blur_player.xml b/app/src/main/res/layout-land/fragment_card_blur_player.xml
index 51e28471..565480bc 100644
--- a/app/src/main/res/layout-land/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml
@@ -41,7 +41,7 @@
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/player_toolbar"
-                    style="@style/Toolbar48"
+                    style="@style/Toolbar"
                     android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
                     app:contentInsetLeft="0dp"
                     app:contentInsetStart="0dp"
diff --git a/app/src/main/res/layout-land/fragment_card_player.xml b/app/src/main/res/layout-land/fragment_card_player.xml
index d2a9600e..25a2a9bb 100644
--- a/app/src/main/res/layout-land/fragment_card_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_player.xml
@@ -45,7 +45,7 @@
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/player_toolbar"
-                    style="@style/Toolbar48"
+                    style="@style/Toolbar"
                     android:navigationIcon="@drawable/ic_close_white_24dp"
                     app:navigationIcon="@drawable/ic_close_white_24dp" />
             </FrameLayout>
diff --git a/app/src/main/res/layout-land/fragment_color_player.xml b/app/src/main/res/layout-land/fragment_color_player.xml
index d0cb7c67..79e1de1e 100644
--- a/app/src/main/res/layout-land/fragment_color_player.xml
+++ b/app/src/main/res/layout-land/fragment_color_player.xml
@@ -119,8 +119,7 @@
 
                         <androidx.appcompat.widget.Toolbar
                             android:id="@+id/player_toolbar"
-                            style="@style/Toolbar48"
-                            android:layout_height="48dp"
+                            style="@style/Toolbar"
                             android:navigationIcon="@drawable/ic_close_white_24dp"
                             app:navigationIcon="@drawable/ic_close_white_24dp" />
                     </FrameLayout>
diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml
index eaa08ee5..1b7a7a3a 100644
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@@ -19,18 +19,50 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:elevation="0dp"
+            app:elevation="0dp">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:ignore="UnusedAttribute">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/searchIcon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp"
+                    app:srcCompat="@drawable/ic_search_white_24dp"
+                    app:tint="@color/md_white_1000" />
+
+                <TextView
+                    android:id="@+id/bannerTitle"
+                    style="@style/BigTitleTextAppearanceToolbar"
+                    android:text="@string/app_name"
+                    android:textColor="@color/md_white_1000" />
+
+                <code.name.monkey.retromusic.views.CircularImageView
+                    android:id="@+id/userImage"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:layout_gravity="end|center_vertical"
+                    android:layout_marginEnd="16dp"
+                    app:civ_border="false" />
+            </FrameLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
         <androidx.core.widget.NestedScrollView
-            android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginStart="@dimen/horizontal_margin"
             android:layout_marginEnd="@dimen/horizontal_margin"
-            android:layout_weight="1"
-            app:behavior_overlapTop="24dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
             <LinearLayout
-                android:id="@+id/content_container"
+                android:id="@+id/contentContainer"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:descendantFocusability="blocksDescendants"
@@ -38,38 +70,6 @@
                 android:focusableInTouchMode="true"
                 android:orientation="vertical">
 
-                <com.google.android.material.appbar.AppBarLayout
-                    android:id="@+id/app_bar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:elevation="0dp"
-                    app:elevation="0dp">
-
-                    <FrameLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        tools:ignore="UnusedAttribute">
-
-                        <code.name.monkey.retromusic.views.IconImageView
-                            android:id="@+id/searchIcon"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:padding="14dp"
-                            app:srcCompat="@drawable/ic_search_white_24dp" />
-
-                        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                            style="@style/BigTitleTextAppearanceToolbar"
-                            android:text="@string/app_name" />
-
-                        <code.name.monkey.retromusic.views.CircularImageView
-                            android:id="@+id/user_image"
-                            android:layout_width="32dp"
-                            android:layout_height="32dp"
-                            android:layout_gravity="end|center_vertical"
-                            android:layout_marginEnd="16dp"
-                            app:civ_border="false" />
-                    </FrameLayout>
-                </com.google.android.material.appbar.AppBarLayout>
 
                 <include layout="@layout/abs_playlists" />
 
diff --git a/app/src/main/res/layout-land/fragment_material.xml b/app/src/main/res/layout-land/fragment_material.xml
index c5c0c10f..67ffead8 100644
--- a/app/src/main/res/layout-land/fragment_material.xml
+++ b/app/src/main/res/layout-land/fragment_material.xml
@@ -70,8 +70,7 @@
 
                         <androidx.appcompat.widget.Toolbar
                             android:id="@+id/player_toolbar"
-                            style="@style/Toolbar48"
-                            android:layout_height="48dp"
+                            style="@style/Toolbar"
                             android:layout_gravity="bottom"
                             android:navigationIcon="@drawable/ic_close_white_24dp"
                             app:navigationIcon="@drawable/ic_close_white_24dp" />
diff --git a/app/src/main/res/layout-land/fragment_plain_player.xml b/app/src/main/res/layout-land/fragment_plain_player.xml
index 6a01f762..8aef0523 100644
--- a/app/src/main/res/layout-land/fragment_plain_player.xml
+++ b/app/src/main/res/layout-land/fragment_plain_player.xml
@@ -62,7 +62,7 @@
 
                         <TextView
                             android:id="@+id/title"
-                            fontPath="@string/circular_std_black"
+                            android:textStyle="bold"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:ellipsize="marquee"
@@ -108,8 +108,7 @@
 
                         <androidx.appcompat.widget.Toolbar
                             android:id="@+id/player_toolbar"
-                            style="@style/Toolbar48"
-                            android:layout_height="48dp"
+                            style="@style/Toolbar"
                             android:navigationIcon="@drawable/ic_close_white_24dp"
                             app:navigationIcon="@drawable/ic_close_white_24dp" />
                     </FrameLayout>
diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml
index fa165fe3..1283ea59 100755
--- a/app/src/main/res/layout-land/fragment_player.xml
+++ b/app/src/main/res/layout-land/fragment_player.xml
@@ -62,8 +62,7 @@
 
                         <androidx.appcompat.widget.Toolbar
                             android:id="@+id/player_toolbar"
-                            style="@style/Toolbar48"
-                            android:layout_height="48dp"
+                            style="@style/Toolbar"
                             android:navigationIcon="@drawable/ic_close_white_24dp"
                             app:navigationIcon="@drawable/ic_close_white_24dp" />
                     </FrameLayout>
diff --git a/app/src/main/res/layout-land/fragment_simple_player.xml b/app/src/main/res/layout-land/fragment_simple_player.xml
index 0c90a1f8..c0ddd8ea 100644
--- a/app/src/main/res/layout-land/fragment_simple_player.xml
+++ b/app/src/main/res/layout-land/fragment_simple_player.xml
@@ -73,8 +73,7 @@
 
                         <androidx.appcompat.widget.Toolbar
                             android:id="@+id/player_toolbar"
-                            style="@style/Toolbar48"
-                            android:layout_height="48dp"
+                            style="@style/Toolbar"
                             android:navigationIcon="@drawable/ic_close_white_24dp"
                             app:navigationIcon="@drawable/ic_close_white_24dp" />
                     </FrameLayout>
diff --git a/app/src/main/res/layout-land/pager_item.xml b/app/src/main/res/layout-land/pager_item.xml
index 48c9d60c..3609aa9c 100644
--- a/app/src/main/res/layout-land/pager_item.xml
+++ b/app/src/main/res/layout-land/pager_item.xml
@@ -48,7 +48,7 @@
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/title"
-        fontPath="@string/circular_std_black"
+        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:ellipsize="end"
diff --git a/app/src/main/res/layout-xlarge-land/activity_album.xml b/app/src/main/res/layout-xlarge-land/activity_album.xml
index 708f2389..fc3f9bff 100644
--- a/app/src/main/res/layout-xlarge-land/activity_album.xml
+++ b/app/src/main/res/layout-xlarge-land/activity_album.xml
@@ -36,7 +36,7 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48" />
+                style="@style/Toolbar" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -92,7 +92,7 @@
 
                     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                         android:id="@+id/albumTitle"
-                        fontPath="@string/circular_std_black"
+                        android:textStyle="bold"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:maxLines="2"
diff --git a/app/src/main/res/layout-xlarge-land/activity_artist_details.xml b/app/src/main/res/layout-xlarge-land/activity_artist_details.xml
index a0aef54c..883177ab 100644
--- a/app/src/main/res/layout-xlarge-land/activity_artist_details.xml
+++ b/app/src/main/res/layout-xlarge-land/activity_artist_details.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/image"
+        android:id="@+id/artistImage"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
@@ -26,20 +26,20 @@
             app:titleEnabled="false">
 
             <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                android:id="@+id/image_container"
+                android:id="@+id/imageContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:layout_collapseMode="parallax" />
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48"
+                style="@style/Toolbar"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView
-        android:id="@+id/content"
+        android:id="@+id/contentContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="fill_vertical"
@@ -64,12 +64,12 @@
                 android:padding="24dp">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    android:id="@+id/title"
-                    fontPath="@string/circular_std_black"
+                    android:id="@+id/artistTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:maxLines="2"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                    android:textStyle="bold"
                     tools:ignore="MissingPrefix"
                     tools:text="Title" />
 
@@ -97,7 +97,7 @@
     </androidx.core.widget.NestedScrollView>
 
     <code.name.monkey.retromusic.views.CollapsingFAB
-        android:id="@+id/action_shuffle_all"
+        android:id="@+id/actionShuffleAll"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
diff --git a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
index 126c386e..4769476a 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
@@ -12,7 +12,7 @@
         android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar"
+
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
@@ -29,13 +29,13 @@
                 app:titleEnabled="false">
 
                 <FrameLayout
-                    android:id="@+id/image_container"
+                    android:id="@+id/imageContainer"
                     android:layout_width="match_parent"
                     android:layout_height="228dp"
-                    app:layout_collapseMode="pin">
+                    app:layout_collapseMode="parallax">
 
                     <ImageView
-                        android:id="@+id/image"
+                        android:id="@+id/bannerImage"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:scaleType="centerCrop"
@@ -58,60 +58,60 @@
                         <include layout="@layout/status_bar" />
                     </FrameLayout>
 
-                    <FrameLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                    <androidx.appcompat.widget.Toolbar
+                        android:id="@+id/toolbar"
+                        style="@style/Toolbar"
+                        android:layout_gravity="center_vertical"
+                        app:layout_collapseMode="pin"
+                        app:layout_scrollFlags="scroll|enterAlways"
                         tools:ignore="UnusedAttribute">
 
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:id="@+id/searchIcon"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:padding="16dp"
-                            app:srcCompat="@drawable/ic_search_white_24dp"
-                            app:tint="@color/md_white_1000" />
-
                         <TextView
+                            android:id="@+id/bannerTitle"
                             style="@style/BigTitleTextAppearanceToolbar"
                             android:text="@string/app_name"
-                            android:textColor="@color/md_white_1000" />
+                            tools:ignore="MissingPrefix" />
 
                         <code.name.monkey.retromusic.views.CircularImageView
-                            android:id="@+id/user_image"
+                            android:id="@+id/userImage"
                             android:layout_width="32dp"
                             android:layout_height="32dp"
                             android:layout_gravity="end|center_vertical"
                             android:layout_marginEnd="16dp"
                             app:civ_border="false" />
-                    </FrameLayout>
+                    </androidx.appcompat.widget.Toolbar>
                 </LinearLayout>
             </com.google.android.material.appbar.CollapsingToolbarLayout>
-
         </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/horizontal_margin"
-            android:layout_marginEnd="@dimen/horizontal_margin"
-            android:background="@color/md_white_1000"
-            app:behavior_overlapTop="24dp"
+            app:behavior_overlapTop="52dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <LinearLayout
-                android:id="@+id/content_container"
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:descendantFocusability="blocksDescendants"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:orientation="vertical">
+                android:layout_marginStart="128dp"
+                android:layout_marginEnd="128dp"
+                app:cardCornerRadius="12dp">
 
-                <include layout="@layout/abs_playlists" />
+                <LinearLayout
+                    android:id="@+id/content_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:descendantFocusability="blocksDescendants"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:orientation="vertical">
 
-                <include layout="@layout/home_section_content" />
-            </LinearLayout>
+                    <include layout="@layout/abs_playlists" />
+
+                    <include layout="@layout/home_section_content" />
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
         </androidx.core.widget.NestedScrollView>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge-land/fragment_blur.xml b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
index c4c1dac7..e98b5454 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
@@ -8,7 +8,7 @@
     android:focusable="true">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/gradient_background"
+        android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop" />
@@ -41,73 +41,41 @@
                 android:layout_above="@id/toolbar_container"
                 android:orientation="horizontal">
 
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <LinearLayout
-                        android:id="@+id/now_playing_container"
-                        android:layout_width="400dp"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center_horizontal"
-                        android:orientation="vertical">
-
-                        <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                            android:id="@+id/album_cover_container"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_weight="0">
-
-                            <fragment
-                                android:id="@+id/player_album_cover_fragment"
-                                android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent" />
-                        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-                        <FrameLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            tools:background="@color/md_white_1000">
-
-                            <fragment
-                                android:id="@+id/playback_controls_fragment"
-                                android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent" />
-                        </FrameLayout>
-                    </LinearLayout>
-                </FrameLayout>
-
                 <LinearLayout
-                    android:layout_width="match_parent"
+                    android:id="@+id/now_playing_container"
+                    android:layout_width="400dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="vertical"
-                    android:padding="24dp">
+                    android:layout_gravity="center_horizontal"
+                    android:orientation="vertical">
 
-                    <TextView
-                        android:id="@+id/title"
-                        fontPath="@string/circular_std_black"
+                    <code.name.monkey.retromusic.views.WidthFitSquareLayout
+                        android:id="@+id/album_cover_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:padding="12dp"
-                        android:text="Queue"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Display2"
-                        android:textColor="@color/md_white_1000"
-                        tools:ignore="MissingPrefix" />
+                        android:layout_weight="0">
 
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/recycler_view"
+                        <fragment
+                            android:id="@+id/player_album_cover_fragment"
+                            android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent" />
+                    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+                    <FrameLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_gravity="center_horizontal" />
+                        android:layout_weight="1"
+                        tools:background="@color/md_white_1000">
+
+                        <fragment
+                            android:id="@+id/playback_controls_fragment"
+                            android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent" />
+                    </FrameLayout>
                 </LinearLayout>
+
             </LinearLayout>
 
 
@@ -119,8 +87,8 @@
                 tools:background="@color/md_red_A700">
 
                 <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/player_toolbar"
-                    style="@style/Toolbar48"
+                    android:id="@+id/playerToolbar"
+                    style="@style/Toolbar"
                     android:layout_height="48dp"
                     android:navigationIcon="@drawable/ic_close_white_24dp"
                     app:navigationIcon="@drawable/ic_close_white_24dp" />
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 e409ac6d..db53cbb0 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_home.xml
@@ -21,7 +21,6 @@
         android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
@@ -33,30 +32,32 @@
                 android:layout_height="wrap_content"
                 tools:ignore="UnusedAttribute">
 
-                <code.name.monkey.retromusic.views.IconImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/searchIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:padding="22dp"
-                    app:srcCompat="@drawable/ic_search_white_24dp" />
+                    android:padding="16dp"
+                    app:srcCompat="@drawable/ic_search_white_24dp"
+                    app:tint="@color/md_white_1000" />
 
-                <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+                <TextView
+                    android:id="@+id/bannerTitle"
                     style="@style/BigTitleTextAppearanceToolbar"
-                    android:text="@string/app_name" />
+                    android:text="@string/app_name"
+                    android:textColor="@color/md_white_1000" />
 
                 <code.name.monkey.retromusic.views.CircularImageView
-                    android:id="@+id/user_image"
-                    android:layout_width="42dp"
-                    android:layout_height="42dp"
+                    android:id="@+id/userImage"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
                     android:layout_gravity="end|center_vertical"
-                    android:layout_marginEnd="22dp"
+                    android:layout_marginEnd="16dp"
                     app:civ_border="false" />
             </FrameLayout>
 
         </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.core.widget.NestedScrollView
-            android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="128dp"
@@ -64,7 +65,7 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
             <LinearLayout
-                android:id="@+id/content_container"
+                android:id="@+id/contentContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:descendantFocusability="blocksDescendants"
diff --git a/app/src/main/res/layout-xlarge-land/fragment_player.xml b/app/src/main/res/layout-xlarge-land/fragment_player.xml
index 6bcf4013..9284e24d 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_player.xml
@@ -62,7 +62,7 @@
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/player_toolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="48dp"
+                    android:layout_height="wrap_content"
                     app:navigationIcon="@drawable/ic_close_white_24dp" />
             </FrameLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout-xlarge-land/pager_item.xml b/app/src/main/res/layout-xlarge-land/pager_item.xml
index 48c9d60c..3609aa9c 100644
--- a/app/src/main/res/layout-xlarge-land/pager_item.xml
+++ b/app/src/main/res/layout-xlarge-land/pager_item.xml
@@ -48,7 +48,7 @@
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/title"
-        fontPath="@string/circular_std_black"
+        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:ellipsize="end"
diff --git a/app/src/main/res/layout-sw600dp/abs_playlists.xml b/app/src/main/res/layout-xlarge/abs_playlists.xml
similarity index 96%
rename from app/src/main/res/layout-sw600dp/abs_playlists.xml
rename to app/src/main/res/layout-xlarge/abs_playlists.xml
index 03226070..5ec995ee 100644
--- a/app/src/main/res/layout-sw600dp/abs_playlists.xml
+++ b/app/src/main/res/layout-xlarge/abs_playlists.xml
@@ -7,13 +7,9 @@
 
     <androidx.appcompat.widget.AppCompatTextView
         style="@style/SubTitleTextAppearance"
-        android:layout_marginStart="128dp"
-        android:layout_marginEnd="128dp"
         android:text="@string/for_you" />
 
     <LinearLayout
-        android:layout_marginStart="128dp"
-        android:layout_marginEnd="128dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
diff --git a/app/src/main/res/layout-xlarge/activity_album.xml b/app/src/main/res/layout-xlarge/activity_album.xml
index 64bb04a2..fad6d301 100644
--- a/app/src/main/res/layout-xlarge/activity_album.xml
+++ b/app/src/main/res/layout-xlarge/activity_album.xml
@@ -35,7 +35,7 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48"
+                style="@style/Toolbar"
                 app:layout_collapseMode="pin"
                 app:title="" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
@@ -94,7 +94,7 @@
 
                     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                         android:id="@+id/albumTitle"
-                        fontPath="@string/circular_std_black"
+                        android:textStyle="bold"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:maxLines="2"
diff --git a/app/src/main/res/layout-sw600dp/activity_artist_content.xml b/app/src/main/res/layout-xlarge/activity_artist_content.xml
similarity index 86%
rename from app/src/main/res/layout-sw600dp/activity_artist_content.xml
rename to app/src/main/res/layout-xlarge/activity_artist_content.xml
index 424129ea..26e4aa4c 100644
--- a/app/src/main/res/layout-sw600dp/activity_artist_content.xml
+++ b/app/src/main/res/layout-xlarge/activity_artist_content.xml
@@ -6,8 +6,8 @@
     android:orientation="vertical">
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/biography_title"
-        fontPath="@string/circular_std_black"
+        android:id="@+id/biographyTitle"
+        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="24dp"
@@ -21,7 +21,7 @@
         tools:ignore="MissingPrefix" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/biography"
+        android:id="@+id/biographyText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="end"
@@ -31,8 +31,8 @@
         android:visibility="gone" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/album_title"
-        fontPath="@string/circular_std_black"
+        android:id="@+id/albumTitle"
+        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="24dp"
@@ -44,14 +44,14 @@
         android:textColor="?android:attr/textColorPrimary" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/album_recycler_view"
+        android:id="@+id/albumRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:nestedScrollingEnabled="false" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/song_title"
-        fontPath="@string/circular_std_black"
+        android:id="@+id/songTitle"
+        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="24dp"
@@ -64,7 +64,7 @@
         tools:ignore="MissingPrefix" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
+        android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:nestedScrollingEnabled="false" />
diff --git a/app/src/main/res/layout-xlarge/activity_artist_details.xml b/app/src/main/res/layout-xlarge/activity_artist_details.xml
index d16bc99b..c308a1c9 100644
--- a/app/src/main/res/layout-xlarge/activity_artist_details.xml
+++ b/app/src/main/res/layout-xlarge/activity_artist_details.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/image"
+        android:id="@+id/artistImage"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
@@ -26,20 +26,20 @@
             app:titleEnabled="false">
 
             <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                android:id="@+id/image_container"
+                android:id="@+id/imageContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:layout_collapseMode="parallax" />
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48"
+                style="@style/Toolbar"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView
-        android:id="@+id/content"
+        android:id="@+id/contentContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="fill_vertical"
@@ -51,7 +51,6 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
-
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:elevation="@dimen/card_elevation"
@@ -66,12 +65,12 @@
                 android:padding="12dp">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    android:id="@+id/title"
-                    fontPath="@string/circular_std_black"
+                    android:id="@+id/artistTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:maxLines="2"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                    android:textStyle="bold"
                     tools:ignore="MissingPrefix"
                     tools:text="Title" />
 
@@ -97,17 +96,16 @@
             <include layout="@layout/activity_artist_content" />
 
         </LinearLayout>
-
     </androidx.core.widget.NestedScrollView>
 
     <code.name.monkey.retromusic.views.CollapsingFAB
-        android:id="@+id/action_shuffle_all"
+        android:id="@+id/actionShuffleAll"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="10dp"
-        app:showTitle="false"
         app:setIcon="@drawable/ic_shuffle_white_24dp"
         app:setText="@string/action_shuffle_all"
+        app:showTitle="false"
         app:shuffleBackgroundColor="@color/md_black_1000" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-sw600dp/activity_user_info.xml b/app/src/main/res/layout-xlarge/activity_user_info.xml
similarity index 98%
rename from app/src/main/res/layout-sw600dp/activity_user_info.xml
rename to app/src/main/res/layout-xlarge/activity_user_info.xml
index 941fe121..bd2facf6 100644
--- a/app/src/main/res/layout-sw600dp/activity_user_info.xml
+++ b/app/src/main/res/layout-xlarge/activity_user_info.xml
@@ -14,7 +14,7 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
-            style="@style/Toolbar48"
+            style="@style/Toolbar"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp">
 
             <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
diff --git a/app/src/main/res/layout-xlarge/fragment_banner_home.xml b/app/src/main/res/layout-xlarge/fragment_banner_home.xml
index e0b52e47..d26bf912 100644
--- a/app/src/main/res/layout-xlarge/fragment_banner_home.xml
+++ b/app/src/main/res/layout-xlarge/fragment_banner_home.xml
@@ -17,49 +17,107 @@
     </FrameLayout>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/coordinator_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/container"
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="64dp"
-            android:layout_marginEnd="64dp"
-            android:layout_weight="1"
-            android:background="@color/md_white_1000"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp">
 
-            <LinearLayout
+            <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:descendantFocusability="blocksDescendants"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:orientation="vertical">
+                android:background="@android:color/transparent"
+                app:contentScrim="@android:color/transparent"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed"
+                app:statusBarScrim="@color/md_black_1000"
+                app:titleEnabled="false">
 
-                <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/image_container"
+                <FrameLayout
+                    android:id="@+id/imageContainer"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="4dp"
-                    app:cardCornerRadius="8dp"
-                    app:cardUseCompatPadding="true">
+                    android:layout_height="196dp"
+                    app:layout_collapseMode="parallax">
 
                     <ImageView
-                        android:id="@+id/image"
+                        android:id="@+id/bannerImage"
                         android:layout_width="match_parent"
-                        android:layout_height="196dp"
+                        android:layout_height="match_parent"
                         android:scaleType="centerCrop"
                         app:layout_collapseMode="parallax"
+                        tools:background="@color/md_red_400"
                         tools:ignore="ContentDescription" />
-                </com.google.android.material.card.MaterialCardView>
+                </FrameLayout>
 
-                <include layout="@layout/abs_playlists" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_collapseMode="pin"
+                    app:layout_scrollFlags="scroll|enterAlways">
 
-                <include layout="@layout/home_section_content" />
-            </LinearLayout>
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <include layout="@layout/status_bar" />
+                    </FrameLayout>
+
+                    <androidx.appcompat.widget.Toolbar
+                        android:id="@+id/toolbar"
+                        style="@style/Toolbar"
+                        android:layout_gravity="center_vertical"
+                        app:layout_collapseMode="pin"
+                        app:layout_scrollFlags="scroll|enterAlways"
+                        tools:ignore="UnusedAttribute">
+
+                        <TextView
+                            android:id="@+id/bannerTitle"
+                            style="@style/BigTitleTextAppearanceToolbar"
+                            android:text="@string/app_name"
+                            tools:ignore="MissingPrefix" />
+
+                        <code.name.monkey.retromusic.views.CircularImageView
+                            android:id="@+id/userImage"
+                            android:layout_width="32dp"
+                            android:layout_height="32dp"
+                            android:layout_gravity="end|center_vertical"
+                            android:layout_marginEnd="16dp"
+                            app:civ_border="false" />
+                    </androidx.appcompat.widget.Toolbar>
+                </LinearLayout>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:behavior_overlapTop="52dp"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="64dp"
+                android:layout_marginEnd="64dp"
+                app:cardCornerRadius="12dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:descendantFocusability="blocksDescendants"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:orientation="vertical">
+
+                    <include layout="@layout/abs_playlists" />
+
+                    <include layout="@layout/home_section_content" />
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
         </androidx.core.widget.NestedScrollView>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/fragment_blur.xml b/app/src/main/res/layout-xlarge/fragment_blur.xml
index 8a8b4517..60a52bb0 100644
--- a/app/src/main/res/layout-xlarge/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge/fragment_blur.xml
@@ -8,7 +8,7 @@
     android:focusable="true">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/gradient_background"
+        android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop" />
@@ -73,8 +73,8 @@
                 tools:background="@color/md_red_A700">
 
                 <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/player_toolbar"
-                    style="@style/Toolbar48"
+                    android:id="@+id/playerToolbar"
+                    style="@style/Toolbar"
                     android:layout_height="48dp"
                     android:navigationIcon="@drawable/ic_close_white_24dp"
                     app:navigationIcon="@drawable/ic_close_white_24dp" />
diff --git a/app/src/main/res/layout-xlarge/fragment_home.xml b/app/src/main/res/layout-xlarge/fragment_home.xml
index 789aa438..5bc9820c 100644
--- a/app/src/main/res/layout-xlarge/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge/fragment_home.xml
@@ -22,48 +22,39 @@
         android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
             android:elevation="0dp"
             app:elevation="0dp">
 
-            <com.google.android.material.card.MaterialCardView
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                app:cardCornerRadius="8dp"
-                app:cardUseCompatPadding="true"
-                app:layout_scrollFlags="scroll|enterAlways">
+                tools:ignore="UnusedAttribute">
 
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    style="@style/Toolbar48"
-                    android:layout_gravity="center_vertical"
-                    app:layout_collapseMode="pin"
-                    tools:ignore="UnusedAttribute">
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/searchIcon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="16dp"
+                    app:srcCompat="@drawable/ic_search_white_24dp"
+                    app:tint="@color/md_white_1000" />
 
-                    <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                        android:id="@+id/search_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:hint="@string/search_hint"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
+                <TextView
+                    android:id="@+id/bannerTitle"
+                    style="@style/BigTitleTextAppearanceToolbar"
+                    android:text="@string/app_name"
+                    android:textColor="@color/md_white_1000" />
 
-
-                    <code.name.monkey.retromusic.views.CircularImageView
-                        android:id="@+id/user_image"
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:layout_gravity="end|center_vertical"
-                        android:layout_marginEnd="16dp"
-                        app:civ_border="false" />
-                </androidx.appcompat.widget.Toolbar>
-            </com.google.android.material.card.MaterialCardView>
+                <code.name.monkey.retromusic.views.CircularImageView
+                    android:id="@+id/userImage"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:layout_gravity="end|center_vertical"
+                    android:layout_marginEnd="16dp"
+                    app:civ_border="false" />
+            </FrameLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.core.widget.NestedScrollView
diff --git a/app/src/main/res/layout-sw600dp/fragment_mini_player.xml b/app/src/main/res/layout-xlarge/fragment_mini_player.xml
similarity index 100%
rename from app/src/main/res/layout-sw600dp/fragment_mini_player.xml
rename to app/src/main/res/layout-xlarge/fragment_mini_player.xml
diff --git a/app/src/main/res/layout-xlarge/fragment_player.xml b/app/src/main/res/layout-xlarge/fragment_player.xml
index 3f556ce8..1dd33d1b 100644
--- a/app/src/main/res/layout-xlarge/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge/fragment_player.xml
@@ -61,8 +61,7 @@
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/player_toolbar"
-                    style="@style/Toolbar48"
-                    android:layout_height="48dp"
+                    style="@style/Toolbar"
                     android:navigationIcon="@drawable/ic_close_white_24dp"
                     app:navigationIcon="@drawable/ic_close_white_24dp" />
             </FrameLayout>
diff --git a/app/src/main/res/layout-xlarge/pager_item.xml b/app/src/main/res/layout-xlarge/pager_item.xml
index 6c067a3f..118dcf16 100644
--- a/app/src/main/res/layout-xlarge/pager_item.xml
+++ b/app/src/main/res/layout-xlarge/pager_item.xml
@@ -48,7 +48,7 @@
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/title"
-        fontPath="@string/circular_std_black"
+        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:ellipsize="end"
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index df498cd7..ee200a6f 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
@@ -14,13 +14,13 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
-            style="@style/Toolbar48"
+            style="@style/Toolbar"
             app:layout_collapseMode="pin"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
             app:title="@null">
 
             <TextView
-                android:id="@+id/title"
+                android:id="@+id/bannerTitle"
                 style="@style/BigTitleTextAppearance"
                 android:text="@string/action_about" />
 
diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml
index 61c21a87..4d4d4727 100755
--- a/app/src/main/res/layout/activity_album.xml
+++ b/app/src/main/res/layout/activity_album.xml
@@ -40,7 +40,7 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48"
+                style="@style/Toolbar"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
@@ -82,7 +82,7 @@
 
                     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                         android:id="@+id/albumTitle"
-                        fontPath="@string/circular_std_black"
+                        android:textStyle="bold"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:maxLines="2"
diff --git a/app/src/main/res/layout/activity_album_small.xml b/app/src/main/res/layout/activity_album_small.xml
deleted file mode 100644
index 19dcd3dc..00000000
--- a/app/src/main/res/layout/activity_album_small.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsing_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed"
-            app:titleEnabled="false">
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="72dp"
-                    android:background="@drawable/shadow_down_strong" />
-
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-
-
-                    <androidx.appcompat.widget.Toolbar
-                        android:id="@+id/toolbar"
-                        style="@style/Toolbar48" />
-
-                    <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                        android:id="@+id/image_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="12dp"
-                        app:layout_collapseMode="parallax">
-
-                        <com.google.android.material.card.MaterialCardView
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            app:cardUseCompatPadding="true">
-
-                            <code.name.monkey.retromusic.views.CircularImageView
-                                android:id="@+id/artist_image"
-                                android:layout_width="52dp"
-                                android:layout_height="52dp"
-                                android:layout_weight="0"
-                                android:visibility="gone"
-                                app:civ_border="false"
-                                app:civ_shadow="false" />
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:id="@+id/image"
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:scaleType="centerCrop"
-                                android:transitionName="@string/transition_album_art" />
-
-                        </com.google.android.material.card.MaterialCardView>
-                    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-                </LinearLayout>
-            </FrameLayout>
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:padding="12dp">
-
-            <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                android:id="@+id/title"
-                fontPath="@string/circular_std_black"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="2"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                tools:ignore="MissingPrefix" />
-
-            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                android:id="@+id/text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:ellipsize="marquee"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:freezesText="true"
-                android:marqueeRepeatLimit="marquee_forever"
-                android:paddingTop="4dp"
-                android:scrollHorizontally="true"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                tools:ignore="MissingPrefix"
-                tools:text="Title" />
-
-        </LinearLayout>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
-
-            <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                android:id="@+id/song_title"
-                fontPath="@string/circular_std_black"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="16dp"
-                android:paddingTop="12dp"
-                android:paddingEnd="16dp"
-                android:paddingBottom="12dp"
-                android:text="@string/songs"
-                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                tools:ignore="MissingPrefix" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:nestedScrollingEnabled="false" />
-
-            <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                android:id="@+id/more_title"
-                fontPath="@string/circular_std_black"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="16dp"
-                android:paddingTop="12dp"
-                android:paddingEnd="16dp"
-                android:paddingBottom="12dp"
-                android:text="@string/songs"
-                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                android:visibility="gone"
-                tools:ignore="MissingPrefix" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/more_recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:nestedScrollingEnabled="false"
-                android:visibility="gone" />
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/action_shuffle_all"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        app:layout_behavior="code.name.monkey.retromusic.misc.ScrollAwareFABBehavior"
-        app:srcCompat="@drawable/ic_shuffle_white_24dp" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album_style_2.xml b/app/src/main/res/layout/activity_album_style_2.xml
deleted file mode 100644
index e5258762..00000000
--- a/app/src/main/res/layout/activity_album_style_2.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsing_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <View
-                    android:id="@+id/gradient_background"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="bottom"
-                    android:background="@drawable/shadow_up_home"
-                    android:backgroundTint="?colorPrimary" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@android:color/transparent"
-                    android:orientation="vertical"
-                    app:layout_collapseMode="pin">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical">
-
-                            <include layout="@layout/status_bar" />
-
-                        </LinearLayout>
-
-                        <FrameLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
-
-                            <androidx.appcompat.widget.AppCompatImageButton
-                                android:id="@+id/menu_close"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="16dp"
-                                android:layout_marginTop="8dp"
-                                android:background="@drawable/color_circle_gradient"
-                                android:padding="8dp"
-                                app:backgroundTint="@color/twenty_percent_black_overlay"
-                                app:srcCompat="@drawable/ic_close_white_24dp" />
-
-                            <androidx.appcompat.widget.AppCompatImageButton
-                                android:id="@+id/menu"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="end"
-                                android:layout_marginEnd="16dp"
-                                android:layout_marginTop="8dp"
-                                android:background="@drawable/color_circle_gradient"
-                                android:padding="8dp"
-                                app:backgroundTint="@color/twenty_percent_black_overlay"
-                                app:srcCompat="@drawable/ic_more_vert_white_24dp" />
-                        </FrameLayout>
-                    </LinearLayout>
-
-                    <com.google.android.material.card.MaterialCardView
-                        android:id="@+id/image_container"
-                        android:layout_width="260dp"
-                        android:layout_height="260dp"
-                        android:layout_gravity="center"
-                        app:cardCornerRadius="8dp"
-                        app:cardElevation="8dp"
-                        app:cardUseCompatPadding="true">
-
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:id="@+id/image"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center"
-                            android:scaleType="centerCrop"
-                            android:transitionName="@string/transition_album_art"
-                             />
-                    </com.google.android.material.card.MaterialCardView>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:orientation="vertical"
-                        android:padding="16dp">
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/title"
-                            fontPath="@string/circular_std_black"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:maxLines="2"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                            tools:ignore="MissingPrefix" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/text"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:ellipsize="marquee"
-                            android:focusable="true"
-                            android:focusableInTouchMode="true"
-                            android:freezesText="true"
-                            android:gravity="center"
-                            android:marqueeRepeatLimit="marquee_forever"
-                            android:paddingTop="4dp"
-                            android:scrollHorizontally="true"
-                            android:singleLine="true"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                            tools:ignore="MissingPrefix"
-                            tools:text="Title" />
-
-                    </LinearLayout>
-                </LinearLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="72dp"
-                    android:background="@drawable/shadow_down_strong" />
-
-            </FrameLayout>
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:overScrollMode="never"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:cardCornerRadius="8dp"
-            app:cardElevation="8dp"
-            app:cardUseCompatPadding="true">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <!-- <LinearLayout
-                         android:layout_width="match_parent"
-                         android:layout_height="wrap_content"
-                         android:layout_weight="1"
-                         android:orientation="vertical"
-                         android:padding="16dp">
-
-                         <android.support.v7.widget.AppCompatTextView
-                             android:id="@+id/title"
-                             fontPath="@string/sans_bold"
-                             android:layout_width="match_parent"
-                             android:layout_height="wrap_content"
-                             android:maxLines="2"
-                             android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                             tools:ignore="MissingPrefix" />
-
-                         <android.support.v7.widget.AppCompatTextView
-                             android:id="@+id/text"
-                             android:layout_width="match_parent"
-                             android:layout_height="wrap_content"
-                             android:layout_gravity="center"
-                             android:ellipsize="marquee"
-                             android:focusable="true"
-                             android:focusableInTouchMode="true"
-                             android:freezesText="true"
-                             android:marqueeRepeatLimit="marquee_forever"
-                             android:paddingTop="4dp"
-                             android:scrollHorizontally="true"
-                             android:singleLine="true"
-                             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                             tools:ignore="MissingPrefix"
-                             tools:text="Title" />
-
-                     </LinearLayout>-->
-
-                </LinearLayout>
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/song_title"
-                    fontPath="@string/circular_std_black"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingBottom="12dp"
-                    android:paddingEnd="16dp"
-                    android:paddingStart="16dp"
-                    android:paddingTop="12dp"
-                    android:text="@string/songs"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="?android:attr/textColorPrimary"
-                    tools:ignore="MissingPrefix" />
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recycler_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:nestedScrollingEnabled="false" />
-            </LinearLayout>
-        </com.google.android.material.card.MaterialCardView>
-    </androidx.core.widget.NestedScrollView>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/action_shuffle_all"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        app:srcCompat="@drawable/ic_shuffle_white_24dp" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index 204d1012..42bc70a5 100755
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -59,7 +59,7 @@
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
-                    style="@style/Toolbar48"
+                    style="@style/Toolbar"
                     app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
                     tools:ignore="UnusedAttribute">
 
diff --git a/app/src/main/res/layout/activity_artist_content.xml b/app/src/main/res/layout/activity_artist_content.xml
index d858129f..3e4dfcf5 100644
--- a/app/src/main/res/layout/activity_artist_content.xml
+++ b/app/src/main/res/layout/activity_artist_content.xml
@@ -6,14 +6,14 @@
     android:orientation="vertical">
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/biography_title"
+        android:id="@+id/biographyTitle"
         style="@style/SubTitleTextAppearance"
         android:text="@string/biography"
         android:visibility="gone"
         tools:visibility="visible" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/biography"
+        android:id="@+id/biographyText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="end"
@@ -24,23 +24,23 @@
         tools:visibility="visible" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/album_title"
+        android:id="@+id/albumTitle"
         style="@style/SubTitleTextAppearance"
         android:text="@string/albums" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/album_recycler_view"
+        android:id="@+id/albumRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:nestedScrollingEnabled="false" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/song_title"
+        android:id="@+id/songTitle"
         style="@style/SubTitleTextAppearance"
         android:text="@string/songs" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
+        android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:nestedScrollingEnabled="false" />
diff --git a/app/src/main/res/layout/activity_artist_details.xml b/app/src/main/res/layout/activity_artist_details.xml
index fd837a3a..3ab4c98a 100755
--- a/app/src/main/res/layout/activity_artist_details.xml
+++ b/app/src/main/res/layout/activity_artist_details.xml
@@ -7,12 +7,12 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsing_toolbar"
+            android:id="@+id/collapsingToolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:contentScrim="@android:color/transparent"
@@ -26,7 +26,7 @@
                 app:layout_collapseMode="parallax">
 
                 <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/image"
+                    android:id="@+id/artistImage"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop"
@@ -41,13 +41,13 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48"
+                style="@style/Toolbar"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView
-        android:id="@+id/content"
+        android:id="@+id/contentContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_circular_top_corners"
@@ -67,8 +67,8 @@
                 android:padding="16dp">
 
                 <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    android:id="@+id/title"
-                    fontPath="@string/circular_std_black"
+                    android:id="@+id/artistTitle"
+                    android:textStyle="bold"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:maxLines="2"
@@ -100,7 +100,7 @@
     </androidx.core.widget.NestedScrollView>
 
     <code.name.monkey.retromusic.views.CollapsingFAB
-        android:id="@+id/action_shuffle_all"
+        android:id="@+id/actionShuffleAll"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
diff --git a/app/src/main/res/layout/activity_donation.xml b/app/src/main/res/layout/activity_donation.xml
index 3582bcfe..11ba30c0 100644
--- a/app/src/main/res/layout/activity_donation.xml
+++ b/app/src/main/res/layout/activity_donation.xml
@@ -21,7 +21,7 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48"
+                style="@style/Toolbar"
                 app:layout_collapseMode="pin"
                 app:title=""
                 tools:ignore="UnusedAttribute">
diff --git a/app/src/main/res/layout/activity_equalizer.xml b/app/src/main/res/layout/activity_equalizer.xml
index eefa588b..f04ae09c 100644
--- a/app/src/main/res/layout/activity_equalizer.xml
+++ b/app/src/main/res/layout/activity_equalizer.xml
@@ -21,7 +21,7 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48"
+                style="@style/Toolbar"
                 app:layout_collapseMode="pin"
                 app:title=""
                 tools:ignore="UnusedAttribute">
@@ -29,7 +29,7 @@
 
                 <TextView
                     android:id="@+id/title"
-                    fontPath="@string/circular_std_black"
+                    android:textStyle="bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
diff --git a/app/src/main/res/layout/activity_error_handler.xml b/app/src/main/res/layout/activity_error_handler.xml
index 4ede7c92..c184cc6b 100644
--- a/app/src/main/res/layout/activity_error_handler.xml
+++ b/app/src/main/res/layout/activity_error_handler.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.google.android.material.appbar.AppBarLayout
        android:id="@+id/app_bar"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:elevation="0dp"
        app:elevation="0dp">

        <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            style="@style/Toolbar48"
            app:layout_collapseMode="pin">


            <TextView
                android:id="@+id/title"
                fontPath="@string/circular_std_black"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:gravity="center"
                android:text="@string/error"
                android:textAppearance="@style/TextAppearance.AppCompat.Large"
                tools:ignore="MissingPrefix" />

        </androidx.appcompat.widget.Toolbar>

        <View
            android:layout_width="match_parent"
            android:layout_height="1dp"
            android:background="?dividerColor" />
    </com.google.android.material.appbar.AppBarLayout>

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:padding="16dp">

        <code.name.monkey.retromusic.views.IconImageView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:paddingBottom="16dp"
            app:srcCompat="@drawable/ic_bug_report_white_24dp" />

        <TextView
            fontPath="@string/circular_std_black"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="OOPS!"
            android:textAppearance="@style/TextAppearance.AppCompat.Display1"
            tools:ignore="MissingPrefix" />

        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/bug_report_summary" />
    </LinearLayout>

    <com.google.android.material.card.MaterialCardView
        android:id="@+id/clear_app_data"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom"
        android:layout_margin="8dp"
        app:cardBackgroundColor="@color/md_blue_A200"
        app:cardCornerRadius="6dp"
        app:cardUseCompatPadding="true">

        <TextView
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:gravity="center"
            android:paddingStart="20dp"
            android:paddingTop="12dp"
            android:paddingEnd="20dp"
            android:paddingBottom="12dp"
            android:text="@string/clear_app_data"
            android:textColor="@color/md_white_1000" />
    </com.google.android.material.card.MaterialCardView>

</LinearLayout>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.google.android.material.appbar.AppBarLayout
        android:id="@+id/app_bar"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:elevation="0dp"
        app:elevation="0dp">

        <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            style="@style/Toolbar"
            app:layout_collapseMode="pin">


            <TextView
                android:id="@+id/title"
                android:textStyle="bold"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:gravity="center"
                android:text="@string/error"
                android:textAppearance="@style/TextAppearance.AppCompat.Large"
                tools:ignore="MissingPrefix" />

        </androidx.appcompat.widget.Toolbar>

        <View
            android:layout_width="match_parent"
            android:layout_height="1dp"
            android:background="?dividerColor" />
    </com.google.android.material.appbar.AppBarLayout>

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:padding="16dp">

        <code.name.monkey.retromusic.views.IconImageView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:paddingBottom="16dp"
            app:srcCompat="@drawable/ic_bug_report_white_24dp" />

        <TextView
            android:textStyle="bold"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="OOPS!"
            android:textAppearance="@style/TextAppearance.AppCompat.Display1"
            tools:ignore="MissingPrefix" />

        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/bug_report_summary" />
    </LinearLayout>

    <com.google.android.material.card.MaterialCardView
        android:id="@+id/clear_app_data"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom"
        android:layout_margin="8dp"
        app:cardBackgroundColor="@color/md_blue_A200"
        app:cardCornerRadius="6dp"
        app:cardUseCompatPadding="true">

        <TextView
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:gravity="center"
            android:paddingStart="20dp"
            android:paddingTop="12dp"
            android:paddingEnd="20dp"
            android:paddingBottom="12dp"
            android:text="@string/clear_app_data"
            android:textColor="@color/md_white_1000" />
    </com.google.android.material.card.MaterialCardView>

</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml
index d1ba7dbd..2439a90f 100644
--- a/app/src/main/res/layout/activity_license.xml
+++ b/app/src/main/res/layout/activity_license.xml
@@ -23,7 +23,7 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48"
+                style="@style/Toolbar"
                 app:layout_collapseMode="pin"
                 app:title=""
                 tools:ignore="UnusedAttribute">
diff --git a/app/src/main/res/layout/activity_main_drawer_layout.xml b/app/src/main/res/layout/activity_main_drawer_layout.xml
index deac29bc..1ffcc1ee 100644
--- a/app/src/main/res/layout/activity_main_drawer_layout.xml
+++ b/app/src/main/res/layout/activity_main_drawer_layout.xml
@@ -1,13 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawerLayout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
     <FrameLayout
         android:id="@+id/drawer_content_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-</FrameLayout>
\ No newline at end of file
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/navigationView"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true"
+        android:paddingStart="0dp"
+        android:paddingEnd="8dp"
+        app:itemBackground="@drawable/navigation_item"
+        app:itemTextAppearance="@style/NavigationViewTitleTextAppearance"
+        app:menu="@menu/menu_drawer" />
+</androidx.drawerlayout.widget.DrawerLayout>
\ 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 149449d3..d1862206 100755
--- a/app/src/main/res/layout/activity_playing_queue.xml
+++ b/app/src/main/res/layout/activity_playing_queue.xml
@@ -23,7 +23,7 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48"
+                style="@style/Toolbar"
                 app:layout_collapseMode="pin"
                 app:title=""
                 tools:ignore="UnusedAttribute">
diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml
index dd236dd0..4b7e426b 100644
--- a/app/src/main/res/layout/activity_playlist_detail.xml
+++ b/app/src/main/res/layout/activity_playlist_detail.xml
@@ -20,14 +20,14 @@
         android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar"
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:elevation="@dimen/card_elevation"
             app:elevation="@dimen/card_elevation">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout
-                android:id="@+id/collapsing_toolbar"
+                android:id="@+id/collapsingToolbarLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:layout_scrollFlags="scroll|enterAlways"
@@ -44,13 +44,13 @@
 
                     <androidx.appcompat.widget.Toolbar
                         android:id="@+id/toolbar"
-                        style="@style/Toolbar48"
+                        style="@style/Toolbar"
                         app:layout_collapseMode="pin"
                         app:title=""
                         tools:ignore="UnusedAttribute">
 
                         <TextView
-                            android:id="@+id/title"
+                            android:id="@+id/bannerTitle"
                             style="@style/BigTitleTextAppearance" />
 
                     </androidx.appcompat.widget.Toolbar>
@@ -65,7 +65,7 @@
 
 
         <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
-            android:id="@+id/recycler_view"
+            android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:clipToPadding="false"
@@ -85,7 +85,7 @@
             android:visibility="gone" />
 
         <code.name.monkey.retromusic.views.CollapsingFAB
-            android:id="@+id/action_shuffle"
+            android:id="@+id/actionShuffle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
diff --git a/app/src/main/res/layout/activity_pro_version.xml b/app/src/main/res/layout/activity_pro_version.xml
index ede3e79f..c87f4334 100644
--- a/app/src/main/res/layout/activity_pro_version.xml
+++ b/app/src/main/res/layout/activity_pro_version.xml
@@ -38,7 +38,7 @@
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
-                    style="@style/Toolbar48"
+                    style="@style/Toolbar"
                     app:layout_collapseMode="pin"
                     tools:ignore="UnusedAttribute">
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 668409e8..3760ef42 100755
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -5,27 +5,27 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:elevation="0dp">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsing_toolbar"
+            android:id="@+id/collapsingToolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:titleEnabled="false">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48"
+                style="@style/Toolbar"
                 app:layout_collapseMode="pin"
                 app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
                 app:title="">
 
                 <TextView
-                    android:id="@+id/title"
+                    android:id="@+id/settingsTitle"
                     style="@style/BigTitleTextAppearance"
                     android:text="@string/action_settings" />
 
@@ -40,7 +40,7 @@
 
 
     <FrameLayout
-        android:id="@+id/content_frame"
+        android:id="@+id/contentFrame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index 6cac0df4..937a2814 100755
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -34,14 +34,14 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48"
+                style="@style/Toolbar"
                 app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
                 tools:ignore="UnusedAttribute">
 
 
                 <TextView
                     android:id="@+id/title"
-                    fontPath="@string/circular_std_black"
+                    android:textStyle="bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index 4df2fd1a..105b834f 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
@@ -14,11 +14,11 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
-            style="@style/Toolbar48"
+            style="@style/Toolbar"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp">
 
             <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                android:id="@+id/title"
+                android:id="@+id/bannerTitle"
                 style="@style/BigTitleTextAppearance"
                 android:text="@string/profile" />
 
@@ -43,19 +43,19 @@
                 app:cardUseCompatPadding="true">
 
                 <FrameLayout
-                    android:id="@+id/image_container"
+                    android:id="@+id/imageContainer"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
                     <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/banner_image"
+                        android:id="@+id/bannerImage"
                         android:layout_width="match_parent"
                         android:layout_height="156dp"
                         android:scaleType="centerCrop"
                         app:srcCompat="@drawable/material_design_default" />
 
                     <View
-                        android:id="@+id/banner_select"
+                        android:id="@+id/bannerSelect"
                         android:layout_width="match_parent"
                         android:layout_height="156dp"
                         android:background="@color/twenty_percent_black_overlay" />
@@ -75,7 +75,7 @@
                         android:layout_margin="8dp">
 
                         <code.name.monkey.retromusic.views.CircularImageView
-                            android:id="@+id/user_image"
+                            android:id="@+id/userImage"
                             android:layout_width="72dp"
                             android:layout_height="72dp"
                             android:layout_gravity="center"
@@ -99,7 +99,7 @@
             </com.google.android.material.card.MaterialCardView>
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/name_container"
+                android:id="@+id/nameContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="12dp"
diff --git a/app/src/main/res/layout/activity_whats_new.xml b/app/src/main/res/layout/activity_whats_new.xml
index b4086b12..4503ec8c 100644
--- a/app/src/main/res/layout/activity_whats_new.xml
+++ b/app/src/main/res/layout/activity_whats_new.xml
@@ -15,7 +15,7 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
-            style="@style/Toolbar48"
+            style="@style/Toolbar"
             app:layout_collapseMode="pin"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
             app:title="">
diff --git a/app/src/main/res/layout/collapsing_floating_action_button.xml b/app/src/main/res/layout/collapsing_floating_action_button.xml
index 8acb7c0a..c29a7938 100644
--- a/app/src/main/res/layout/collapsing_floating_action_button.xml
+++ b/app/src/main/res/layout/collapsing_floating_action_button.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="wrap_content"
+    android:layout_gravity="center"
     android:layout_height="wrap_content"
     app:cardCornerRadius="26dp"
     app:cardUseCompatPadding="true"
diff --git a/app/src/main/res/layout/dialog_add_to_playlist.xml b/app/src/main/res/layout/dialog_add_to_playlist.xml
index d2f6f8cc..85626eff 100644
--- a/app/src/main/res/layout/dialog_add_to_playlist.xml
+++ b/app/src/main/res/layout/dialog_add_to_playlist.xml
@@ -12,13 +12,13 @@
         android:orientation="horizontal">
 
         <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-            android:id="@+id/title"
+            android:id="@+id/bannerTitle"
             style="@style/SubTitleTextAppearance"
             android:layout_weight="1"
             android:text="@string/add_playlist_title" />
 
         <code.name.monkey.retromusic.views.IconImageView
-            android:id="@+id/action_add_playlist"
+            android:id="@+id/actionAddPlaylist"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="0"
@@ -34,7 +34,7 @@
 
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/playlists"
+        android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_file_details.xml b/app/src/main/res/layout/dialog_file_details.xml
index 5d5d2b21..e30b911e 100644
--- a/app/src/main/res/layout/dialog_file_details.xml
+++ b/app/src/main/res/layout/dialog_file_details.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/title"
-        fontPath="@string/circular_std_black"
+        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="12dp"
diff --git a/app/src/main/res/layout/dialog_file_share.xml b/app/src/main/res/layout/dialog_file_share.xml
index b43e1e83..6d1be9d3 100644
--- a/app/src/main/res/layout/dialog_file_share.xml
+++ b/app/src/main/res/layout/dialog_file_share.xml
@@ -8,7 +8,7 @@
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/title"
-        fontPath="@string/circular_std_black"
+        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
diff --git a/app/src/main/res/layout/dialog_create_playlist.xml b/app/src/main/res/layout/dialog_playlist.xml
similarity index 86%
rename from app/src/main/res/layout/dialog_create_playlist.xml
rename to app/src/main/res/layout/dialog_playlist.xml
index 3f4354c9..42d4c194 100644
--- a/app/src/main/res/layout/dialog_create_playlist.xml
+++ b/app/src/main/res/layout/dialog_playlist.xml
@@ -6,23 +6,18 @@
     android:orientation="vertical">
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-        android:id="@+id/title"
+        android:id="@+id/bannerTitle"
         style="@style/SubTitleTextAppearance"
-        android:padding="12dp"
+        android:padding="16dp"
         android:text="@string/new_playlist_title" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?dividerColor" />
-
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/action_new_playlist"
+        android:id="@+id/actionNewPlaylistContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
-        android:layout_marginEnd="12dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="12dp"
         app:boxBackgroundMode="outline"
         app:boxCollapsedPaddingTop="16dp"
         app:boxCornerRadiusBottomEnd="8dp"
@@ -34,7 +29,7 @@
         app:hintEnabled="true">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/option_1"
+            android:id="@+id/actionNewPlaylist"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@null"
@@ -51,7 +46,7 @@
         android:padding="12dp">
 
         <com.google.android.material.button.MaterialButton
-            android:id="@+id/action_cancel"
+            android:id="@+id/actionCancel"
             style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -60,7 +55,7 @@
             app:strokeWidth="1dp" />
 
         <com.google.android.material.button.MaterialButton
-            android:id="@+id/action_create"
+            android:id="@+id/actionCreate"
             style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_playlist_rename.xml b/app/src/main/res/layout/dialog_playlist_rename.xml
index cf17df2b..a1c96d94 100644
--- a/app/src/main/res/layout/dialog_playlist_rename.xml
+++ b/app/src/main/res/layout/dialog_playlist_rename.xml
@@ -9,11 +9,12 @@
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/title"
-        fontPath="@string/circular_std_black"
+        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
-        android:padding="6dp"
+        android:padding="12dp"
+
         android:text="@string/rename_playlist_title"
         android:textAppearance="@style/TextAppearance.AppCompat.Title"
         android:textColor="?android:attr/textColorPrimary"
diff --git a/app/src/main/res/layout/dialog_remove_from_playlist.xml b/app/src/main/res/layout/dialog_remove_from_playlist.xml
index 72840aad..8b916c5e 100644
--- a/app/src/main/res/layout/dialog_remove_from_playlist.xml
+++ b/app/src/main/res/layout/dialog_remove_from_playlist.xml
@@ -2,16 +2,17 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingTop="8dp"
     android:orientation="vertical">
 
     <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-        android:id="@+id/title"
+        android:id="@+id/bannerTitle"
         style="@style/SubTitleTextAppearance"
         android:padding="12dp"
         android:text="@string/remove_song_from_playlist_title" />
 
     <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-        android:id="@+id/action_remove"
+        android:id="@+id/actionRemove"
         style="@style/TextAppearance.AppCompat.Subhead"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -19,7 +20,7 @@
         android:text="@string/remove_action" />
 
     <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-        android:id="@+id/action_cancel"
+        android:id="@+id/actionCancel"
         style="@style/TextAppearance.AppCompat.Subhead"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml
index 89ad7a21..c377147d 100644
--- a/app/src/main/res/layout/fragment_adaptive_player.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player.xml
@@ -33,7 +33,7 @@
                 android:layout_weight="0">
 
                 <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/player_toolbar"
+                    android:id="@+id/playerToolbar"
                     style="@style/Toolbar48"
                     android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
                     app:contentInsetLeft="0dp"
diff --git a/app/src/main/res/layout/fragment_album_cover.xml b/app/src/main/res/layout/fragment_album_cover.xml
index 43ed5911..250f2d07 100644
--- a/app/src/main/res/layout/fragment_album_cover.xml
+++ b/app/src/main/res/layout/fragment_album_cover.xml
@@ -3,16 +3,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/player_album_art_frame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp"
         app:cardCornerRadius="8dp"
-        app:cardElevation="8dp">
+        app:cardElevation="8dp"
+        app:cardUseCompatPadding="true">
 
         <code.name.monkey.retromusic.views.WidthFitSquareLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_banner_home.xml b/app/src/main/res/layout/fragment_banner_home.xml
index 7ae19eaa..cd28d74b 100644
--- a/app/src/main/res/layout/fragment_banner_home.xml
+++ b/app/src/main/res/layout/fragment_banner_home.xml
@@ -6,7 +6,6 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
@@ -23,13 +22,13 @@
             app:titleEnabled="false">
 
             <FrameLayout
-                android:id="@+id/image_container"
+                android:id="@+id/imageContainer"
                 android:layout_width="match_parent"
-                android:layout_height="196dp"
+                android:layout_height="228dp"
                 app:layout_collapseMode="parallax">
 
                 <ImageView
-                    android:id="@+id/image"
+                    android:id="@+id/bannerImage"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop"
@@ -52,38 +51,34 @@
                     <include layout="@layout/status_bar" />
                 </FrameLayout>
 
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar"
+                    android:layout_gravity="center_vertical"
+                    app:layout_collapseMode="pin"
+                    app:layout_scrollFlags="scroll|enterAlways"
                     tools:ignore="UnusedAttribute">
 
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/searchIcon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:padding="16dp"
-                        app:srcCompat="@drawable/ic_search_white_24dp"
-                        app:tint="@color/md_white_1000" />
-
-                    <TextView
+                    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+                        android:id="@+id/bannerTitle"
                         style="@style/BigTitleTextAppearanceToolbar"
                         android:text="@string/app_name"
-                        android:textColor="@color/md_white_1000" />
+                        tools:ignore="MissingPrefix" />
 
                     <code.name.monkey.retromusic.views.CircularImageView
-                        android:id="@+id/user_image"
+                        android:id="@+id/userImage"
                         android:layout_width="32dp"
                         android:layout_height="32dp"
                         android:layout_gravity="end|center_vertical"
                         android:layout_marginEnd="16dp"
                         app:civ_border="false" />
-                </FrameLayout>
+                </androidx.appcompat.widget.Toolbar>
             </LinearLayout>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView
-        android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:behavior_overlapTop="24dp"
@@ -95,7 +90,7 @@
             app:cardCornerRadius="12dp">
 
             <LinearLayout
-                android:id="@+id/content_container"
+                android:id="@+id/contentContainer"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:descendantFocusability="blocksDescendants"
diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml
index 280f8185..d5ed4aeb 100644
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@@ -8,7 +8,7 @@
     android:focusable="true">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/gradient_background"
+        android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop" />
@@ -40,19 +40,6 @@
                 <include layout="@layout/status_bar" />
             </FrameLayout>
 
-            <FrameLayout
-                android:id="@+id/toolbar_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0">
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/player_toolbar"
-                    style="@style/Toolbar48"
-                    android:layout_height="48dp"
-                    android:navigationIcon="@drawable/ic_close_white_24dp"
-                    app:navigationIcon="@drawable/ic_close_white_24dp" />
-            </FrameLayout>
 
             <code.name.monkey.retromusic.views.WidthFitSquareLayout
                 android:id="@+id/album_cover_container"
@@ -79,6 +66,20 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
             </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/toolbar_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/playerToolbar"
+                    style="@style/Toolbar"
+                    android:layout_height="48dp"
+                    android:navigationIcon="@drawable/ic_close_white_24dp"
+                    app:navigationIcon="@drawable/ic_close_white_24dp" />
+            </FrameLayout>
         </LinearLayout>
     </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_card_blur_player.xml b/app/src/main/res/layout/fragment_card_blur_player.xml
index 24c4581b..54fd0e99 100644
--- a/app/src/main/res/layout/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player.xml
@@ -43,7 +43,7 @@
 
                     <androidx.appcompat.widget.Toolbar
                         android:id="@+id/player_toolbar"
-                        style="@style/Toolbar48"
+                        style="@style/Toolbar"
                         android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
                         app:contentInsetLeft="0dp"
                         app:contentInsetStart="0dp"
diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml
index 1d75abd6..62de5d9a 100644
--- a/app/src/main/res/layout/fragment_card_player.xml
+++ b/app/src/main/res/layout/fragment_card_player.xml
@@ -46,7 +46,7 @@
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/player_toolbar"
-                    style="@style/Toolbar48"
+                    style="@style/Toolbar"
                     android:navigationIcon="@drawable/ic_close_white_24dp"
                     app:navigationIcon="@drawable/ic_close_white_24dp" />
             </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml
index 6eb67786..422bbd50 100644
--- a/app/src/main/res/layout/fragment_color_player.xml
+++ b/app/src/main/res/layout/fragment_color_player.xml
@@ -116,8 +116,7 @@
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/player_toolbar"
-                    style="@style/Toolbar48"
-                    android:layout_height="48dp"
+                    style="@style/Toolbar"
                     android:navigationIcon="@drawable/ic_close_white_24dp"
                     app:navigationIcon="@drawable/ic_close_white_24dp" />
 
diff --git a/app/src/main/res/layout/fragment_fit.xml b/app/src/main/res/layout/fragment_fit.xml
index d31f16c6..b45af0d6 100644
--- a/app/src/main/res/layout/fragment_fit.xml
+++ b/app/src/main/res/layout/fragment_fit.xml
@@ -48,8 +48,7 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
-                style="@style/Toolbar48"
-                android:layout_height="48dp"
+                style="@style/Toolbar"
                 android:layout_gravity="bottom"
                 android:navigationIcon="@drawable/ic_close_white_24dp"
                 app:navigationIcon="@drawable/ic_close_white_24dp" />
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 45da3457..66473c3c 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
@@ -23,16 +23,16 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp">
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
 
         <TextView
             android:id="@+id/player_song_current_progress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:paddingEnd="8dp"
             android:paddingStart="8dp"
+            android:paddingEnd="8dp"
             android:textColor="?android:attr/textColorSecondary"
             android:textSize="12sp"
             android:textStyle="bold"
@@ -44,8 +44,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="0"
-            android:paddingEnd="8dp"
             android:paddingStart="8dp"
+            android:paddingEnd="8dp"
             android:textColor="?android:attr/textColorSecondary"
             android:textSize="12sp"
             android:textStyle="bold"
@@ -59,12 +59,11 @@
         android:layout_weight="1"
         android:gravity="center_vertical"
         android:orientation="vertical"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp">
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/text"
-            fontPath="@string/circular_std_black"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@color/md_red_500"
@@ -76,11 +75,11 @@
             android:textAllCaps="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Body2"
             android:textSize="12sp"
+            android:textStyle="bold"
             tools:text="Title" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title"
-            fontPath="@string/circular_std_black"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
@@ -102,8 +101,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:paddingEnd="16dp"
         android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         tools:ignore="ContentDescription,UnusedAttribute">
 
         <androidx.appcompat.widget.AppCompatImageButton
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 686ba1ed..d4db9947 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_fragment_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -18,14 +17,14 @@
     </FrameLayout>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/coordinator_layout"
+        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1">
 
 
         <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar"
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:elevation="0dp"
@@ -38,15 +37,16 @@
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
-                    style="@style/Toolbar48"
+                    style="@style/Toolbar"
                     android:layout_gravity="center_vertical"
                     app:layout_collapseMode="pin"
                     tools:ignore="UnusedAttribute">
 
-                    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                        android:id="@+id/title"
+                    <TextView
+                        android:id="@+id/bannerTitle"
                         style="@style/BigTitleTextAppearanceToolbar"
-                        android:text="@string/folders" />
+                        android:text="@string/folders"
+                        tools:ignore="MissingPrefix" />
 
                 </androidx.appcompat.widget.Toolbar>
 
@@ -65,7 +65,7 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
             <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
-                android:id="@+id/recycler_view"
+                android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:clipToPadding="false"
@@ -91,7 +91,7 @@
         android:background="?dividerColor" />
 
     <code.name.monkey.retromusic.views.BreadCrumbLayout
-        android:id="@+id/bread_crumbs"
+        android:id="@+id/breadCrumbs"
         android:layout_width="match_parent"
         android:layout_height="@dimen/tab_height"
         android:layout_weight="0"
diff --git a/app/src/main/res/layout/fragment_hmm_player.xml b/app/src/main/res/layout/fragment_hmm_player.xml
index 52823e59..b3d534a5 100644
--- a/app/src/main/res/layout/fragment_hmm_player.xml
+++ b/app/src/main/res/layout/fragment_hmm_player.xml
@@ -61,7 +61,7 @@
 
                     <code.name.monkey.retromusic.views.VerticalTextView
                         android:id="@+id/title"
-                        fontPath="@string/circular_std_black"
+                        android:textStyle="bold"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:ellipsize="end"
@@ -118,7 +118,7 @@
 
                     <code.name.monkey.retromusic.views.VerticalTextView
                         android:id="@+id/player_song_total_time"
-                        fontPath="@string/circular_std_black"
+                        android:textStyle="bold"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="end"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 36e1d90e..c7649a14 100755
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -25,45 +25,42 @@
             android:elevation="0dp"
             app:elevation="0dp">
 
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar48"
+                android:layout_gravity="center_vertical"
+                app:layout_collapseMode="pin"
+                app:layout_scrollFlags="scroll|enterAlways"
                 tools:ignore="UnusedAttribute">
 
-                <code.name.monkey.retromusic.views.IconImageView
-                    android:id="@+id/searchIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:padding="14dp"
-                    app:srcCompat="@drawable/ic_search_white_24dp" />
-
-                <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+                <TextView
+                    android:id="@+id/bannerTitle"
                     style="@style/BigTitleTextAppearanceToolbar"
-                    android:text="@string/app_name" />
+                    android:text="@string/app_name"
+                    tools:ignore="MissingPrefix" />
 
                 <code.name.monkey.retromusic.views.CircularImageView
-                    android:id="@+id/user_image"
+                    android:id="@+id/userImage"
                     android:layout_width="32dp"
                     android:layout_height="32dp"
                     android:layout_gravity="end|center_vertical"
                     android:layout_marginEnd="16dp"
                     app:civ_border="false" />
-            </FrameLayout>
+            </androidx.appcompat.widget.Toolbar>
 
         </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.core.widget.NestedScrollView
-            android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@color/md_white_1000"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
             <LinearLayout
-                android:id="@+id/content_container"
+                android:id="@+id/contentContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/md_white_1000"
                 android:descendantFocusability="blocksDescendants"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index d1f494ef..16355f0d 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -36,7 +36,7 @@
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
-                    style="@style/Toolbar48"
+                    style="@style/Toolbar"
                     android:layout_gravity="center_vertical"
                     app:layout_collapseMode="pin"
                     tools:ignore="UnusedAttribute">
@@ -47,13 +47,6 @@
                         android:text="@string/app_name"
                         tools:ignore="MissingPrefix" />
 
-                    <code.name.monkey.retromusic.views.CircularImageView
-                        android:id="@+id/user_image"
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:layout_gravity="end|center_vertical"
-                        android:layout_marginEnd="16dp"
-                        app:civ_border="false" />
                 </androidx.appcompat.widget.Toolbar>
 
                 <ViewStub
diff --git a/app/src/main/res/layout/fragment_main_options.xml b/app/src/main/res/layout/fragment_main_options.xml
index b5cdc312..31ece678 100644
--- a/app/src/main/res/layout/fragment_main_options.xml
+++ b/app/src/main/res/layout/fragment_main_options.xml
@@ -5,22 +5,22 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp"
     tools:ignore="MissingPrefix">
 
+
+
     <LinearLayout
-        android:id="@+id/user_info_container"
+        android:id="@+id/userInfoContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingStart="8dp"
+        android:paddingStart="16dp"
         android:paddingTop="16dp"
-        android:paddingEnd="8dp"
+        android:paddingEnd="16dp"
         android:paddingBottom="16dp">
 
         <code.name.monkey.retromusic.views.CircularImageView
-            android:id="@+id/user_image_bottom"
+            android:id="@+id/userImage"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_weight="0"
@@ -29,17 +29,17 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingStart="12dp"
             android:layout_gravity="center_vertical"
+            android:layout_weight="1"
             android:gravity="center_vertical"
-            android:paddingEnd="12dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp">
 
             <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                android:id="@+id/title_welcome"
+                android:id="@+id/titleWelcome"
                 style="@style/SubTitleTextAppearance"
-                android:padding="0dp"  />
+                android:padding="0dp" />
 
             <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:id="@+id/text"
@@ -52,7 +52,7 @@
         </LinearLayout>
 
         <code.name.monkey.retromusic.views.IconImageView
-            android:id="@+id/action_settings"
+            android:id="@+id/actionSettings"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="?roundSelector"
@@ -61,23 +61,8 @@
             android:textAllCaps="false"
             app:srcCompat="@drawable/ic_settings_white_24dp" />
     </LinearLayout>
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/action_folders"
-        style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:text="@string/folders"
-        android:textAllCaps="false"
-        android:textColor="?android:attr/textColorPrimary"
-        app:icon="@drawable/ic_folder_white_24dp"
-        app:iconPadding="12dp"
-        app:iconTint="?iconColor"
-        app:rippleColor="?iconColor" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/action_sleep_timer"
+    <code.name.monkey.retromusic.views.MaterialButtonTextColor
+        android:id="@+id/actionSleepTimer"
         style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -90,8 +75,8 @@
         app:iconTint="?iconColor"
         app:rippleColor="?iconColor" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/action_about"
+    <code.name.monkey.retromusic.views.MaterialButtonTextColor
+        android:id="@+id/actionAbout"
         style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -104,8 +89,8 @@
         app:iconTint="?iconColor"
         app:rippleColor="?iconColor" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/action_rate"
+    <code.name.monkey.retromusic.views.MaterialButtonTextColor
+        android:id="@+id/actionRate"
         style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -118,18 +103,5 @@
         app:iconTint="?iconColor"
         app:rippleColor="?iconColor" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/action_buy_pro"
-        style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:text="@string/buy_retro_music_pro"
-        android:textAllCaps="false"
-        android:textColor="?android:attr/textColorPrimary"
-        app:icon="@drawable/ic_card_giftcard_white_24dp"
-        app:iconPadding="12dp"
-        app:iconTint="?iconColor"
-        app:rippleColor="?iconColor" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml
index 2a9dca1f..31436e21 100644
--- a/app/src/main/res/layout/fragment_main_settings.xml
+++ b/app/src/main/res/layout/fragment_main_settings.xml
@@ -13,56 +13,7 @@
         android:orientation="vertical">
 
         <LinearLayout
-            android:id="@+id/user_info_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingStart="12dp"
-            android:paddingTop="12dp"
-            android:paddingEnd="8dp"
-            android:paddingBottom="12dp">
-
-            <code.name.monkey.retromusic.views.CircularImageView
-                android:id="@+id/user_image_bottom"
-                android:layout_width="38dp"
-                android:layout_height="38dp"
-                android:layout_weight="0"
-                app:civ_border="false" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingStart="18dp"
-                android:paddingEnd="12dp"
-                android:paddingBottom="8dp">
-
-                <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    android:id="@+id/title_welcome"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="marquee"
-                    android:fadingEdge="horizontal"
-                    android:singleLine="true"
-                    android:text="@string/general_settings_title"
-                    android:textSize="@dimen/ate_default_textsize_subheading" />
-
-                <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                    android:id="@+id/text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:maxLines="4"
-                    android:text="@string/lets_play_something"
-                    android:textSize="@dimen/ate_default_textsize_body"
-                    tools:text="Summary" />
-
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/general_settings"
+            android:id="@+id/generalSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
@@ -105,7 +56,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/now_playing_settings"
+            android:id="@+id/nowPlayingSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
@@ -146,7 +97,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/audio_settings"
+            android:id="@+id/audioSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
@@ -187,7 +138,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/personalize_settings"
+            android:id="@+id/personalizeSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
@@ -227,7 +178,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/image_settings"
+            android:id="@+id/imageSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
@@ -267,7 +218,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/notification_settings"
+            android:id="@+id/notificationSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
@@ -307,7 +258,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/other_settings"
+            android:id="@+id/otherSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
diff --git a/app/src/main/res/layout/fragment_material.xml b/app/src/main/res/layout/fragment_material.xml
index 6852274b..b4b1d4b0 100644
--- a/app/src/main/res/layout/fragment_material.xml
+++ b/app/src/main/res/layout/fragment_material.xml
@@ -61,8 +61,7 @@
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/player_toolbar"
-                    style="@style/Toolbar48"
-                    android:layout_height="48dp"
+                    style="@style/Toolbar"
                     android:layout_gravity="bottom"
                     android:navigationIcon="@drawable/ic_close_white_24dp"
                     app:navigationIcon="@drawable/ic_close_white_24dp" />
diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml
index 0b78367e..a78847fe 100644
--- a/app/src/main/res/layout/fragment_plain_player.xml
+++ b/app/src/main/res/layout/fragment_plain_player.xml
@@ -37,7 +37,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/title"
-                    fontPath="@string/circular_std_black"
+                    android:textStyle="bold"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="marquee"
@@ -95,8 +95,7 @@
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/player_toolbar"
-                    style="@style/Toolbar48"
-                    android:layout_height="48dp"
+                    style="@style/Toolbar"
                     android:navigationIcon="@drawable/ic_close_white_24dp"
                     app:navigationIcon="@drawable/ic_close_white_24dp" />
             </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index e2ca2221..c9f51eb7 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -65,8 +65,7 @@
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/player_toolbar"
-                    style="@style/Toolbar48"
-                    android:layout_height="48dp"
+                    style="@style/Toolbar"
                     android:layout_gravity="bottom"
                     android:navigationIcon="@drawable/ic_close_white_24dp"
                     app:navigationIcon="@drawable/ic_close_white_24dp" />
diff --git a/app/src/main/res/layout/fragment_simple_controls_fragment.xml b/app/src/main/res/layout/fragment_simple_controls_fragment.xml
index 4375c7f8..0804abf2 100644
--- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml
+++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml
@@ -22,7 +22,7 @@
 
             <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                 android:id="@+id/title"
-                fontPath="@string/circular_std_black"
+                android:textStyle="bold"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml
index c45336b2..5bace5fe 100644
--- a/app/src/main/res/layout/fragment_simple_player.xml
+++ b/app/src/main/res/layout/fragment_simple_player.xml
@@ -66,8 +66,7 @@
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/player_toolbar"
-                    style="@style/Toolbar48"
-                    android:layout_height="48dp"
+                    style="@style/Toolbar"
                     android:navigationIcon="@drawable/ic_close_white_24dp"
                     app:navigationIcon="@drawable/ic_close_white_24dp" />
             </FrameLayout>
diff --git a/app/src/main/res/layout/home_section_content.xml b/app/src/main/res/layout/home_section_content.xml
index 56d37e3b..71103b18 100644
--- a/app/src/main/res/layout/home_section_content.xml
+++ b/app/src/main/res/layout/home_section_content.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical">
 
     <LinearLayout
-        android:id="@+id/recent_artist_container"
+        android:id="@+id/recentArtistContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -19,7 +19,7 @@
 
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler_view"
+            android:id="@+id/recentArtist"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:nestedScrollingEnabled="false" />
@@ -32,7 +32,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/recent_albums_container"
+        android:id="@+id/recentAlbumsContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -45,7 +45,7 @@
 
 
         <code.name.monkey.retromusic.views.MetalRecyclerViewPager
-            android:id="@+id/recent_album"
+            android:id="@+id/recentAlbum"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:nestedScrollingEnabled="false"
@@ -59,7 +59,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/top_artist_container"
+        android:id="@+id/topArtistContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -70,7 +70,7 @@
             android:text="@string/top_artists" />
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/top_artist"
+            android:id="@+id/topArtist"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:nestedScrollingEnabled="false" />
@@ -83,7 +83,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/top_albums_container"
+        android:id="@+id/topAlbumsContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -95,7 +95,7 @@
             android:text="@string/top_albums" />
 
         <code.name.monkey.retromusic.views.MetalRecyclerViewPager
-            android:id="@+id/top_album"
+            android:id="@+id/topAlbum"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:nestedScrollingEnabled="false"
@@ -109,7 +109,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/suggestion_container"
+        android:id="@+id/suggestionContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -121,7 +121,7 @@
             android:text="@string/suggestion_songs" />
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/suggestion_songs"
+            android:id="@+id/suggestionSongs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:nestedScrollingEnabled="false" />
@@ -134,7 +134,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/genre_container"
+        android:id="@+id/genreContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
@@ -145,7 +145,7 @@
             android:text="@string/genres" />
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/genres"
+            android:id="@+id/genresRecyclerView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:nestedScrollingEnabled="false" />
diff --git a/app/src/main/res/layout/item_album_card.xml b/app/src/main/res/layout/item_album_card.xml
index ed085678..ccab06d2 100644
--- a/app/src/main/res/layout/item_album_card.xml
+++ b/app/src/main/res/layout/item_album_card.xml
@@ -22,7 +22,7 @@
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/title"
-        fontPath="@string/circular_std_black"
+        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:ellipsize="end"
diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml
index 07106cf2..3aeaf97c 100644
--- a/app/src/main/res/layout/item_card.xml
+++ b/app/src/main/res/layout/item_card.xml
@@ -40,7 +40,7 @@
 
             <TextView
                 android:id="@+id/title"
-                fontPath="@string/circular_std_black"
+                android:textStyle="bold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
diff --git a/app/src/main/res/layout/item_card_color.xml b/app/src/main/res/layout/item_card_color.xml
index 69550357..39eab6a6 100644
--- a/app/src/main/res/layout/item_card_color.xml
+++ b/app/src/main/res/layout/item_card_color.xml
@@ -40,7 +40,7 @@
 
             <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                 android:id="@+id/title"
-                fontPath="@string/circular_std_black"
+                android:textStyle="bold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:singleLine="true" />
diff --git a/app/src/main/res/layout/item_color.xml b/app/src/main/res/layout/item_color.xml
index de687034..530485c9 100644
--- a/app/src/main/res/layout/item_color.xml
+++ b/app/src/main/res/layout/item_color.xml
@@ -38,7 +38,7 @@
 
       <TextView
         android:id="@+id/title"
-        fontPath="@string/circular_std_black"
+        android:textStyle="bold"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:singleLine="true"
diff --git a/app/src/main/res/layout/item_donation_option.xml b/app/src/main/res/layout/item_donation_option.xml
index 1dadaba5..abf08b9f 100644
--- a/app/src/main/res/layout/item_donation_option.xml
+++ b/app/src/main/res/layout/item_donation_option.xml
@@ -21,7 +21,6 @@
 
             <TextView
                 android:id="@+id/price"
-                fontPath="@string/circular_std_black"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index bd51590a..61e10ffa 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -48,7 +48,7 @@
 
             <TextView
                 android:id="@+id/title"
-                fontPath="@string/circular_std_black"
+                android:textStyle="bold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
diff --git a/app/src/main/res/layout/item_grid_circle.xml b/app/src/main/res/layout/item_grid_circle.xml
index ba117cee..22e106c9 100644
--- a/app/src/main/res/layout/item_grid_circle.xml
+++ b/app/src/main/res/layout/item_grid_circle.xml
@@ -44,7 +44,7 @@
 
             <TextView
                 android:id="@+id/title"
-                fontPath="@string/circular_std_black"
+                android:textStyle="bold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index 2c148978..05fbf2ad 100755
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -53,13 +53,14 @@
                     android:id="@+id/image_text"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:fontFamily="@font/font"
                     android:gravity="center"
                     android:maxLines="1"
-                    tools:text="1"
-                    tools:visibility="visible"
                     android:minHeight="40dp"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    tools:text="1"
+                    tools:visibility="visible" />
             </com.google.android.material.card.MaterialCardView>
         </FrameLayout>
 
@@ -75,25 +76,24 @@
             android:paddingStart="16dp"
             android:paddingEnd="16dp">
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
                 android:id="@+id/title"
-                style="@style/TextAppearance.AppCompat.Subhead"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="2dp"
                 android:ellipsize="end"
+                android:fontFamily="@font/font"
                 android:maxLines="1"
-                android:textColor="?android:attr/textColorPrimary" />
+                android:textSize="16sp"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
+            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                 android:id="@+id/text"
                 style="@style/TextAppearance.AppCompat.Body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:ellipsize="end"
-                android:maxLines="1"
-                android:textColor="?android:attr/textColorSecondary" />
+                android:maxLines="1" />
         </LinearLayout>
 
         <code.name.monkey.retromusic.views.IconImageView
diff --git a/app/src/main/res/layout/navigation_drawer_header.xml b/app/src/main/res/layout/navigation_drawer_header.xml
new file mode 100644
index 00000000..3509b841
--- /dev/null
+++ b/app/src/main/res/layout/navigation_drawer_header.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml
index 1f5d06fa..6d899d9b 100644
--- a/app/src/main/res/layout/pager_item.xml
+++ b/app/src/main/res/layout/pager_item.xml
@@ -48,7 +48,7 @@
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/title"
-        fontPath="@string/circular_std_black"
+        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:ellipsize="end"