From d6a99f99e4059cdcf1b4856298c84932f5bcadaf Mon Sep 17 00:00:00 2001
From: h4h13 <hemanth@stacklighting.com>
Date: Thu, 13 Dec 2018 02:32:14 +0530
Subject: [PATCH] refactor code

---
 app/app.iml                                   | 25 +++----
 app/build.gradle                              | 13 ++--
 app/src/main/assets/retro-changelog.html      |  2 +-
 ...gment.kt => OptionsSheetDialogFragment.kt} | 45 ++++++++++--
 .../monkey/retromusic/loaders/HomeLoader.kt   | 10 ++-
 .../loaders/LastAddedSongsLoader.kt           |  2 +-
 .../retromusic/misc/DisposableManager.kt      | 24 +++++++
 .../retromusic/misc/DisposingObserver.kt      | 18 +++++
 .../retromusic/mvp/presenter/HomePresenter.kt | 40 ++++++-----
 .../monkey/retromusic/rest/KogouClient.java   |  5 --
 .../base/AbsSlidingMusicPanelActivity.kt      |  2 +-
 .../fragments/base/AbsMainActivityFragment.kt |  5 +-
 .../mainactivity/LibraryFragment.java         | 40 +++++++++--
 .../mainactivity/folders/FoldersFragment.java |  7 +-
 .../mainactivity/home/BannerHomeFragment.kt   | 19 +----
 .../main/res/drawable/color_progress_seek.xml |  8 +--
 .../main/res/layout-xlarge/abs_playlists.xml  | 22 ------
 app/src/main/res/layout/abs_playlists.xml     | 22 ------
 app/src/main/res/layout/activity_lyrics.xml   |  2 +-
 .../layout/activity_main_drawer_layout.xml    | 17 +----
 .../res/layout/activity_playlist_detail.xml   |  1 -
 app/src/main/res/layout/fragment_blur.xml     |  6 +-
 app/src/main/res/layout/fragment_library.xml  | 40 +++++++----
 app/src/main/res/layout/fragment_lyrics.xml   |  6 +-
 .../main/res/layout/fragment_main_options.xml | 72 ++++++++++++++++++-
 .../main/res/layout/fragment_mini_player.xml  |  1 +
 app/src/main/res/layout/fragment_synced.xml   | 11 +--
 .../main/res/menu/bottom_navigation_main.xml  |  6 ++
 app/src/main/res/menu/menu_main.xml           |  6 +-
 29 files changed, 299 insertions(+), 178 deletions(-)
 rename app/src/main/java/code/name/monkey/retromusic/dialogs/{MainOptionsBottomSheetDialogFragment.kt => OptionsSheetDialogFragment.kt} (68%)
 create mode 100644 app/src/main/java/code/name/monkey/retromusic/misc/DisposableManager.kt
 create mode 100644 app/src/main/java/code/name/monkey/retromusic/misc/DisposingObserver.kt

diff --git a/app/app.iml b/app/app.iml
index 0254e2ab..df688ff0 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -26,7 +26,7 @@
         <compilerSettings />
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/normalDebug" />
-          <option name="classpath" value="$MODULE_DIR$/libs/juniversalchardet-1.0.3.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/multidex-2.0.0.aar/54f1c3d62fe7611370986b2fd6299433/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-commons-0.9.6.0.aar/58a879902cb0ac3ddc64df096149fe46/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-core-0.9.6.0.aar/1f8e3dd9fae0498d8a2b20a6d7253988/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-material-cab-0.1.12.aar/9c42900bb5605e1bdfe3ab0e235a79a1/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-advrecyclerview-0.11.0.aar/f479cf015a5bf1cf2be9f67b5f61e8a6/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-library-1.4.2.aar/a4c8df9d4c82b43088c39cf40ed85a3c/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-PiracyChecker-1.2.4.aar/db7047f0be2eaaa05d1842ccbcdf7a3a/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-preference-v14-1.0.0.aar/49f613beb456c712b7c885b1e47921a5/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/preference-1.0.0.aar/09d14c4319f2ea0e6a7d9ea2ed2acdcf/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/material-1.0.0.aar/b08b25f9ffa1263b349fc2c360eb949d/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-cast-framework-16.1.0.aar/de6271c30562ce2e3a3e48ecfd2b0722/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-cast-16.1.0.aar/82acf659c838cfa552e493d26757efde/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/mediarouter-1.0.0.aar/0f51d48e9e4a54a3d40e01fedf0b0d83/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/appcompat-1.0.2.aar/51d975e57330a62a61a7c5076b372a3b/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-support-v13-1.0.0.aar/e3a1adcdd49604eb0fd828568cf2ded3/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-slidableactivity-2.0.6.aar/a296e722a28ba7b3c313bafb3d396cae/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-AndroidSlidingUpPanel-3.5.0.aar/d5f6c370b752c1da7940fe381e0d2da0/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/play-services-flags-16.0.1.aar/0426aa6426aa65925cc21145ee604c9b/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-base-16.0.1.aar/ff7f663d472273a39c1f9e5035cee493/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-tasks-16.0.1.aar/46ca5d484097e6056e5795d32e7feb54/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-basement-16.0.1.aar/fe118068c68b1dbfc07127d159b0f281/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-support-v4-1.0.0.aar/75081ac6e68e74d349599c47284282e4/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/fragment-1.0.0.aar/7dcca52b9f3c89547d2bc6c32882acdd/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-android-observablescrollview-1.6.0.aar/d0ba6da9008baf37d374ebe8c69e4e64/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-RecyclerView-FastScroll-1.0.16-kmod.aar/5f7e50484337cfe35fd96d28604ed7a1/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/recyclerview-1.0.0.aar/15506489faaa569025f8c230946d5fa1/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/gridlayout-1.0.0.aar/02a12bcc3f4967bc138de83cfc908fc8/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/cardview-1.0.0.aar/cb28f2f7a3c0f50c6e51bdf131dc03c2/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/palette-1.0.0.aar/9bad23e1c7243a9d9b9a0a86d8463e68/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/library-1.0.44.jar/0c5862b2e50c6075e293189842dff0a7/jetified-library-1.0.44.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/vectordrawable-animated-1.0.0.aar/d2cc00d4e003850bcb9d487c642652fc/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-support-core-ui-1.0.0.aar/a66d507f5de3c821483f581e7d3199f3/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-support-core-utils-1.0.0.aar/ae12074f4c498838c65e76ad7e16e009/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/loader-1.0.0.aar/923d1c35d98a3273df2353a83b534208/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/lifecycle-viewmodel-2.0.0.aar/22b27fac1b329c3aa4673eda8df6c0c2/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/vectordrawable-1.0.1.aar/d7f9664759736ab0457f64ed5d87a956/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/transition-1.0.0.aar/01d8c17fada51bd5683b1d6167b181c3/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/media-1.0.0.aar/83f90da8444def515596c40156312d8e/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/viewpager-1.0.0.aar/67dae85255cd99793582455500556ec2/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-1.0.0.aar/53c7c09af9948c6d5b0cf3d70c9fba00/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/drawerlayout-1.0.0.aar/ce19088f604150a58fb7267bc83e141f/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-1.0.0.aar/b559f66d4e01d3dff3b5758cd084a29f/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/customview-1.0.0.aar/17216852b8fa1c3e3fa02e641d706687/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-1.0.0.aar/2be931c5e9c38fa8f871ff0d0c1ef884/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-1.0.0.aar/6c5f0debea713bf36171fc09b0d10a9c/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/core-1.0.1.aar/0959e6cf61d61a7b41db6bd7c348f863/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/versionedparcelable-1.0.0.aar/77fd0ba8b75fef07154e5eaa40b7ebc1/jars/classes.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.0.0/42858b26cafdaa69b6149f45dfc2894007bc2c7a/collection-1.0.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/cursoradapter-1.0.0.aar/2e49d1cf66b9c2eeda70f202e41b9d5f/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/interpolator-1.0.0.aar/dde6490b82695a658a3e1758937d9976/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/documentfile-1.0.0.aar/889c649e165283ed472be8f347c79530/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-1.0.0.aar/fa6de59ab75fa0a66834c058f2d4e8db/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/print-1.0.0.aar/0fa0822a973d977ef87877e3017cfea5/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/lifecycle-runtime-2.0.0.aar/fa7af9cffcfa2723241f4b9cea7c7933/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/lifecycle-livedata-2.0.0.aar/a3b583314fba43e3fc7a8312379d4ab4/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/lifecycle-livedata-core-2.0.0.aar/5984d52892998721d92129423a836b5b/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/core-runtime-2.0.0.aar/3dbd159f925e7bb0466df2189ddc2b19/jars/classes.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.0.0/bb21b9a11761451b51624ac428d1f1bb5deeac38/core-common-2.0.0.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.0.0/e070ffae07452331bc5684734fce6831d531785c/lifecycle-common-2.0.0.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.0.0/45599f2cd5965ac05a1488fa2a5c0cdd7c499ead/annotation-1.0.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/converter-gson-2.4.0.jar/b224dd188a155a643291a79f7d5eae4a/jetified-converter-gson-2.4.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/adapter-rxjava2-2.4.0.jar/bdb8d5d82520264eff85259d835a662b/jetified-adapter-rxjava2-2.4.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/retrofit-2.4.0.jar/b7964051f8a1f9467255d8ee1ff1f4b1/jetified-retrofit-2.4.0.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/okhttp3-integration/1.5.0/1e5d1f5fb6f867397009e73ea79b108ef6a51fc0/okhttp3-integration-1.5.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/glide-3.8.0.jar/6c50118f57d86f3b2683cfe1f00dbecb/jetified-glide-3.8.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/rxandroid-2.0.2.aar/2ab2ae418dc7e378941bd6044d4b363d/jars/classes.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxjava/2.1.17/ebbf1af30cbae72ce658926fb7faf554225479f0/rxjava-2.1.17.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/logging-interceptor-3.11.0.jar/5f5f54118b67f2953bc3e7733351657d/jetified-logging-interceptor-3.11.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/okhttp-3.11.0.jar/0d8aa7ebc5f9ff01684263e20ba912cf/jetified-okhttp-3.11.0.jar:/Users/hemanths/Desktop/KeepSafe/RetroMusicPlayer/appthemehelper/build/intermediates/intermediate-jars/debug/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jaudiotagger-2.2.3.aar/0e6777357fb7de3b096a11b5685b5e10/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/nanohttpd-2.3.1.jar/b29bf458cf770f2f6f2508001475f750/jetified-nanohttpd-2.3.1.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.10/4d147bf43060dc43d61b096e24da1e67dfe0c032/kotlin-stdlib-jdk7-1.3.10.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/org.eclipse.egit.github.core-2.1.5.jar/9e3e71385dcca94af509978ef65d507a/jetified-org.eclipse.egit.github.core-2.1.5.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/android-snowfall-1.2.0.aar/37be5106a8414b37c119edab31b0ead7/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/gson-2.8.2.jar/2c4e77fe308afafda36de643efaa86bb/jetified-gson-2.8.2.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.reactivestreams/reactive-streams/1.0.2/323964c36556eb0e6209f65c1cef72b53b461ab8/reactive-streams-1.0.2.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/okio-1.14.0.jar/54837c7f01a42bfbb80c15456764fff5/jetified-okio-1.14.0.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.10/b178c1501609c6e4ee8be635513cb023a466457d/kotlin-stdlib-1.3.10.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.10/1b19d99229dcedad7caf50534dce38fe82845269/kotlin-stdlib-common-1.3.10.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/Users/hemanths/Library/Android/sdk/platforms/android-28/android.jar" />
+          <option name="classpath" value="$MODULE_DIR$/libs/juniversalchardet-1.0.3.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/multidex-2.0.0.aar/54f1c3d62fe7611370986b2fd6299433/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-okhttp3-integration-4.8.0.aar/ccf6491f5b58650d85d3a110fe4d1c89/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-glide-4.8.0.aar/8f010aab24d7f18dcfdb0de05ad13b9f/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-commons-0.9.6.0.aar/58a879902cb0ac3ddc64df096149fe46/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-core-0.9.6.0.aar/1f8e3dd9fae0498d8a2b20a6d7253988/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-material-cab-0.1.12.aar/9c42900bb5605e1bdfe3ab0e235a79a1/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-advrecyclerview-0.11.0.aar/f479cf015a5bf1cf2be9f67b5f61e8a6/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-library-1.4.2.aar/a4c8df9d4c82b43088c39cf40ed85a3c/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-PiracyChecker-1.2.4.aar/db7047f0be2eaaa05d1842ccbcdf7a3a/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-preference-v14-1.0.0.aar/49f613beb456c712b7c885b1e47921a5/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/preference-1.0.0.aar/09d14c4319f2ea0e6a7d9ea2ed2acdcf/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/material-1.0.0.aar/b08b25f9ffa1263b349fc2c360eb949d/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-cast-framework-16.1.0.aar/de6271c30562ce2e3a3e48ecfd2b0722/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-cast-16.1.0.aar/82acf659c838cfa552e493d26757efde/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/mediarouter-1.0.0.aar/0f51d48e9e4a54a3d40e01fedf0b0d83/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/appcompat-1.0.2.aar/51d975e57330a62a61a7c5076b372a3b/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-support-v13-1.0.0.aar/e3a1adcdd49604eb0fd828568cf2ded3/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-slidableactivity-2.0.6.aar/a296e722a28ba7b3c313bafb3d396cae/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-AndroidSlidingUpPanel-3.5.0.aar/d5f6c370b752c1da7940fe381e0d2da0/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/play-services-flags-16.0.1.aar/0426aa6426aa65925cc21145ee604c9b/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-base-16.0.1.aar/ff7f663d472273a39c1f9e5035cee493/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-tasks-16.0.1.aar/46ca5d484097e6056e5795d32e7feb54/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-basement-16.0.1.aar/fe118068c68b1dbfc07127d159b0f281/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-support-v4-1.0.0.aar/75081ac6e68e74d349599c47284282e4/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/fragment-1.0.0.aar/7dcca52b9f3c89547d2bc6c32882acdd/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-android-observablescrollview-1.6.0.aar/d0ba6da9008baf37d374ebe8c69e4e64/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-RecyclerView-FastScroll-1.0.16-kmod.aar/5f7e50484337cfe35fd96d28604ed7a1/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/recyclerview-1.0.0.aar/15506489faaa569025f8c230946d5fa1/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/gridlayout-1.0.0.aar/02a12bcc3f4967bc138de83cfc908fc8/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/cardview-1.0.0.aar/cb28f2f7a3c0f50c6e51bdf131dc03c2/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/palette-1.0.0.aar/9bad23e1c7243a9d9b9a0a86d8463e68/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/library-1.0.44.jar/0c5862b2e50c6075e293189842dff0a7/jetified-library-1.0.44.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-gifdecoder-4.8.0.aar/d9c5d24265dfd213c810521807459d1f/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/vectordrawable-animated-1.0.0.aar/d2cc00d4e003850bcb9d487c642652fc/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-support-core-ui-1.0.0.aar/a66d507f5de3c821483f581e7d3199f3/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-support-core-utils-1.0.0.aar/ae12074f4c498838c65e76ad7e16e009/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/loader-1.0.0.aar/923d1c35d98a3273df2353a83b534208/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/lifecycle-viewmodel-2.0.0.aar/22b27fac1b329c3aa4673eda8df6c0c2/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/vectordrawable-1.0.1.aar/d7f9664759736ab0457f64ed5d87a956/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/transition-1.0.0.aar/01d8c17fada51bd5683b1d6167b181c3/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/media-1.0.0.aar/83f90da8444def515596c40156312d8e/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/viewpager-1.0.0.aar/67dae85255cd99793582455500556ec2/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-1.0.0.aar/53c7c09af9948c6d5b0cf3d70c9fba00/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/drawerlayout-1.0.0.aar/ce19088f604150a58fb7267bc83e141f/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-1.0.0.aar/b559f66d4e01d3dff3b5758cd084a29f/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/customview-1.0.0.aar/17216852b8fa1c3e3fa02e641d706687/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-1.0.0.aar/2be931c5e9c38fa8f871ff0d0c1ef884/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-1.0.0.aar/6c5f0debea713bf36171fc09b0d10a9c/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/core-1.0.1.aar/0959e6cf61d61a7b41db6bd7c348f863/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/versionedparcelable-1.0.0.aar/77fd0ba8b75fef07154e5eaa40b7ebc1/jars/classes.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.0.0/42858b26cafdaa69b6149f45dfc2894007bc2c7a/collection-1.0.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/cursoradapter-1.0.0.aar/2e49d1cf66b9c2eeda70f202e41b9d5f/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/interpolator-1.0.0.aar/dde6490b82695a658a3e1758937d9976/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/documentfile-1.0.0.aar/889c649e165283ed472be8f347c79530/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-1.0.0.aar/fa6de59ab75fa0a66834c058f2d4e8db/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/print-1.0.0.aar/0fa0822a973d977ef87877e3017cfea5/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/lifecycle-runtime-2.0.0.aar/fa7af9cffcfa2723241f4b9cea7c7933/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/lifecycle-livedata-2.0.0.aar/a3b583314fba43e3fc7a8312379d4ab4/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/lifecycle-livedata-core-2.0.0.aar/5984d52892998721d92129423a836b5b/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/core-runtime-2.0.0.aar/3dbd159f925e7bb0466df2189ddc2b19/jars/classes.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.0.0/bb21b9a11761451b51624ac428d1f1bb5deeac38/core-common-2.0.0.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.0.0/e070ffae07452331bc5684734fce6831d531785c/lifecycle-common-2.0.0.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.0.0/45599f2cd5965ac05a1488fa2a5c0cdd7c499ead/annotation-1.0.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/converter-gson-2.4.0.jar/b224dd188a155a643291a79f7d5eae4a/jetified-converter-gson-2.4.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/adapter-rxjava2-2.4.0.jar/bdb8d5d82520264eff85259d835a662b/jetified-adapter-rxjava2-2.4.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/retrofit-2.4.0.jar/b7964051f8a1f9467255d8ee1ff1f4b1/jetified-retrofit-2.4.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/rxandroid-2.0.2.aar/2ab2ae418dc7e378941bd6044d4b363d/jars/classes.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxjava/2.1.17/ebbf1af30cbae72ce658926fb7faf554225479f0/rxjava-2.1.17.jar:/Users/hemanths/Desktop/KeepSafe/RetroMusicPlayer/appthemehelper/build/intermediates/intermediate-jars/debug/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jaudiotagger-2.2.3.aar/0e6777357fb7de3b096a11b5685b5e10/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/nanohttpd-2.3.1.jar/b29bf458cf770f2f6f2508001475f750/jetified-nanohttpd-2.3.1.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.10/4d147bf43060dc43d61b096e24da1e67dfe0c032/kotlin-stdlib-jdk7-1.3.10.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/org.eclipse.egit.github.core-2.1.5.jar/9e3e71385dcca94af509978ef65d507a/jetified-org.eclipse.egit.github.core-2.1.5.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/android-snowfall-1.2.0.aar/37be5106a8414b37c119edab31b0ead7/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/okhttp-3.10.0.jar/d49203fd249de05d85d19ece748e6a40/jetified-okhttp-3.10.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/gson-2.8.2.jar/2c4e77fe308afafda36de643efaa86bb/jetified-gson-2.8.2.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/disklrucache/4.8.0/a7448551cb3edd61bcf3d1b1136b670e630441cf/disklrucache-4.8.0.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/annotations/4.8.0/c4c9e79eb2bfeb9059fce55020c6b237402285f6/annotations-4.8.0.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.reactivestreams/reactive-streams/1.0.2/323964c36556eb0e6209f65c1cef72b53b461ab8/reactive-streams-1.0.2.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.10/b178c1501609c6e4ee8be635513cb023a466457d/kotlin-stdlib-1.3.10.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/okio-1.14.0.jar/54837c7f01a42bfbb80c15456764fff5/jetified-okio-1.14.0.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.10/1b19d99229dcedad7caf50534dce38fe82845269/kotlin-stdlib-common-1.3.10.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/Users/hemanths/Library/Android/sdk/platforms/android-28/android.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_normalDebug" />
@@ -55,6 +55,7 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/normalDebugUnitTest/compileNormalDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/normalDebug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/normal/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/normal/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/normal/debug" isTestSource="false" generated="true" />
@@ -68,6 +69,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/normalDebugAndroidTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/normal/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/normal/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/normal/debug" isTestSource="true" generated="true" />
@@ -81,6 +83,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/normalDebugUnitTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/normal/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/resources" type="java-test-resource" />
@@ -162,9 +165,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkNormalDebugClasspath" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkNormalReleaseClasspath" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkSansDebugClasspath" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkSansReleaseClasspath" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@@ -176,35 +176,28 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/linked_res_for_bundle" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged-not-compiled-resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/module_bundle" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res_stripped" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shrunk_linked_res_for_bundle" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/kotlin" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:okhttp3-integration:1.5.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:okhttp3-integration:4.8.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.10@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
@@ -227,6 +220,7 @@
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:annotations:4.8.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.10@jar" level="project" />
@@ -234,7 +228,6 @@
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-flags:16.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.hannesa2:AndroidSlidingUpPanel:3.5.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:3.11.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.mediarouter:mediarouter:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.4.0@jar" level="project" />
@@ -245,6 +238,7 @@
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.afollestad.material-dialogs:core:0.9.6.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:gifdecoder:4.8.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-cast-framework:16.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: __local_aars__:/Users/hemanths/Desktop/KeepSafe/RetroMusicPlayer/app/libs/juniversalchardet-1.0.3.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
@@ -252,13 +246,12 @@
     <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:4.8.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid:2.0.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.11.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.r0adkll:slidableactivity:2.0.6@aar" level="project" />
     <orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.2@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.AdrienPoupa:jaudiotagger:2.2.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:3.8.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: org.nanohttpd:nanohttpd:2.3.1@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.0.0@aar" level="project" />
@@ -276,11 +269,13 @@
     <orderEntry type="library" name="Gradle: com.github.javiersantos:PiracyChecker:1.2.4@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:16.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.2@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.palette:palette:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.preference:preference:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.jetradarmobile:android-snowfall:1.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:disklrucache:4.8.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.core:core:1.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:16.0.1@aar" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index ff8fe881..07c88b73 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 static def gitBranch() {
     def branch = 'GitHub'
@@ -31,8 +32,8 @@ android {
         vectorDrawables.useSupportLibrary = true
 
         applicationId "code.name.monkey.retromusic"
-        versionCode 262
-        versionName '3.0.030'
+        versionCode 263
+        versionName '3.0.130'
 
         multiDexEnabled true
 
@@ -144,12 +145,10 @@ dependencies {
     implementation "com.afollestad.material-dialogs:core:$materialDialog"
     implementation "com.afollestad.material-dialogs:commons:$materialDialog"
     implementation 'com.afollestad:material-cab:0.1.12'
-    implementation 'com.github.bumptech.glide:glide:3.8.0'
-    implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0'
+    implementation 'com.github.bumptech.glide:glide:4.8.0'
+    implementation 'com.github.bumptech.glide:okhttp3-integration:4.8.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
     implementation 'io.reactivex.rxjava2:rxjava:2.1.17'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
-    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
     implementation('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0@aar') {
         transitive = true
     }
@@ -170,6 +169,8 @@ dependencies {
     implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5'
     implementation 'com.github.jetradarmobile:android-snowfall:1.2.0'
     implementation 'com.github.javiersantos:PiracyChecker:1.2.4'
+
+    kapt 'com.github.bumptech.glide:compiler:4.8.0'
 }
 repositories {
     mavenCentral()
diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html
index 17716315..69f0c46e 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};
        }
        ul {
        list-style-position: outside;
        padding-left: 0;
        padding-right: 0;
        margin-left: 1em;
        }
        li {
        padding-top: 8px;
        }
    </style>
</head>
<body>
<h3>Version 3.0.00</h3>
<ul style="line-height:150%">
    <li>Converted app to kotlin</li>
    <li>Now you can add plain text home screen widget</li>
    <li>Good old side navigation bar for options</li>
    <li>Bug report for better tracking with milestones</li>
    <li>Snow fall effect can be enable from other settings</li>
    <li>Click new music mix to play songs</li>
    <li>Gradient image option for gird list</li>
    <li>Clear button for playing queue</li>
    <li>Folder list back button</li>
    <li>New theme Fit</li>
    <li>On library click on toolbar for accessing main menu
    </li>
    <li>On home click on toolbar for accessing search
    </li>
    <li>BottomSheetDialogue is now adaptable to screens, background colour and text size
        consistency.
    </li>
    <li>Removed coloured navigation bar option to making app adapt the primary colour</li>
    <li>Swipe up gesture for now playing removed, replaced with "tap to open", To achieve
        transparent navigation bar for desired themes.
    </li>
    <li>Improved tablet UI and home screen by adding suggestions toggle banner issues.</li>
    <li>Improving lyrics page</li>
</ul>

<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};
        }
        ul {
        list-style-position: outside;
        padding-left: 0;
        padding-right: 0;
        margin-left: 1em;
        }
        li {
        padding-top: 8px;
        }
    </style>
</head>
<body>
<h3>Version 3.0.00</h3>
<ul style="line-height:150%">
    <li>Converted app to kotlin</li>
    <li>Now you can add plain text home screen widget</li>
    <li>Good old side navigation bar for options</li>
    <li>Bug report for better tracking with milestones</li>
    <li>Snow fall effect can be enable from other settings(Works only one normal theme)</li>
    <li>Click new music mix to play songs</li>
    <li>Gradient image option for gird list</li>
    <li>Clear button for playing queue</li>
    <li>Folder list back button</li>
    <li>New theme Fit</li>
    <li>On library click on toolbar for accessing main menu
    </li>
    <li>On home click on toolbar for accessing search
    </li>
    <li>BottomSheetDialogue is now adaptable to screens, background colour and text size
        consistency.
    </li>
    <li>Removed coloured navigation bar option to making app adapt the primary colour</li>
    <li>Swipe up gesture for now playing removed, replaced with "tap to open", To achieve
        transparent navigation bar for desired themes.
    </li>
    <li>Improved tablet UI and home screen by adding suggestions toggle banner issues.</li>
    <li>Improving lyrics page</li>
</ul>

<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/dialogs/MainOptionsBottomSheetDialogFragment.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
similarity index 68%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/MainOptionsBottomSheetDialogFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
index 50f76b85..57ab22aa 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/MainOptionsBottomSheetDialogFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
@@ -1,15 +1,20 @@
 package code.name.monkey.retromusic.dialogs
 
+import android.content.Intent
 import android.graphics.Bitmap
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.app.ShareCompat
 import androidx.core.content.ContextCompat
 import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.Constants.USER_PROFILE
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.ui.activities.MainActivity
+import code.name.monkey.retromusic.ui.activities.bugreport.BugReportActivity
+import code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFragment
 import code.name.monkey.retromusic.util.Compressor
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
@@ -21,7 +26,7 @@ import kotlinx.android.synthetic.main.fragment_main_options.*
 import java.io.File
 import java.util.*
 
-class MainOptionsBottomSheetDialogFragment : RoundedBottomSheetDialogFragment(), View.OnClickListener {
+class OptionsSheetDialogFragment : RoundedBottomSheetDialogFragment(), View.OnClickListener {
 
     private val disposable = CompositeDisposable()
 
@@ -52,6 +57,7 @@ class MainOptionsBottomSheetDialogFragment : RoundedBottomSheetDialogFragment(),
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        actionBuyPro.visibility = if (!App.isProVersion) View.VISIBLE else View.GONE
         text!!.setTextColor(ThemeStore.textColorSecondary(context!!))
         titleWelcome!!.setTextColor(ThemeStore.textColorPrimary(context!!))
         titleWelcome!!.text = String.format("%s %s!", timeOfTheDay, PreferenceUtil.getInstance().userName)
@@ -61,24 +67,51 @@ class MainOptionsBottomSheetDialogFragment : RoundedBottomSheetDialogFragment(),
         actionAbout.setOnClickListener(this)
         actionSleepTimer.setOnClickListener(this)
         userInfoContainer.setOnClickListener(this)
+        actionEqualizer.setOnClickListener(this)
+        actionFolders.setOnClickListener(this)
         actionRate.setOnClickListener(this)
+        actionShare.setOnClickListener(this)
+        actionBuyPro.setOnClickListener(this)
+        actionBugReport.setOnClickListener(this)
     }
 
 
     override fun onClick(view: View) {
         val mainActivity = activity as MainActivity? ?: return
         when (view.id) {
+            R.id.actionFolders -> {
+                mainActivity.setCurrentFragment(FoldersFragment.newInstance(context), true)
+            }
             R.id.actionSettings -> NavigationUtil.goToSettings(mainActivity)
             R.id.actionAbout -> NavigationUtil.goToAbout(mainActivity)
             R.id.actionSleepTimer -> if (fragmentManager != null) {
                 SleepTimerDialog().show(fragmentManager!!, TAG)
             }
-            R.id.userInfoContainer -> NavigationUtil.goToUserInfo(activity!!)
+            R.id.userInfoContainer -> NavigationUtil.goToUserInfo(mainActivity)
             R.id.actionRate -> NavigationUtil.goToPlayStore(mainActivity)
+            R.id.actionShare -> shareApp()
+            R.id.actionBugReport -> prepareBugReport()
+            R.id.actionEqualizer -> NavigationUtil.openEqualizer(mainActivity)
+            R.id.actionBuyPro -> NavigationUtil.goToProVersion(mainActivity)
         }
         dismiss()
     }
 
+    private fun prepareBugReport() {
+        startActivity(Intent(activity, BugReportActivity::class.java))
+    }
+
+    private fun shareApp() {
+        val shareIntent = ShareCompat.IntentBuilder.from(activity)
+                .setType("songText/plain")
+                .setText(String.format(getString(R.string.app_share), activity!!.packageName))
+                .intent
+        if (shareIntent.resolveActivity(activity!!.packageManager) != null) {
+            startActivity(
+                    Intent.createChooser(shareIntent, resources.getText(R.string.action_share)))
+        }
+    }
+
     private fun loadImageFromStorage() {
 
         disposable.add(Compressor(context!!)
@@ -102,16 +135,16 @@ class MainOptionsBottomSheetDialogFragment : RoundedBottomSheetDialogFragment(),
 
         private const val TAG: String = "MainOptionsBottomSheetD"
 
-        fun newInstance(selected_id: Int): MainOptionsBottomSheetDialogFragment {
+        fun newInstance(selected_id: Int): OptionsSheetDialogFragment {
             val bundle = Bundle()
             bundle.putInt("selected_id", selected_id)
-            val fragment = MainOptionsBottomSheetDialogFragment()
+            val fragment = OptionsSheetDialogFragment()
             fragment.arguments = bundle
             return fragment
         }
 
-        fun newInstance(): MainOptionsBottomSheetDialogFragment {
-            return MainOptionsBottomSheetDialogFragment()
+        fun newInstance(): OptionsSheetDialogFragment {
+            return OptionsSheetDialogFragment()
         }
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/HomeLoader.kt b/app/src/main/java/code/name/monkey/retromusic/loaders/HomeLoader.kt
index 273d1a81..930d72b3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/HomeLoader.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/HomeLoader.kt
@@ -2,9 +2,9 @@ package code.name.monkey.retromusic.loaders
 
 
 import android.content.Context
-
-import java.util.ArrayList
+import code.name.monkey.retromusic.misc.DisposingObserver
 import code.name.monkey.retromusic.model.Playlist
+import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
 import code.name.monkey.retromusic.model.smartplaylist.HistoryPlaylist
 import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
@@ -13,9 +13,9 @@ import io.reactivex.Observable
 
 object HomeLoader {
 
-    fun getRecentAndTopThings(
-            context: Context): Observable<ArrayList<AbsSmartPlaylist>> {
+    fun getRecentAndTopThings(context: Context): Observable<ArrayList<AbsSmartPlaylist>> {
         val objects = ArrayList<AbsSmartPlaylist>()
+
         return Observable.create { e ->
 
             HistoryPlaylist(context).getSongs(context).subscribe { songs ->
@@ -56,6 +56,4 @@ object HomeLoader {
                 }
         return Observable.just(playlists)
     }
-
-
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/LastAddedSongsLoader.kt b/app/src/main/java/code/name/monkey/retromusic/loaders/LastAddedSongsLoader.kt
index 3aa2ab06..83bcbf2e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/LastAddedSongsLoader.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/LastAddedSongsLoader.kt
@@ -24,7 +24,7 @@ object LastAddedSongsLoader {
         return SongLoader.getSongs(makeLastAddedCursor(context))
     }
 
-    fun makeLastAddedCursor(@NonNull context: Context): Cursor? {
+    private fun makeLastAddedCursor(@NonNull context: Context): Cursor? {
         val cutoff = PreferenceUtil.getInstance().lastAddedCutoff
 
         return SongLoader.makeSongCursor(
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/DisposableManager.kt b/app/src/main/java/code/name/monkey/retromusic/misc/DisposableManager.kt
new file mode 100644
index 00000000..56035047
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/DisposableManager.kt
@@ -0,0 +1,24 @@
+package code.name.monkey.retromusic.misc
+
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.disposables.Disposable
+
+object DisposableManager {
+
+    private var compositeDisposable: CompositeDisposable? = null
+
+    fun add(disposable: Disposable) {
+        getCompositeDisposable().add(disposable)
+    }
+
+    fun dispose() {
+        getCompositeDisposable().dispose()
+    }
+
+    private fun getCompositeDisposable(): CompositeDisposable {
+        if (compositeDisposable == null || compositeDisposable!!.isDisposed) {
+            compositeDisposable = CompositeDisposable()
+        }
+        return compositeDisposable!!
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/DisposingObserver.kt b/app/src/main/java/code/name/monkey/retromusic/misc/DisposingObserver.kt
new file mode 100644
index 00000000..a54ad771
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/DisposingObserver.kt
@@ -0,0 +1,18 @@
+package code.name.monkey.retromusic.misc
+
+import androidx.annotation.CallSuper
+import io.reactivex.Observer
+import io.reactivex.disposables.Disposable
+
+class DisposingObserver<T> : Observer<T> {
+    @CallSuper
+    override fun onSubscribe(d: Disposable) {
+        DisposableManager.add(d)
+    }
+
+    override fun onNext(next: T) {}
+
+    override fun onError(e: Throwable) {}
+
+    override fun onComplete() {}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt
index 858acc00..477e4079 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt
@@ -3,6 +3,12 @@ package code.name.monkey.retromusic.mvp.presenter
 import code.name.monkey.retromusic.mvp.Presenter
 import code.name.monkey.retromusic.mvp.contract.HomeContract
 import code.name.monkey.retromusic.util.PreferenceUtil
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.disposables.Disposable
+
+operator fun CompositeDisposable.plusAssign(disposable: Disposable) {
+    add(disposable)
+}
 
 class HomePresenter(private val view: HomeContract.HomeView) : Presenter(), HomeContract.HomePresenter {
 
@@ -19,22 +25,24 @@ class HomePresenter(private val view: HomeContract.HomeView) : Presenter(), Home
     }
 
     override fun unsubscribe() {
-        disposable.clear()
+        if (!disposable.isDisposed) {
+            disposable.dispose()
+        }
     }
 
     fun loadPlaylists() {
-        disposable.add(repository.allPlaylists
+        disposable += repository.allPlaylists
                 .observeOn(schedulerProvider.ui())
                 .subscribeOn(schedulerProvider.io())
                 .subscribe({ playlist ->
                     if (!playlist.isEmpty()) {
                         view.playlists(playlist)
                     }
-                }, { view.showEmptyView() }, { view.completed() }))
+                }, { view.showEmptyView() }, { view.completed() })
     }
 
     override fun loadRecentAlbums() {
-        disposable.add(repository.recentAlbums
+        disposable += repository.recentAlbums
                 .observeOn(schedulerProvider.ui())
                 .subscribeOn(schedulerProvider.io())
                 .doOnSubscribe { view.loading() }
@@ -42,11 +50,11 @@ class HomePresenter(private val view: HomeContract.HomeView) : Presenter(), Home
                     if (!artists.isEmpty()) {
                         view.recentAlbum(artists)
                     }
-                }, { view.showEmptyView() }, { view.completed() }))
+                }, { view.showEmptyView() }, { view.completed() })
     }
 
     override fun loadTopAlbums() {
-        disposable.add(repository.topAlbums
+        disposable += repository.topAlbums
                 .observeOn(schedulerProvider.ui())
                 .subscribeOn(schedulerProvider.io())
                 .doOnSubscribe { view.loading() }
@@ -54,11 +62,11 @@ class HomePresenter(private val view: HomeContract.HomeView) : Presenter(), Home
                     if (!artists.isEmpty()) {
                         view.topAlbums(artists)
                     }
-                }, { view.showEmptyView() }, { view.completed() }))
+                }, { view.showEmptyView() }, { view.completed() })
     }
 
     override fun loadRecentArtists() {
-        disposable.add(repository.recentArtists
+        disposable += repository.recentArtists
                 .observeOn(schedulerProvider.ui())
                 .subscribeOn(schedulerProvider.io())
                 .doOnSubscribe { view.loading() }
@@ -66,11 +74,11 @@ class HomePresenter(private val view: HomeContract.HomeView) : Presenter(), Home
                     if (!artists.isEmpty()) {
                         view.recentArtist(artists)
                     }
-                }, { view.showEmptyView() }, { view.completed() }))
+                }, { view.showEmptyView() }, { view.completed() })
     }
 
     override fun loadTopArtists() {
-        disposable.add(repository.topArtists
+        disposable += repository.topArtists
                 .observeOn(schedulerProvider.ui())
                 .subscribeOn(schedulerProvider.io())
                 .doOnSubscribe { view.loading() }
@@ -78,20 +86,21 @@ class HomePresenter(private val view: HomeContract.HomeView) : Presenter(), Home
                     if (!artists.isEmpty()) {
                         view.topArtists(artists)
                     }
-                }, { view.showEmptyView() }, { view.completed() }))
+                }, { view.showEmptyView() }, { view.completed() })
 
     }
 
     override fun loadSuggestions() {
-        disposable.add(repository.suggestionSongs
+        disposable += repository.suggestionSongs
                 .observeOn(schedulerProvider.ui())
                 .subscribeOn(schedulerProvider.io())
                 .doOnSubscribe { view.loading() }
-                .subscribe({ songs -> view.suggestions(songs) }, { view.showEmptyView() }, { view.completed() }))
+                .subscribe({ songs -> view.suggestions(songs) },
+                        { view.showEmptyView() }, { view.completed() })
     }
 
     override fun loadGenres() {
-        disposable.add(repository.allGenres
+        disposable += repository.allGenres
                 .observeOn(schedulerProvider.ui())
                 .subscribeOn(schedulerProvider.io())
                 .doOnSubscribe { view.loading() }
@@ -99,7 +108,6 @@ class HomePresenter(private val view: HomeContract.HomeView) : Presenter(), Home
                     if (!genres.isEmpty()) {
                         view.geners(genres)
                     }
-                },
-                        { view.showEmptyView() }, { view.completed() }))
+                }, { view.showEmptyView() }, { view.completed() })
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/rest/KogouClient.java b/app/src/main/java/code/name/monkey/retromusic/rest/KogouClient.java
index dca902fa..906a2e1d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/rest/KogouClient.java
+++ b/app/src/main/java/code/name/monkey/retromusic/rest/KogouClient.java
@@ -13,7 +13,6 @@ import okhttp3.Call;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -64,11 +63,7 @@ public class KogouClient {
     }
 
     private static OkHttpClient.Builder createDefaultOkHttpClientBuilder() {
-        HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
-        interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
-
         return new OkHttpClient.Builder()
-                .addInterceptor(interceptor)
                 .cache(createDefaultCache(App.Companion.getInstance()))
                 .addInterceptor(createCacheControlInterceptor());
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt
index 94c9bb7a..292f2db5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -136,7 +136,7 @@ abstract class AbsSlidingMusicPanelActivity protected constructor() : AbsMusicSe
         bottomNavigationView.visibility = if (toggle) View.GONE else View.VISIBLE
     }
 
-    fun getBottomNavigationView(): BottomNavigationBarTinted? {
+    fun getBottomNavigationView(): BottomNavigationBarTinted {
         return bottomNavigationView
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.kt b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.kt
index f0a231f4..cb4babc4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.kt
@@ -8,10 +8,9 @@ import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.dialogs.MainOptionsBottomSheetDialogFragment
+import code.name.monkey.retromusic.dialogs.OptionsSheetDialogFragment
 import code.name.monkey.retromusic.ui.activities.MainActivity
 
-
 abstract class AbsMainActivityFragment : AbsMusicServiceFragment() {
 
     val mainActivity: MainActivity
@@ -51,6 +50,6 @@ abstract class AbsMainActivityFragment : AbsMusicServiceFragment() {
     }
 
     protected fun showMainMenu() {
-        MainOptionsBottomSheetDialogFragment.newInstance().show(childFragmentManager, "Main Menu")
+        OptionsSheetDialogFragment.newInstance().show(childFragmentManager, "Main Menu")
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java
index 0e821672..eb6c8c49 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java
@@ -2,6 +2,7 @@ package code.name.monkey.retromusic.ui.fragments.mainactivity;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -10,15 +11,20 @@ import android.view.MenuItem;
 import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.afollestad.materialcab.MaterialCab;
 import com.google.android.material.appbar.AppBarLayout;
 
+import java.io.File;
+import java.util.Objects;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
@@ -38,9 +44,17 @@ import code.name.monkey.retromusic.loaders.SongLoader;
 import code.name.monkey.retromusic.ui.activities.SettingsActivity;
 import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
 import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment;
+import code.name.monkey.retromusic.ui.fragments.mainactivity.home.BannerHomeFragment;
+import code.name.monkey.retromusic.util.Compressor;
 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.RetroUtil;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
+
+import static code.name.monkey.retromusic.Constants.USER_PROFILE;
 
 public class LibraryFragment extends AbsMainActivityFragment implements CabHolder, MainActivityFragmentCallbacks {
 
@@ -54,6 +68,8 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
 
     private MaterialCab cab;
     private FragmentManager fragmentManager;
+    private ImageView userImage;
+    private CompositeDisposable disposable = new CompositeDisposable();
 
     public static Fragment newInstance(int tab) {
         Bundle args = new Bundle();
@@ -76,9 +92,25 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         bannerTitle = view.findViewById(R.id.bannerTitle);
         appBarLayout = view.findViewById(R.id.appBarLayout);
         toolbar = view.findViewById(R.id.toolbar);
+        userImage = view.findViewById(R.id.userImage);
+        userImage.setOnClickListener(v -> showMainMenu());
+        loadImageFromStorage();
         return view;
     }
 
+    private void loadImageFromStorage() {
+        disposable.add(new Compressor(Objects.requireNonNull(getContext()))
+                .setMaxHeight(300)
+                .setMaxWidth(300)
+                .setQuality(75)
+                .setCompressFormat(Bitmap.CompressFormat.WEBP)
+                .compressToBitmapAsFlowable(new File(PreferenceUtil.getInstance().getProfileImage(), USER_PROFILE))
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(bitmap -> userImage.setImageBitmap(bitmap),
+                        throwable -> userImage.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_person_flat))));
+    }
+
     public void setTitle(@StringRes int name) {
         bannerTitle.setText(getString(name));
     }
@@ -134,7 +166,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         TintHelper.setTintAuto(contentContainer, primaryColor, true);
 
         toolbar.setBackgroundColor(primaryColor);
-        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
+        toolbar.setNavigationIcon(R.drawable.ic_search_white_24dp);
         appBarLayout.setBackgroundColor(primaryColor);
         appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) ->
                 getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext())));
@@ -169,7 +201,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
 
     @NonNull
     @Override
-    public MaterialCab openCab(int menuRes, MaterialCab.Callback callback) {
+    public MaterialCab openCab(int menuRes, @NonNull MaterialCab.Callback callback) {
         if (cab != null && cab.isActive()) {
             cab.finish();
         }
@@ -348,9 +380,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
                 MusicPlayerRemote.INSTANCE.openAndShuffleQueue(SongLoader.INSTANCE.getAllSongs(getContext())
                         .blockingFirst(), true);
                 return true;
-            case R.id.action_search:
-                NavigationUtil.goToSearch(getMainActivity());
-                break;
+
             case R.id.action_equalizer:
                 NavigationUtil.openEqualizer(getActivity());
                 return true;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java
index 1dbd69da..f20fc07c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java
@@ -230,14 +230,17 @@ public class FoldersFragment extends AbsMainActivityFragment implements
         //noinspection ConstantConditions
         int primaryColor = ThemeStore.primaryColor(getContext());
 
-
-        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
+        toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp);
         //noinspection ConstantConditions
+
         getActivity().setTitle(null);
         getMainActivity().setSupportActionBar(toolbar);
         TintHelper.setTintAuto(container, primaryColor, true);
         appBarLayout.setBackgroundColor(primaryColor);
         toolbar.setBackgroundColor(primaryColor);
+        toolbar.setNavigationOnClickListener(v -> {
+            getActivity().onBackPressed();
+        });
 
         breadCrumbs.setActivatedContentColor(ToolbarContentTintHelper.toolbarTitleColor(getActivity(), ColorUtil.darkenColor(primaryColor)));
         breadCrumbs.setDeactivatedContentColor(ToolbarContentTintHelper.toolbarSubtitleColor(getActivity(), ColorUtil.darkenColor(primaryColor)));
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.kt
index 35471ea0..428e4f98 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.kt
@@ -40,7 +40,6 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.abs_playlists.*
 import kotlinx.android.synthetic.main.fragment_banner_home.*
 import kotlinx.android.synthetic.main.home_section_content.*
 import java.io.File
@@ -58,11 +57,6 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
     private lateinit var userImage: ImageView
     private lateinit var toolbar: Toolbar
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        mainActivity.setBottomBarVisibility(View.GONE)
-    }
-
     override fun onCreateView(inflater: LayoutInflater, viewGroup: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(if (PreferenceUtil.getInstance().isHomeBanner) R.layout.fragment_banner_home else R.layout.fragment_home, viewGroup, false)
     }
@@ -95,16 +89,14 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
 
 
     private fun loadTimeImage(day: String) {
-
         if (bannerImage != null) {
             if (PreferenceUtil.getInstance().bannerImage.isEmpty()) {
-                Glide.with(activity).load(day)
+                /*Glide.with(activity).load(day)
                         .asBitmap()
                         .placeholder(R.drawable.material_design_default)
                         .diskCacheStrategy(DiskCacheStrategy.SOURCE)
-                        .into(bannerImage!!)
+                        .into(bannerImage!!)*/
             } else {
-
                 disposable.add(Compressor(context!!)
                         .setQuality(100)
                         .setCompressFormat(Bitmap.CompressFormat.WEBP)
@@ -140,8 +132,6 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        mainActivity.setBottomBarVisibility(View.GONE)
-
         toolbar = view.findViewById(R.id.toolbar)
 
         if (!PreferenceUtil.getInstance().isHomeBanner)
@@ -183,13 +173,10 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
         loadImageFromStorage(userImage)
         getTimeOfTheDay()
 
-        searchView.setOnClickListener {
-            NavigationUtil.goToSearch(activity!!)
-        }
     }
 
     private fun setupToolbar() {
-        toolbar.navigationIcon = TintHelper.createTintedDrawable(ContextCompat.getDrawable(context!!, R.drawable.ic_menu_white_24dp), ThemeStore.textColorPrimary(context!!))
+        toolbar.navigationIcon = TintHelper.createTintedDrawable(ContextCompat.getDrawable(context!!, R.drawable.ic_search_white_24dp), ThemeStore.textColorPrimary(context!!))
         mainActivity.title = null
         mainActivity.setSupportActionBar(toolbar)
         toolbar.setBackgroundColor(Color.TRANSPARENT)
diff --git a/app/src/main/res/drawable/color_progress_seek.xml b/app/src/main/res/drawable/color_progress_seek.xml
index 8091c388..5ad5b9a6 100755
--- a/app/src/main/res/drawable/color_progress_seek.xml
+++ b/app/src/main/res/drawable/color_progress_seek.xml
@@ -1,7 +1,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
-            <corners android:radius="5dp" />
+            <corners android:radius="8dp" />
             <solid android:color="@color/md_grey_200" />
         </shape>
     </item>
@@ -9,7 +9,7 @@
     <item android:id="@android:id/secondaryProgress">
         <clip>
             <shape android:shape="rectangle">
-                <corners android:radius="5dp" />
+                <corners android:radius="8dp" />
                 <solid android:color="@color/md_grey_200" />
             </shape>
         </clip>
@@ -17,9 +17,9 @@
 
     <item android:id="@android:id/progress">
         <clip>
-            <shape>
+            <shape android:shape="rectangle">
                 <solid android:color="@color/md_green_A700" />
-                <corners android:radius="5dp" />
+                <corners android:radius="8dp" />
             </shape>
         </clip>
     </item>
diff --git a/app/src/main/res/layout-xlarge/abs_playlists.xml b/app/src/main/res/layout-xlarge/abs_playlists.xml
index 8cba5ffa..5ec995ee 100644
--- a/app/src/main/res/layout-xlarge/abs_playlists.xml
+++ b/app/src/main/res/layout-xlarge/abs_playlists.xml
@@ -5,28 +5,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/searchView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="12dp"
-        app:cardUseCompatPadding="true">
-
-        <code.name.monkey.retromusic.views.IconImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:padding="14dp"
-            app:srcCompat="@drawable/ic_search_white_24dp" />
-
-        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:padding="12dp"
-            android:text="@string/search_hint" />
-    </com.google.android.material.card.MaterialCardView>
-
     <androidx.appcompat.widget.AppCompatTextView
         style="@style/SubTitleTextAppearance"
         android:text="@string/for_you" />
diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml
index 7832c9fa..4bb235dc 100644
--- a/app/src/main/res/layout/abs_playlists.xml
+++ b/app/src/main/res/layout/abs_playlists.xml
@@ -5,28 +5,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/searchView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="12dp"
-        app:cardUseCompatPadding="true">
-
-        <code.name.monkey.retromusic.views.IconImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:padding="14dp"
-            app:srcCompat="@drawable/ic_search_white_24dp" />
-
-        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:padding="12dp"
-            android:text="@string/search_hint" />
-    </com.google.android.material.card.MaterialCardView>
-
     <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         style="@style/SubTitleTextAppearance"
         android:text="@string/for_you" />
diff --git a/app/src/main/res/layout/activity_lyrics.xml b/app/src/main/res/layout/activity_lyrics.xml
index 308f97aa..19aa19d0 100644
--- a/app/src/main/res/layout/activity_lyrics.xml
+++ b/app/src/main/res/layout/activity_lyrics.xml
@@ -17,7 +17,7 @@
             app:contentInsetLeft="0dp"
             app:contentInsetStart="0dp"
             app:contentInsetStartWithNavigation="0dp"
-            app:layout_scrollFlags="scroll|enterAlways"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
             app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
             app:titleMargin="0dp"
             app:titleMarginStart="0dp"
diff --git a/app/src/main/res/layout/activity_main_drawer_layout.xml b/app/src/main/res/layout/activity_main_drawer_layout.xml
index 368a024a..78578bf2 100644
--- a/app/src/main/res/layout/activity_main_drawer_layout.xml
+++ b/app/src/main/res/layout/activity_main_drawer_layout.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawerLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -10,16 +9,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/navigationView"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true"
-        android:paddingStart="0dp"
-        android:paddingEnd="8dp"
-        app:headerLayout="@layout/navigation_drawer_header"
-        app:itemBackground="@drawable/navigation_item"
-        app:itemTextAppearance="@style/NavigationViewTitleTextAppearance"
-        app:menu="@menu/menu_drawer" />
-</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml
index 4b7e426b..6767488c 100644
--- a/app/src/main/res/layout/activity_playlist_detail.xml
+++ b/app/src/main/res/layout/activity_playlist_detail.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml
index d5ed4aeb..a8f38133 100644
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@@ -42,13 +42,12 @@
 
 
             <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                android:id="@+id/album_cover_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal">
 
                 <fragment
-                    android:id="@+id/player_album_cover_fragment"
+                    android:id="@+id/playerAlbumCoverFragment"
                     android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
@@ -61,14 +60,13 @@
                 tools:background="@color/md_white_1000">
 
                 <fragment
-                    android:id="@+id/playback_controls_fragment"
+                    android:id="@+id/playbackControlsFragment"
                     android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
             </FrameLayout>
 
             <FrameLayout
-                android:id="@+id/toolbar_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="0">
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 47b315cc..e6ac016e 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -34,20 +34,36 @@
                 android:layout_height="wrap_content"
                 app:layout_scrollFlags="scroll|enterAlways">
 
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    style="@style/Toolbar"
-                    android:layout_gravity="center_vertical"
-                    app:layout_collapseMode="pin"
-                    tools:ignore="UnusedAttribute">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
-                    <TextView
-                        android:id="@+id/bannerTitle"
-                        style="@style/BigTitleTextAppearanceToolbar"
-                        android:text="@string/app_name"
-                        tools:ignore="MissingPrefix" />
+                    <androidx.appcompat.widget.Toolbar
+                        android:id="@+id/toolbar"
+                        style="@style/Toolbar"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        app:layout_collapseMode="pin"
+                        tools:ignore="UnusedAttribute">
 
-                </androidx.appcompat.widget.Toolbar>
+                        <TextView
+                            android:id="@+id/bannerTitle"
+                            style="@style/BigTitleTextAppearanceToolbar"
+                            android:text="@string/app_name"
+                            tools:ignore="MissingPrefix" />
+
+                        <code.name.monkey.retromusic.views.CircularImageView
+                            android:id="@+id/userImage"
+                            android:layout_width="32dp"
+                            android:layout_height="32dp"
+                            android:layout_gravity="end|center_vertical"
+                            android:layout_marginEnd="8dp"
+                            android:layout_weight="0"
+                            app:civ_border="false" />
+                    </androidx.appcompat.widget.Toolbar>
+
+                </LinearLayout>
 
                 <ViewStub
                     android:id="@+id/cab_stub"
diff --git a/app/src/main/res/layout/fragment_lyrics.xml b/app/src/main/res/layout/fragment_lyrics.xml
index 610685b3..9cd1e71d 100644
--- a/app/src/main/res/layout/fragment_lyrics.xml
+++ b/app/src/main/res/layout/fragment_lyrics.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:fadingEdge="vertical">
+    android:fadingEdge="vertical"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <TextView
         android:id="@+id/offlineLyrics"
@@ -12,5 +14,5 @@
         android:lineSpacingExtra="3dp"
         android:padding="16dp"
         android:text="@string/no_lyrics_found"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main_options.xml b/app/src/main/res/layout/fragment_main_options.xml
index 31ece678..656e96f1 100644
--- a/app/src/main/res/layout/fragment_main_options.xml
+++ b/app/src/main/res/layout/fragment_main_options.xml
@@ -7,8 +7,6 @@
     android:orientation="vertical"
     tools:ignore="MissingPrefix">
 
-
-
     <LinearLayout
         android:id="@+id/userInfoContainer"
         android:layout_width="match_parent"
@@ -61,6 +59,35 @@
             android:textAllCaps="false"
             app:srcCompat="@drawable/ic_settings_white_24dp" />
     </LinearLayout>
+
+    <code.name.monkey.retromusic.views.MaterialButtonTextColor
+        android:id="@+id/actionFolders"
+        style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:text="@string/folders"
+        android:textAllCaps="false"
+        android:textColor="?android:attr/textColorPrimary"
+        app:icon="@drawable/ic_folder_white_24dp"
+        app:iconPadding="12dp"
+        app:iconTint="?iconColor"
+        app:rippleColor="?iconColor" />
+
+    <code.name.monkey.retromusic.views.MaterialButtonTextColor
+        android:id="@+id/actionEqualizer"
+        style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:text="@string/equalizer"
+        android:textAllCaps="false"
+        android:textColor="?android:attr/textColorPrimary"
+        app:icon="@drawable/ic_equalizer_white_24dp"
+        app:iconPadding="12dp"
+        app:iconTint="?iconColor"
+        app:rippleColor="?iconColor" />
+
     <code.name.monkey.retromusic.views.MaterialButtonTextColor
         android:id="@+id/actionSleepTimer"
         style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
@@ -75,6 +102,34 @@
         app:iconTint="?iconColor"
         app:rippleColor="?iconColor" />
 
+    <code.name.monkey.retromusic.views.MaterialButtonTextColor
+        android:id="@+id/actionShare"
+        style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:text="@string/action_share"
+        android:textAllCaps="false"
+        android:textColor="?android:attr/textColorPrimary"
+        app:icon="@drawable/ic_share_white_24dp"
+        app:iconPadding="12dp"
+        app:iconTint="?iconColor"
+        app:rippleColor="?iconColor" />
+
+    <code.name.monkey.retromusic.views.MaterialButtonTextColor
+        android:id="@+id/actionBugReport"
+        style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:text="@string/report_bug"
+        android:textAllCaps="false"
+        android:textColor="?android:attr/textColorPrimary"
+        app:icon="@drawable/ic_bug_report_white_24dp"
+        app:iconPadding="12dp"
+        app:iconTint="?iconColor"
+        app:rippleColor="?iconColor" />
+
     <code.name.monkey.retromusic.views.MaterialButtonTextColor
         android:id="@+id/actionAbout"
         style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
@@ -103,5 +158,18 @@
         app:iconTint="?iconColor"
         app:rippleColor="?iconColor" />
 
+    <code.name.monkey.retromusic.views.MaterialButtonTextColor
+        android:id="@+id/actionBuyPro"
+        style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:text="@string/buy_pro"
+        android:textAllCaps="false"
+        android:textColor="?android:attr/textColorPrimary"
+        app:icon="@drawable/ic_card_giftcard_white_24dp"
+        app:iconPadding="12dp"
+        app:iconTint="?iconColor"
+        app:rippleColor="?iconColor" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml
index ebc5cad1..f697c263 100644
--- a/app/src/main/res/layout/fragment_mini_player.xml
+++ b/app/src/main/res/layout/fragment_mini_player.xml
@@ -89,6 +89,7 @@
         android:layout_width="match_parent"
         android:layout_height="3dp"
         android:progress="20"
+        android:progressDrawable="@drawable/color_progress_seek"
         app:mpb_progressStyle="horizontal"
         app:mpb_useIntrinsicPadding="false" />
 </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_synced.xml b/app/src/main/res/layout/fragment_synced.xml
index 205f3683..00fae9f4 100644
--- a/app/src/main/res/layout/fragment_synced.xml
+++ b/app/src/main/res/layout/fragment_synced.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <code.name.monkey.retromusic.views.LyricView
         android:id="@+id/lyricsView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         app:fadeInFadeOut="true"
         app:highlightColor="@color/md_white_1000"
         app:hint="No Lyrics"
         app:hintColor="@color/md_grey_400"
         app:lineSpace="15dp"
         app:textAlign="left"
-        app:textSize="18sp"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        app:textSize="18sp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_navigation_main.xml b/app/src/main/res/menu/bottom_navigation_main.xml
index 6f80430a..d2412258 100644
--- a/app/src/main/res/menu/bottom_navigation_main.xml
+++ b/app/src/main/res/menu/bottom_navigation_main.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <item
+        android:id="@+id/action_home"
+        android:enabled="true"
+        android:icon="@drawable/ic_home_white_24dp"
+        android:title="@string/home" />
+
     <item
         android:id="@+id/action_song"
         android:enabled="true"
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 5366e228..cb9fa8a4 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -2,11 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".DrawerActivity">
-    <item
-        android:id="@+id/action_search"
-        android:icon="@drawable/ic_search_white_24dp"
-        android:title="@string/action_search"
-        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/action_shuffle_all"
         android:icon="@drawable/ic_shuffle_white_24dp"