From 621006522148c2643cc2afeb9482980e72ecf78f Mon Sep 17 00:00:00 2001
From: h4h13 <hemanths@live.com>
Date: Fri, 17 Jan 2020 22:49:06 +0530
Subject: [PATCH] Added grid layout change option

---
 app/build.gradle                              |    3 +-
 app/src/main/assets/contributors.json         |   12 +-
 app/src/main/assets/retro-changelog.html      |    2 +-
 .../activities/AlbumDetailsActivity.kt        |    4 +-
 .../activities/ArtistDetailActivity.kt        |    2 +-
 .../activities/GenreDetailsActivity.kt        |    2 +-
 .../activities/PlaylistDetailActivity.kt      |    3 +-
 .../adapter/CategoryInfoAdapter.java          |  143 +-
 .../retromusic/adapter/ContributorAdapter.kt  |  108 +-
 .../monkey/retromusic/adapter/GenreAdapter.kt |   15 +-
 .../monkey/retromusic/adapter/HomeAdapter.kt  |   12 +-
 .../retromusic/adapter/SearchAdapter.kt       |   25 +-
 .../retromusic/adapter/SongFileAdapter.kt     |   52 +-
 .../retromusic/adapter/album/AlbumAdapter.kt  |   10 +-
 .../adapter/album/AlbumCoverPagerAdapter.kt   |    4 +-
 .../adapter/album/HorizontalAlbumAdapter.kt   |   84 +-
 .../adapter/artist/ArtistAdapter.kt           |   12 +-
 .../adapter/base/AbsMultiSelectAdapter.java   |  140 +-
 .../adapter/base/MediaEntryViewHolder.java    |    5 +-
 .../adapter/playlist/PlaylistAdapter.kt       |   60 +-
 .../adapter/song/AbsOffsetSongAdapter.kt      |  133 +-
 .../song/OrderablePlaylistSongAdapter.kt      |  208 +--
 .../adapter/song/PlayingQueueAdapter.kt       |   12 +-
 .../adapter/song/PlaylistSongAdapter.kt       |    3 +-
 .../adapter/song/ShuffleButtonSongAdapter.kt  |   75 +-
 .../adapter/song/SimpleSongAdapter.kt         |   12 +-
 .../retromusic/adapter/song/SongAdapter.kt    |   22 +-
 ...PagerRecyclerViewCustomGridSizeFragment.kt |   62 +-
 .../AbsLibraryPagerRecyclerViewFragment.kt    |   23 +-
 .../fragments/mainactivity/AlbumsFragment.kt  |   31 +-
 .../fragments/mainactivity/ArtistsFragment.kt |   24 +-
 .../mainactivity/LibraryFragment.java         |   90 +-
 .../fragments/mainactivity/SongsFragment.kt   |   40 +-
 .../mainactivity/folders/FoldersFragment.java | 1210 +++++++++--------
 .../normal/PlayerPlaybackControlsFragment.kt  |    3 +-
 .../settings/PersonalizeSettingsFragment.kt   |    6 +-
 .../retromusic/helper/MusicPlayerRemote.kt    |   65 +-
 .../monkey/retromusic/util/MusicUtil.java     |    8 +-
 .../retromusic/util/PreferenceUtil.java       |   72 +-
 .../views/BaselineGridTextView.java           |  106 +-
 app/src/main/res/layout/activity_album.xml    |    4 +-
 app/src/main/res/layout/fragment_folder.xml   |    2 +-
 app/src/main/res/layout/fragment_library.xml  |    2 +-
 .../fragment_main_activity_recycler_view.xml  |    5 +-
 .../fragment_player_playback_controls.xml     |    5 +-
 app/src/main/res/menu/menu_main.xml           |   36 +-
 .../main/res/xml/pref_now_playing_screen.xml  |    7 +
 app/src/main/res/xml/pref_ui.xml              |   31 +-
 .../appthemehelper/util/TintHelper.java       |    4 +-
 49 files changed, 1571 insertions(+), 1428 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b4d7fbf0..f8c719dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,7 +22,7 @@ android {
         vectorDrawables.useSupportLibrary = true
 
         applicationId "code.name.monkey.retromusic"
-        versionCode 403
+        versionCode 404
         versionName '3.4.850'
 
         multiDexEnabled true
@@ -175,6 +175,7 @@ dependencies {
     implementation 'com.anjlab.android.iab.v3:library:1.1.0'
     implementation 'com.r0adkll:slidableactivity:2.1.0'
     implementation 'com.heinrichreimersoftware:material-intro:1.6'
+    implementation 'me.zhanghai.android.fastscroll:library:1.1.0'
 
     def dagger_version = "2.23.1"
     implementation "com.google.dagger:dagger:$dagger_version"
diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json
index e84023c3..48116569 100644
--- a/app/src/main/assets/contributors.json
+++ b/app/src/main/assets/contributors.json
@@ -12,21 +12,15 @@
     "profile_image": "https://i.imgur.com/Q5Nsx1R.jpg"
   },
   {
-    "name": "Gaming Inc.",
+    "name": "GameSpeck",
     "summary": "Telegram group maintainer",
-    "link": "https://www.gaminginc.tk/",
-    "profile_image": "https://i.imgur.com/pfvN7d9.png"
+    "link": "https://t.me/GameSpeck",
+    "profile_image": "https://imgur.com/B15Kb9a.jpg"
   },
   {
     "name": "Milind Goel",
     "summary": "Github & Telegram maintainer",
     "link": "https://t.me/MilindGoel15",
     "profile_image": "https://i.imgur.com/Bz4De21_d.jpg"
-  },
-  {
-    "name": "Abilas Sathiya",
-    "summary": "Design & Suggestions",
-    "link": "https://t.me/@abs2606",
-    "profile_image": "https://i.imgur.com/MUyEWlx.jpg"
   }
 ]
\ No newline at end of file
diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html
index 02168721..2b7a291d 100644
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@@ -1 +1 @@
-<html>
<head>
    <style type="text/css">
        * {
        word-wrap: break-word;
        }
        {style-placeholder}
        a {
        color: {link-color};
        }
        a:active {
        color: {link-color-active};
        }
        ol {
        list-style-position: inside;
        padding-left: 0;
        padding-right: 0;
        }
        li {
        padding-top: 8px;
        }


    </style>
</head>
<body>
<h4>v3.4.850</h4>
<ul>
    <li>Added new theme called circle</li>
    <li>Added tiny color card style for home artists</li>
    <li>Added extra track info details to now playing themes</li>
    <li>Added scroll animation</li>
    <li>Added smooth transition animations 🤔</li>
    <li>Added current playing tab options for Bottom Navigation View</li>
    <li>Added search in genre</li>
    <li>Improved selecting feedback effect(ripple with corners)</li>
    <li>Fix bugs & crashes</li>
    <li>Fix crashing on lyrics</li>
    <li>Fix genre details last song is under mini player</li>
    <li>Fix colors mistakes and font sizes</li>
</ul>
<h4>v3.4.800</h4>
<ul>
    <li>Improved dark theme colors and Follow system theme</li>
    <li>Rounded rectangle ripple for BottomNavigationView</li>
    <li>Follow sleep timer dialog checkbox color as accent</li>
    <li>Added song list selection for Album and Artist details</li>
    <li>Fixed Toolbar popup text color when selecting songs</li>
</ul>
<h4>v3.4.700</h4>
<ul>
    <li>Added splash screen(for app loading time)</li>
    <li>Updated dark theme colors</li>
    <li>Added circular progress view</li>
    <li>Hiding year if not showing</li>
</ul>
<h4>v3.4.600</h4>
<ul>
    <li>Fix notification layout height</li>
    <li>Fix folder list last item not showing</li>
    <li>Added auto hide/ show controls according to first and last item</li>
</ul>
<h4>v3.4.500</h4>
<ul>
    <li>Added peak theme</li>
    <li>Added app rating dialog</li>
    <li>Fix song name scrolling in now playing themes if it's long</li>
    <li>Fix playing queue last item hiding FAB</li>
    <li>Added desaturated color option for dark mode</li>
    <li>Fix slow search loading</li>
    <li>Fix last added slow loading</li>
    <li>Fix home banner toolbar corner</li>
    <li>Fix home crashing when switching between two tabs</li>
    <li>Fix remaining time in playing queue</li>
    <li>Fix font not applied for some components</li>
    <li>Fix crashing on album details sorting</li>
    <li>Fixed lot of internal bugs</li>
    <li>Fix dialog expand</li>
    <li>Fix list card color</li>
    <li>Removed SlidingUpPanel to replace with BottomSheet</li>
    <li>Removed color theme as per material design guidelines</li>
    <li>Removed classic theme(We're bringing back)</li>
    <li>Replace line switch to Material Switch in settings</li>
    <li>Performance improved</li>
    <li>Updated internal libraries</li>
    <li>Updated translation</li>
    <li>Limiting the use of Theme engine for making use of system colors</li>
    <li>Change home icon from the user icon</li>
    <li>Corrected all toolbar with elevation when scrolling</li>
</ul>
<h4>v3.3.200</h4>
<ul>
    <li>Fix fullscreen bottom tabs icons squash</li>
    <li>Improved tiny theme colors</li>
    <li>Android auto support</li>
    <li>New notification icon</li>
    <li>Favorite icon in mini player</li>
</ul>
<h4>v.3.3.100</h4>
<ul>
    <li>Improved Now playing controls alignment</li>
    <li>Lot internal changes to improve performance</li>
    <li>Fix playlist adding crash</li>
    <li>Fix color corrections</li>
    <li>Fix file editing crash</li>
</ul>
<h4>v3.3.000</h4>
<ul>
    <li>SD card support for deleting and editing</li>
</ul>
<h4>v3.2.240</h4>
<ul>
    <li>Improved options dialog with selected color and title icon</li>
    <li>Fix dialog color on dark theme</li>
</ul>
<h4>v3.2.220</h4>
<ul>
    <li>Fix Notification SeekBar position (Need Android Q test)</li>
    <li>Rolled back settings tint icons</li>
    <li>Changed preference category title style according Android Q</li>
    <li>Fix tabs options not working</li>
</ul>
<h4>v3.2.203</h4>
<ul>
    <li>Carousel effect improved</li>
    <li>Settings icons are now tint accent color</li>
    <li>Settings title, back arrow and icons are now tint accent color</li>
    <li>Equalizer is removed</li>
    <li>Fix keyboard not popping on Search</li>
    <li>Curated the main options</li>
    <li>Folder toolbar outlined, folder icon background fix and separate line removed</li>
    <li>Edit text input handles are colored</li>
</ul>
<h4>v3.2.135</h4>
<ul>
    <li>Fix crashing on sharing song</li>
</ul>
<h4>v3.2.125</h4>
<ul>
    <li>Fix crashing on selecting profile picture</li>
    <li>Semi transparent color fix(s) on now playing themes</li>
</ul>
<h4>v3.2.120</h4>
<ul>
    <li>Fix crashing on choosing a theme</li>
    <li>Fix color theme selection without pro enabled</li>
    <li>Fix icon tint some places</li>
</ul>
<h4>v3.2.105</h4>
<ul>
    <li>Fix color notifications</li>
</ul>
<h4>v3.2.100</h4>
<ul>
    <li>Fix crashing on Sleep timer</li>
    <li>Toolbar elevation removed added stroke instead</li>
    <li>Show empty indication for home</li>
</ul>
<h4>v3.2.000</h4>
<ul>
    <li>Implemented Artist image loading all thanks to <a
            href="https://github.com/AdrienPoupa/VinylMusicPlayer"> VinylMusicPlayer</a></li>
    <li>Fixed buttons in Genre details</li>
    <li>Fixed color buttons in Album and Artist details screen</li>
</ul>
<h4>v3.1.900</h4>
<ul>
    <li>Added Play and Shuffle buttons on Songs list, Album Details, Artist Details, Playlist
        Details etc.
    </li>
    <li>Home toolbar is semi transparent in Banner mode</li>
    <li>Added new Buy Retro Music pro in settings</li>
    <li>Improved dark color in Dark theme</li>
</ul>
<h4>v3.1.850</h4>
<ul>
    <li>Toolbar will be clickable for Search</li>

</ul>
<h4>v3.1.800</h4>
<ul>
    <li>Search bar CardView background</li>
    <li>Improve volume zero</li>
    <li>Now playing and Album theme picker rollback to dialog</li>
    <li>Fix sharing app link</li>
    <li>Fix scanning dialog</li>
    <li>Added settings icons for options</li>
</ul>
<h4>v3.1.700</h4>
<ul>
    <li>Cleaned internal code</li>
    <li>Removed full screen option</li>
    <li>Added Toolbar elevation</li>
    <li>To access menu either tap on Toolbar or Hamburger icon</li>
    <li>Fix back button not working on playing queue</li>
    <li>Fix crashing on What's New screen</li>
    <li>Fix lyrics dialog</li>
    <li>Changed toggles to line icons</li>
    <li>Fix crashing on artist list for number format error</li>
    <li>Fix blacklist dialog crashing</li>
    <li>Rearranged icons and main menu access</li>
    <li>Fix some crashes when device is locked or background</li>
    <li>Folder screen have main options access</li>
    <li>Dialogs are now using Material Dialogs v3(BottomSheet)</li>
    <li>Fix Shuffle icon for Artist, Album, Genre and Playlist details</li>
</ul>
<h4>v3.1.400</h4>
<ul>
    <li>Removed sync lyrics for Android 5</li>
    <li>Fix Seek-bar color in settings</li>
    <li>Added keyboard to popup on search</li>
    <li>Added keyboard to popup on search</li>
    <li>Improved lock-screen behavior and UI</li>
    <li>Improved text appearance</li>
    <li>Fix bio text not showing in settings</li>
    <li>Fix not showing slider(blur, filter song) amount in settings</li>
    <li>Fix setting ringtone</li>
    <li>Fix file sharing crash</li>
    <li>Fix some crashes</li>
    <li>Fix playlist icon on small devices</li>
    <li>Fix empty lyrics text color</li>
    <li>Fix album cover background purple color in color theme</li>
</ul>
<h4>v3.1.300</h4>
<ul>
    <li>Fix rename playlist text color</li>
    <li>Fix same album showing in details page</li>
    <li>Fix lyrics text alignment on sync and lyrics reading improved</li>
    <li>Improved home sections loading</li>
    <li>Removed library options which are duplicated (it's available from profile menu)</li>
    <li>Replaced collapsing Fab with Android Floating Extended Fab</li>
    <li>Replaced home with for you</li>
    <li>Fixed profile image not loading in about</li>
    <li>Improved selecting user profile image</li>
    <li>Added bio to enter custom message</li>
    <li>Improved some UI screens</li>
</ul>

<p>If you see entire app white or dark or black select same theme in settings to fix </p>
<p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a>
</p>
<p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its
    not working try to
    uninstall and install again. </p>
</body>
\ No newline at end of file
+<html>
<head>
    <style type="text/css">
        * {
        word-wrap: break-word;
        }
        {style-placeholder}
        a {
        color: {link-color};
        }
        a:active {
        color: {link-color-active};
        }
        ol {
        list-style-position: inside;
        padding-left: 0;
        padding-right: 0;
        }
        li {
        padding-top: 8px;
        }


    </style>
</head>
<body>
<h4>v3.4.850</h4>
<ul>
    <li>Added new theme called circle</li>
    <li>Added tiny color card style for home artists</li>
    <li>Added extra track info details to now playing themes</li>
    <li>Added scroll animation</li>
    <li>Added smooth transition animations 🤔</li>
    <li>Added current playing tab options for Bottom Navigation View</li>
    <li>Added search in genre</li>
    <li>Improved selecting feedback effect(ripple with corners)</li>
    <li>Fix bugs & crashes</li>
    <li>Fix crashing on lyrics</li>
    <li>Fix genre details last song is under mini player</li>
    <li>Fix colors mistakes and font sizes</li>
    <li>Fix slider jumping while scrolling in now playing themes</li>
</ul>
<h4>v3.4.800</h4>
<ul>
    <li>Improved dark theme colors and Follow system theme</li>
    <li>Rounded rectangle ripple for BottomNavigationView</li>
    <li>Follow sleep timer dialog checkbox color as accent</li>
    <li>Added song list selection for Album and Artist details</li>
    <li>Fixed Toolbar popup text color when selecting songs</li>
</ul>
<h4>v3.4.700</h4>
<ul>
    <li>Added splash screen(for app loading time)</li>
    <li>Updated dark theme colors</li>
    <li>Added circular progress view</li>
    <li>Hiding year if not showing</li>
</ul>
<h4>v3.4.600</h4>
<ul>
    <li>Fix notification layout height</li>
    <li>Fix folder list last item not showing</li>
    <li>Added auto hide/ show controls according to first and last item</li>
</ul>
<h4>v3.4.500</h4>
<ul>
    <li>Added peak theme</li>
    <li>Added app rating dialog</li>
    <li>Fix song name scrolling in now playing themes if it's long</li>
    <li>Fix playing queue last item hiding FAB</li>
    <li>Added desaturated color option for dark mode</li>
    <li>Fix slow search loading</li>
    <li>Fix last added slow loading</li>
    <li>Fix home banner toolbar corner</li>
    <li>Fix home crashing when switching between two tabs</li>
    <li>Fix remaining time in playing queue</li>
    <li>Fix font not applied for some components</li>
    <li>Fix crashing on album details sorting</li>
    <li>Fixed lot of internal bugs</li>
    <li>Fix dialog expand</li>
    <li>Fix list card color</li>
    <li>Removed SlidingUpPanel to replace with BottomSheet</li>
    <li>Removed color theme as per material design guidelines</li>
    <li>Removed classic theme(We're bringing back)</li>
    <li>Replace line switch to Material Switch in settings</li>
    <li>Performance improved</li>
    <li>Updated internal libraries</li>
    <li>Updated translation</li>
    <li>Limiting the use of Theme engine for making use of system colors</li>
    <li>Change home icon from the user icon</li>
    <li>Corrected all toolbar with elevation when scrolling</li>
</ul>
<h4>v3.3.200</h4>
<ul>
    <li>Fix fullscreen bottom tabs icons squash</li>
    <li>Improved tiny theme colors</li>
    <li>Android auto support</li>
    <li>New notification icon</li>
    <li>Favorite icon in mini player</li>
</ul>
<h4>v.3.3.100</h4>
<ul>
    <li>Improved Now playing controls alignment</li>
    <li>Lot internal changes to improve performance</li>
    <li>Fix playlist adding crash</li>
    <li>Fix color corrections</li>
    <li>Fix file editing crash</li>
</ul>
<h4>v3.3.000</h4>
<ul>
    <li>SD card support for deleting and editing</li>
</ul>
<h4>v3.2.240</h4>
<ul>
    <li>Improved options dialog with selected color and title icon</li>
    <li>Fix dialog color on dark theme</li>
</ul>
<h4>v3.2.220</h4>
<ul>
    <li>Fix Notification SeekBar position (Need Android Q test)</li>
    <li>Rolled back settings tint icons</li>
    <li>Changed preference category title style according Android Q</li>
    <li>Fix tabs options not working</li>
</ul>
<h4>v3.2.203</h4>
<ul>
    <li>Carousel effect improved</li>
    <li>Settings icons are now tint accent color</li>
    <li>Settings title, back arrow and icons are now tint accent color</li>
    <li>Equalizer is removed</li>
    <li>Fix keyboard not popping on Search</li>
    <li>Curated the main options</li>
    <li>Folder toolbar outlined, folder icon background fix and separate line removed</li>
    <li>Edit text input handles are colored</li>
</ul>
<h4>v3.2.135</h4>
<ul>
    <li>Fix crashing on sharing song</li>
</ul>
<h4>v3.2.125</h4>
<ul>
    <li>Fix crashing on selecting profile picture</li>
    <li>Semi transparent color fix(s) on now playing themes</li>
</ul>
<h4>v3.2.120</h4>
<ul>
    <li>Fix crashing on choosing a theme</li>
    <li>Fix color theme selection without pro enabled</li>
    <li>Fix icon tint some places</li>
</ul>
<h4>v3.2.105</h4>
<ul>
    <li>Fix color notifications</li>
</ul>
<h4>v3.2.100</h4>
<ul>
    <li>Fix crashing on Sleep timer</li>
    <li>Toolbar elevation removed added stroke instead</li>
    <li>Show empty indication for home</li>
</ul>
<h4>v3.2.000</h4>
<ul>
    <li>Implemented Artist image loading all thanks to <a
            href="https://github.com/AdrienPoupa/VinylMusicPlayer"> VinylMusicPlayer</a></li>
    <li>Fixed buttons in Genre details</li>
    <li>Fixed color buttons in Album and Artist details screen</li>
</ul>
<h4>v3.1.900</h4>
<ul>
    <li>Added Play and Shuffle buttons on Songs list, Album Details, Artist Details, Playlist
        Details etc.
    </li>
    <li>Home toolbar is semi transparent in Banner mode</li>
    <li>Added new Buy Retro Music pro in settings</li>
    <li>Improved dark color in Dark theme</li>
</ul>
<h4>v3.1.850</h4>
<ul>
    <li>Toolbar will be clickable for Search</li>

</ul>
<h4>v3.1.800</h4>
<ul>
    <li>Search bar CardView background</li>
    <li>Improve volume zero</li>
    <li>Now playing and Album theme picker rollback to dialog</li>
    <li>Fix sharing app link</li>
    <li>Fix scanning dialog</li>
    <li>Added settings icons for options</li>
</ul>
<h4>v3.1.700</h4>
<ul>
    <li>Cleaned internal code</li>
    <li>Removed full screen option</li>
    <li>Added Toolbar elevation</li>
    <li>To access menu either tap on Toolbar or Hamburger icon</li>
    <li>Fix back button not working on playing queue</li>
    <li>Fix crashing on What's New screen</li>
    <li>Fix lyrics dialog</li>
    <li>Changed toggles to line icons</li>
    <li>Fix crashing on artist list for number format error</li>
    <li>Fix blacklist dialog crashing</li>
    <li>Rearranged icons and main menu access</li>
    <li>Fix some crashes when device is locked or background</li>
    <li>Folder screen have main options access</li>
    <li>Dialogs are now using Material Dialogs v3(BottomSheet)</li>
    <li>Fix Shuffle icon for Artist, Album, Genre and Playlist details</li>
</ul>
<h4>v3.1.400</h4>
<ul>
    <li>Removed sync lyrics for Android 5</li>
    <li>Fix Seek-bar color in settings</li>
    <li>Added keyboard to popup on search</li>
    <li>Added keyboard to popup on search</li>
    <li>Improved lock-screen behavior and UI</li>
    <li>Improved text appearance</li>
    <li>Fix bio text not showing in settings</li>
    <li>Fix not showing slider(blur, filter song) amount in settings</li>
    <li>Fix setting ringtone</li>
    <li>Fix file sharing crash</li>
    <li>Fix some crashes</li>
    <li>Fix playlist icon on small devices</li>
    <li>Fix empty lyrics text color</li>
    <li>Fix album cover background purple color in color theme</li>
</ul>
<h4>v3.1.300</h4>
<ul>
    <li>Fix rename playlist text color</li>
    <li>Fix same album showing in details page</li>
    <li>Fix lyrics text alignment on sync and lyrics reading improved</li>
    <li>Improved home sections loading</li>
    <li>Removed library options which are duplicated (it's available from profile menu)</li>
    <li>Replaced collapsing Fab with Android Floating Extended Fab</li>
    <li>Replaced home with for you</li>
    <li>Fixed profile image not loading in about</li>
    <li>Improved selecting user profile image</li>
    <li>Added bio to enter custom message</li>
    <li>Improved some UI screens</li>
</ul>

<p>If you see entire app white or dark or black select same theme in settings to fix </p>
<p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a>
</p>
<p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its
    not working try to
    uninstall and install again. </p>
</body>
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt
index ce145306..d4987eb8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt
@@ -187,14 +187,14 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, C
             albumText.text = String.format(
                 "%s • %s",
                 album.artistName,
-                MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, album.songs))
+                MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(album.songs))
             )
         } else {
             albumText.text = String.format(
                 "%s • %s • %s",
                 album.artistName,
                 MusicUtil.getYearString(album.year),
-                MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, album.songs))
+                MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(album.songs))
             )
         }
         loadAlbumCover()
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt
index 0873ad44..5414af1b 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt
@@ -219,7 +219,7 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView,
         text.text = String.format(
             "%s • %s",
             MusicUtil.getArtistInfoString(this, artist),
-            MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, artist.songs))
+            MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(artist.songs))
         )
 
         songAdapter.swapDataSet(artist.songs)
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt
index 290f8779..13e9a8f1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt
@@ -116,7 +116,7 @@ class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), CabHolder, GenreDet
 
     private fun setupRecyclerView() {
         ViewUtil.setUpFastScrollRecyclerViewColor(this, recyclerView)
-        songAdapter = ShuffleButtonSongAdapter(this, ArrayList(), R.layout.item_list, false, this)
+        songAdapter = ShuffleButtonSongAdapter(this, ArrayList(), R.layout.item_list, this)
         recyclerView.apply {
             itemAnimator = DefaultItemAnimator()
             layoutManager = LinearLayoutManager(this@GenreDetailsActivity)
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt
index 4d4c3743..a8fee264 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt
@@ -77,7 +77,7 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli
 
         recyclerView.layoutManager = LinearLayoutManager(this)
         if (playlist is AbsCustomPlaylist) {
-            adapter = PlaylistSongAdapter(this, ArrayList(), R.layout.item_list, false, this)
+            adapter = PlaylistSongAdapter(this, ArrayList(), R.layout.item_list, this)
             recyclerView.adapter = adapter
         } else {
             recyclerViewDragDropManager = RecyclerViewDragDropManager()
@@ -85,7 +85,6 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli
             adapter = OrderablePlaylistSongAdapter(this,
                 ArrayList(),
                 R.layout.item_list,
-                false,
                 this,
                 object : OrderablePlaylistSongAdapter.OnMoveItemListener {
                     override fun onMoveItem(fromPosition: Int, toPosition: Int) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.java b/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.java
index 83273edc..fbafe636 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.java
@@ -22,22 +22,39 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.checkbox.MaterialCheckBox;
-
-import java.util.List;
-
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.model.CategoryInfo;
 import code.name.monkey.retromusic.util.SwipeAndDragHelper;
+import com.google.android.material.checkbox.MaterialCheckBox;
+import java.util.List;
+
+public class CategoryInfoAdapter extends RecyclerView.Adapter<CategoryInfoAdapter.ViewHolder>
+        implements SwipeAndDragHelper.ActionCompletionContract {
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+
+        MaterialCheckBox checkBox;
+
+        View dragView;
+
+        TextView title;
+
+        ViewHolder(View view) {
+            super(view);
+            checkBox = view.findViewById(R.id.checkbox);
+            checkBox.setButtonTintList(
+                    ColorStateList.valueOf(ThemeStore.Companion.accentColor(checkBox.getContext())));
+            title = view.findViewById(R.id.title);
+            dragView = view.findViewById(R.id.drag_view);
+        }
+    }
 
-public class CategoryInfoAdapter extends RecyclerView.Adapter<CategoryInfoAdapter.ViewHolder> implements SwipeAndDragHelper.ActionCompletionContract {
     private List<CategoryInfo> categoryInfos;
+
     private ItemTouchHelper touchHelper;
 
     public CategoryInfoAdapter(@NonNull List<CategoryInfo> categoryInfos) {
@@ -46,52 +63,6 @@ public class CategoryInfoAdapter extends RecyclerView.Adapter<CategoryInfoAdapte
         touchHelper = new ItemTouchHelper(swipeAndDragHelper);
     }
 
-    @Override
-    @NonNull
-    public CategoryInfoAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.preference_dialog_library_categories_listitem, parent, false);
-        return new ViewHolder(view);
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    public void onBindViewHolder(@NonNull CategoryInfoAdapter.ViewHolder holder, int position) {
-        CategoryInfo categoryInfo = categoryInfos.get(position);
-
-        holder.checkBox.setChecked(categoryInfo.visible);
-        holder.title.setText(holder.title.getResources().getString(categoryInfo.category.stringRes));
-
-        holder.itemView.setOnClickListener(v -> {
-            if (!(categoryInfo.visible && isLastCheckedCategory(categoryInfo))) {
-                categoryInfo.visible = !categoryInfo.visible;
-                holder.checkBox.setChecked(categoryInfo.visible);
-            } else {
-                Toast.makeText(holder.itemView.getContext(), R.string.you_have_to_select_at_least_one_category, Toast.LENGTH_SHORT).show();
-            }
-        });
-
-        holder.dragView.setOnTouchListener((view, event) -> {
-                    if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
-                        touchHelper.startDrag(holder);
-                    }
-                    return false;
-                }
-        );
-    }
-
-    @Override
-    public int getItemCount() {
-        return categoryInfos.size();
-    }
-
-    @Override
-    public void onViewMoved(int oldPosition, int newPosition) {
-        CategoryInfo categoryInfo = categoryInfos.get(oldPosition);
-        categoryInfos.remove(oldPosition);
-        categoryInfos.add(newPosition, categoryInfo);
-        notifyItemMoved(oldPosition, newPosition);
-    }
-
     public void attachToRecyclerView(RecyclerView recyclerView) {
         touchHelper.attachToRecyclerView(recyclerView);
     }
@@ -106,26 +77,62 @@ public class CategoryInfoAdapter extends RecyclerView.Adapter<CategoryInfoAdapte
         notifyDataSetChanged();
     }
 
+    @Override
+    public int getItemCount() {
+        return categoryInfos.size();
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    @Override
+    public void onBindViewHolder(@NonNull CategoryInfoAdapter.ViewHolder holder, int position) {
+        CategoryInfo categoryInfo = categoryInfos.get(position);
+
+        holder.checkBox.setChecked(categoryInfo.visible);
+        holder.title.setText(holder.title.getResources().getString(categoryInfo.category.stringRes));
+
+        holder.itemView.setOnClickListener(v -> {
+            if (!(categoryInfo.visible && isLastCheckedCategory(categoryInfo))) {
+                categoryInfo.visible = !categoryInfo.visible;
+                holder.checkBox.setChecked(categoryInfo.visible);
+            } else {
+                Toast.makeText(holder.itemView.getContext(), R.string.you_have_to_select_at_least_one_category,
+                        Toast.LENGTH_SHORT).show();
+            }
+        });
+
+        holder.dragView.setOnTouchListener((view, event) -> {
+                    if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+                        touchHelper.startDrag(holder);
+                    }
+                    return false;
+                }
+        );
+    }
+
+    @Override
+    @NonNull
+    public CategoryInfoAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.preference_dialog_library_categories_listitem, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onViewMoved(int oldPosition, int newPosition) {
+        CategoryInfo categoryInfo = categoryInfos.get(oldPosition);
+        categoryInfos.remove(oldPosition);
+        categoryInfos.add(newPosition, categoryInfo);
+        notifyItemMoved(oldPosition, newPosition);
+    }
+
     private boolean isLastCheckedCategory(CategoryInfo categoryInfo) {
         if (categoryInfo.visible) {
             for (CategoryInfo c : categoryInfos) {
-                if (c != categoryInfo && c.visible) return false;
+                if (c != categoryInfo && c.visible) {
+                    return false;
+                }
             }
         }
         return true;
     }
-
-    static class ViewHolder extends RecyclerView.ViewHolder {
-        MaterialCheckBox checkBox;
-        TextView title;
-        View dragView;
-
-        ViewHolder(View view) {
-            super(view);
-            checkBox = view.findViewById(R.id.checkbox);
-            checkBox.setButtonTintList(ColorStateList.valueOf(ThemeStore.Companion.accentColor(checkBox.getContext())));
-            title = view.findViewById(R.id.title);
-            dragView = view.findViewById(R.id.drag_view);
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt
index df7fec52..2042e3c5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt
@@ -1,7 +1,9 @@
 package code.name.monkey.retromusic.adapter
 
 import android.app.Activity
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
@@ -11,64 +13,64 @@ import code.name.monkey.retromusic.views.CircularImageView
 import com.bumptech.glide.Glide
 
 class ContributorAdapter(
-		private var contributors: List<Contributor>
+    private var contributors: List<Contributor>
 ) : RecyclerView.Adapter<ContributorAdapter.ViewHolder>() {
 
-	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-		return if (viewType == HEADER) {
-			ViewHolder(
-					LayoutInflater.from(parent.context).inflate(
-							R.layout.item_contributor_header,
-							parent,
-							false
-					)
-			)
-		} else ViewHolder(
-				LayoutInflater.from(parent.context).inflate(
-						R.layout.item_contributor,
-						parent,
-						false
-				)
-		)
-	}
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return if (viewType == HEADER) {
+            ViewHolder(
+                LayoutInflater.from(parent.context).inflate(
+                    R.layout.item_contributor_header,
+                    parent,
+                    false
+                )
+            )
+        } else ViewHolder(
+            LayoutInflater.from(parent.context).inflate(
+                R.layout.item_contributor,
+                parent,
+                false
+            )
+        )
+    }
 
-	companion object {
-		const val HEADER: Int = 0
-		const val ITEM: Int = 1
-	}
+    companion object {
+        const val HEADER: Int = 0
+        const val ITEM: Int = 1
+    }
 
-	override fun getItemViewType(position: Int): Int {
-		return if (position == 0) {
-			HEADER
-		} else {
-			ITEM
-		}
-	}
+    override fun getItemViewType(position: Int): Int {
+        return if (position == 0) {
+            HEADER
+        } else {
+            ITEM
+        }
+    }
 
-	override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-		val contributor = contributors[position]
-		holder.bindData(contributor)
-		holder.itemView.setOnClickListener {
-			openUrl(it?.context as Activity, contributors[position].link)
-		}
-	}
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val contributor = contributors[position]
+        holder.bindData(contributor)
+        holder.itemView.setOnClickListener {
+            openUrl(it?.context as Activity, contributors[position].link)
+        }
+    }
 
-	override fun getItemCount(): Int {
-		return contributors.size
-	}
+    override fun getItemCount(): Int {
+        return contributors.size
+    }
 
-	inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-		val title: TextView = itemView.findViewById(R.id.title)
-		val text: TextView = itemView.findViewById(R.id.text)
-		val image: CircularImageView = itemView.findViewById(R.id.icon)
+    inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val title: TextView = itemView.findViewById(R.id.title)
+        val text: TextView = itemView.findViewById(R.id.text)
+        val image: CircularImageView = itemView.findViewById(R.id.icon)
 
-		internal fun bindData(contributor: Contributor) {
-			title.text = contributor.name
-			text.text = contributor.summary
-			println(contributor.profileImage)
-			Glide.with(image.context).load(contributor.profileImage)
-				.error(R.drawable.ic_account_white_24dp)
-				.placeholder(R.drawable.ic_account_white_24dp).dontAnimate().into(image)
-		}
-	}
+        internal fun bindData(contributor: Contributor) {
+            title.text = contributor.name
+            text.text = contributor.summary
+            println(contributor.profileImage)
+            Glide.with(image.context).load(contributor.profileImage)
+                .error(R.drawable.ic_account_white_24dp)
+                .placeholder(R.drawable.ic_account_white_24dp).dontAnimate().into(image)
+        }
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
index d8166e4f..ae5ed811 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
@@ -9,15 +9,19 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.model.Genre
 import code.name.monkey.retromusic.util.NavigationUtil
-import java.util.*
+import java.util.ArrayList
+import java.util.Locale
 
 /**
  * @author Hemanth S (h4h13).
  */
 
 class GenreAdapter(
-        private val activity: Activity, dataSet: ArrayList<Genre>, private val mItemLayoutRes: Int
+    private val activity: Activity,
+    dataSet: ArrayList<Genre>,
+    private val mItemLayoutRes: Int
 ) : RecyclerView.Adapter<GenreAdapter.ViewHolder>() {
+
     var dataSet = ArrayList<Genre>()
         private set
 
@@ -32,7 +36,12 @@ class GenreAdapter(
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val genre = dataSet[position]
         holder.title?.text = genre.name
-        holder.text?.text = String.format(Locale.getDefault(), "%d %s", genre.songCount, if (genre.songCount > 1) activity.getString(R.string.songs) else activity.getString(R.string.song))
+        holder.text?.text = String.format(
+            Locale.getDefault(),
+            "%d %s",
+            genre.songCount,
+            if (genre.songCount > 1) activity.getString(R.string.songs) else activity.getString(R.string.song)
+        )
     }
 
     override fun getItemCount(): Int {
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
index d0218318..10ce8b0a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
@@ -23,7 +23,8 @@ import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.util.PreferenceUtil
 
 class HomeAdapter(
-    private val activity: AppCompatActivity, private val displayMetrics: DisplayMetrics
+    private val activity: AppCompatActivity,
+    private val displayMetrics: DisplayMetrics
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     private var list = ArrayList<Home>()
@@ -137,14 +138,9 @@ class HomeAdapter(
                 if (songs.isNotEmpty()) {
                     recyclerView.apply {
                         show()
-                        val songAdapter = SongAdapter(
-                            activity, songs, R.layout.item_album_card, false, null
-                        )
-                        layoutManager = GridLayoutManager(
-                            activity, 1, GridLayoutManager.HORIZONTAL, false
-                        )
+                        val songAdapter = SongAdapter(activity, songs, R.layout.item_album_card, null)
+                        layoutManager = GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
                         adapter = songAdapter
-
                     }
                     title.text = activity.getString(titleRes)
                 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
index dc5c066d..bd479725 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
@@ -23,7 +23,8 @@ import com.bumptech.glide.Glide
 import android.util.Pair as UtilPair
 
 class SearchAdapter(
-        private val activity: AppCompatActivity, private var dataSet: List<Any>?
+    private val activity: AppCompatActivity,
+    private var dataSet: List<Any>?
 ) : RecyclerView.Adapter<SearchAdapter.ViewHolder>() {
 
     fun swapDataSet(dataSet: MutableList<Any>) {
@@ -39,7 +40,13 @@ class SearchAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return if (viewType == HEADER) ViewHolder(LayoutInflater.from(activity).inflate(R.layout.sub_header, parent, false), viewType)
+        return if (viewType == HEADER) ViewHolder(
+            LayoutInflater.from(activity).inflate(
+                R.layout.sub_header,
+                parent,
+                false
+            ), viewType
+        )
         else
             ViewHolder(LayoutInflater.from(activity).inflate(R.layout.item_list, parent, false), viewType)
     }
@@ -51,14 +58,14 @@ class SearchAdapter(
                 holder.title?.text = album.title
                 holder.text?.text = album.artistName
                 SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
-                        .checkIgnoreMediaStore(activity).build().into(holder.image)
+                    .checkIgnoreMediaStore(activity).build().into(holder.image)
             }
             ARTIST -> {
                 val artist = dataSet?.get(position) as Artist
                 holder.title?.text = artist.name
                 holder.text?.text = MusicUtil.getArtistInfoString(activity, artist)
                 ArtistGlideRequest.Builder.from(Glide.with(activity), artist).build()
-                        .into(holder.image)
+                    .into(holder.image)
             }
             SONG -> {
                 val song = dataSet?.get(position) as Song
@@ -108,11 +115,17 @@ class SearchAdapter(
             val item = dataSet!![adapterPosition]
             when (itemViewType) {
                 ALBUM -> {
-                    val options = ActivityOptions.makeSceneTransitionAnimation(activity, UtilPair.create(image, activity.getString(R.string.transition_album_art)))
+                    val options = ActivityOptions.makeSceneTransitionAnimation(
+                        activity,
+                        UtilPair.create(image, activity.getString(R.string.transition_album_art))
+                    )
                     NavigationUtil.goToAlbumOptions(activity, (item as Album).id, options)
                 }
                 ARTIST -> {
-                    val options = ActivityOptions.makeSceneTransitionAnimation(activity, UtilPair.create(image, activity.getString(R.string.transition_artist_image)))
+                    val options = ActivityOptions.makeSceneTransitionAnimation(
+                        activity,
+                        UtilPair.create(image, activity.getString(R.string.transition_artist_image))
+                    )
                     NavigationUtil.goToArtistOptions(activity, (item as Artist).id, options)
                 }
                 GENRE -> {
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt
index 60d2d855..9bcb3c8c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt
@@ -12,37 +12,38 @@ import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.glide.audiocover.AudioFileCover
 import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.RetroUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.signature.MediaStoreSignature
-import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+import me.zhanghai.android.fastscroll.PopupTextProvider
 import java.io.File
 import java.text.DecimalFormat
-import java.util.*
+import java.util.ArrayList
 import kotlin.math.log10
 import kotlin.math.pow
 
 class SongFileAdapter(
-        private val activity: AppCompatActivity,
-        private var dataSet: List<File>?,
-        private val itemLayoutRes: Int,
-        private val callbacks: Callbacks?,
-        cabHolder: CabHolder?
+    private val activity: AppCompatActivity,
+    private var dataSet: List<File>,
+    private val itemLayoutRes: Int,
+    private val callbacks: Callbacks?,
+    cabHolder: CabHolder?
 ) : AbsMultiSelectAdapter<SongFileAdapter.ViewHolder, File>(
-        activity, cabHolder, R.menu.menu_media_selection
-), FastScrollRecyclerView.SectionedAdapter {
+    activity, cabHolder, R.menu.menu_media_selection
+), PopupTextProvider {
 
     init {
         this.setHasStableIds(true)
     }
 
     override fun getItemViewType(position: Int): Int {
-        return if (dataSet!![position].isDirectory) FOLDER else FILE
+        return if (dataSet[position].isDirectory) FOLDER else FILE
     }
 
     override fun getItemId(position: Int): Long {
-        return dataSet!![position].hashCode().toLong()
+        return dataSet[position].hashCode().toLong()
     }
 
     fun swapDataSet(songFiles: List<File>) {
@@ -55,7 +56,7 @@ class SongFileAdapter(
     }
 
     override fun onBindViewHolder(holder: ViewHolder, index: Int) {
-        val file = dataSet!![index]
+        val file = dataSet[index]
         holder.itemView.isActivated = isChecked(file)
         holder.title?.text = getFileTitle(file)
         if (holder.text != null) {
@@ -87,24 +88,23 @@ class SongFileAdapter(
                 it.setImageResource(R.drawable.ic_folder_white_24dp)
             }
             holder.imageTextContainer?.setCardBackgroundColor(ATHUtil.resolveColor(activity, R.attr.colorSurface))
-
         } else {
             val error = RetroUtil.getTintedVectorDrawable(
-                    activity, R.drawable.ic_file_music_white_24dp, iconColor
+                activity, R.drawable.ic_file_music_white_24dp, iconColor
             )
             Glide.with(activity).load(AudioFileCover(file.path))
-                    .diskCacheStrategy(DiskCacheStrategy.NONE).error(error).placeholder(error)
-                    .animate(android.R.anim.fade_in)
-                    .signature(MediaStoreSignature("", file.lastModified(), 0)).into(holder.image)
+                .diskCacheStrategy(DiskCacheStrategy.NONE).error(error).placeholder(error)
+                .animate(android.R.anim.fade_in)
+                .signature(MediaStoreSignature("", file.lastModified(), 0)).into(holder.image)
         }
     }
 
     override fun getItemCount(): Int {
-        return dataSet!!.size
+        return dataSet.size
     }
 
     override fun getIdentifier(position: Int): File? {
-        return dataSet!![position]
+        return dataSet[position]
     }
 
     override fun getName(`object`: File): String {
@@ -116,8 +116,12 @@ class SongFileAdapter(
         callbacks.onMultipleItemAction(menuItem, selection)
     }
 
-    override fun getSectionName(position: Int): String {
-        return dataSet!![position].name[0].toString().toUpperCase()
+    override fun getPopupText(position: Int): String {
+        return getSectionName(position)
+    }
+
+    private fun getSectionName(position: Int): String {
+        return MusicUtil.getSectionName(dataSet[position].name)
     }
 
     interface Callbacks {
@@ -135,7 +139,7 @@ class SongFileAdapter(
                 menu?.setOnClickListener { v ->
                     val position = adapterPosition
                     if (isPositionInRange(position)) {
-                        callbacks.onFileMenuClicked(dataSet!![position], v)
+                        callbacks.onFileMenuClicked(dataSet[position], v)
                     }
                 }
             }
@@ -150,7 +154,7 @@ class SongFileAdapter(
                 if (isInQuickSelectMode) {
                     toggleChecked(position)
                 } else {
-                    callbacks?.onFileSelected(dataSet!![position])
+                    callbacks?.onFileSelected(dataSet[position])
                 }
             }
         }
@@ -161,7 +165,7 @@ class SongFileAdapter(
         }
 
         private fun isPositionInRange(position: Int): Boolean {
-            return position >= 0 && position < dataSet!!.size
+            return position >= 0 && position < dataSet.size
         }
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
index 8de57eb4..13f2fc89 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
@@ -25,7 +25,7 @@ import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
-import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+import me.zhanghai.android.fastscroll.PopupTextProvider
 
 open class AlbumAdapter(
     protected val activity: AppCompatActivity,
@@ -37,7 +37,7 @@ open class AlbumAdapter(
     activity,
     cabHolder,
     R.menu.menu_media_selection
-), FastScrollRecyclerView.SectionedAdapter {
+), PopupTextProvider {
 
     var dataSet: ArrayList<Album>
         protected set
@@ -168,7 +168,11 @@ open class AlbumAdapter(
         return songs
     }
 
-    override fun getSectionName(position: Int): String {
+    override fun getPopupText(position: Int): String {
+        return getSectionName(position)
+    }
+
+    private fun getSectionName(position: Int): String {
         var sectionName: String? = null
         when (PreferenceUtil.getInstance(activity).albumSortOrder) {
             SortOrder.AlbumSortOrder.ALBUM_A_Z, SortOrder.AlbumSortOrder.ALBUM_Z_A -> sectionName =
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
index 88283c9d..722baac8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
@@ -70,7 +70,7 @@ class AlbumCoverPagerAdapter(
 
         private val layout: Int
             get() {
-                return when (PreferenceUtil.getInstance(activity).albumCoverStyle) {
+                return when (PreferenceUtil.getInstance(requireContext()).albumCoverStyle) {
                     AlbumCoverStyle.NORMAL -> R.layout.fragment_album_cover
                     AlbumCoverStyle.FLAT -> R.layout.fragment_album_flat_cover
                     AlbumCoverStyle.CIRCLE -> R.layout.fragment_album_circle_cover
@@ -95,7 +95,7 @@ class AlbumCoverPagerAdapter(
             savedInstanceState: Bundle?
         ): View? {
             val finalLayout = when {
-                PreferenceUtil.getInstance(activity).carouselEffect() -> R.layout.fragment_album_carousel_cover
+                PreferenceUtil.getInstance(requireContext()).carouselEffect() -> R.layout.fragment_album_carousel_cover
                 else -> layout
             }
             val view = inflater.inflate(finalLayout, container, false)
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
index 1a85231f..644666ac 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
@@ -13,59 +13,59 @@ import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.util.MusicUtil
 import com.bumptech.glide.Glide
-import java.util.*
+import java.util.ArrayList
 
 class HorizontalAlbumAdapter(
-		activity: AppCompatActivity,
-		dataSet: ArrayList<Album>,
-		usePalette: Boolean,
-		cabHolder: CabHolder?
+    activity: AppCompatActivity,
+    dataSet: ArrayList<Album>,
+    usePalette: Boolean,
+    cabHolder: CabHolder?
 ) : AlbumAdapter(
-		activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, usePalette, cabHolder
+    activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, usePalette, cabHolder
 ) {
 
-	override fun createViewHolder(view: View, viewType: Int): ViewHolder {
-		val params = view.layoutParams as ViewGroup.MarginLayoutParams
-		HorizontalAdapterHelper.applyMarginToLayoutParams(activity, params, viewType)
-		return ViewHolder(view)
-	}
+    override fun createViewHolder(view: View, viewType: Int): ViewHolder {
+        val params = view.layoutParams as ViewGroup.MarginLayoutParams
+        HorizontalAdapterHelper.applyMarginToLayoutParams(activity, params, viewType)
+        return ViewHolder(view)
+    }
 
-	override fun setColors(color: Int, holder: ViewHolder) {
-		holder.title?.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)))
-		holder.text?.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)))
-	}
+    override fun setColors(color: Int, holder: ViewHolder) {
+        holder.title?.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)))
+        holder.text?.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)))
+    }
 
-	override fun loadAlbumCover(album: Album, holder: ViewHolder) {
-		if (holder.image == null) return
+    override fun loadAlbumCover(album: Album, holder: ViewHolder) {
+        if (holder.image == null) return
 
-		SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
-			.checkIgnoreMediaStore(activity).generatePalette(activity).build()
-			.into(object : RetroMusicColoredTarget(holder.image!!) {
-				override fun onLoadCleared(placeholder: Drawable?) {
-					super.onLoadCleared(placeholder)
-					setColors(albumArtistFooterColor, holder)
-				}
+        SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
+            .checkIgnoreMediaStore(activity).generatePalette(activity).build()
+            .into(object : RetroMusicColoredTarget(holder.image!!) {
+                override fun onLoadCleared(placeholder: Drawable?) {
+                    super.onLoadCleared(placeholder)
+                    setColors(albumArtistFooterColor, holder)
+                }
 
-				override fun onColorReady(color: Int) {
-					if (usePalette) setColors(color, holder)
-					else setColors(albumArtistFooterColor, holder)
-				}
-			})
-	}
+                override fun onColorReady(color: Int) {
+                    if (usePalette) setColors(color, holder)
+                    else setColors(albumArtistFooterColor, holder)
+                }
+            })
+    }
 
-	override fun getAlbumText(album: Album): String? {
-		return MusicUtil.getYearString(album.year)
-	}
+    override fun getAlbumText(album: Album): String? {
+        return MusicUtil.getYearString(album.year)
+    }
 
-	override fun getItemViewType(position: Int): Int {
-		return HorizontalAdapterHelper.getItemViewtype(position, itemCount)
-	}
+    override fun getItemViewType(position: Int): Int {
+        return HorizontalAdapterHelper.getItemViewtype(position, itemCount)
+    }
 
-	override fun getItemCount(): Int {
-		return dataSet.size
-	}
+    override fun getItemCount(): Int {
+        return dataSet.size
+    }
 
-	companion object {
-		val TAG: String = AlbumAdapter::class.java.simpleName
-	}
+    companion object {
+        val TAG: String = AlbumAdapter::class.java.simpleName
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
index 796bb148..362299e3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
@@ -23,7 +23,7 @@ import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.NavigationUtil
 import com.bumptech.glide.Glide
-import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+import me.zhanghai.android.fastscroll.PopupTextProvider
 import java.util.ArrayList
 
 class ArtistAdapter(
@@ -34,7 +34,7 @@ class ArtistAdapter(
     cabHolder: CabHolder?
 ) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(
     activity, cabHolder, R.menu.menu_media_selection
-), FastScrollRecyclerView.SectionedAdapter {
+), PopupTextProvider {
 
     fun swapDataSet(dataSet: ArrayList<Artist>) {
         this.dataSet = dataSet
@@ -70,7 +70,7 @@ class ArtistAdapter(
 
     fun setColors(color: Int, holder: ViewHolder) {
         if (holder.paletteColorContainer != null) {
-            holder.paletteColorContainer?.backgroundTintList = ColorStateList.valueOf(color)
+            holder.paletteColorContainer?.setBackgroundColor(color)
             holder.title?.setTextColor(
                 MaterialValueHelper.getPrimaryTextColor(
                     activity, ColorUtil.isColorLight(
@@ -126,7 +126,11 @@ class ArtistAdapter(
         return songs
     }
 
-    override fun getSectionName(position: Int): String {
+    override fun getPopupText(position: Int): String {
+        return getSectionName(position)
+    }
+
+    private fun getSectionName(position: Int): String {
         return MusicUtil.getSectionName(dataSet[position].name)
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java
index 36bbe6bd..e8bf2e4b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java
@@ -3,26 +3,28 @@ package code.name.monkey.retromusic.adapter.base;
 import android.content.Context;
 import android.view.Menu;
 import android.view.MenuItem;
-
 import androidx.annotation.MenuRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.afollestad.materialcab.MaterialCab;
-
-import java.util.ArrayList;
-
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.interfaces.CabHolder;
+import com.afollestad.materialcab.MaterialCab;
+import java.util.ArrayList;
 
 
-public abstract class AbsMultiSelectAdapter<VH extends RecyclerView.ViewHolder, I> extends RecyclerView.Adapter<VH> implements MaterialCab.Callback {
+public abstract class AbsMultiSelectAdapter<VH extends RecyclerView.ViewHolder, I> extends RecyclerView.Adapter<VH>
+        implements MaterialCab.Callback {
+
+    private MaterialCab cab;
+
     @Nullable
     private final CabHolder cabHolder;
-    private final Context context;
-    private MaterialCab cab;
+
     private ArrayList<I> checked;
+
+    private final Context context;
+
     private int menuRes;
 
     public AbsMultiSelectAdapter(@NonNull Context context, @Nullable CabHolder cabHolder, @MenuRes int menuRes) {
@@ -32,22 +34,27 @@ public abstract class AbsMultiSelectAdapter<VH extends RecyclerView.ViewHolder,
         this.context = context;
     }
 
-    protected void setMultiSelectMenuRes(@MenuRes int menuRes) {
-        this.menuRes = menuRes;
+    @Override
+    public boolean onCabCreated(MaterialCab materialCab, Menu menu) {
+        return true;
     }
 
-    protected boolean toggleChecked(final int position) {
-        if (cabHolder != null) {
-            I identifier = getIdentifier(position);
-            if (identifier == null) return false;
+    @Override
+    public boolean onCabFinished(MaterialCab materialCab) {
+        clearChecked();
+        return true;
+    }
 
-            if (!checked.remove(identifier)) checked.add(identifier);
-
-            notifyItemChanged(position);
-            updateCab();
-            return true;
+    @Override
+    public boolean onCabItemClicked(MenuItem menuItem) {
+        if (menuItem.getItemId() == R.id.action_multi_select_adapter_check_all) {
+            checkAll();
+        } else {
+            onMultipleItemAction(menuItem, new ArrayList<>(checked));
+            cab.finish();
+            clearChecked();
         }
-        return false;
+        return true;
     }
 
     protected void checkAll() {
@@ -64,21 +71,11 @@ public abstract class AbsMultiSelectAdapter<VH extends RecyclerView.ViewHolder,
         }
     }
 
-    private void updateCab() {
-        if (cabHolder != null) {
-            if (cab == null || !cab.isActive()) {
-                cab = cabHolder.openCab(menuRes, this);
-            }
-            final int size = checked.size();
-            if (size <= 0) cab.finish();
-            else if (size == 1) cab.setTitle(getName(checked.get(0)));
-            else cab.setTitle(context.getString(R.string.x_selected, size));
-        }
-    }
+    @Nullable
+    protected abstract I getIdentifier(int position);
 
-    private void clearChecked() {
-        checked.clear();
-        notifyDataSetChanged();
+    protected String getName(I object) {
+        return object.toString();
     }
 
     protected boolean isChecked(I identifier) {
@@ -89,35 +86,48 @@ public abstract class AbsMultiSelectAdapter<VH extends RecyclerView.ViewHolder,
         return cab != null && cab.isActive();
     }
 
-    @Override
-    public boolean onCabCreated(MaterialCab materialCab, Menu menu) {
-        return true;
-    }
-
-    @Override
-    public boolean onCabItemClicked(MenuItem menuItem) {
-        if (menuItem.getItemId() == R.id.action_multi_select_adapter_check_all) {
-            checkAll();
-        } else {
-            onMultipleItemAction(menuItem, new ArrayList<>(checked));
-            cab.finish();
-            clearChecked();
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onCabFinished(MaterialCab materialCab) {
-        clearChecked();
-        return true;
-    }
-
-    protected String getName(I object) {
-        return object.toString();
-    }
-
-    @Nullable
-    protected abstract I getIdentifier(int position);
-
     protected abstract void onMultipleItemAction(MenuItem menuItem, ArrayList<I> selection);
+
+    protected void setMultiSelectMenuRes(@MenuRes int menuRes) {
+        this.menuRes = menuRes;
+    }
+
+    protected boolean toggleChecked(final int position) {
+        if (cabHolder != null) {
+            I identifier = getIdentifier(position);
+            if (identifier == null) {
+                return false;
+            }
+
+            if (!checked.remove(identifier)) {
+                checked.add(identifier);
+            }
+
+            notifyItemChanged(position);
+            updateCab();
+            return true;
+        }
+        return false;
+    }
+
+    private void clearChecked() {
+        checked.clear();
+        notifyDataSetChanged();
+    }
+
+    private void updateCab() {
+        if (cabHolder != null) {
+            if (cab == null || !cab.isActive()) {
+                cab = cabHolder.openCab(menuRes, this);
+            }
+            final int size = checked.size();
+            if (size <= 0) {
+                cab.finish();
+            } else if (size == 1) {
+                cab.setTitle(getName(checked.get(0)));
+            } else {
+                cab.setTitle(context.getString(R.string.x_selected, size));
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
index d73be731..014d7ea1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
@@ -14,6 +14,7 @@
 
 package code.name.monkey.retromusic.adapter.base;
 
+import android.graphics.Color;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
@@ -22,7 +23,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.retromusic.R;
 import com.google.android.material.card.MaterialCardView;
 import com.h6ah4i.android.widget.advrecyclerview.utils.AbstractDraggableSwipeableItemViewHolder;
@@ -97,8 +97,7 @@ public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHold
         dummyContainer = itemView.findViewById(R.id.dummy_view);
 
         if (imageContainerCard != null) {
-            imageContainerCard.setCardBackgroundColor(
-                    ATHUtil.INSTANCE.resolveColor(itemView.getContext(), R.attr.colorSurface));
+            imageContainerCard.setCardBackgroundColor(Color.TRANSPARENT);
         }
         itemView.setOnClickListener(this);
         itemView.setOnLongClickListener(this);
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
index f448f3d6..70395660 100755
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
@@ -1,5 +1,6 @@
 package code.name.monkey.retromusic.adapter.playlist
 
+import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.MenuItem
@@ -15,6 +16,8 @@ import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.dialogs.ClearSmartPlaylistDialog
 import code.name.monkey.retromusic.dialogs.DeletePlaylistDialog
+import code.name.monkey.retromusic.extensions.hide
+import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
@@ -26,17 +29,17 @@ import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
 import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.NavigationUtil
-import java.util.*
+import java.util.ArrayList
 
 class PlaylistAdapter(
-        private val activity: AppCompatActivity,
-        var dataSet: ArrayList<Playlist>,
-        private var itemLayoutRes: Int,
-        cabHolder: CabHolder?
+    private val activity: AppCompatActivity,
+    var dataSet: ArrayList<Playlist>,
+    private var itemLayoutRes: Int,
+    cabHolder: CabHolder?
 ) : AbsMultiSelectAdapter<PlaylistAdapter.ViewHolder, Playlist>(
-        activity,
-        cabHolder,
-        R.menu.menu_playlists_selection
+    activity,
+    cabHolder,
+    R.menu.menu_playlists_selection
 ) {
 
     var songs = ArrayList<Song>()
@@ -77,12 +80,26 @@ class PlaylistAdapter(
         holder.title?.text = getPlaylistTitle(playlist)
         holder.text?.text = getPlaylistText(playlist)
         holder.image?.setImageDrawable(getIconRes(playlist))
+        val isChecked = isChecked(playlist)
+        if (isChecked) {
+            holder.menu?.hide()
+        } else {
+            holder.menu?.show()
+        }
     }
 
     private fun getIconRes(playlist: Playlist): Drawable {
         return if (MusicUtil.isFavoritePlaylist(activity, playlist))
-            TintHelper.createTintedDrawable(activity, R.drawable.ic_favorite_white_24dp, ThemeStore.accentColor(activity))!!
-        else TintHelper.createTintedDrawable(activity, R.drawable.ic_playlist_play_white_24dp, ATHUtil.resolveColor(activity, R.attr.colorControlNormal))!!
+            TintHelper.createTintedDrawable(
+                activity,
+                R.drawable.ic_favorite_white_24dp,
+                ThemeStore.accentColor(activity)
+            )
+        else TintHelper.createTintedDrawable(
+            activity,
+            R.drawable.ic_playlist_play_white_24dp,
+            ATHUtil.resolveColor(activity, R.attr.colorControlNormal)
+        )
     }
 
     override fun getItemViewType(position: Int): Int {
@@ -109,7 +126,7 @@ class PlaylistAdapter(
                     val playlist = selection[i]
                     if (playlist is AbsSmartPlaylist) {
                         ClearSmartPlaylistDialog.create(playlist).show(
-                                activity.supportFragmentManager, "CLEAR_PLAYLIST_" + playlist.name
+                            activity.supportFragmentManager, "CLEAR_PLAYLIST_" + playlist.name
                         )
                         selection.remove(playlist)
                         i--
@@ -118,13 +135,13 @@ class PlaylistAdapter(
                 }
                 if (selection.size > 0) {
                     DeletePlaylistDialog.create(selection)
-                            .show(activity.supportFragmentManager, "DELETE_PLAYLIST")
+                        .show(activity.supportFragmentManager, "DELETE_PLAYLIST")
                 }
             }
             else -> SongsMenuHelper.handleMenuClick(
-                    activity,
-                    getSongList(selection),
-                    menuItem.itemId
+                activity,
+                getSongList(selection),
+                menuItem.itemId
             )
         }
     }
@@ -157,15 +174,14 @@ class PlaylistAdapter(
             image?.apply {
                 val iconPadding = activity.resources.getDimensionPixelSize(R.dimen.list_item_image_icon_padding)
                 setPadding(iconPadding, iconPadding, iconPadding, iconPadding)
-                //setColorFilter(ATHUtil.resolveColor(activity, R.attr.iconColor), PorterDuff.Mode.SRC_IN)
             }
 
             menu?.setOnClickListener { view ->
                 val playlist = dataSet[adapterPosition]
                 val popupMenu = PopupMenu(activity, view)
                 popupMenu.inflate(
-                        if (itemViewType == SMART_PLAYLIST) R.menu.menu_item_smart_playlist
-                        else R.menu.menu_item_playlist
+                    if (itemViewType == SMART_PLAYLIST) R.menu.menu_item_smart_playlist
+                    else R.menu.menu_item_playlist
                 )
                 if (playlist is LastAddedPlaylist) {
                     popupMenu.menu.findItem(R.id.action_clear_playlist).isVisible = false
@@ -174,14 +190,14 @@ class PlaylistAdapter(
                     if (item.itemId == R.id.action_clear_playlist) {
                         if (playlist is AbsSmartPlaylist) {
                             ClearSmartPlaylistDialog.create(playlist).show(
-                                    activity.supportFragmentManager,
-                                    "CLEAR_SMART_PLAYLIST_" + playlist.name
+                                activity.supportFragmentManager,
+                                "CLEAR_SMART_PLAYLIST_" + playlist.name
                             )
                             return@setOnMenuItemClickListener true
                         }
                     }
                     PlaylistMenuHelper.handleMenuClick(
-                            activity, dataSet[adapterPosition], item
+                        activity, dataSet[adapterPosition], item
                     )
                 }
                 popupMenu.show()
@@ -189,7 +205,7 @@ class PlaylistAdapter(
 
             imageTextContainer?.apply {
                 cardElevation = 0f
-                setCardBackgroundColor(ATHUtil.resolveColor(activity, R.attr.colorSurface))
+                setCardBackgroundColor(Color.TRANSPARENT)
             }
         }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt
index 9cf2aaf1..b3427584 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt
@@ -1,95 +1,80 @@
 package code.name.monkey.retromusic.adapter.song
 
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
-import java.util.*
+import java.util.ArrayList
 
-abstract class AbsOffsetSongAdapter : SongAdapter {
+abstract class AbsOffsetSongAdapter(
+    activity: AppCompatActivity,
+    dataSet: ArrayList<Song>,
+    @LayoutRes itemLayoutRes: Int,
+    cabHolder: CabHolder?
+) : SongAdapter(activity, dataSet, itemLayoutRes, cabHolder) {
 
-	constructor(
-			activity: AppCompatActivity,
-			dataSet: ArrayList<Song>, @LayoutRes itemLayoutRes: Int,
-			usePalette: Boolean,
-			cabHolder: CabHolder?
-	) : super(activity, dataSet, itemLayoutRes, usePalette, cabHolder)
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SongAdapter.ViewHolder {
+        if (viewType == OFFSET_ITEM) {
+            val view = LayoutInflater.from(activity)
+                .inflate(R.layout.item_list_quick_actions, parent, false)
+            return createViewHolder(view)
+        }
+        return super.onCreateViewHolder(parent, viewType)
+    }
 
-	constructor(
-			activity: AppCompatActivity,
-			dataSet: ArrayList<Song>, @LayoutRes itemLayoutRes: Int,
-			usePalette: Boolean,
-			cabHolder: CabHolder?,
-			showSectionName: Boolean
-	) : super(activity, dataSet, itemLayoutRes, usePalette, cabHolder, showSectionName) {
-	}
+    override fun createViewHolder(view: View): SongAdapter.ViewHolder {
+        return ViewHolder(view)
+    }
 
-	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SongAdapter.ViewHolder {
-		if (viewType == OFFSET_ITEM) {
-			val view = LayoutInflater.from(activity)
-				.inflate(R.layout.item_list_quick_actions, parent, false)
-			return createViewHolder(view)
-		}
-		return super.onCreateViewHolder(parent, viewType)
-	}
+    override fun getItemId(position: Int): Long {
+        var positionFinal = position
+        positionFinal--
+        return if (positionFinal < 0) -2 else super.getItemId(positionFinal)
+    }
 
-	override fun createViewHolder(view: View): SongAdapter.ViewHolder {
-		return ViewHolder(view)
-	}
+    override fun getIdentifier(position: Int): Song? {
+        var positionFinal = position
+        positionFinal--
+        return if (positionFinal < 0) null else super.getIdentifier(positionFinal)
+    }
 
-	override fun getItemId(position: Int): Long {
-		var positionFinal = position
-		positionFinal--
-		return if (positionFinal < 0) -2 else super.getItemId(positionFinal)
-	}
+    override fun getItemCount(): Int {
+        val superItemCount = super.getItemCount()
+        return if (superItemCount == 0) 0 else superItemCount + 1
+    }
 
-	override fun getIdentifier(position: Int): Song? {
-		var positionFinal = position
-		positionFinal--
-		return if (positionFinal < 0) null else super.getIdentifier(positionFinal)
-	}
+    override fun getItemViewType(position: Int): Int {
+        return if (position == 0) OFFSET_ITEM else SONG
+    }
 
-	override fun getItemCount(): Int {
-		val superItemCount = super.getItemCount()
-		return if (superItemCount == 0) 0 else superItemCount + 1
-	}
+    open inner class ViewHolder(itemView: View) : SongAdapter.ViewHolder(itemView) {
 
-	override fun getItemViewType(position: Int): Int {
-		return if (position == 0) OFFSET_ITEM else SONG
-	}
+        override // could also return null, just to be safe return empty song
+        val song: Song
+            get() = if (itemViewType == OFFSET_ITEM) Song.emptySong else dataSet[adapterPosition - 1]
 
-	override fun getSectionName(position: Int): String {
-		var positionF = position
-		positionF--
-		return if (positionF < 0) "" else super.getSectionName(positionF)
-	}
+        override fun onClick(v: View?) {
+            if (isInQuickSelectMode && itemViewType != OFFSET_ITEM) {
+                toggleChecked(adapterPosition)
+            } else {
+                MusicPlayerRemote.openQueue(dataSet, adapterPosition - 1, true)
+            }
+        }
 
-	open inner class ViewHolder(itemView: View) : SongAdapter.ViewHolder(itemView) {
+        override fun onLongClick(v: View?): Boolean {
+            if (itemViewType == OFFSET_ITEM) return false
+            toggleChecked(adapterPosition)
+            return true
+        }
+    }
 
-		override // could also return null, just to be safe return empty song
-		val song: Song
-			get() = if (itemViewType == OFFSET_ITEM) Song.emptySong else dataSet[adapterPosition - 1]
-
-		override fun onClick(v: View?) {
-			if (isInQuickSelectMode && itemViewType != OFFSET_ITEM) {
-				toggleChecked(adapterPosition)
-			} else {
-				MusicPlayerRemote.openQueue(dataSet, adapterPosition - 1, true)
-			}
-		}
-
-		override fun onLongClick(v: View?): Boolean {
-			if (itemViewType == OFFSET_ITEM) return false
-			toggleChecked(adapterPosition)
-			return true
-		}
-	}
-
-	companion object {
-		const val OFFSET_ITEM = 0
-		const val SONG = 1
-	}
+    companion object {
+        const val OFFSET_ITEM = 0
+        const val SONG = 1
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
index 5095a440..01879bb9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
@@ -1,134 +1,138 @@
 package code.name.monkey.retromusic.adapter.song
 
-import android.view.*
+import android.view.MenuItem
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.R.menu
 import code.name.monkey.retromusic.dialogs.RemoveFromPlaylistDialog
 import code.name.monkey.retromusic.interfaces.CabHolder
-import code.name.monkey.retromusic.model.*
+import code.name.monkey.retromusic.model.PlaylistSong
+import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.ViewUtil
-import com.h6ah4i.android.widget.advrecyclerview.draggable.*
+import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
+import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemViewHolder
+import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
 import com.h6ah4i.android.widget.advrecyclerview.draggable.annotation.DraggableItemStateFlags
 
 class OrderablePlaylistSongAdapter(
-		activity: AppCompatActivity,
-		dataSet: ArrayList<Song>,
-		itemLayoutRes: Int,
-		usePalette: Boolean,
-		cabHolder: CabHolder?,
-		private val onMoveItemListener: OnMoveItemListener?
+    activity: AppCompatActivity,
+    dataSet: ArrayList<Song>,
+    itemLayoutRes: Int,
+    cabHolder: CabHolder?,
+    private val onMoveItemListener: OnMoveItemListener?
 ) : PlaylistSongAdapter(
-		activity, dataSet, itemLayoutRes, usePalette, cabHolder
+    activity, dataSet, itemLayoutRes, cabHolder
 ), DraggableItemAdapter<OrderablePlaylistSongAdapter.ViewHolder> {
 
-	init {
-		setMultiSelectMenuRes(code.name.monkey.retromusic.R.menu.menu_playlists_songs_selection)
-	}
+    init {
+        setMultiSelectMenuRes(menu.menu_playlists_songs_selection)
+    }
 
-	override fun createViewHolder(view: View): SongAdapter.ViewHolder {
-		return ViewHolder(view)
-	}
+    override fun createViewHolder(view: View): SongAdapter.ViewHolder {
+        return ViewHolder(view)
+    }
 
-	override fun getItemId(position: Int): Long {
-		var positionFinal = position
-		positionFinal--
+    override fun getItemId(position: Int): Long {
+        var positionFinal = position
+        positionFinal--
 
-		var long: Long = 0
-		if (positionFinal < 0) {
-			long = -2
-		} else {
-			if (dataSet[positionFinal] is PlaylistSong) {
-				long = (dataSet[positionFinal] as PlaylistSong).idInPlayList.toLong()
-			}
-		}
-		return long
-	}
+        var long: Long = 0
+        if (positionFinal < 0) {
+            long = -2
+        } else {
+            if (dataSet[positionFinal] is PlaylistSong) {
+                long = (dataSet[positionFinal] as PlaylistSong).idInPlayList.toLong()
+            }
+        }
+        return long
+    }
 
-	override fun onMultipleItemAction(menuItem: MenuItem, selection: ArrayList<Song>) {
-		when (menuItem.itemId) {
-			R.id.action_remove_from_playlist -> {
-				RemoveFromPlaylistDialog.create(selection as ArrayList<PlaylistSong>)
-					.show(activity.supportFragmentManager, "ADD_PLAYLIST")
-				return
-			}
-		}
-		super.onMultipleItemAction(menuItem, selection)
-	}
+    override fun onMultipleItemAction(menuItem: MenuItem, selection: ArrayList<Song>) {
+        when (menuItem.itemId) {
+            R.id.action_remove_from_playlist -> {
+                RemoveFromPlaylistDialog.create(selection as ArrayList<PlaylistSong>)
+                    .show(activity.supportFragmentManager, "ADD_PLAYLIST")
+                return
+            }
+        }
+        super.onMultipleItemAction(menuItem, selection)
+    }
 
-	override fun onCheckCanStartDrag(holder: ViewHolder, position: Int, x: Int, y: Int): Boolean {
-		return onMoveItemListener != null && position > 0 && (ViewUtil.hitTest(
-				holder.dragView!!, x, y
-		) || ViewUtil.hitTest(holder.image!!, x, y))
-	}
+    override fun onCheckCanStartDrag(holder: ViewHolder, position: Int, x: Int, y: Int): Boolean {
+        return onMoveItemListener != null && position > 0 && (ViewUtil.hitTest(
+            holder.dragView!!, x, y
+        ) || ViewUtil.hitTest(holder.image!!, x, y))
+    }
 
-	override fun onGetItemDraggableRange(holder: ViewHolder, position: Int): ItemDraggableRange {
-		return ItemDraggableRange(1, dataSet.size)
-	}
+    override fun onGetItemDraggableRange(holder: ViewHolder, position: Int): ItemDraggableRange {
+        return ItemDraggableRange(1, dataSet.size)
+    }
 
-	override fun onMoveItem(fromPosition: Int, toPosition: Int) {
-		if (onMoveItemListener != null && fromPosition != toPosition) {
-			onMoveItemListener.onMoveItem(fromPosition - 1, toPosition - 1)
-		}
-	}
+    override fun onMoveItem(fromPosition: Int, toPosition: Int) {
+        if (onMoveItemListener != null && fromPosition != toPosition) {
+            onMoveItemListener.onMoveItem(fromPosition - 1, toPosition - 1)
+        }
+    }
 
-	override fun onCheckCanDrop(draggingPosition: Int, dropPosition: Int): Boolean {
-		return dropPosition > 0
-	}
+    override fun onCheckCanDrop(draggingPosition: Int, dropPosition: Int): Boolean {
+        return dropPosition > 0
+    }
 
-	override fun onItemDragStarted(position: Int) {
-		notifyDataSetChanged()
-	}
+    override fun onItemDragStarted(position: Int) {
+        notifyDataSetChanged()
+    }
 
-	override fun onItemDragFinished(fromPosition: Int, toPosition: Int, result: Boolean) {
-		notifyDataSetChanged()
-	}
+    override fun onItemDragFinished(fromPosition: Int, toPosition: Int, result: Boolean) {
+        notifyDataSetChanged()
+    }
 
-	interface OnMoveItemListener {
-		fun onMoveItem(fromPosition: Int, toPosition: Int)
-	}
+    interface OnMoveItemListener {
+        fun onMoveItem(fromPosition: Int, toPosition: Int)
+    }
 
-	inner class ViewHolder(itemView: View) : PlaylistSongAdapter.ViewHolder(itemView), DraggableItemViewHolder {
-		@DraggableItemStateFlags
-		private var mDragStateFlags: Int = 0
+    inner class ViewHolder(itemView: View) : PlaylistSongAdapter.ViewHolder(itemView), DraggableItemViewHolder {
+        @DraggableItemStateFlags
+        private var mDragStateFlags: Int = 0
 
-		override var songMenuRes: Int
-			get() = code.name.monkey.retromusic.R.menu.menu_item_playlist_song
-			set(value) {
-				super.songMenuRes = value
-			}
+        override var songMenuRes: Int
+            get() = code.name.monkey.retromusic.R.menu.menu_item_playlist_song
+            set(value) {
+                super.songMenuRes = value
+            }
 
-		init {
-			if (dragView != null) {
-				if (onMoveItemListener != null) {
-					dragView?.visibility = View.VISIBLE
-				} else {
-					dragView?.visibility = View.GONE
-				}
-			}
-		}
+        init {
+            if (dragView != null) {
+                if (onMoveItemListener != null) {
+                    dragView?.visibility = View.VISIBLE
+                } else {
+                    dragView?.visibility = View.GONE
+                }
+            }
+        }
 
-		override fun onSongMenuItemClick(item: MenuItem): Boolean {
-			when (item.itemId) {
-				code.name.monkey.retromusic.R.id.action_remove_from_playlist -> {
-					RemoveFromPlaylistDialog.create(song as PlaylistSong)
-						.show(activity.supportFragmentManager, "REMOVE_FROM_PLAYLIST")
-					return true
-				}
-			}
-			return super.onSongMenuItemClick(item)
-		}
+        override fun onSongMenuItemClick(item: MenuItem): Boolean {
+            when (item.itemId) {
+                code.name.monkey.retromusic.R.id.action_remove_from_playlist -> {
+                    RemoveFromPlaylistDialog.create(song as PlaylistSong)
+                        .show(activity.supportFragmentManager, "REMOVE_FROM_PLAYLIST")
+                    return true
+                }
+            }
+            return super.onSongMenuItemClick(item)
+        }
 
-		@DraggableItemStateFlags
-		override fun getDragStateFlags(): Int {
-			return mDragStateFlags
-		}
+        @DraggableItemStateFlags
+        override fun getDragStateFlags(): Int {
+            return mDragStateFlags
+        }
 
-		override fun setDragStateFlags(@DraggableItemStateFlags flags: Int) {
-			mDragStateFlags = flags
-		}
-	}
+        override fun setDragStateFlags(@DraggableItemStateFlags flags: Int) {
+            mDragStateFlags = flags
+        }
+    }
 
-	companion object {
-		val TAG: String = OrderablePlaylistSongAdapter::class.java.simpleName
-	}
+    companion object {
+        val TAG: String = OrderablePlaylistSongAdapter::class.java.simpleName
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
index 62df7bc9..a0970bcf 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
@@ -1,6 +1,5 @@
 package code.name.monkey.retromusic.adapter.song
 
-import android.graphics.Color
 import android.graphics.PorterDuff.Mode
 import android.view.MenuItem
 import android.view.View
@@ -31,7 +30,7 @@ class PlayingQueueAdapter(
     private var current: Int,
     itemLayoutRes: Int
 ) : SongAdapter(
-    activity, dataSet, itemLayoutRes, false, null
+    activity, dataSet, itemLayoutRes, null
 ), DraggableItemAdapter<PlayingQueueAdapter.ViewHolder>, SwipeableItemAdapter<PlayingQueueAdapter.ViewHolder> {
 
     private var color = -1
@@ -48,9 +47,6 @@ class PlayingQueueAdapter(
         if (holder.itemViewType == HISTORY || holder.itemViewType == CURRENT) {
             setAlpha(holder, 0.5f)
         }
-        if (usePalette) {
-            setColor(holder, Color.WHITE)
-        }
     }
 
     private fun setColor(holder: SongAdapter.ViewHolder, white: Int) {
@@ -70,12 +66,6 @@ class PlayingQueueAdapter(
         }
     }
 
-    override fun usePalette(usePalette: Boolean) {
-        super.usePalette(usePalette)
-        this.usePalette = usePalette
-        notifyDataSetChanged()
-    }
-
     override fun getItemViewType(position: Int): Int {
         if (position < current) {
             return HISTORY
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt
index 31ac5268..44a29b28 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt
@@ -16,9 +16,8 @@ open class PlaylistSongAdapter(
     activity: AppCompatActivity,
     dataSet: ArrayList<Song>,
     itemLayoutRes: Int,
-    usePalette: Boolean,
     cabHolder: CabHolder?
-) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, usePalette, cabHolder, false) {
+) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, cabHolder) {
 
     init {
         this.setMultiSelectMenuRes(R.menu.menu_cannot_delete_single_songs_playlist_songs_selection)
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
index a0e63ae7..785a6925 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
@@ -7,48 +7,47 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
 import com.google.android.material.button.MaterialButton
-import java.util.*
+import java.util.ArrayList
 
 class ShuffleButtonSongAdapter(
-		activity: AppCompatActivity,
-		dataSet: ArrayList<Song>,
-		itemLayoutRes: Int,
-		usePalette: Boolean,
-		cabHolder: CabHolder?
-) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, usePalette, cabHolder) {
+    activity: AppCompatActivity,
+    dataSet: ArrayList<Song>,
+    itemLayoutRes: Int,
+    cabHolder: CabHolder?
+) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, cabHolder) {
 
-	override fun createViewHolder(view: View): SongAdapter.ViewHolder {
-		return ViewHolder(view)
-	}
+    override fun createViewHolder(view: View): SongAdapter.ViewHolder {
+        return ViewHolder(view)
+    }
 
-	override fun onBindViewHolder(holder: SongAdapter.ViewHolder, position: Int) {
-		if (holder.itemViewType == OFFSET_ITEM) {
-			val viewHolder = holder as ViewHolder
-			viewHolder.playAction?.let {
-				it.setOnClickListener {
-					MusicPlayerRemote.openQueue(dataSet, 0, true)
-				}
-			}
-			viewHolder.shuffleAction?.let {
-				it.setOnClickListener {
-					MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
-				}
-			}
-		} else {
-			super.onBindViewHolder(holder, position - 1)
-		}
-	}
+    override fun onBindViewHolder(holder: SongAdapter.ViewHolder, position: Int) {
+        if (holder.itemViewType == OFFSET_ITEM) {
+            val viewHolder = holder as ViewHolder
+            viewHolder.playAction?.let {
+                it.setOnClickListener {
+                    MusicPlayerRemote.openQueue(dataSet, 0, true)
+                }
+            }
+            viewHolder.shuffleAction?.let {
+                it.setOnClickListener {
+                    MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
+                }
+            }
+        } else {
+            super.onBindViewHolder(holder, position - 1)
+        }
+    }
 
-	inner class ViewHolder(itemView: View) : AbsOffsetSongAdapter.ViewHolder(itemView) {
-		val playAction: MaterialButton? = itemView.findViewById(R.id.playAction)
-		val shuffleAction: MaterialButton? = itemView.findViewById(R.id.shuffleAction)
+    inner class ViewHolder(itemView: View) : AbsOffsetSongAdapter.ViewHolder(itemView) {
+        val playAction: MaterialButton? = itemView.findViewById(R.id.playAction)
+        val shuffleAction: MaterialButton? = itemView.findViewById(R.id.shuffleAction)
 
-		override fun onClick(v: View?) {
-			if (itemViewType == OFFSET_ITEM) {
-				MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
-				return
-			}
-			super.onClick(v)
-		}
-	}
+        override fun onClick(v: View?) {
+            if (itemViewType == OFFSET_ITEM) {
+                MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
+                return
+            }
+            super.onClick(v)
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt
index c2d40a27..7bc79e95 100755
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt
@@ -6,14 +6,14 @@ import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
-import java.util.*
+import java.util.ArrayList
 
 class SimpleSongAdapter(
-        context: AppCompatActivity,
-        songs: ArrayList<Song>,
-        i: Int,
-        cabHolder: CabHolder?
-) : SongAdapter(context, songs, i, false, cabHolder) {
+    context: AppCompatActivity,
+    songs: ArrayList<Song>,
+    layoutRes: Int,
+    cabHolder: CabHolder?
+) : SongAdapter(context, songs, layoutRes, cabHolder) {
 
     override fun swapDataSet(dataSet: ArrayList<Song>) {
         this.dataSet.clear()
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
index 3ec4b293..35d55ab0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
@@ -25,7 +25,7 @@ import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import com.afollestad.materialcab.MaterialCab
 import com.bumptech.glide.Glide
-import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+import me.zhanghai.android.fastscroll.PopupTextProvider
 import java.util.ArrayList
 
 /**
@@ -36,21 +36,17 @@ open class SongAdapter(
     protected val activity: AppCompatActivity,
     dataSet: ArrayList<Song>,
     protected var itemLayoutRes: Int,
-    usePalette: Boolean,
     cabHolder: CabHolder?,
     showSectionName: Boolean = true
 ) : AbsMultiSelectAdapter<SongAdapter.ViewHolder, Song>(
     activity, cabHolder, R.menu.menu_media_selection
-), MaterialCab.Callback, FastScrollRecyclerView.SectionedAdapter {
+), MaterialCab.Callback, PopupTextProvider {
 
     var dataSet: ArrayList<Song>
-
-    protected var usePalette = false
     private var showSectionName = true
 
     init {
         this.dataSet = dataSet
-        this.usePalette = usePalette
         this.showSectionName = showSectionName
         this.setHasStableIds(true)
     }
@@ -60,11 +56,6 @@ open class SongAdapter(
         notifyDataSetChanged()
     }
 
-    open fun usePalette(usePalette: Boolean) {
-        this.usePalette = usePalette
-        notifyDataSetChanged()
-    }
-
     override fun getItemId(position: Int): Long {
         return dataSet[position].id.toLong()
     }
@@ -113,8 +104,7 @@ open class SongAdapter(
                 }
 
                 override fun onColorReady(color: Int) {
-                    if (usePalette) setColors(color, holder)
-                    else setColors(defaultFooterColor, holder)
+                    setColors(color, holder)
                 }
             })
     }
@@ -143,10 +133,7 @@ open class SongAdapter(
         SongsMenuHelper.handleMenuClick(activity, selection, menuItem.itemId)
     }
 
-    override fun getSectionName(position: Int): String {
-        if (!showSectionName) {
-            return ""
-        }
+    override fun getPopupText(position: Int): String {
         val sectionName: String? = when (PreferenceUtil.getInstance(activity).songSortOrder) {
             SortOrder.SongSortOrder.SONG_A_Z, SortOrder.SongSortOrder.SONG_Z_A -> dataSet[position].title
             SortOrder.SongSortOrder.SONG_ALBUM -> dataSet[position].albumName
@@ -157,6 +144,7 @@ open class SongAdapter(
                 return ""
             }
         }
+        println("File name -> $sectionName")
         return MusicUtil.getSectionName(sectionName)
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt
index 267b9b07..99ad3294 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt
@@ -12,10 +12,9 @@ abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A : RecyclerVie
 
     private var gridSize: Int = 0
     private var sortOrder: String? = null
-
-    private var usePaletteInitialized: Boolean = false
-    private var usePalette: Boolean = false
     private var currentLayoutRes: Int = 0
+    private val isLandscape: Boolean
+        get() = RetroUtil.isLandscape()
 
     val maxGridSize: Int
         get() = if (isLandscape) {
@@ -24,25 +23,24 @@ abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A : RecyclerVie
             resources.getInteger(R.integer.max_columns)
         }
 
-    /**
-     * Override to customize which item layout currentLayoutRes should be used. You might also want to
-     * override [.canUsePalette] then.
-     *
-     * @see .getGridSize
-     */
-    protected val itemLayoutRes: Int
-        get() = if (getGridSize() > maxGridSizeForList) {
-            R.layout.item_grid
+    fun itemLayoutRes(): Int {
+        return if (getGridSize() > maxGridSizeForList) {
+            loadLayoutRes()
         } else R.layout.item_list
+    }
 
-    protected val maxGridSizeForList: Int
+    protected abstract fun setLayoutRes(layoutRes: Int)
+
+    fun setAndSaveLayoutRes(layoutRes: Int) {
+        saveLayoutRes(layoutRes)
+        setLayoutRes(layoutRes)
+    }
+
+    private val maxGridSizeForList: Int
         get() = if (isLandscape) {
             activity!!.resources.getInteger(R.integer.default_list_columns_land)
         } else activity!!.resources.getInteger(R.integer.default_list_columns)
 
-    private val isLandscape: Boolean
-        get() = RetroUtil.isLandscape()
-
     fun getGridSize(): Int {
         if (gridSize == 0) {
             gridSize = if (isLandscape) {
@@ -71,19 +69,8 @@ abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A : RecyclerVie
         setSortOrder(sortOrder)
     }
 
-    /**
-     * @return whether the palette should be used at all or not
-     */
-    fun usePalette(): Boolean {
-        if (!usePaletteInitialized) {
-            usePalette = loadUsePalette()
-            usePaletteInitialized = true
-        }
-        return usePalette
-    }
-
     fun setAndSaveGridSize(gridSize: Int) {
-        val oldLayoutRes = itemLayoutRes
+        val oldLayoutRes = itemLayoutRes()
         this.gridSize = gridSize
         if (isLandscape) {
             saveGridSizeLand(gridSize)
@@ -91,7 +78,7 @@ abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A : RecyclerVie
             saveGridSize(gridSize)
         }
         // only recreate the adapter and layout manager if the layout currentLayoutRes has changed
-        if (oldLayoutRes != itemLayoutRes) {
+        if (oldLayoutRes != itemLayoutRes()) {
             invalidateLayoutManager()
             invalidateAdapter()
         } else {
@@ -99,19 +86,6 @@ abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A : RecyclerVie
         }
     }
 
-    fun setAndSaveUsePalette(usePalette: Boolean) {
-        this.usePalette = usePalette
-        saveUsePalette(usePalette)
-        setUsePalette(usePalette)
-    }
-
-    /**
-     * @return whether the palette option should be available for the current item layout or not
-     */
-    fun canUsePalette(): Boolean {
-        return itemLayoutRes == R.layout.item_card_color
-    }
-
     protected fun notifyLayoutResChanged(@LayoutRes res: Int) {
         this.currentLayoutRes = res
         val recyclerView = recyclerView()
@@ -149,4 +123,8 @@ abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A : RecyclerVie
     protected abstract fun loadUsePalette(): Boolean
 
     protected abstract fun setUsePalette(usePalette: Boolean)
+
+    protected abstract fun loadLayoutRes(): Int
+
+    protected abstract fun saveLayoutRes(layoutRes: Int)
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt
index b1134f39..dd4c3bf9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt
@@ -10,15 +10,16 @@ import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.util.DensityUtil
-import code.name.monkey.retromusic.util.ViewUtil
+import code.name.monkey.retromusic.util.ThemedFastScroller.create
+import code.name.monkey.retromusic.views.ScrollingViewOnApplyWindowInsetsListener
 import com.google.android.material.appbar.AppBarLayout
-import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.container
 import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.empty
 import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.emptyEmoji
 import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.emptyText
 import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.recyclerView
-import me.everything.android.ui.overscroll.OverScrollDecoratorHelper
+import me.zhanghai.android.fastscroll.FastScroller
+import me.zhanghai.android.fastscroll.FastScrollerBuilder
 
 abstract class AbsLibraryPagerRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : RecyclerView.LayoutManager> :
     AbsLibraryPagerFragment(), AppBarLayout.OnOffsetChangedListener {
@@ -41,13 +42,21 @@ abstract class AbsLibraryPagerRecyclerViewFragment<A : RecyclerView.Adapter<*>,
     }
 
     private fun setUpRecyclerView() {
-        if (recyclerView is FastScrollRecyclerView) {
-            ViewUtil.setUpFastScrollRecyclerViewColor(requireActivity(), recyclerView as FastScrollRecyclerView)
-        }
+
         recyclerView.layoutManager = layoutManager
         recyclerView.adapter = adapter
+        val fastScroller = create(recyclerView)
+        recyclerView.setOnApplyWindowInsetsListener(
+            ScrollingViewOnApplyWindowInsetsListener(
+                recyclerView,
+                fastScroller
+            )
+        )
+        //OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL)
+    }
 
-        OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL)
+    protected open fun createFastScroller(recyclerView: RecyclerView): FastScroller {
+        return FastScrollerBuilder(recyclerView).useMd2Style().build()
     }
 
     private fun initAdapter() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt
index ec1bd229..c1f976d1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt
@@ -53,13 +53,13 @@ open class AlbumsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<Al
     }
 
     override fun createAdapter(): AlbumAdapter {
-        var itemLayoutRes = itemLayoutRes
-        notifyLayoutResChanged(itemLayoutRes)
-        if (itemLayoutRes != R.layout.item_list) {
-            itemLayoutRes = PreferenceUtil.getInstance(requireContext()).getAlbumGridStyle(requireContext())
-        }
+        /* var itemLayoutRes = itemLayoutRes
+         notifyLayoutResChanged(itemLayoutRes)
+         if (itemLayoutRes != R.layout.item_list) {
+             itemLayoutRes = PreferenceUtil.getInstance(requireContext()).getAlbumGridStyle(requireContext())
+         }*/
         val dataSet = if (adapter == null) ArrayList() else adapter!!.dataSet
-        return AlbumAdapter(libraryFragment.mainActivity, dataSet, itemLayoutRes, loadUsePalette(), libraryFragment)
+        return AlbumAdapter(libraryFragment.mainActivity, dataSet, itemLayoutRes(), loadUsePalette(), libraryFragment)
     }
 
     public override fun loadUsePalette(): Boolean {
@@ -76,37 +76,30 @@ open class AlbumsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<Al
     }
 
     override fun loadSortOrder(): String {
-
         return PreferenceUtil.getInstance(requireContext()).albumSortOrder
     }
 
     override fun saveSortOrder(sortOrder: String) {
-
         PreferenceUtil.getInstance(requireContext()).albumSortOrder = sortOrder
     }
 
     override fun loadGridSize(): Int {
-
         return PreferenceUtil.getInstance(requireContext()).getAlbumGridSize(activity!!)
     }
 
     override fun saveGridSize(gridColumns: Int) {
-
         PreferenceUtil.getInstance(requireContext()).setAlbumGridSize(gridColumns)
     }
 
     override fun loadGridSizeLand(): Int {
-
         return PreferenceUtil.getInstance(requireContext()).getAlbumGridSizeLand(activity!!)
     }
 
     override fun saveGridSizeLand(gridColumns: Int) {
-
         PreferenceUtil.getInstance(requireContext()).setAlbumGridSizeLand(gridColumns)
     }
 
     override fun saveUsePalette(usePalette: Boolean) {
-
         PreferenceUtil.getInstance(requireContext()).setAlbumColoredFooters(usePalette)
     }
 
@@ -122,6 +115,18 @@ open class AlbumsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<Al
         adapter?.swapDataSet(ArrayList())
     }
 
+    override fun setLayoutRes(layoutRes: Int) {
+        //adapter?.itemCount?.let { adapter?.notifyItemRangeChanged(0, it) }
+    }
+
+    override fun loadLayoutRes(): Int {
+        return PreferenceUtil.getInstance(requireContext()).albumGridStyle
+    }
+
+    override fun saveLayoutRes(layoutRes: Int) {
+        PreferenceUtil.getInstance(requireContext()).albumGridStyle = layoutRes
+    }
+
     companion object {
         @JvmField
         var TAG: String = AlbumsFragment::class.java.simpleName
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt
index fb8da7ae..069ef0ee 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt
@@ -61,13 +61,14 @@ class ArtistsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<Artist
     }
 
     override fun createAdapter(): ArtistAdapter {
-        var itemLayoutRes = itemLayoutRes
-        notifyLayoutResChanged(itemLayoutRes)
-        if (itemLayoutRes != R.layout.item_list) {
-            itemLayoutRes = PreferenceUtil.getInstance(requireContext()).getArtistGridStyle(requireContext())
-        }
         val dataSet = if (adapter == null) ArrayList() else adapter!!.dataSet
-        return ArtistAdapter(libraryFragment.mainActivity, dataSet, itemLayoutRes, loadUsePalette(), libraryFragment)
+        return ArtistAdapter(
+            libraryFragment.mainActivity,
+            dataSet,
+            itemLayoutRes(),
+            loadUsePalette(),
+            libraryFragment
+        )
     }
 
     override fun loadGridSize(): Int {
@@ -128,4 +129,15 @@ class ArtistsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<Artist
             return fragment
         }
     }
+
+    override fun setLayoutRes(layoutRes: Int) {
+    }
+
+    override fun loadLayoutRes(): Int {
+        return PreferenceUtil.getInstance(requireContext()).artistGridStyle
+    }
+
+    override fun saveLayoutRes(layoutRes: Int) {
+        PreferenceUtil.getInstance(requireContext()).artistGridStyle = layoutRes
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java
index 6586b534..09776298 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java
@@ -35,7 +35,6 @@ import code.name.monkey.retromusic.util.RetroUtil;
 import com.afollestad.materialcab.MaterialCab;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.card.MaterialCardView;
-import io.reactivex.disposables.CompositeDisposable;
 import org.jetbrains.annotations.NotNull;
 
 public class LibraryFragment extends AbsMainActivityFragment implements CabHolder, MainActivityFragmentCallbacks {
@@ -48,8 +47,6 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
 
     private MaterialCab cab;
 
-    private CompositeDisposable disposable;
-
     private FragmentManager fragmentManager;
 
     private Toolbar toolbar;
@@ -76,7 +73,6 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
             @Nullable ViewGroup container,
             @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_library, container, false);
-        disposable = new CompositeDisposable();
         appBarLayout = view.findViewById(R.id.appBarLayout);
         toolbarContainer = view.findViewById(R.id.toolbarContainer);
         toolbar = view.findViewById(R.id.toolbar);
@@ -91,11 +87,6 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         inflateFragment();
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        disposable.dispose();
-    }
 
     public void addOnAppBarOffsetChangedListener(
             @NonNull AppBarLayout.OnOffsetChangedListener onOffsetChangedListener) {
@@ -126,11 +117,18 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
             AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment
                     = (AbsLibraryPagerRecyclerViewCustomGridSizeFragment) currentFragment;
 
-            MenuItem gridSizeItem = menu.findItem(R.id.action_grid_size);
-            if (RetroUtil.isLandscape()) {
-                gridSizeItem.setTitle(R.string.action_grid_size_land);
+            if (fragment instanceof SongsFragment) {
+                menu.removeItem(R.id.action_grid_size);
+                menu.removeItem(R.id.action_layout_type);
+            } else {
+                MenuItem gridSizeItem = menu.findItem(R.id.action_grid_size);
+                if (RetroUtil.isLandscape()) {
+                    gridSizeItem.setTitle(R.string.action_grid_size_land);
+                }
+                setUpGridSizeMenu(fragment, gridSizeItem.getSubMenu());
+                MenuItem layoutItem = menu.findItem(R.id.action_layout_type);
+                setupLayoutMenu(fragment, layoutItem.getSubMenu());
             }
-            setUpGridSizeMenu(fragment, gridSizeItem.getSubMenu());
 
             setUpSortOrderMenu(fragment, menu.findItem(R.id.action_sort_order).getSubMenu());
 
@@ -157,6 +155,9 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
             if (handleGridSizeMenuItem(fragment, item)) {
                 return true;
             }
+            if (handleLayoutResType(fragment, item)) {
+                return true;
+            }
             if (handleSortOrderMenuItem(fragment, item)) {
                 return true;
             }
@@ -220,8 +221,8 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
     }
 
     private boolean handleGridSizeMenuItem(
-            @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment
-                    fragment, @NonNull MenuItem item) {
+            @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment,
+            @NonNull MenuItem item) {
         int gridSize = 0;
         switch (item.getItemId()) {
             case R.id.action_grid_size_1:
@@ -258,6 +259,38 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         return false;
     }
 
+    private boolean handleLayoutResType(
+            final AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment,
+            final MenuItem item) {
+        int layoutRes = -1;
+        switch (item.getItemId()) {
+            case R.id.action_layout_normal:
+                layoutRes = R.layout.item_grid;
+                break;
+            case R.id.action_layout_card:
+                layoutRes = R.layout.item_card;
+                break;
+            case R.id.action_layout_colored_card:
+                layoutRes = R.layout.item_card_color;
+                break;
+            case R.id.action_layout_circular:
+                layoutRes = R.layout.item_grid_circle;
+                break;
+            case R.id.action_layout_image:
+                layoutRes = R.layout.image;
+                break;
+            case R.id.action_layout_gradient_image:
+                layoutRes = R.layout.item_image_gradient;
+                break;
+        }
+        if (layoutRes != -1) {
+            item.setChecked(true);
+            fragment.setAndSaveLayoutRes(layoutRes);
+            return true;
+        }
+        return false;
+    }
+
     private boolean handleSortOrderMenuItem(
             @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment
                     fragment, @NonNull MenuItem item) {
@@ -448,7 +481,31 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         sortOrderMenu.setGroupCheckable(0, true, true);
     }
 
-    @SuppressWarnings("ConstantConditions")
+    private void setupLayoutMenu(
+            @NonNull final AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment,
+            @NonNull final SubMenu subMenu) {
+        switch (fragment.itemLayoutRes()) {
+            case R.layout.item_card:
+                subMenu.findItem(R.id.action_layout_card).setChecked(true);
+                break;
+            case R.layout.item_grid:
+                subMenu.findItem(R.id.action_layout_normal).setChecked(true);
+                break;
+            case R.layout.item_card_color:
+                subMenu.findItem(R.id.action_layout_colored_card).setChecked(true);
+                break;
+            case R.layout.item_grid_circle:
+                subMenu.findItem(R.id.action_layout_circular).setChecked(true);
+                break;
+            case R.layout.image:
+                subMenu.findItem(R.id.action_layout_image).setChecked(true);
+                break;
+            case R.layout.item_image_gradient:
+                subMenu.findItem(R.id.action_layout_gradient_image).setChecked(true);
+                break;
+        }
+    }
+
     private void setupToolbar() {
         toolbar.setBackgroundTintList(
                 ColorStateList.valueOf(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface)));
@@ -462,6 +519,5 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         getMainActivity().setSupportActionBar(toolbar);
         toolbar.setNavigationOnClickListener(v -> showMainMenu(OptionsSheetDialogFragment.LIBRARY));
         ToolbarContentTintHelper.colorBackButton(toolbar);
-        //toolbar.setTitleTextColor(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorOnSecondary));
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
index 6551f194..d58e0365 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
@@ -2,7 +2,8 @@ package code.name.monkey.retromusic.fragments.mainactivity
 
 import android.os.Bundle
 import android.view.View
-import androidx.recyclerview.widget.GridLayoutManager
+import androidx.annotation.LayoutRes
+import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter
@@ -12,15 +13,15 @@ import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.mvp.presenter.SongPresenter
 import code.name.monkey.retromusic.mvp.presenter.SongView
 import code.name.monkey.retromusic.util.PreferenceUtil
-import java.util.*
+import java.util.ArrayList
 import javax.inject.Inject
 
-class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdapter, GridLayoutManager>(), SongView {
+class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdapter, LinearLayoutManager>(),
+    SongView {
 
     @Inject
     lateinit var songPresenter: SongPresenter
 
-
     override val emptyMessage: Int
         get() = R.string.no_songs
 
@@ -34,20 +35,18 @@ class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdap
         songPresenter.attachView(this)
     }
 
-    override fun createLayoutManager(): GridLayoutManager {
-        return GridLayoutManager(activity, getGridSize())
+    override fun createLayoutManager(): LinearLayoutManager {
+        return LinearLayoutManager(activity)
     }
 
     override fun createAdapter(): SongAdapter {
-        val itemLayoutRes = itemLayoutRes
-        notifyLayoutResChanged(itemLayoutRes)
-        val usePalette = loadUsePalette()
-
         val dataSet = if (adapter == null) ArrayList() else adapter!!.dataSet
-
-        return if (getGridSize() <= maxGridSizeForList) {
-            ShuffleButtonSongAdapter(libraryFragment.mainActivity, dataSet, itemLayoutRes, usePalette, libraryFragment)
-        } else SongAdapter(libraryFragment.mainActivity, dataSet, itemLayoutRes, usePalette, libraryFragment)
+        return ShuffleButtonSongAdapter(
+            libraryFragment.mainActivity,
+            dataSet,
+            R.layout.item_list,
+            libraryFragment
+        )
     }
 
     override fun songs(songs: ArrayList<Song>) {
@@ -83,11 +82,9 @@ class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdap
     }
 
     public override fun setUsePalette(usePalette: Boolean) {
-        adapter?.usePalette(usePalette)
     }
 
     override fun setGridSize(gridSize: Int) {
-        layoutManager?.spanCount = gridSize
         adapter?.notifyDataSetChanged()
     }
 
@@ -131,4 +128,15 @@ class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdap
             return fragment
         }
     }
+
+    override fun setLayoutRes(@LayoutRes layoutRes: Int) {
+    }
+
+    @LayoutRes
+    override fun loadLayoutRes(): Int {
+        return R.layout.item_list
+    }
+
+    override fun saveLayoutRes(@LayoutRes layoutRes: Int) {
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
index af55f095..1ddef96f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
@@ -18,7 +18,6 @@ import android.webkit.MimeTypeMap;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
@@ -26,25 +25,6 @@ import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.afollestad.materialcab.MaterialCab;
-import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.card.MaterialCardView;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.snackbar.Snackbar;
-import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity;
 import code.name.monkey.appthemehelper.util.ATHUtil;
@@ -68,575 +48,51 @@ import code.name.monkey.retromusic.util.FileUtil;
 import code.name.monkey.retromusic.util.NavigationUtil;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 import code.name.monkey.retromusic.util.RetroColorUtil;
-import code.name.monkey.retromusic.util.ViewUtil;
+import code.name.monkey.retromusic.util.ThemedFastScroller;
 import code.name.monkey.retromusic.views.BreadCrumbLayout;
+import code.name.monkey.retromusic.views.ScrollingViewOnApplyWindowInsetsListener;
+import com.afollestad.materialcab.MaterialCab;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.snackbar.Snackbar;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import me.zhanghai.android.fastscroll.FastScroller;
 
 public class FoldersFragment extends AbsMainActivityFragment implements
         MainActivityFragmentCallbacks,
         CabHolder, BreadCrumbLayout.SelectionCallback, SongFileAdapter.Callbacks,
         AppBarLayout.OnOffsetChangedListener, LoaderManager.LoaderCallbacks<List<File>> {
 
-    public static final String TAG = FoldersFragment.class.getSimpleName();
-    public static final FileFilter AUDIO_FILE_FILTER = file -> !file.isHidden() && (file.isDirectory() ||
-            FileUtil.fileIsMimeType(file, "audio/*", MimeTypeMap.getSingleton()) ||
-            FileUtil.fileIsMimeType(file, "application/opus", MimeTypeMap.getSingleton()) ||
-            FileUtil.fileIsMimeType(file, "application/ogg", MimeTypeMap.getSingleton()));
-
-    private static final String PATH = "path";
-    private static final String CRUMBS = "crumbs";
-    private static final int LOADER_ID = LoaderIds.Companion.getFOLDERS_FRAGMENT();
-
-    private View coordinatorLayout, empty;
-    private TextView emojiText;
-    private MaterialCardView toolbarContainer;
-    private Toolbar toolbar;
-    private BreadCrumbLayout breadCrumbs;
-    private AppBarLayout appBarLayout;
-    private FastScrollRecyclerView recyclerView;
-
-    private Comparator<File> fileComparator = (lhs, rhs) -> {
-        if (lhs.isDirectory() && !rhs.isDirectory()) {
-            return -1;
-        } else if (!lhs.isDirectory() && rhs.isDirectory()) {
-            return 1;
-        } else {
-            return lhs.getName().compareToIgnoreCase
-                    (rhs.getName());
-        }
-    };
-    private SongFileAdapter adapter;
-    private MaterialCab cab;
-
-    public FoldersFragment() {
-    }
-
-    public static FoldersFragment newInstance(Context context) {
-        return newInstance(PreferenceUtil.getInstance(context).getStartDirectory());
-    }
-
-    public static FoldersFragment newInstance(File directory) {
-        FoldersFragment frag = new FoldersFragment();
-        Bundle b = new Bundle();
-        b.putSerializable(PATH, directory);
-        frag.setArguments(b);
-        return frag;
-    }
-
-    public static File getDefaultStartDirectory() {
-        File musicDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC);
-        File startFolder;
-        if (musicDir.exists() && musicDir.isDirectory()) {
-            startFolder = musicDir;
-        } else {
-            File externalStorage = Environment.getExternalStorageDirectory();
-            if (externalStorage.exists() && externalStorage.isDirectory()) {
-                startFolder = externalStorage;
-            } else {
-                startFolder = new File("/"); // root
-            }
-        }
-        return startFolder;
-    }
-
-    private static File tryGetCanonicalFile(File file) {
-        try {
-            return file.getCanonicalFile();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return file;
-        }
-    }
-
-    private String getEmojiByUnicode(int unicode) {
-        return new String(Character.toChars(unicode));
-    }
-
-    private void initViews(View view) {
-        coordinatorLayout = view.findViewById(R.id.coordinatorLayout);
-        toolbarContainer = view.findViewById(R.id.toolbarContainer);
-        recyclerView = view.findViewById(R.id.recyclerView);
-        appBarLayout = view.findViewById(R.id.appBarLayout);
-        breadCrumbs = view.findViewById(R.id.breadCrumbs);
-        toolbar = view.findViewById(R.id.toolbar);
-        empty = view.findViewById(android.R.id.empty);
-        emojiText = view.findViewById(R.id.emptyEmoji);
-    }
-
-    private void setCrumb(BreadCrumbLayout.Crumb crumb, boolean addToHistory) {
-        if (crumb == null) {
-            return;
-        }
-        saveScrollPosition();
-        breadCrumbs.setActiveOrAdd(crumb, false);
-        if (addToHistory) {
-            breadCrumbs.addHistory(crumb);
-        }
-        getLoaderManager().restartLoader(LOADER_ID, null, this);
-    }
-
-    private void saveScrollPosition() {
-        BreadCrumbLayout.Crumb crumb = getActiveCrumb();
-        if (crumb != null) {
-            crumb.setScrollPosition(((LinearLayoutManager) recyclerView.getLayoutManager()).findFirstVisibleItemPosition());
-        }
-    }
-
-    @Nullable
-    private BreadCrumbLayout.Crumb getActiveCrumb() {
-        return breadCrumbs != null && breadCrumbs.size() > 0 ? breadCrumbs
-                .getCrumb(breadCrumbs.getActiveIndex()) : null;
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        if (breadCrumbs != null) {
-            outState.putParcelable(CRUMBS, breadCrumbs.getStateWrapper());
-        }
-
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        getMainActivity().setBottomBarVisibility(View.GONE);
-
-        if (savedInstanceState == null) {
-            //noinspection ConstantConditions
-            setCrumb(new BreadCrumbLayout.Crumb(
-                    FileUtil.safeGetCanonicalFile((File) getArguments().getSerializable(PATH))), true);
-        } else {
-            breadCrumbs.restoreFromStateWrapper(savedInstanceState.getParcelable(CRUMBS));
-            getLoaderManager().initLoader(LOADER_ID, null, this);
-        }
-    }
-
-    @NonNull
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_folder, container, false);
-        initViews(view);
-        return view;
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        setStatusBarColorAuto(view);
-        setUpAppbarColor();
-        setUpBreadCrumbs();
-        setUpRecyclerView();
-        setUpAdapter();
-    }
-
-    private void setUpAppbarColor() {
-        int primaryColor = ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface);
-        getMainActivity().setSupportActionBar(toolbar);
-        toolbar.setBackgroundTintList(ColorStateList.valueOf(primaryColor));
-        toolbarContainer.setCardBackgroundColor(ColorStateList.valueOf(primaryColor));
-        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
-        toolbar.setNavigationOnClickListener(v -> {
-            showMainMenu(OptionsSheetDialogFragment.FOLDER);
-        });
-        breadCrumbs.setActivatedContentColor(ATHUtil.INSTANCE.resolveColor(requireContext(), android.R.attr.textColorPrimary));
-        breadCrumbs.setDeactivatedContentColor(ATHUtil.INSTANCE.resolveColor(requireContext(), android.R.attr.textColorSecondary));
-        appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> getMainActivity().setLightStatusbar(!ATHUtil.INSTANCE.isWindowBackgroundDark(requireContext())));
-        toolbar.setOnClickListener(v -> {
-            ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(getMainActivity(), toolbarContainer, getString(R.string.transition_toolbar));
-            NavigationUtil.goToSearch(getMainActivity(), options);
-        });
-    }
-
-    private void setUpBreadCrumbs() {
-        breadCrumbs.setCallback(this);
-    }
-
-    private void setUpRecyclerView() {
-        //noinspection ConstantConditions
-        ViewUtil.INSTANCE.setUpFastScrollRecyclerViewColor(getActivity(), recyclerView,
-                ThemeStore.Companion.accentColor(getActivity()));
-        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
-        appBarLayout.addOnOffsetChangedListener(this);
-    }
-
-    private void setUpAdapter() {
-        adapter = new SongFileAdapter(getMainActivity(), new LinkedList<File>(), R.layout.item_list,
-                this, this);
-        adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
-            @Override
-            public void onChanged() {
-                super.onChanged();
-                checkIsEmpty();
-            }
-        });
-        recyclerView.setAdapter(adapter);
-        checkIsEmpty();
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        saveScrollPosition();
-    }
-
-    @Override
-    public void onDestroyView() {
-        appBarLayout.removeOnOffsetChangedListener(this);
-        super.onDestroyView();
-    }
-
-    @Override
-    public boolean handleBackPress() {
-        if (cab != null && cab.isActive()) {
-            cab.finish();
-            return true;
-        }
-        if (breadCrumbs != null && breadCrumbs.popHistory()) {
-            setCrumb(breadCrumbs.lastHistory(), false);
-            return true;
-        }
-        return false;
-    }
-
-    @NonNull
-    @Override
-    public MaterialCab openCab(int menuRes, MaterialCab.Callback callback) {
-        if (cab != null && cab.isActive()) {
-            cab.finish();
-        }
-        cab = new MaterialCab(getMainActivity(), R.id.cab_stub)
-                .setMenu(menuRes)
-                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
-                .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface)))
-                .start(callback);
-        return cab;
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        inflater.inflate(R.menu.menu_folders, menu);
-        ToolbarContentTintHelper.handleOnCreateOptionsMenu(getActivity(), toolbar, menu,
-                ATHToolbarActivity.getToolbarBackgroundColor(toolbar));
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-        ToolbarContentTintHelper.handleOnPrepareOptionsMenu(getActivity(), toolbar);
-    }
-
-    @Override
-    public void onCrumbSelection(BreadCrumbLayout.Crumb crumb, int index) {
-        setCrumb(crumb, true);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_go_to_start_directory:
-                setCrumb(new BreadCrumbLayout.Crumb(tryGetCanonicalFile(PreferenceUtil.getInstance(requireContext()).getStartDirectory())), true);
-                return true;
-            case R.id.action_scan:
-                BreadCrumbLayout.Crumb crumb = getActiveCrumb();
-                if (crumb != null) {
-                    //noinspection Convert2MethodRef
-                    new ListPathsAsyncTask(getActivity(), paths -> scanPaths(paths)).execute(new ListPathsAsyncTask.LoadingInfo(crumb.getFile(),
-                            AUDIO_FILE_FILTER));
-                }
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onFileSelected(File file) {
-        file = tryGetCanonicalFile(file); // important as we compare the path value later
-        if (file.isDirectory()) {
-            setCrumb(new BreadCrumbLayout.Crumb(file), true);
-        } else {
-            FileFilter fileFilter = pathname -> !pathname.isDirectory() && AUDIO_FILE_FILTER
-                    .accept(pathname);
-            new ListSongsAsyncTask(getActivity(), file, (songs, extra) -> {
-                File file1 = (File) extra;
-                int startIndex = -1;
-                for (int i = 0; i < songs.size(); i++) {
-                    if (file1.getPath().equals(songs.get(i).getData())) { // path is already canonical here
-                        startIndex = i;
-                        break;
-                    }
-                }
-                if (startIndex > -1) {
-                    MusicPlayerRemote.INSTANCE.openQueue(songs, startIndex, true);
-                } else {
-                    final File finalFile = file1;
-                    Snackbar.make(coordinatorLayout, Html.fromHtml(
-                            String.format(getString(R.string.not_listed_in_media_store), file1.getName())),
-                            Snackbar.LENGTH_LONG)
-                            .setAction(R.string.action_scan,
-                                    v -> new ListPathsAsyncTask(getActivity(), this::scanPaths)
-                                            .execute(new ListPathsAsyncTask.LoadingInfo(finalFile, AUDIO_FILE_FILTER)))
-                            .setActionTextColor(ThemeStore.Companion.accentColor(getActivity()))
-                            .show();
-                }
-            }).execute(new ListSongsAsyncTask.LoadingInfo(toList(file.getParentFile()), fileFilter,
-                    getFileComparator()));
-        }
-    }
-
-    @Override
-    public void onMultipleItemAction(MenuItem item, ArrayList<File> files) {
-        final int itemId = item.getItemId();
-        new ListSongsAsyncTask(getActivity(), null,
-                (songs, extra) -> SongsMenuHelper.INSTANCE.handleMenuClick(getActivity(), songs, itemId))
-                .execute(new ListSongsAsyncTask.LoadingInfo(files, AUDIO_FILE_FILTER, getFileComparator()));
-    }
-
-    private ArrayList<File> toList(File file) {
-        ArrayList<File> files = new ArrayList<>(1);
-        files.add(file);
-        return files;
-    }
-
-    private Comparator<File> getFileComparator() {
-        return fileComparator;
-    }
-
-    @Override
-    public void onFileMenuClicked(final File file, View view) {
-        PopupMenu popupMenu = new PopupMenu(getActivity(), view);
-        if (file.isDirectory()) {
-            popupMenu.inflate(R.menu.menu_item_directory);
-            popupMenu.setOnMenuItemClickListener(item -> {
-                final int itemId = item.getItemId();
-                switch (itemId) {
-                    case R.id.action_play_next:
-                    case R.id.action_add_to_current_playing:
-                    case R.id.action_add_to_playlist:
-                    case R.id.action_delete_from_device:
-                        new ListSongsAsyncTask(getActivity(), null, (songs, extra) -> {
-                            if (!songs.isEmpty()) {
-                                SongsMenuHelper.INSTANCE.handleMenuClick(getActivity(), songs, itemId);
-                            }
-                        }).execute(new ListSongsAsyncTask.LoadingInfo(toList(file), AUDIO_FILE_FILTER,
-                                getFileComparator()));
-                        return true;
-                    case R.id.action_set_as_start_directory:
-                        PreferenceUtil.getInstance(requireContext()).setStartDirectory(file);
-                        Toast.makeText(getActivity(),
-                                String.format(getString(R.string.new_start_directory), file.getPath()),
-                                Toast.LENGTH_SHORT).show();
-                        return true;
-                    case R.id.action_scan:
-                        new ListPathsAsyncTask(getActivity(), this::scanPaths)
-                                .execute(new ListPathsAsyncTask.LoadingInfo(file, AUDIO_FILE_FILTER));
-                        return true;
-                }
-                return false;
-            });
-        } else {
-            popupMenu.inflate(R.menu.menu_item_file);
-            popupMenu.setOnMenuItemClickListener(item -> {
-                final int itemId = item.getItemId();
-                switch (itemId) {
-                    case R.id.action_play_next:
-                    case R.id.action_add_to_current_playing:
-                    case R.id.action_add_to_playlist:
-                    case R.id.action_go_to_album:
-                    case R.id.action_go_to_artist:
-                    case R.id.action_share:
-                    case R.id.action_tag_editor:
-                    case R.id.action_details:
-                    case R.id.action_set_as_ringtone:
-                    case R.id.action_delete_from_device:
-                        new ListSongsAsyncTask(getActivity(), null, (songs, extra) -> SongMenuHelper.INSTANCE.handleMenuClick(getActivity(),
-                                songs.get(0), itemId)).execute(new ListSongsAsyncTask.LoadingInfo(toList(file), AUDIO_FILE_FILTER,
-                                getFileComparator()));
-                        return true;
-                    case R.id.action_scan:
-                        new ListPathsAsyncTask(getActivity(), this::scanPaths).execute(new ListPathsAsyncTask.LoadingInfo(file, AUDIO_FILE_FILTER));
-                        return true;
-                }
-                return false;
-            });
-        }
-        popupMenu.show();
-    }
-
-    @Override
-    public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-        recyclerView.setPadding(recyclerView.getPaddingLeft(), recyclerView.getPaddingTop(),
-                recyclerView.getPaddingRight(), DensityUtil.dip2px(requireContext(), 52f) +
-                        this.appBarLayout.getTotalScrollRange() + verticalOffset);
-    }
-
-    private void checkIsEmpty() {
-        emojiText.setText(getEmojiByUnicode(0x1F631));
-        if (empty != null) {
-            empty.setVisibility(adapter == null || adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
-        }
-    }
-
-    private void scanPaths(@Nullable String[] toBeScanned) {
-        if (getActivity() == null) {
-            return;
-        }
-        if (toBeScanned == null || toBeScanned.length < 1) {
-            Toast.makeText(getActivity(), R.string.nothing_to_scan, Toast.LENGTH_SHORT).show();
-        } else {
-            MediaScannerConnection.scanFile(getActivity().getApplicationContext(), toBeScanned, null,
-                    new UpdateToastMediaScannerCompletionListener(getActivity(), toBeScanned));
-        }
-    }
-
-    private void updateAdapter(@NonNull List<File> files) {
-        adapter.swapDataSet(files);
-        BreadCrumbLayout.Crumb crumb = getActiveCrumb();
-        if (crumb != null && recyclerView != null) {
-            ((LinearLayoutManager) recyclerView.getLayoutManager()).scrollToPositionWithOffset(crumb.getScrollPosition(), 0);
-        }
-    }
-
-    @NonNull
-    @Override
-    public Loader<List<File>> onCreateLoader(int id, Bundle args) {
-        return new AsyncFileLoader(this);
-    }
-
-    @Override
-    public void onLoadFinished(@NonNull Loader<List<File>> loader, List<File> data) {
-        updateAdapter(data);
-    }
-
-    @Override
-    public void onLoaderReset(@NonNull Loader<List<File>> loader) {
-        updateAdapter(new LinkedList<File>());
-    }
-
-    private static class AsyncFileLoader extends WrappedAsyncTaskLoader<List<File>> {
-
-        private WeakReference<FoldersFragment> fragmentWeakReference;
-
-        AsyncFileLoader(FoldersFragment foldersFragment) {
-            super(Objects.requireNonNull(foldersFragment.getActivity()));
-            fragmentWeakReference = new WeakReference<>(foldersFragment);
-        }
-
-        @Override
-        public List<File> loadInBackground() {
-            FoldersFragment foldersFragment = fragmentWeakReference.get();
-            File directory = null;
-            if (foldersFragment != null) {
-                BreadCrumbLayout.Crumb crumb = foldersFragment.getActiveCrumb();
-                if (crumb != null) {
-                    directory = crumb.getFile();
-                }
-            }
-            if (directory != null) {
-                List<File> files = FileUtil.listFiles(directory, AUDIO_FILE_FILTER);
-                Collections.sort(files, foldersFragment.getFileComparator());
-                return files;
-            } else {
-                return new LinkedList<>();
-            }
-        }
-    }
-
-    private static class ListSongsAsyncTask extends ListingFilesDialogAsyncTask<ListSongsAsyncTask.LoadingInfo, Void, ArrayList<Song>> {
-
-        private final Object extra;
-        private WeakReference<Context> contextWeakReference;
-        private WeakReference<OnSongsListedCallback> callbackWeakReference;
-
-        ListSongsAsyncTask(Context context, Object extra, OnSongsListedCallback callback) {
-            super(context);
-            this.extra = extra;
-            contextWeakReference = new WeakReference<>(context);
-            callbackWeakReference = new WeakReference<>(callback);
-        }
-
-        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-            checkCallbackReference();
-            checkContextReference();
-        }
-
-        @Override
-        protected ArrayList<Song> doInBackground(LoadingInfo... params) {
-            try {
-                LoadingInfo info = params[0];
-                List<File> files = FileUtil.listFilesDeep(info.files, info.fileFilter);
-
-                if (isCancelled() || checkContextReference() == null
-                        || checkCallbackReference() == null) {
-                    return null;
-                }
-
-                Collections.sort(files, info.fileComparator);
-
-                Context context = checkContextReference();
-                if (isCancelled() || context == null || checkCallbackReference() == null) {
-                    return null;
-                }
-
-                return FileUtil.matchFilesWithMediaStore(context, files);
-            } catch (Exception e) {
-                e.printStackTrace();
-                cancel(false);
-                return null;
-            }
-        }
-
-        @Override
-        protected void onPostExecute(ArrayList<Song> songs) {
-            super.onPostExecute(songs);
-            OnSongsListedCallback callback = checkCallbackReference();
-            if (songs != null && callback != null) {
-                callback.onSongsListed(songs, extra);
-            }
-        }
-
-        private Context checkContextReference() {
-            Context context = contextWeakReference.get();
-            if (context == null) {
-                cancel(false);
-            }
-            return context;
-        }
-
-        private OnSongsListedCallback checkCallbackReference() {
-            OnSongsListedCallback callback = callbackWeakReference.get();
-            if (callback == null) {
-                cancel(false);
-            }
-            return callback;
-        }
-
-        public interface OnSongsListedCallback {
-
-            void onSongsListed(@NonNull ArrayList<Song> songs, Object extra);
-        }
-
-        static class LoadingInfo {
-
-            final Comparator<File> fileComparator;
-            final FileFilter fileFilter;
-            final List<File> files;
-
-            LoadingInfo(@NonNull List<File> files, @NonNull FileFilter fileFilter,
-                        @NonNull Comparator<File> fileComparator) {
-                this.fileComparator = fileComparator;
-                this.fileFilter = fileFilter;
-                this.files = files;
-            }
-        }
-    }
-
     public static class ListPathsAsyncTask extends
             ListingFilesDialogAsyncTask<ListPathsAsyncTask.LoadingInfo, String, String[]> {
 
+        public static class LoadingInfo {
+
+            public final File file;
+
+            final FileFilter fileFilter;
+
+            public LoadingInfo(File file, FileFilter fileFilter) {
+                this.file = file;
+                this.fileFilter = fileFilter;
+            }
+        }
+
+        public interface OnPathsListedCallback {
+
+            void onPathsListed(@NonNull String[] paths);
+        }
+
         private WeakReference<OnPathsListedCallback> onPathsListedCallbackWeakReference;
 
         public ListPathsAsyncTask(Context context, OnPathsListedCallback callback) {
@@ -644,12 +100,6 @@ public class FoldersFragment extends AbsMainActivityFragment implements
             onPathsListedCallbackWeakReference = new WeakReference<>(callback);
         }
 
-        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-            checkCallbackReference();
-        }
-
         @Override
         protected String[] doInBackground(LoadingInfo... params) {
             try {
@@ -699,6 +149,12 @@ public class FoldersFragment extends AbsMainActivityFragment implements
             }
         }
 
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            checkCallbackReference();
+        }
+
         private OnPathsListedCallback checkCallbackReference() {
             OnPathsListedCallback callback = onPathsListedCallbackWeakReference.get();
             if (callback == null) {
@@ -706,22 +162,131 @@ public class FoldersFragment extends AbsMainActivityFragment implements
             }
             return callback;
         }
+    }
 
-        public interface OnPathsListedCallback {
+    private static class AsyncFileLoader extends WrappedAsyncTaskLoader<List<File>> {
 
-            void onPathsListed(@NonNull String[] paths);
+        private WeakReference<FoldersFragment> fragmentWeakReference;
+
+        AsyncFileLoader(FoldersFragment foldersFragment) {
+            super(Objects.requireNonNull(foldersFragment.getActivity()));
+            fragmentWeakReference = new WeakReference<>(foldersFragment);
         }
 
-        public static class LoadingInfo {
+        @Override
+        public List<File> loadInBackground() {
+            FoldersFragment foldersFragment = fragmentWeakReference.get();
+            File directory = null;
+            if (foldersFragment != null) {
+                BreadCrumbLayout.Crumb crumb = foldersFragment.getActiveCrumb();
+                if (crumb != null) {
+                    directory = crumb.getFile();
+                }
+            }
+            if (directory != null) {
+                List<File> files = FileUtil.listFiles(directory, AUDIO_FILE_FILTER);
+                Collections.sort(files, foldersFragment.getFileComparator());
+                return files;
+            } else {
+                return new LinkedList<>();
+            }
+        }
+    }
+
+    private static class ListSongsAsyncTask
+            extends ListingFilesDialogAsyncTask<ListSongsAsyncTask.LoadingInfo, Void, ArrayList<Song>> {
+
+        static class LoadingInfo {
+
+            final Comparator<File> fileComparator;
 
-            public final File file;
             final FileFilter fileFilter;
 
-            public LoadingInfo(File file, FileFilter fileFilter) {
-                this.file = file;
+            final List<File> files;
+
+            LoadingInfo(@NonNull List<File> files, @NonNull FileFilter fileFilter,
+                    @NonNull Comparator<File> fileComparator) {
+                this.fileComparator = fileComparator;
                 this.fileFilter = fileFilter;
+                this.files = files;
             }
         }
+
+        public interface OnSongsListedCallback {
+
+            void onSongsListed(@NonNull ArrayList<Song> songs, Object extra);
+        }
+
+        private WeakReference<OnSongsListedCallback> callbackWeakReference;
+
+        private WeakReference<Context> contextWeakReference;
+
+        private final Object extra;
+
+        ListSongsAsyncTask(Context context, Object extra, OnSongsListedCallback callback) {
+            super(context);
+            this.extra = extra;
+            contextWeakReference = new WeakReference<>(context);
+            callbackWeakReference = new WeakReference<>(callback);
+        }
+
+        @Override
+        protected ArrayList<Song> doInBackground(LoadingInfo... params) {
+            try {
+                LoadingInfo info = params[0];
+                List<File> files = FileUtil.listFilesDeep(info.files, info.fileFilter);
+
+                if (isCancelled() || checkContextReference() == null
+                        || checkCallbackReference() == null) {
+                    return null;
+                }
+
+                Collections.sort(files, info.fileComparator);
+
+                Context context = checkContextReference();
+                if (isCancelled() || context == null || checkCallbackReference() == null) {
+                    return null;
+                }
+
+                return FileUtil.matchFilesWithMediaStore(context, files);
+            } catch (Exception e) {
+                e.printStackTrace();
+                cancel(false);
+                return null;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(ArrayList<Song> songs) {
+            super.onPostExecute(songs);
+            OnSongsListedCallback callback = checkCallbackReference();
+            if (songs != null && callback != null) {
+                callback.onSongsListed(songs, extra);
+            }
+        }
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            checkCallbackReference();
+            checkContextReference();
+        }
+
+        private OnSongsListedCallback checkCallbackReference() {
+            OnSongsListedCallback callback = callbackWeakReference.get();
+            if (callback == null) {
+                cancel(false);
+            }
+            return callback;
+        }
+
+        private Context checkContextReference() {
+            Context context = contextWeakReference.get();
+            if (context == null) {
+                cancel(false);
+            }
+            return context;
+        }
     }
 
     private static abstract class ListingFilesDialogAsyncTask<Params, Progress, Result> extends
@@ -746,4 +311,467 @@ public class FoldersFragment extends AbsMainActivityFragment implements
                     .create();
         }
     }
+
+    public static final String TAG = FoldersFragment.class.getSimpleName();
+
+    public static final FileFilter AUDIO_FILE_FILTER = file -> !file.isHidden() && (file.isDirectory() ||
+            FileUtil.fileIsMimeType(file, "audio/*", MimeTypeMap.getSingleton()) ||
+            FileUtil.fileIsMimeType(file, "application/opus", MimeTypeMap.getSingleton()) ||
+            FileUtil.fileIsMimeType(file, "application/ogg", MimeTypeMap.getSingleton()));
+
+    private static final String PATH = "path";
+
+    private static final String CRUMBS = "crumbs";
+
+    private static final int LOADER_ID = LoaderIds.Companion.getFOLDERS_FRAGMENT();
+
+    private SongFileAdapter adapter;
+
+    private AppBarLayout appBarLayout;
+
+    private BreadCrumbLayout breadCrumbs;
+
+    private MaterialCab cab;
+
+    private View coordinatorLayout, empty;
+
+    private TextView emojiText;
+
+    private Comparator<File> fileComparator = (lhs, rhs) -> {
+        if (lhs.isDirectory() && !rhs.isDirectory()) {
+            return -1;
+        } else if (!lhs.isDirectory() && rhs.isDirectory()) {
+            return 1;
+        } else {
+            return lhs.getName().compareToIgnoreCase
+                    (rhs.getName());
+        }
+    };
+
+    private RecyclerView recyclerView;
+
+    private Toolbar toolbar;
+
+    private MaterialCardView toolbarContainer;
+
+    public static File getDefaultStartDirectory() {
+        File musicDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC);
+        File startFolder;
+        if (musicDir.exists() && musicDir.isDirectory()) {
+            startFolder = musicDir;
+        } else {
+            File externalStorage = Environment.getExternalStorageDirectory();
+            if (externalStorage.exists() && externalStorage.isDirectory()) {
+                startFolder = externalStorage;
+            } else {
+                startFolder = new File("/"); // root
+            }
+        }
+        return startFolder;
+    }
+
+    public static FoldersFragment newInstance(File directory) {
+        FoldersFragment frag = new FoldersFragment();
+        Bundle b = new Bundle();
+        b.putSerializable(PATH, directory);
+        frag.setArguments(b);
+        return frag;
+    }
+
+    public static FoldersFragment newInstance(Context context) {
+        return newInstance(PreferenceUtil.getInstance(context).getStartDirectory());
+    }
+
+    public FoldersFragment() {
+    }
+
+    @NonNull
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater,
+            ViewGroup container,
+            Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_folder, container, false);
+        initViews(view);
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        setStatusBarColorAuto(view);
+        setUpAppbarColor();
+        setUpBreadCrumbs();
+        setUpRecyclerView();
+        setUpAdapter();
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        getMainActivity().setBottomBarVisibility(View.GONE);
+
+        if (savedInstanceState == null) {
+            //noinspection ConstantConditions
+            setCrumb(new BreadCrumbLayout.Crumb(
+                    FileUtil.safeGetCanonicalFile((File) getArguments().getSerializable(PATH))), true);
+        } else {
+            breadCrumbs.restoreFromStateWrapper(savedInstanceState.getParcelable(CRUMBS));
+            getLoaderManager().initLoader(LOADER_ID, null, this);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        saveScrollPosition();
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (breadCrumbs != null) {
+            outState.putParcelable(CRUMBS, breadCrumbs.getStateWrapper());
+        }
+
+    }
+
+    @Override
+    public void onDestroyView() {
+        appBarLayout.removeOnOffsetChangedListener(this);
+        super.onDestroyView();
+    }
+
+    @Override
+    public boolean handleBackPress() {
+        if (cab != null && cab.isActive()) {
+            cab.finish();
+            return true;
+        }
+        if (breadCrumbs != null && breadCrumbs.popHistory()) {
+            setCrumb(breadCrumbs.lastHistory(), false);
+            return true;
+        }
+        return false;
+    }
+
+    @NonNull
+    @Override
+    public Loader<List<File>> onCreateLoader(int id, Bundle args) {
+        return new AsyncFileLoader(this);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.menu_folders, menu);
+        ToolbarContentTintHelper.handleOnCreateOptionsMenu(getActivity(), toolbar, menu,
+                ATHToolbarActivity.getToolbarBackgroundColor(toolbar));
+    }
+
+    @Override
+    public void onCrumbSelection(BreadCrumbLayout.Crumb crumb, int index) {
+        setCrumb(crumb, true);
+    }
+
+    @Override
+    public void onFileMenuClicked(final File file, View view) {
+        PopupMenu popupMenu = new PopupMenu(getActivity(), view);
+        if (file.isDirectory()) {
+            popupMenu.inflate(R.menu.menu_item_directory);
+            popupMenu.setOnMenuItemClickListener(item -> {
+                final int itemId = item.getItemId();
+                switch (itemId) {
+                    case R.id.action_play_next:
+                    case R.id.action_add_to_current_playing:
+                    case R.id.action_add_to_playlist:
+                    case R.id.action_delete_from_device:
+                        new ListSongsAsyncTask(getActivity(), null, (songs, extra) -> {
+                            if (!songs.isEmpty()) {
+                                SongsMenuHelper.INSTANCE.handleMenuClick(getActivity(), songs, itemId);
+                            }
+                        }).execute(new ListSongsAsyncTask.LoadingInfo(toList(file), AUDIO_FILE_FILTER,
+                                getFileComparator()));
+                        return true;
+                    case R.id.action_set_as_start_directory:
+                        PreferenceUtil.getInstance(requireContext()).setStartDirectory(file);
+                        Toast.makeText(getActivity(),
+                                String.format(getString(R.string.new_start_directory), file.getPath()),
+                                Toast.LENGTH_SHORT).show();
+                        return true;
+                    case R.id.action_scan:
+                        new ListPathsAsyncTask(getActivity(), this::scanPaths)
+                                .execute(new ListPathsAsyncTask.LoadingInfo(file, AUDIO_FILE_FILTER));
+                        return true;
+                }
+                return false;
+            });
+        } else {
+            popupMenu.inflate(R.menu.menu_item_file);
+            popupMenu.setOnMenuItemClickListener(item -> {
+                final int itemId = item.getItemId();
+                switch (itemId) {
+                    case R.id.action_play_next:
+                    case R.id.action_add_to_current_playing:
+                    case R.id.action_add_to_playlist:
+                    case R.id.action_go_to_album:
+                    case R.id.action_go_to_artist:
+                    case R.id.action_share:
+                    case R.id.action_tag_editor:
+                    case R.id.action_details:
+                    case R.id.action_set_as_ringtone:
+                    case R.id.action_delete_from_device:
+                        new ListSongsAsyncTask(getActivity(), null,
+                                (songs, extra) -> SongMenuHelper.INSTANCE.handleMenuClick(getActivity(),
+                                        songs.get(0), itemId))
+                                .execute(new ListSongsAsyncTask.LoadingInfo(toList(file), AUDIO_FILE_FILTER,
+                                        getFileComparator()));
+                        return true;
+                    case R.id.action_scan:
+                        new ListPathsAsyncTask(getActivity(), this::scanPaths)
+                                .execute(new ListPathsAsyncTask.LoadingInfo(file, AUDIO_FILE_FILTER));
+                        return true;
+                }
+                return false;
+            });
+        }
+        popupMenu.show();
+    }
+
+    @Override
+    public void onFileSelected(File file) {
+        file = tryGetCanonicalFile(file); // important as we compare the path value later
+        if (file.isDirectory()) {
+            setCrumb(new BreadCrumbLayout.Crumb(file), true);
+        } else {
+            FileFilter fileFilter = pathname -> !pathname.isDirectory() && AUDIO_FILE_FILTER
+                    .accept(pathname);
+            new ListSongsAsyncTask(getActivity(), file, (songs, extra) -> {
+                File file1 = (File) extra;
+                int startIndex = -1;
+                for (int i = 0; i < songs.size(); i++) {
+                    if (file1.getPath().equals(songs.get(i).getData())) { // path is already canonical here
+                        startIndex = i;
+                        break;
+                    }
+                }
+                if (startIndex > -1) {
+                    MusicPlayerRemote.INSTANCE.openQueue(songs, startIndex, true);
+                } else {
+                    final File finalFile = file1;
+                    Snackbar.make(coordinatorLayout, Html.fromHtml(
+                            String.format(getString(R.string.not_listed_in_media_store), file1.getName())),
+                            Snackbar.LENGTH_LONG)
+                            .setAction(R.string.action_scan,
+                                    v -> new ListPathsAsyncTask(getActivity(), this::scanPaths)
+                                            .execute(
+                                                    new ListPathsAsyncTask.LoadingInfo(finalFile, AUDIO_FILE_FILTER)))
+                            .setActionTextColor(ThemeStore.Companion.accentColor(getActivity()))
+                            .show();
+                }
+            }).execute(new ListSongsAsyncTask.LoadingInfo(toList(file.getParentFile()), fileFilter,
+                    getFileComparator()));
+        }
+    }
+
+    @Override
+    public void onLoadFinished(@NonNull Loader<List<File>> loader, List<File> data) {
+        updateAdapter(data);
+    }
+
+    @Override
+    public void onLoaderReset(@NonNull Loader<List<File>> loader) {
+        updateAdapter(new LinkedList<File>());
+    }
+
+    @Override
+    public void onMultipleItemAction(MenuItem item, ArrayList<File> files) {
+        final int itemId = item.getItemId();
+        new ListSongsAsyncTask(getActivity(), null,
+                (songs, extra) -> SongsMenuHelper.INSTANCE.handleMenuClick(getActivity(), songs, itemId))
+                .execute(new ListSongsAsyncTask.LoadingInfo(files, AUDIO_FILE_FILTER, getFileComparator()));
+    }
+
+    @Override
+    public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
+        recyclerView.setPadding(recyclerView.getPaddingLeft(), recyclerView.getPaddingTop(),
+                recyclerView.getPaddingRight(), DensityUtil.dip2px(requireContext(), 52f) +
+                        this.appBarLayout.getTotalScrollRange() + verticalOffset);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_go_to_start_directory:
+                setCrumb(new BreadCrumbLayout.Crumb(
+                        tryGetCanonicalFile(PreferenceUtil.getInstance(requireContext()).getStartDirectory())), true);
+                return true;
+            case R.id.action_scan:
+                BreadCrumbLayout.Crumb crumb = getActiveCrumb();
+                if (crumb != null) {
+                    //noinspection Convert2MethodRef
+                    new ListPathsAsyncTask(getActivity(), paths -> scanPaths(paths))
+                            .execute(new ListPathsAsyncTask.LoadingInfo(crumb.getFile(),
+                                    AUDIO_FILE_FILTER));
+                }
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        ToolbarContentTintHelper.handleOnPrepareOptionsMenu(getActivity(), toolbar);
+    }
+
+    @NonNull
+    @Override
+    public MaterialCab openCab(int menuRes, MaterialCab.Callback callback) {
+        if (cab != null && cab.isActive()) {
+            cab.finish();
+        }
+        cab = new MaterialCab(getMainActivity(), R.id.cab_stub)
+                .setMenu(menuRes)
+                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+                .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(
+                        ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface)))
+                .start(callback);
+        return cab;
+    }
+
+    private void checkIsEmpty() {
+        emojiText.setText(getEmojiByUnicode(0x1F631));
+        if (empty != null) {
+            empty.setVisibility(adapter == null || adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    @Nullable
+    private BreadCrumbLayout.Crumb getActiveCrumb() {
+        return breadCrumbs != null && breadCrumbs.size() > 0 ? breadCrumbs
+                .getCrumb(breadCrumbs.getActiveIndex()) : null;
+    }
+
+    private String getEmojiByUnicode(int unicode) {
+        return new String(Character.toChars(unicode));
+    }
+
+    private Comparator<File> getFileComparator() {
+        return fileComparator;
+    }
+
+    private void initViews(View view) {
+        coordinatorLayout = view.findViewById(R.id.coordinatorLayout);
+        toolbarContainer = view.findViewById(R.id.toolbarContainer);
+        recyclerView = view.findViewById(R.id.recyclerView);
+        appBarLayout = view.findViewById(R.id.appBarLayout);
+        breadCrumbs = view.findViewById(R.id.breadCrumbs);
+        toolbar = view.findViewById(R.id.toolbar);
+        empty = view.findViewById(android.R.id.empty);
+        emojiText = view.findViewById(R.id.emptyEmoji);
+    }
+
+    private void saveScrollPosition() {
+        BreadCrumbLayout.Crumb crumb = getActiveCrumb();
+        if (crumb != null) {
+            crumb.setScrollPosition(
+                    ((LinearLayoutManager) recyclerView.getLayoutManager()).findFirstVisibleItemPosition());
+        }
+    }
+
+    private void scanPaths(@Nullable String[] toBeScanned) {
+        if (getActivity() == null) {
+            return;
+        }
+        if (toBeScanned == null || toBeScanned.length < 1) {
+            Toast.makeText(getActivity(), R.string.nothing_to_scan, Toast.LENGTH_SHORT).show();
+        } else {
+            MediaScannerConnection.scanFile(getActivity().getApplicationContext(), toBeScanned, null,
+                    new UpdateToastMediaScannerCompletionListener(getActivity(), toBeScanned));
+        }
+    }
+
+    private void setCrumb(BreadCrumbLayout.Crumb crumb, boolean addToHistory) {
+        if (crumb == null) {
+            return;
+        }
+        saveScrollPosition();
+        breadCrumbs.setActiveOrAdd(crumb, false);
+        if (addToHistory) {
+            breadCrumbs.addHistory(crumb);
+        }
+        getLoaderManager().restartLoader(LOADER_ID, null, this);
+    }
+
+    private void setUpAdapter() {
+        adapter = new SongFileAdapter(getMainActivity(), new LinkedList<File>(), R.layout.item_list,
+                this, this);
+        adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
+            @Override
+            public void onChanged() {
+                super.onChanged();
+                checkIsEmpty();
+            }
+        });
+        recyclerView.setAdapter(adapter);
+        checkIsEmpty();
+    }
+
+    private void setUpAppbarColor() {
+        int primaryColor = ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface);
+        getMainActivity().setSupportActionBar(toolbar);
+        toolbar.setBackgroundTintList(ColorStateList.valueOf(primaryColor));
+        toolbarContainer.setCardBackgroundColor(ColorStateList.valueOf(primaryColor));
+        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
+        toolbar.setNavigationOnClickListener(v -> {
+            showMainMenu(OptionsSheetDialogFragment.FOLDER);
+        });
+        breadCrumbs.setActivatedContentColor(
+                ATHUtil.INSTANCE.resolveColor(requireContext(), android.R.attr.textColorPrimary));
+        breadCrumbs.setDeactivatedContentColor(
+                ATHUtil.INSTANCE.resolveColor(requireContext(), android.R.attr.textColorSecondary));
+        appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> getMainActivity()
+                .setLightStatusbar(!ATHUtil.INSTANCE.isWindowBackgroundDark(requireContext())));
+        toolbar.setOnClickListener(v -> {
+            ActivityOptions options = ActivityOptions
+                    .makeSceneTransitionAnimation(getMainActivity(), toolbarContainer,
+                            getString(R.string.transition_toolbar));
+            NavigationUtil.goToSearch(getMainActivity(), options);
+        });
+    }
+
+    private void setUpBreadCrumbs() {
+        breadCrumbs.setCallback(this);
+    }
+
+    private void setUpRecyclerView() {
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        appBarLayout.addOnOffsetChangedListener(this);
+        FastScroller fastScroller = ThemedFastScroller.INSTANCE.create(recyclerView);
+        recyclerView.setOnApplyWindowInsetsListener(
+                new ScrollingViewOnApplyWindowInsetsListener(recyclerView, fastScroller));
+    }
+
+    private ArrayList<File> toList(File file) {
+        ArrayList<File> files = new ArrayList<>(1);
+        files.add(file);
+        return files;
+    }
+
+    private void updateAdapter(@NonNull List<File> files) {
+        adapter.swapDataSet(files);
+        BreadCrumbLayout.Crumb crumb = getActiveCrumb();
+        if (crumb != null && recyclerView != null) {
+            ((LinearLayoutManager) recyclerView.getLayoutManager())
+                    .scrollToPositionWithOffset(crumb.getScrollPosition(), 0);
+        }
+    }
+
+    private static File tryGetCanonicalFile(File file) {
+        try {
+            return file.getCanonicalFile();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return file;
+        }
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
index b6f43afe..4be53f6b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
@@ -111,6 +111,7 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment(), OnSharedPref
         val song = MusicPlayerRemote.currentSong
         title.text = song.title
         text.text = song.artistName
+
         if (PreferenceUtil.getInstance(requireContext()).isSongInfo) {
             songInfo?.text = getSongInfo(song)
         } else {
@@ -266,7 +267,7 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment(), OnSharedPref
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         println(key)
         if (key == PreferenceUtil.EXTRA_SONG_INFO) {
-            updateSong()
+            if (activity != null) updateSong()
         }
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt
index e17af8f2..fd49bdb2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt
@@ -41,11 +41,7 @@ class PersonalizeSettingsFragment : AbsSettingsFragment(), SharedPreferences.OnS
         super.onViewCreated(view, savedInstanceState)
         PreferenceUtil.getInstance(requireContext()).registerOnSharedPreferenceChangedListener(this)
 
-        var preference: Preference? = findPreference("album_grid_style")
-        setSummary(preference!!)
-        preference = findPreference("artist_grid_style")
-        setSummary(preference!!)
-        preference = findPreference("home_artist_grid_style")
+        var preference: Preference? = findPreference("home_artist_grid_style")
         setSummary(preference!!)
         preference = findPreference("tab_text_mode")
         setSummary(preference!!)
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
index 6166e6db..2ca4e444 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
@@ -16,7 +16,12 @@ package code.name.monkey.retromusic.helper
 
 import android.annotation.TargetApi
 import android.app.Activity
-import android.content.*
+import android.content.ComponentName
+import android.content.ContentResolver
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
+import android.content.ServiceConnection
 import android.database.Cursor
 import android.net.Uri
 import android.os.Build
@@ -32,8 +37,9 @@ import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.util.PreferenceUtil
 import java.io.File
-import java.util.*
-
+import java.util.ArrayList
+import java.util.Random
+import java.util.WeakHashMap
 
 object MusicPlayerRemote {
     val TAG: String = MusicPlayerRemote::class.java.simpleName
@@ -116,7 +122,12 @@ object MusicPlayerRemote {
         }
         val binder = ServiceBinder(callback)
 
-        if (contextWrapper.bindService(Intent().setClass(contextWrapper, MusicService::class.java), binder, Context.BIND_AUTO_CREATE)) {
+        if (contextWrapper.bindService(
+                Intent().setClass(contextWrapper, MusicService::class.java),
+                binder,
+                Context.BIND_AUTO_CREATE
+            )
+        ) {
             mConnectionMap[contextWrapper] = binder
             return ServiceToken(contextWrapper)
         }
@@ -234,7 +245,11 @@ object MusicPlayerRemote {
         }
     }
 
-    private fun tryToHandleOpenPlayingQueue(queue: ArrayList<Song>, startPosition: Int, startPlaying: Boolean): Boolean {
+    private fun tryToHandleOpenPlayingQueue(
+        queue: ArrayList<Song>,
+        startPosition: Int,
+        startPlaying: Boolean
+    ): Boolean {
         if (playingQueue === queue) {
             if (startPlaying) {
                 playSongAt(startPosition)
@@ -291,7 +306,11 @@ object MusicPlayerRemote {
                 queue.add(song)
                 openQueue(queue, 0, false)
             }
-            Toast.makeText(musicService, musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_title_to_playing_queue), Toast.LENGTH_SHORT).show()
+            Toast.makeText(
+                musicService,
+                musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_title_to_playing_queue),
+                Toast.LENGTH_SHORT
+            ).show()
             return true
         }
         return false
@@ -304,7 +323,11 @@ object MusicPlayerRemote {
             } else {
                 openQueue(songs, 0, false)
             }
-            val toast = if (songs.size == 1) musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_title_to_playing_queue) else musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_x_titles_to_playing_queue, songs.size)
+            val toast =
+                if (songs.size == 1) musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_title_to_playing_queue) else musicService!!.resources.getString(
+                    code.name.monkey.retromusic.R.string.added_x_titles_to_playing_queue,
+                    songs.size
+                )
             Toast.makeText(musicService, toast, Toast.LENGTH_SHORT).show()
             return true
         }
@@ -320,7 +343,11 @@ object MusicPlayerRemote {
                 queue.add(song)
                 openQueue(queue, 0, false)
             }
-            Toast.makeText(musicService, musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_title_to_playing_queue), Toast.LENGTH_SHORT).show()
+            Toast.makeText(
+                musicService,
+                musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_title_to_playing_queue),
+                Toast.LENGTH_SHORT
+            ).show()
             return true
         }
         return false
@@ -333,7 +360,11 @@ object MusicPlayerRemote {
             } else {
                 openQueue(songs, 0, false)
             }
-            val toast = if (songs.size == 1) musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_title_to_playing_queue) else musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_x_titles_to_playing_queue, songs.size)
+            val toast =
+                if (songs.size == 1) musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_title_to_playing_queue) else musicService!!.resources.getString(
+                    code.name.monkey.retromusic.R.string.added_x_titles_to_playing_queue,
+                    songs.size
+                )
             Toast.makeText(musicService, toast, Toast.LENGTH_SHORT).show()
             return true
         }
@@ -385,18 +416,21 @@ object MusicPlayerRemote {
                         songId = uri.lastPathSegment
                     }
                     if (songId != null) {
-                        songs = SongLoader.getSongs(SongLoader.makeSongCursor(
+                        songs = SongLoader.getSongs(
+                            SongLoader.makeSongCursor(
                                 musicService!!,
                                 MediaStore.Audio.AudioColumns._ID + "=?",
                                 arrayOf(songId)
-                        ))
+                            )
+                        )
                     }
                 }
             }
             if (songs == null) {
                 var songFile: File? = null
                 if (uri.authority != null && uri.authority == "com.android.externalstorage.documents") {
-                    songFile = File(Environment.getExternalStorageDirectory(), uri.path?.split(":".toRegex(), 2)?.get(1))
+                    songFile =
+                        File(Environment.getExternalStorageDirectory(), uri.path?.split(":".toRegex(), 2)?.get(1))
                 }
                 if (songFile == null) {
                     val path = getFilePathFromUri(musicService!!, uri)
@@ -407,11 +441,13 @@ object MusicPlayerRemote {
                     songFile = File(uri.path)
                 }
                 if (songFile != null) {
-                    songs = SongLoader.getSongs(SongLoader.makeSongCursor(
+                    songs = SongLoader.getSongs(
+                        SongLoader.makeSongCursor(
                             musicService!!,
                             MediaStore.Audio.AudioColumns.DATA + "=?",
                             arrayOf(songFile.absolutePath)
-                    ))
+                        )
+                    )
                 }
             }
             if (songs != null && songs.isNotEmpty()) {
@@ -442,5 +478,4 @@ object MusicPlayerRemote {
     }
 
     class ServiceToken internal constructor(internal var mWrappedContext: ContextWrapper)
-
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java
index 86483e4b..f8d21d58 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java
@@ -112,7 +112,7 @@ public class MusicUtil {
 
     @NonNull
     public static String getPlaylistInfoString(@NonNull final Context context, @NonNull List<Song> songs) {
-        final long duration = getTotalDuration(context, songs);
+        final long duration = getTotalDuration(songs);
 
         return MusicUtil.buildInfoString(
                 MusicUtil.getSongCountString(context, songs.size()),
@@ -388,7 +388,7 @@ public class MusicUtil {
         if (musicMediaTitle.isEmpty()) {
             return "";
         }
-        return String.valueOf(musicMediaTitle.charAt(0)).toUpperCase();
+        return musicMediaTitle.substring(0, 1).toUpperCase();
     }
 
     @NonNull
@@ -400,7 +400,7 @@ public class MusicUtil {
         MusicUtil.playlist = playlist;
     }
 
-    public static long getTotalDuration(@NonNull final Context context, @NonNull List<Song> songs) {
+    public static long getTotalDuration(@NonNull List<Song> songs) {
         long duration = 0;
         for (int i = 0; i < songs.size(); i++) {
             duration += songs.get(i).getDuration();
@@ -408,7 +408,7 @@ public class MusicUtil {
         return duration;
     }
 
-    public static int indexOfSongInList(List<Song> songs, int songId) {
+    public static int indexOfSongInList(@NonNull List<Song> songs, int songId) {
         for (int i = 0; i < songs.size(); i++) {
             if (songs.get(i).getId() == songId) {
                 return i;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
index ad38af9a..8ca67846 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
@@ -28,7 +28,6 @@ import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StyleRes;
 import androidx.viewpager.widget.ViewPager;
-import code.name.monkey.retromusic.App;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.activities.MainActivity;
 import code.name.monkey.retromusic.fragments.AlbumCoverStyle;
@@ -118,11 +117,11 @@ public final class PreferenceUtil {
 
     public static final String TOGGLE_SEPARATE_LINE = "toggle_separate_line";
 
-    public static final String ALBUM_GRID_STYLE = "album_grid_style";
+    public static final String ALBUM_GRID_STYLE = "album_grid_style_home";
 
     public static final String HOME_ARTIST_GRID_STYLE = "home_artist_grid_style";
 
-    public static final String ARTIST_GRID_STYLE = "artist_grid_style";
+    public static final String ARTIST_GRID_STYLE = "artist_grid_style_home";
 
     public static final String TOGGLE_ADD_CONTROLS = "toggle_add_controls";
 
@@ -233,7 +232,7 @@ public final class PreferenceUtil {
     @NonNull
     public static PreferenceUtil getInstance(Context context) {
         if (sInstance == null) {
-            sInstance = new PreferenceUtil(App.Companion.getContext());
+            sInstance = new PreferenceUtil(context);
         }
         return sInstance;
     }
@@ -249,7 +248,7 @@ public final class PreferenceUtil {
         }
     }
 
-    public static boolean isAllowedToDownloadMetadata(final Context context) {
+    public static boolean isAllowedToDownloadMetadata(@NonNull Context context) {
         switch (getInstance(context).autoDownloadImagesPolicy()) {
             case "always":
                 return true;
@@ -392,26 +391,25 @@ public final class PreferenceUtil {
         return layoutRes;
     }
 
-    public final int getAlbumGridSize(Context context) {
+    public final int getAlbumGridSize(@NonNull Context context) {
         return mPreferences
                 .getInt(ALBUM_GRID_SIZE, context.getResources().getInteger(R.integer.default_grid_columns));
     }
 
-    public final int getAlbumGridSizeLand(Context context) {
-        return mPreferences.getInt(ALBUM_GRID_SIZE_LAND,
-                context.getResources().getInteger(R.integer.default_grid_columns_land));
+    public final int getAlbumGridSizeLand(@NonNull Context context) {
+        return mPreferences
+                .getInt(ALBUM_GRID_SIZE_LAND, context.getResources().getInteger(R.integer.default_grid_columns_land));
     }
 
     @LayoutRes
-    public int getAlbumGridStyle(Context context) {
-        int pos = Integer.parseInt(mPreferences.getString(ALBUM_GRID_STYLE, "0"));
-        TypedArray typedArray = context.getResources().obtainTypedArray(R.array.pref_grid_style_layout);
-        int layoutRes = typedArray.getResourceId(pos, -1);
-        typedArray.recycle();
-        if (layoutRes == -1) {
-            return R.layout.item_card;
-        }
-        return layoutRes;
+    public int getAlbumGridStyle() {
+        return mPreferences.getInt(ALBUM_GRID_STYLE, R.layout.item_grid);
+    }
+
+    public void setAlbumGridStyle(int layoutRes) {
+        mPreferences.edit()
+                .putInt(ALBUM_GRID_STYLE, layoutRes)
+                .apply();
     }
 
     public final String getAlbumSongSortOrder() {
@@ -455,15 +453,12 @@ public final class PreferenceUtil {
     }
 
     @LayoutRes
-    public int getArtistGridStyle(Context context) {
-        int pos = Integer.parseInt(Objects.requireNonNull(mPreferences.getString(ARTIST_GRID_STYLE, "0")));
-        TypedArray typedArray = context.getResources().obtainTypedArray(R.array.pref_grid_style_layout);
-        int layoutRes = typedArray.getResourceId(pos, -1);
-        typedArray.recycle();
-        if (layoutRes == -1) {
-            return R.layout.item_card;
-        }
-        return layoutRes;
+    public int getArtistGridStyle() {
+        return mPreferences.getInt(ARTIST_GRID_STYLE, R.layout.item_grid);
+    }
+
+    public void setArtistGridStyle(int viewAs) {
+        mPreferences.edit().putInt(ARTIST_GRID_STYLE, viewAs).apply();
     }
 
     public final String getArtistSongSortOrder() {
@@ -699,10 +694,6 @@ public final class PreferenceUtil {
         return mPreferences.getBoolean(SLEEP_TIMER_FINISH_SONG, false);
     }
 
-    public boolean isSongInfo() {
-        return mPreferences.getBoolean(EXTRA_SONG_INFO, false);
-    }
-
     public void setSleepTimerFinishMusic(final boolean value) {
         final SharedPreferences.Editor editor = mPreferences.edit();
         editor.putBoolean(SLEEP_TIMER_FINISH_SONG, value);
@@ -836,6 +827,10 @@ public final class PreferenceUtil {
         return mPreferences.getBoolean(SNOW_FALL_EFFECT, false);
     }
 
+    public boolean isSongInfo() {
+        return mPreferences.getBoolean(EXTRA_SONG_INFO, false);
+    }
+
     public boolean pauseOnZeroVolume() {
         return mPreferences.getBoolean(PAUSE_ON_ZERO_VOLUME, false);
     }
@@ -899,10 +894,6 @@ public final class PreferenceUtil {
         editor.apply();
     }
 
-    public void setArtistGridStyle(int viewAs) {
-        mPreferences.edit().putInt(ARTIST_GRID_STYLE, viewAs).apply();
-    }
-
     public void setBannerImagePath(String bannerImagePath) {
         mPreferences.edit().putString(BANNER_IMAGE_PATH, bannerImagePath)
                 .apply();
@@ -980,17 +971,6 @@ public final class PreferenceUtil {
         return mPreferences.getBoolean(SONG_COLORED_FOOTERS, false);
     }
 
-    public final boolean synchronizedLyricsShow() {
-        return mPreferences.getBoolean(SYNCHRONIZED_LYRICS_SHOW, true);
-    }
-
-    public boolean tabTitles() {
-        return getTabTitleMode() != LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED;
-    }
-
-    public boolean toggleSeparateLine() {
-        return mPreferences.getBoolean(TOGGLE_SEPARATE_LINE, false);
-    }
 
     public void unregisterOnSharedPreferenceChangedListener(
             @NonNull OnSharedPreferenceChangeListener sharedPreferenceChangeListener) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java b/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java
index a82b38c6..7d82b758 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java
@@ -19,25 +19,27 @@ import android.content.res.TypedArray;
 import android.graphics.Paint;
 import android.util.AttributeSet;
 import android.util.TypedValue;
-
 import androidx.annotation.FontRes;
-
-import com.google.android.material.textview.MaterialTextView;
-
 import code.name.monkey.retromusic.R;
+import com.google.android.material.textview.MaterialTextView;
 
 public class BaselineGridTextView extends MaterialTextView {
 
     private final float FOUR_DIP;
 
-    private float lineHeightMultiplierHint = 1f;
-    private float lineHeightHint = 0f;
-    private boolean maxLinesByHeight = false;
-    private int extraTopPadding = 0;
     private int extraBottomPadding = 0;
+
+    private int extraTopPadding = 0;
+
     private @FontRes
     int fontResId = 0;
 
+    private float lineHeightHint = 0f;
+
+    private float lineHeightMultiplierHint = 1f;
+
+    private boolean maxLinesByHeight = false;
+
     public BaselineGridTextView(Context context) {
         this(context, null);
     }
@@ -73,13 +75,21 @@ public class BaselineGridTextView extends MaterialTextView {
         computeLineHeight();
     }
 
-    public float getLineHeightMultiplierHint() {
-        return lineHeightMultiplierHint;
+    @Override
+    public int getCompoundPaddingBottom() {
+        // include extra padding to make the height a multiple of 4dp
+        return super.getCompoundPaddingBottom() + extraBottomPadding;
     }
 
-    public void setLineHeightMultiplierHint(float lineHeightMultiplierHint) {
-        this.lineHeightMultiplierHint = lineHeightMultiplierHint;
-        computeLineHeight();
+    @Override
+    public int getCompoundPaddingTop() {
+        // include extra padding to place the first line's baseline on the grid
+        return super.getCompoundPaddingTop() + extraTopPadding;
+    }
+
+    public @FontRes
+    int getFontResId() {
+        return fontResId;
     }
 
     public float getLineHeightHint() {
@@ -91,6 +101,15 @@ public class BaselineGridTextView extends MaterialTextView {
         computeLineHeight();
     }
 
+    public float getLineHeightMultiplierHint() {
+        return lineHeightMultiplierHint;
+    }
+
+    public void setLineHeightMultiplierHint(float lineHeightMultiplierHint) {
+        this.lineHeightMultiplierHint = lineHeightMultiplierHint;
+        computeLineHeight();
+    }
+
     public boolean getMaxLinesByHeight() {
         return maxLinesByHeight;
     }
@@ -100,23 +119,6 @@ public class BaselineGridTextView extends MaterialTextView {
         requestLayout();
     }
 
-    public @FontRes
-    int getFontResId() {
-        return fontResId;
-    }
-
-    @Override
-    public int getCompoundPaddingTop() {
-        // include extra padding to place the first line's baseline on the grid
-        return super.getCompoundPaddingTop() + extraTopPadding;
-    }
-
-    @Override
-    public int getCompoundPaddingBottom() {
-        // include extra padding to make the height a multiple of 4dp
-        return super.getCompoundPaddingBottom() + extraBottomPadding;
-    }
-
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         extraTopPadding = 0;
@@ -129,18 +131,18 @@ public class BaselineGridTextView extends MaterialTextView {
         checkMaxLines(height, MeasureSpec.getMode(heightMeasureSpec));
     }
 
-    private void parseTextAttrs(TypedArray a) {
-        if (a.hasValue(R.styleable.BaselineGridTextView_lineHeightMultiplierHint)) {
-            lineHeightMultiplierHint =
-                    a.getFloat(R.styleable.BaselineGridTextView_lineHeightMultiplierHint, 1f);
-        }
-        if (a.hasValue(R.styleable.BaselineGridTextView_lineHeightHint)) {
-            lineHeightHint = a.getDimensionPixelSize(
-                    R.styleable.BaselineGridTextView_lineHeightHint, 0);
-        }
-        if (a.hasValue(R.styleable.BaselineGridTextView_android_fontFamily)) {
-            fontResId = a.getResourceId(R.styleable.BaselineGridTextView_android_fontFamily, 0);
+    /**
+     * When measured with an exact height, text can be vertically clipped mid-line. Prevent
+     * this by setting the {@code maxLines} property based on the available space.
+     */
+    private void checkMaxLines(int height, int heightMode) {
+        if (!maxLinesByHeight || heightMode != MeasureSpec.EXACTLY) {
+            return;
         }
+
+        int textHeight = height - getCompoundPaddingTop() - getCompoundPaddingBottom();
+        int completeLines = (int) Math.floor(textHeight / getLineHeight());
+        setMaxLines(completeLines);
     }
 
     /**
@@ -181,15 +183,17 @@ public class BaselineGridTextView extends MaterialTextView {
         return extraBottomPadding;
     }
 
-    /**
-     * When measured with an exact height, text can be vertically clipped mid-line. Prevent
-     * this by setting the {@code maxLines} property based on the available space.
-     */
-    private void checkMaxLines(int height, int heightMode) {
-        if (!maxLinesByHeight || heightMode != MeasureSpec.EXACTLY) return;
-
-        int textHeight = height - getCompoundPaddingTop() - getCompoundPaddingBottom();
-        int completeLines = (int) Math.floor(textHeight / getLineHeight());
-        setMaxLines(completeLines);
+    private void parseTextAttrs(TypedArray a) {
+        if (a.hasValue(R.styleable.BaselineGridTextView_lineHeightMultiplierHint)) {
+            lineHeightMultiplierHint =
+                    a.getFloat(R.styleable.BaselineGridTextView_lineHeightMultiplierHint, 1f);
+        }
+        if (a.hasValue(R.styleable.BaselineGridTextView_lineHeightHint)) {
+            lineHeightHint = a.getDimensionPixelSize(
+                    R.styleable.BaselineGridTextView_lineHeightHint, 0);
+        }
+        if (a.hasValue(R.styleable.BaselineGridTextView_android_fontFamily)) {
+            fontResId = a.getResourceId(R.styleable.BaselineGridTextView_android_fontFamily, 0);
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml
index c2e026e0..df6fd3ad 100755
--- a/app/src/main/res/layout/activity_album.xml
+++ b/app/src/main/res/layout/activity_album.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:orientation="vertical"
     tools:ignore="UnusedAttribute">
 
@@ -16,8 +17,7 @@
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSurface">
+        android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appBarLayout"
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 3a9c9ba3..c2d949b9 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -80,7 +80,7 @@
             </com.google.android.material.card.MaterialCardView>
         </com.google.android.material.appbar.AppBarLayout>
 
-        <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 176ff771..e360c91a 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -67,7 +67,7 @@
                         app:contentInsetStart="0dp"
                         app:contentInsetStartWithNavigation="0dp"
                         app:popupTheme="?attr/toolbarPopupTheme"
-                        app:title="@string/search_hint"
+                        app:title="@string/action_search"
                         app:titleMarginStart="0dp"
                         app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
                         app:titleTextColor="?android:attr/textColorSecondary"
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 3294e976..32e9d4e6 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
@@ -6,14 +6,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clipToPadding="false"
         android:layoutAnimation="@anim/layout_animation_fall_down"
         android:scrollbars="none"
-        app:layout_dodgeInsetEdges="bottom" />
+        app:layout_dodgeInsetEdges="bottom"
+        tools:listitem="@layout/item_list" />
 
     <LinearLayout
         android:id="@android:id/empty"
diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml
index 502f3b27..5e011af4 100755
--- a/app/src/main/res/layout/fragment_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_player_playback_controls.xml
@@ -15,7 +15,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:gravity="center"
         android:minWidth="40dp"
         android:singleLine="true"
         android:textColor="?android:attr/textColorSecondary"
@@ -31,8 +30,8 @@
         style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="8"
         android:maxHeight="3dp"
+        android:padding="0dp"
         android:progressDrawable="@drawable/color_progress_seek"
         android:splitTrack="false"
         android:thumb="@drawable/switch_thumb_material"
@@ -47,7 +46,7 @@
         android:layout_width="40dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
-        android:gravity="center"
+        android:gravity="end"
         android:minWidth="40dp"
         android:singleLine="true"
         android:textColor="?android:attr/textColorSecondary"
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 6de1c335..d497d5c4 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -26,8 +26,7 @@
         <menu>
             <group
                 android:id="@+id/group_grid_size"
-                android:checkableBehavior="single"
-                tools:ignore="HardcodedText">
+                android:checkableBehavior="single">
                 <item
                     android:id="@+id/action_grid_size_1"
                     android:title="@string/grid_size_1" />
@@ -55,12 +54,41 @@
             </group>
         </menu>
     </item>
-
+    <item
+        android:id="@+id/action_layout_type"
+        android:icon="@drawable/ic_grid_size_white_24dp"
+        android:title="@string/grid_style_label"
+        app:showAsAction="never">
+        <menu>
+            <group
+                android:id="@+id/group_layout_type"
+                android:checkableBehavior="single">
+                <item
+                    android:id="@+id/action_layout_normal"
+                    android:title="@string/normal" />
+                <item
+                    android:id="@+id/action_layout_card"
+                    android:title="@string/card" />
+                <item
+                    android:id="@+id/action_layout_colored_card"
+                    android:title="@string/card_color_style" />
+                <item
+                    android:id="@+id/action_layout_circular"
+                    android:title="@string/circular" />
+                <item
+                    android:id="@+id/action_layout_image"
+                    android:title="@string/image" />
+                <item
+                    android:id="@+id/action_layout_gradient_image"
+                    android:title="@string/image_gradient" />
+            </group>
+        </menu>
+    </item>
     <item
         android:id="@+id/action_sort_order"
         android:icon="@drawable/ic_sort_white_24dp"
         android:title="@string/action_sort_order"
-        app:showAsAction="never">
+        app:showAsAction="ifRoom">
         <menu></menu>
     </item>
 
diff --git a/app/src/main/res/xml/pref_now_playing_screen.xml b/app/src/main/res/xml/pref_now_playing_screen.xml
index c0155844..edb39ff1 100644
--- a/app/src/main/res/xml/pref_now_playing_screen.xml
+++ b/app/src/main/res/xml/pref_now_playing_screen.xml
@@ -8,6 +8,13 @@
         android:title="@string/pref_title_now_playing_screen_appearance"
         app:icon="@drawable/ic_play_circle_filled_white_24dp" />
 
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+        android:defaultValue="false"
+        android:key="extra_song_info"
+        android:layout="@layout/list_item_view_switch"
+        android:summary="@string/pref_summary_extra_song_info"
+        android:title="@string/pref_title_extra_song_info" />
+
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
         android:layout="@layout/preference_category_title"
         android:title="@string/pref_header_album">
diff --git a/app/src/main/res/xml/pref_ui.xml b/app/src/main/res/xml/pref_ui.xml
index 037de101..8b648127 100644
--- a/app/src/main/res/xml/pref_ui.xml
+++ b/app/src/main/res/xml/pref_ui.xml
@@ -3,29 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
         android:layout="@layout/preference_category_title"
-        app:title="@string/grid_style_label">
-        <code.name.monkey.retromusic.preferences.MaterialListPreference
-            android:defaultValue="0"
-            android:entries="@array/pref_grid_style_list_titles"
-            android:entryValues="@array/pref_grid_style_list_values"
-            android:key="album_grid_style"
-            android:layout="@layout/list_item_view"
-            android:negativeButtonText="@null"
-            android:positiveButtonText="@null"
-            android:title="@string/pref_title_album_grid_style"
-            app:icon="@drawable/ic_album_white_24dp" />
-
-        <code.name.monkey.retromusic.preferences.MaterialListPreference
-            android:defaultValue="0"
-            android:entries="@array/pref_grid_style_list_titles"
-            android:entryValues="@array/pref_grid_style_list_values"
-            android:key="artist_grid_style"
-            android:layout="@layout/list_item_view"
-            android:negativeButtonText="@null"
-            android:positiveButtonText="@null"
-            android:title="@string/pref_title_artist_grid_style"
-            app:icon="@drawable/ic_artist_white_24dp" />
-
+        app:title="@string/home">
 
         <code.name.monkey.retromusic.preferences.MaterialListPreference
             android:defaultValue="0"
@@ -45,12 +23,7 @@
             android:summary="@string/pref_summary_home_banner"
             android:title="@string/pref_title_home_banner" />
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="false"
-            android:key="extra_song_info"
-            android:layout="@layout/list_item_view_switch"
-            android:summary="@string/pref_summary_extra_song_info"
-            android:title="@string/pref_title_extra_song_info" />
+
 
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java
index 3f04d133..649ec803 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java
@@ -78,7 +78,7 @@ public final class TintHelper {
     }
 
     @CheckResult
-    @Nullable
+    @NonNull
     public static Drawable createTintedDrawable(Context context,
             @DrawableRes int res, @ColorInt int color) {
         Drawable drawable = ContextCompat.getDrawable(context, res);
@@ -87,7 +87,7 @@ public final class TintHelper {
 
     // This returns a NEW Drawable because of the mutate() call. The mutate() call is necessary because Drawables with the same resource have shared states otherwise.
     @CheckResult
-    @Nullable
+    @NonNull
     public static Drawable createTintedDrawable(@Nullable Drawable drawable, @ColorInt int color) {
         if (drawable == null) {
             return null;