diff --git a/app/src/main/res/drawable/tab_indicator.xml b/app/src/main/res/drawable/tab_indicator.xml
new file mode 100644
index 00000000..2f6041ca
--- /dev/null
+++ b/app/src/main/res/drawable/tab_indicator.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp" />
+    <solid android:color="@color/md_red_500" />
+</shape>
\ No newline at end of file
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 a500740b..c530f5ab 100644
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@@ -88,7 +88,8 @@
             android:layout_height="match_parent"
             android:layout_marginStart="64dp"
             android:layout_marginEnd="64dp"
-            app:behavior_overlapTop="24dp"
+            android:elevation="@dimen/card_elevation"
+            app:behavior_overlapTop="72dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
             <com.google.android.material.card.MaterialCardView
diff --git a/app/src/main/res/layout-land/fragment_blur.xml b/app/src/main/res/layout-land/fragment_blur.xml
index d4504a2c..6af2540c 100644
--- a/app/src/main/res/layout-land/fragment_blur.xml
+++ b/app/src/main/res/layout-land/fragment_blur.xml
@@ -50,13 +50,12 @@
                 android:orientation="horizontal">
 
                 <code.name.monkey.retromusic.views.HeightFitSquareLayout
-                    android:id="@+id/album_cover_container"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_gravity="center_horizontal">
 
                     <fragment
-                        android:id="@+id/player_album_cover_fragment"
+                        android:id="@+id/playerAlbumCoverFragment"
                         android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -69,14 +68,13 @@
                     android:orientation="vertical">
 
                     <fragment
-                        android:id="@+id/playback_controls_fragment"
+                        android:id="@+id/playbackControlsFragment"
                         android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_weight="1" />
 
                     <FrameLayout
-                        android:id="@+id/toolbar_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="0"
diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml
index 060d3296..4d818d33 100755
--- a/app/src/main/res/layout-land/fragment_player.xml
+++ b/app/src/main/res/layout-land/fragment_player.xml
@@ -12,6 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <com.jetradarmobile.snowfall.SnowfallView
+        android:id="@+id/snowfall"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
     <code.name.monkey.retromusic.views.FitSystemWindowsLayout
@@ -37,12 +42,11 @@
                 android:orientation="horizontal">
 
                 <code.name.monkey.retromusic.views.HeightFitSquareLayout
-                    android:id="@+id/album_cover_container"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
                     <fragment
-                        android:id="@+id/player_album_cover_fragment"
+                        android:id="@+id/playerAlbumCoverFragment"
                         android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -68,7 +72,7 @@
                     </FrameLayout>
 
                     <fragment
-                        android:id="@+id/playback_controls_fragment"
+                        android:id="@+id/playbackControlsFragment"
                         android:name="code.name.monkey.retromusic.ui.fragments.player.normal.PlayerPlaybackControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout-land/pager_item.xml b/app/src/main/res/layout-land/pager_item.xml
index 3609aa9c..c2782744 100644
--- a/app/src/main/res/layout-land/pager_item.xml
+++ b/app/src/main/res/layout-land/pager_item.xml
@@ -8,7 +8,7 @@
     android:orientation="vertical">
 
     <com.google.android.material.card.MaterialCardView
-        android:id="@+id/image_container"
+        android:id="@+id/imageContainer"
         android:layout_width="match_parent"
         android:layout_height="256dp"
         app:cardCornerRadius="12dp"
@@ -21,7 +21,7 @@
             android:scaleType="centerCrop" />
 
         <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/play_songs"
+            android:id="@+id/playSongs"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
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 e98b5454..df3539e5 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
@@ -56,7 +56,7 @@
                         android:layout_weight="0">
 
                         <fragment
-                            android:id="@+id/player_album_cover_fragment"
+                            android:id="@+id/playerAlbumCoverFragment"
                             android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent" />
@@ -69,7 +69,7 @@
                         tools:background="@color/md_white_1000">
 
                         <fragment
-                            android:id="@+id/playback_controls_fragment"
+                            android:id="@+id/playbackControlsFragment"
                             android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent" />
@@ -80,7 +80,6 @@
 
 
             <FrameLayout
-                android:id="@+id/toolbar_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
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 68862dbd..14117735 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_player.xml
@@ -12,6 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <com.jetradarmobile.snowfall.SnowfallView
+        android:id="@+id/snowfall"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
     <code.name.monkey.retromusic.views.FitSystemWindowsLayout
@@ -33,12 +38,11 @@
                 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">
 
                     <fragment
-                        android:id="@+id/player_album_cover_fragment"
+                        android:id="@+id/playerAlbumCoverFragment"
                         android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -46,7 +50,7 @@
                 </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
                 <fragment
-                    android:id="@+id/playback_controls_fragment"
+                    android:id="@+id/playbackControlsFragment"
                     android:name="code.name.monkey.retromusic.ui.fragments.player.normal.PlayerPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
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 3609aa9c..c2782744 100644
--- a/app/src/main/res/layout-xlarge-land/pager_item.xml
+++ b/app/src/main/res/layout-xlarge-land/pager_item.xml
@@ -8,7 +8,7 @@
     android:orientation="vertical">
 
     <com.google.android.material.card.MaterialCardView
-        android:id="@+id/image_container"
+        android:id="@+id/imageContainer"
         android:layout_width="match_parent"
         android:layout_height="256dp"
         app:cardCornerRadius="12dp"
@@ -21,7 +21,7 @@
             android:scaleType="centerCrop" />
 
         <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/play_songs"
+            android:id="@+id/playSongs"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
diff --git a/app/src/main/res/layout-xlarge/abs_playlists.xml b/app/src/main/res/layout-xlarge/abs_playlists.xml
index 5ec995ee..8cba5ffa 100644
--- a/app/src/main/res/layout-xlarge/abs_playlists.xml
+++ b/app/src/main/res/layout-xlarge/abs_playlists.xml
@@ -5,6 +5,28 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/searchView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardCornerRadius="12dp"
+        app:cardUseCompatPadding="true">
+
+        <code.name.monkey.retromusic.views.IconImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:padding="14dp"
+            app:srcCompat="@drawable/ic_search_white_24dp" />
+
+        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:padding="12dp"
+            android:text="@string/search_hint" />
+    </com.google.android.material.card.MaterialCardView>
+
     <androidx.appcompat.widget.AppCompatTextView
         style="@style/SubTitleTextAppearance"
         android:text="@string/for_you" />
diff --git a/app/src/main/res/layout-xlarge/fragment_blur.xml b/app/src/main/res/layout-xlarge/fragment_blur.xml
index 60a52bb0..b2904b07 100644
--- a/app/src/main/res/layout-xlarge/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge/fragment_blur.xml
@@ -39,13 +39,12 @@
             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">
 
                 <fragment
-                    android:id="@+id/player_album_cover_fragment"
+                    android:id="@+id/playerAlbumCoverFragment"
                     android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
@@ -58,7 +57,7 @@
                 tools:background="@color/md_white_1000">
 
                 <fragment
-                    android:id="@+id/playback_controls_fragment"
+                    android:id="@+id/playbackControlsFragment"
                     android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -66,7 +65,6 @@
             </FrameLayout>
 
             <FrameLayout
-                android:id="@+id/toolbar_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
diff --git a/app/src/main/res/layout-xlarge/fragment_player.xml b/app/src/main/res/layout-xlarge/fragment_player.xml
index aba4ab1f..74a8b79d 100644
--- a/app/src/main/res/layout-xlarge/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge/fragment_player.xml
@@ -11,7 +11,10 @@
         android:id="@+id/colorGradientBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-
+    <com.jetradarmobile.snowfall.SnowfallView
+        android:id="@+id/snowfall"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
     <include layout="@layout/shadow_statusbar_toolbar" />
 
     <code.name.monkey.retromusic.views.FitSystemWindowsLayout
@@ -33,7 +36,7 @@
                 android:layout_height="wrap_content">
 
                 <fragment
-                    android:id="@+id/player_album_cover_fragment"
+                    android:id="@+id/playerAlbumCoverFragment"
                     android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -46,7 +49,7 @@
                 android:layout_weight="1">
 
                 <fragment
-                    android:id="@+id/playback_controls_fragment"
+                    android:id="@+id/playbackControlsFragment"
                     android:name="code.name.monkey.retromusic.ui.fragments.player.normal.PlayerPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout-xlarge/pager_item.xml b/app/src/main/res/layout-xlarge/pager_item.xml
index 118dcf16..400eb2cb 100644
--- a/app/src/main/res/layout-xlarge/pager_item.xml
+++ b/app/src/main/res/layout-xlarge/pager_item.xml
@@ -8,7 +8,7 @@
     android:orientation="vertical">
 
     <com.google.android.material.card.MaterialCardView
-        android:id="@+id/image_container"
+        android:id="@+id/imageContainer"
         android:layout_width="match_parent"
         android:layout_height="196dp"
         app:cardCornerRadius="12dp"
@@ -21,7 +21,7 @@
             android:scaleType="centerCrop" />
 
         <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/play_songs"
+            android:id="@+id/playSongs"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml
index 4bb235dc..7832c9fa 100644
--- a/app/src/main/res/layout/abs_playlists.xml
+++ b/app/src/main/res/layout/abs_playlists.xml
@@ -5,6 +5,28 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/searchView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardCornerRadius="12dp"
+        app:cardUseCompatPadding="true">
+
+        <code.name.monkey.retromusic.views.IconImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:padding="14dp"
+            app:srcCompat="@drawable/ic_search_white_24dp" />
+
+        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:padding="12dp"
+            android:text="@string/search_hint" />
+    </com.google.android.material.card.MaterialCardView>
+
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         style="@style/SubTitleTextAppearance"
         android:text="@string/for_you" />
diff --git a/app/src/main/res/layout/activity_lyrics.xml b/app/src/main/res/layout/activity_lyrics.xml
index dc307708..1a59b7d8 100644
--- a/app/src/main/res/layout/activity_lyrics.xml
+++ b/app/src/main/res/layout/activity_lyrics.xml
@@ -1,134 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/albumImage"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:tint="#80000000" />
+        android:layout_height="wrap_content">
 
-    <code.name.monkey.retromusic.views.FitSystemWindowsLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content"
+            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+            app:contentInsetLeft="0dp"
+            app:contentInsetStart="0dp"
+            app:contentInsetStartWithNavigation="0dp"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
+            app:titleMargin="0dp"
+            app:titleMarginStart="0dp"
+            app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:tabGravity="fill"
+            android:background="@android:color/transparent"
+            app:tabTextAppearance="@style/TabTextAppearance"
+            app:tabIndicator="@drawable/tab_indicator"
+            app:tabIndicatorAnimationDuration="@integer/anim_duration_medium"
+            app:tabIndicatorFullWidth="false"
+            app:tabIndicatorHeight="4dp"
+            app:tabInlineLabel="true">
 
-            <com.google.android.material.bottomappbar.BottomAppBar
-                android:id="@+id/bottomAppBar"
-                style="@style/Widget.MaterialComponents.BottomAppBar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:elevation="8dp"
-                app:backgroundTint="@color/md_red_500"
-                app:contentInsetLeft="0dp"
-                app:fabAlignmentMode="end"
-                app:fabCradleRoundedCornerRadius="8dp"
-                app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
-                app:title="@string/lyrics"
-                app:titleMargin="0dp"
-                app:titleMarginStart="0dp" />
-
-            <com.google.android.material.floatingactionbutton.FloatingActionButton
-                android:id="@+id/fab"
+            <com.google.android.material.tabs.TabItem
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_edit_white_24dp"
-                app:layout_anchor="@id/bottomAppBar" />
+                android:text="@string/synced_lyrics" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:paddingBottom="52dp"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
+            <com.google.android.material.tabs.TabItem
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/normal_lyrics" />
+        </com.google.android.material.tabs.TabLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-                <RadioGroup
-                    android:id="@+id/actions"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:orientation="horizontal"
-                    android:paddingStart="12dp"
-                    android:paddingEnd="12dp">
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-                    <RadioButton
-                        android:id="@+id/syncedLyrics"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="4dp"
-                        android:layout_weight="1"
-                        android:background="@drawable/toggle_outline_buttons"
-                        android:button="@null"
-                        android:gravity="center"
-                        android:padding="12dp"
-                        android:text="@string/synced_lyrics"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-                        android:textColor="@color/md_white_1000" />
 
-                    <RadioButton
-                        android:id="@+id/normalLyrics"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="4dp"
-                        android:layout_weight="1"
-                        android:background="@drawable/toggle_outline_buttons"
-                        android:button="@null"
-                        android:gravity="center"
-                        android:padding="12dp"
-                        android:text="@string/normal_lyrics"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-                        android:textColor="@color/md_white_1000" />
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="14dp"
+        android:src="@drawable/ic_edit_white_24dp"
+        app:useCompatPadding="true" />
 
-                </RadioGroup>
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <ScrollView
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:fadingEdge="vertical">
-
-                        <TextView
-                            android:id="@+id/offlineLyrics"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:gravity="start"
-                            android:lineSpacingExtra="3dp"
-                            android:paddingStart="16dp"
-                            android:paddingEnd="16dp"
-                            android:paddingBottom="16dp"
-                            android:text="@string/no_lyrics_found"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                            android:textColor="@color/md_white_1000"
-                            android:visibility="gone" />
-                    </ScrollView>
-
-                    <code.name.monkey.retromusic.views.LyricView
-                        android:id="@+id/lyricsView"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        app:fadeInFadeOut="true"
-                        app:highlightColor="@color/md_white_1000"
-                        app:hint="No Lyrics"
-                        app:hintColor="@color/md_grey_400"
-                        app:lineSpace="15dp"
-                        app:textAlign="left"
-                        app:textSize="18sp" />
-                </FrameLayout>
-            </LinearLayout>
-
-        </androidx.coordinatorlayout.widget.CoordinatorLayout>
-    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
-</FrameLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
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 1ffcc1ee..368a024a 100644
--- a/app/src/main/res/layout/activity_main_drawer_layout.xml
+++ b/app/src/main/res/layout/activity_main_drawer_layout.xml
@@ -18,6 +18,7 @@
         android:fitsSystemWindows="true"
         android:paddingStart="0dp"
         android:paddingEnd="8dp"
+        app:headerLayout="@layout/navigation_drawer_header"
         app:itemBackground="@drawable/navigation_item"
         app:itemTextAppearance="@style/NavigationViewTitleTextAppearance"
         app:menu="@menu/menu_drawer" />
diff --git a/app/src/main/res/layout/activity_whats_new.xml b/app/src/main/res/layout/activity_whats_new.xml
index 4503ec8c..65073125 100644
--- a/app/src/main/res/layout/activity_whats_new.xml
+++ b/app/src/main/res/layout/activity_whats_new.xml
@@ -21,7 +21,7 @@
             app:title="">
 
             <TextView
-                android:id="@+id/whatNewtitle"
+                android:id="@+id/bannerTitle"
                 style="@style/BigTitleTextAppearance"
                 android:text="@string/whats_new" />
 
diff --git a/app/src/main/res/layout/fragment_album_cover.xml b/app/src/main/res/layout/fragment_album_cover.xml
index 250f2d07..28967ad9 100644
--- a/app/src/main/res/layout/fragment_album_cover.xml
+++ b/app/src/main/res/layout/fragment_album_cover.xml
@@ -3,20 +3,19 @@
     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="wrap_content">
 
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/player_album_art_frame"
+    <code.name.monkey.retromusic.views.WidthFitSquareLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="8dp"
-        app:cardElevation="8dp"
-        app:cardUseCompatPadding="true">
+        android:layout_height="wrap_content">
 
-        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+        <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_height="match_parent"
+            app:cardCornerRadius="8dp"
+            app:cardElevation="8dp"
+            app:cardUseCompatPadding="true">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/player_image"
@@ -24,6 +23,7 @@
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
                 tools:ignore="ContentDescription,UnusedAttribute" />
-        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-    </com.google.android.material.card.MaterialCardView>
+
+        </com.google.android.material.card.MaterialCardView>
+    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 16355f0d..47b315cc 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -23,7 +23,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"
@@ -42,7 +42,7 @@
                     tools:ignore="UnusedAttribute">
 
                     <TextView
-                        android:id="@+id/title"
+                        android:id="@+id/bannerTitle"
                         style="@style/BigTitleTextAppearanceToolbar"
                         android:text="@string/app_name"
                         tools:ignore="MissingPrefix" />
@@ -57,7 +57,7 @@
         </com.google.android.material.appbar.AppBarLayout>
 
         <FrameLayout
-            android:id="@+id/fragment_container"
+            android:id="@+id/fragmentContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
index fb4e7a6b..9716ea39 100644
--- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
@@ -1,6 +1,5 @@
 <?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:id="@+id/playback_controls"
     android:layout_width="match_parent"
@@ -10,53 +9,21 @@
     tools:ignore="MissingPrefix">
 
     <SeekBar
-        android:id="@+id/player_progress_slider"
+        android:id="@+id/progressSlider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:maxHeight="3dp"
-        android:paddingEnd="24dp"
         android:paddingStart="24dp"
+        android:paddingEnd="24dp"
         android:progressDrawable="@drawable/color_progress_seek"
         tools:progress="20" />
 
+    <include layout="@layout/player_time" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp">
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/player_song_current_progress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:alpha="0.75"
-            android:paddingEnd="8dp"
-            android:paddingStart="8dp"
-            android:textSize="12sp"
-            android:textStyle="bold"
-            tools:text="22.00" />
-
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/player_song_total_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:alpha="0.75"
-            android:paddingEnd="8dp"
-            android:paddingStart="8dp"
-            android:textSize="12sp"
-            android:textStyle="bold"
-            tools:text="22.00" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
+        android:layout_weight="0"
         android:gravity="center"
         android:orientation="vertical">
 
@@ -66,8 +33,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:gravity="center"
-            android:paddingEnd="16dp"
-            android:paddingStart="16dp"
+            android:padding="16dp"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
             tools:text="Title" />
@@ -77,83 +43,20 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginTop="8dp"
             android:ellipsize="marquee"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:gravity="center"
             android:marqueeRepeatLimit="marquee_forever"
-            android:paddingEnd="16dp"
             android:paddingStart="16dp"
+            android:paddingEnd="16dp"
             android:scrollHorizontally="true"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             tools:text="Title" />
     </LinearLayout>
 
-    <RelativeLayout
-        android:id="@+id/player_media_controller_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:minHeight="72dp"
-        tools:ignore="ContentDescription,UnusedAttribute">
+    <include layout="@layout/media_button" />
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/player_prev_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="24dp"
-            android:layout_toStartOf="@+id/player_play_pause_button"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_previous_white_24dp"
-            app:tint="@color/md_white_1000"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/player_next_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="24dp"
-            android:layout_toEndOf="@+id/player_play_pause_button"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_next_white_24dp"
-            app:tint="@color/md_white_1000"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/player_play_pause_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/title_container"
-            android:layout_centerInParent="true"
-            android:background="@drawable/color_circle_gradient"
-            android:elevation="4dp"
-            android:padding="12dp"
-            app:srcCompat="@drawable/ic_play_arrow_white_24dp" />
-
-    </RelativeLayout>
-
-    <FrameLayout
-        android:id="@+id/volume_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0">
-
-        <fragment
-            android:id="@+id/volume_fragment"
-            android:name="code.name.monkey.retromusic.ui.fragments.VolumeFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:layout="@layout/fragment_volume" />
-    </FrameLayout>
+    <include layout="@layout/volume_controls" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_lyrics.xml b/app/src/main/res/layout/fragment_lyrics.xml
new file mode 100644
index 00000000..610685b3
--- /dev/null
+++ b/app/src/main/res/layout/fragment_lyrics.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:fadingEdge="vertical">
+
+    <TextView
+        android:id="@+id/offlineLyrics"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="start"
+        android:lineSpacingExtra="3dp"
+        android:padding="16dp"
+        android:text="@string/no_lyrics_found"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
index 7eb06b37..1aecbf23 100644
--- a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
+++ b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="match_parent">
+
 
     <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
         android:id="@+id/recyclerView"
@@ -23,5 +23,4 @@
         android:textColor="?android:textColorSecondary"
         android:visibility="gone" />
 
-
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml
index 31436e21..f65a8a85 100644
--- a/app/src/main/res/layout/fragment_main_settings.xml
+++ b/app/src/main/res/layout/fragment_main_settings.xml
@@ -12,6 +12,55 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <LinearLayout
+            android:id="@+id/userInfoContainer"
+            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/userImage"
+                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/titleWelcome"
+                    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/generalSettings"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index edb5fc81..88387861 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -12,6 +12,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <com.jetradarmobile.snowfall.SnowfallView
+        android:id="@+id/snowfall"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
     <code.name.monkey.retromusic.views.FitSystemWindowsLayout
diff --git a/app/src/main/res/layout/fragment_synced.xml b/app/src/main/res/layout/fragment_synced.xml
new file mode 100644
index 00000000..205f3683
--- /dev/null
+++ b/app/src/main/res/layout/fragment_synced.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+
+    <code.name.monkey.retromusic.views.LyricView
+        android:id="@+id/lyricsView"
+        app:fadeInFadeOut="true"
+        app:highlightColor="@color/md_white_1000"
+        app:hint="No Lyrics"
+        app:hintColor="@color/md_grey_400"
+        app:lineSpace="15dp"
+        app:textAlign="left"
+        app:textSize="18sp"
+        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/home_section_content.xml b/app/src/main/res/layout/home_section_content.xml
index 71103b18..6f58e7f7 100644
--- a/app/src/main/res/layout/home_section_content.xml
+++ b/app/src/main/res/layout/home_section_content.xml
@@ -150,4 +150,9 @@
             android:layout_height="wrap_content"
             android:nestedScrollingEnabled="false" />
     </LinearLayout>
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_marginBottom="16dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/navigation_drawer_header.xml b/app/src/main/res/layout/navigation_drawer_header.xml
index 3509b841..79158f7a 100644
--- a/app/src/main/res/layout/navigation_drawer_header.xml
+++ b/app/src/main/res/layout/navigation_drawer_header.xml
@@ -1,6 +1,8 @@
 <?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">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-</LinearLayout>
\ No newline at end of file
+    <include layout="@layout/status_bar" />
+</FrameLayout>
\ 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 6d899d9b..25f8719d 100644
--- a/app/src/main/res/layout/pager_item.xml
+++ b/app/src/main/res/layout/pager_item.xml
@@ -8,7 +8,7 @@
     android:orientation="vertical">
 
     <com.google.android.material.card.MaterialCardView
-        android:id="@+id/image_container"
+        android:id="@+id/imageContainer"
         android:layout_width="match_parent"
         android:layout_height="172dp"
         app:cardCornerRadius="12dp"
@@ -21,7 +21,7 @@
             android:scaleType="centerCrop" />
 
         <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/play_songs"
+            android:id="@+id/playSongs"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
@@ -48,7 +48,6 @@
 
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         android:id="@+id/title"
-        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:ellipsize="end"
@@ -56,6 +55,7 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp"
         android:textSize="14sp"
+        android:textStyle="bold"
         tools:ignore="MissingPrefix"
         tools:text="My top tracks" />
 
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index cb9fa8a4..5366e228 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -2,7 +2,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".DrawerActivity">
-
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_search_white_24dp"
+        android:title="@string/action_search"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_shuffle_all"
         android:icon="@drawable/ic_shuffle_white_24dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 97a862d5..3756ce2e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -586,4 +586,5 @@
     <string name="bug_report_failed_unknown">An unexpected error occurred. Please contact the app developer.</string>
     <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
+    <string name="pref_snow_fall_title">Snow fall effect</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 96a6ec85..96f0d5ca 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -82,7 +82,8 @@
     <style name="BottomSheetTextAppearance">
         <item name="android:breakStrategy">simple</item>
         <item name="android:hyphenationFrequency">none</item>
-        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6</item>
+        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
+        </item>
         <item name="android:textStyle">bold</item>
     </style>
 
@@ -106,4 +107,8 @@
     </style>
 
     <style name="Fab" parent="FabParent" />
+
+    <style name="TabTextAppearance" parent="TextAppearance.Design.Tab">
+        <item name="android:textAllCaps">false</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
index 852b5d9a..43a561bc 100755
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -19,13 +19,18 @@
             android:title="@string/pref_keep_pause_on_zero_volume_title"
             app:iconSpaceReserved="false" />
 
-      <!--  <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="false"
-            android:key="now_playing_screen"
-            android:summary="@string/pref_now_playing_screen_summary"
-            android:title="@string/pref_now_playing_screen_title"
-            app:iconSpaceReserved="false" />-->
+        <!--  <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+              android:defaultValue="false"
+              android:key="now_playing_screen"
+              android:summary="@string/pref_now_playing_screen_summary"
+              android:title="@string/pref_now_playing_screen_title"
+              app:iconSpaceReserved="false" />-->
 
+        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+            android:defaultValue="false"
+            android:key="snow_fall_effect"
+            android:title="@string/pref_snow_fall_title"
+            app:iconSpaceReserved="false" />
 
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 </androidx.preference.PreferenceScreen>
\ No newline at end of file