diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9f00a592..dbb97a73 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml b/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml
deleted file mode 100644
index bf16fff6..00000000
--- a/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.core:common:1.1.1@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/ae9b923fc99c1fc5a7a9b6cedc6df8b2b8529c54/common-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
deleted file mode 100644
index 6b49b1e3..00000000
--- a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.core:runtime:1.1.1@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/c324b717cdee25a0d7eb92b74d3e39c8/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/c324b717cdee25a0d7eb92b74d3e39c8/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/runtime/1.1.1/25df553df10af32bede9dd768a2d15299543d84/runtime-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml
deleted file mode 100644
index 27b18675..00000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.lifecycle:common:1.1.1@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/bcdaa509a856d1430e736b102f899aa9870a8f83/common-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
deleted file mode 100644
index 2a4d2541..00000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/9d4b2666528128f71f62dd263e1b227f/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/9d4b2666528128f71f62dd263e1b227f/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/livedata-core/1.1.1/c38818e006ea7a408c05e3090364332d46494ef/livedata-core-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
deleted file mode 100644
index a8d1b10f..00000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/382a60084da6e645516d78f7c780cbe0/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/382a60084da6e645516d78f7c780cbe0/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/runtime/1.1.1/8e4214221b3797b863dc9998d16abb4af043e784/runtime-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
deleted file mode 100644
index f03d57e8..00000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/56a4c258581209f35f66a2cd00fba4e3/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/56a4c258581209f35f66a2cd00fba4e3/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/viewmodel/1.1.1/d1cc8e805317f171be63c68341f499acda7e42d6/viewmodel-1.1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_navigation_navigation_common_1_0_0_alpha05_aar.xml b/.idea/libraries/Gradle__android_arch_navigation_navigation_common_1_0_0_alpha05_aar.xml
new file mode 100644
index 00000000..a80f8bc9
--- /dev/null
+++ b/.idea/libraries/Gradle__android_arch_navigation_navigation_common_1_0_0_alpha05_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: android.arch.navigation:navigation-common:1.0.0-alpha05@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-common-1.0.0-alpha05.aar/5e2a2eea3403bb0077ef13b42aedf099/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-common-1.0.0-alpha05.aar/5e2a2eea3403bb0077ef13b42aedf099/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-common-1.0.0-alpha05.aar/5e2a2eea3403bb0077ef13b42aedf099/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.navigation/navigation-common/1.0.0-alpha05/c993c5c6966859560f1e30f1d620af212b751116/navigation-common-1.0.0-alpha05-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_navigation_navigation_fragment_1_0_0_alpha05_aar.xml b/.idea/libraries/Gradle__android_arch_navigation_navigation_fragment_1_0_0_alpha05_aar.xml
new file mode 100644
index 00000000..13c0d716
--- /dev/null
+++ b/.idea/libraries/Gradle__android_arch_navigation_navigation_fragment_1_0_0_alpha05_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: android.arch.navigation:navigation-fragment:1.0.0-alpha05@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-fragment-1.0.0-alpha05.aar/84ef0a3159ce5c7b19e0bd449d3c1aa7/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-fragment-1.0.0-alpha05.aar/84ef0a3159ce5c7b19e0bd449d3c1aa7/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.navigation/navigation-fragment/1.0.0-alpha05/c2dd45048f539b5b359dbbfee9c80f3d0c646381/navigation-fragment-1.0.0-alpha05-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_navigation_navigation_runtime_1_0_0_alpha05_aar.xml b/.idea/libraries/Gradle__android_arch_navigation_navigation_runtime_1_0_0_alpha05_aar.xml
new file mode 100644
index 00000000..f114992a
--- /dev/null
+++ b/.idea/libraries/Gradle__android_arch_navigation_navigation_runtime_1_0_0_alpha05_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: android.arch.navigation:navigation-runtime:1.0.0-alpha05@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-runtime-1.0.0-alpha05.aar/bb310dd858183064328792edb306d025/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-runtime-1.0.0-alpha05.aar/bb310dd858183064328792edb306d025/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.navigation/navigation-runtime/1.0.0-alpha05/f65f267889cdf7a667b2a205d68d27d0d272bfd1/navigation-runtime-1.0.0-alpha05-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_navigation_navigation_ui_1_0_0_alpha05_aar.xml b/.idea/libraries/Gradle__android_arch_navigation_navigation_ui_1_0_0_alpha05_aar.xml
new file mode 100644
index 00000000..0fac57be
--- /dev/null
+++ b/.idea/libraries/Gradle__android_arch_navigation_navigation_ui_1_0_0_alpha05_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: android.arch.navigation:navigation-ui:1.0.0-alpha05@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-ui-1.0.0-alpha05.aar/02ef3e0dd7a8e383526003034c8c6f3d/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-ui-1.0.0-alpha05.aar/02ef3e0dd7a8e383526003034c8c6f3d/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.navigation/navigation-ui/1.0.0-alpha05/b68f2152e0ef5b04c444a95f52179ea8f63b0fd8/navigation-ui-1.0.0-alpha05-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc01_jar.xml
new file mode 100644
index 00000000..2087654b
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc01_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.annotation:annotation:1.0.0-rc01@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.0.0-rc01/d3593590c18777c0721a538a06c6882621ab49fe/annotation-1.0.0-rc01.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.0.0-rc01/ff05a631f4ac3b930f99ce7ae211744159d9dba5/annotation-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc02_jar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc02_jar.xml
new file mode 100644
index 00000000..f58d836b
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc02_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.annotation:annotation:1.0.0-rc02@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.0.0-rc02/d3593590c18777c0721a538a06c6882621ab49fe/annotation-1.0.0-rc02.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.0.0-rc02/ff05a631f4ac3b930f99ce7ae211744159d9dba5/annotation-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..1ab0f188
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc01_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.appcompat:appcompat:1.0.0-rc01@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-1.0.0-rc01.aar/a0a5756bc681e3bb142d1806b690cd30/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-1.0.0-rc01.aar/a0a5756bc681e3bb142d1806b690cd30/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-1.0.0-rc01.aar/a0a5756bc681e3bb142d1806b690cd30/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.0.0-rc01/8143257ed176889e8dacdd3f70f3f9283f58d396/appcompat-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..1421367f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc02_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.appcompat:appcompat:1.0.0-rc02@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-1.0.0-rc02.aar/2380a578a25c158674b22bfd54331248/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-1.0.0-rc02.aar/2380a578a25c158674b22bfd54331248/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-1.0.0-rc02.aar/2380a578a25c158674b22bfd54331248/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.0.0-rc02/5fb4ac533a3a49b60fd2503352bb531acbd06b4c/appcompat-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_rc01_jar.xml
new file mode 100644
index 00000000..3a8c8be9
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_rc01_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.arch.core:core-common:2.0.0-rc01@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.0.0-rc01/b8d58af4adf433117dc96446040f31a0a50fc3fd/core-common-2.0.0-rc01.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.0.0-rc01/434dc11cddd9df57856802f9e345f29aae62564b/core-common-2.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_rc01_aar.xml
new file mode 100644
index 00000000..11d3fe19
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.arch.core:core-runtime:2.0.0-rc01@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/core-runtime-2.0.0-rc01.aar/a539884c14c0d8ccc3ff3db28d8bc8b9/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/core-runtime-2.0.0-rc01.aar/a539884c14c0d8ccc3ff3db28d8bc8b9/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-runtime/2.0.0-rc01/e115f455e439a6e07f57913084f0e54a41f3a4bc/core-runtime-2.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..c3d249f2
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-1.0.0-rc01.aar/9ddbdd321670a113d072f2b3147bfb72/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-1.0.0-rc01.aar/9ddbdd321670a113d072f2b3147bfb72/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.asynclayoutinflater/asynclayoutinflater/1.0.0-rc01/40ecbceb244edf2bbf035f483c71a02b2c1adae9/asynclayoutinflater-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..df4d7a3d
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-1.0.0-rc02.aar/1855bccf712c83625492497d3131c17a/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-1.0.0-rc02.aar/1855bccf712c83625492497d3131c17a/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.asynclayoutinflater/asynclayoutinflater/1.0.0-rc02/40ecbceb244edf2bbf035f483c71a02b2c1adae9/asynclayoutinflater-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..5838e264
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.cardview:cardview:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-1.0.0-rc01.aar/99d1c53b6b96849de40f4a93797d6e07/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-1.0.0-rc01.aar/99d1c53b6b96849de40f4a93797d6e07/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.cardview/cardview/1.0.0-rc01/ffddeb04b1595bf188a3291d4d0bcf13e4620495/cardview-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc01_jar.xml
new file mode 100644
index 00000000..585b745c
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc01_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.collection:collection:1.0.0-rc01@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.0.0-rc01/a6f2dcbb844fe194f0ea37bc327a3ffab0de9e4f/collection-1.0.0-rc01.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.0.0-rc01/9d11d2f18cf2c85359878ec7cccd9b83803a452f/collection-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc02_jar.xml b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc02_jar.xml
new file mode 100644
index 00000000..3e426f1c
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc02_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.collection:collection:1.0.0-rc02@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.0.0-rc02/a6f2dcbb844fe194f0ea37bc327a3ffab0de9e4f/collection-1.0.0-rc02.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.0.0-rc02/9d11d2f18cf2c85359878ec7cccd9b83803a452f/collection-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..c7ef04a0
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc01_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0-rc01@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-1.0.0-rc01.aar/83f92a7a2489a3c26eceeb2cfc04a923/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-1.0.0-rc01.aar/83f92a7a2489a3c26eceeb2cfc04a923/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-1.0.0-rc01.aar/83f92a7a2489a3c26eceeb2cfc04a923/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.coordinatorlayout/coordinatorlayout/1.0.0-rc01/b39503e045e3be31224bb5274cad27bded6a6278/coordinatorlayout-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..316b2982
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc02_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0-rc02@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-1.0.0-rc02.aar/7810b9d34fd1d1ae25f042cfd4f36ac3/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-1.0.0-rc02.aar/7810b9d34fd1d1ae25f042cfd4f36ac3/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-1.0.0-rc02.aar/7810b9d34fd1d1ae25f042cfd4f36ac3/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.coordinatorlayout/coordinatorlayout/1.0.0-rc02/b39503e045e3be31224bb5274cad27bded6a6278/coordinatorlayout-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..c53a6c68
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc01_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.core:core:1.0.0-rc01@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/core-1.0.0-rc01.aar/5e2f0e7247226d936772aa03ba9f9729/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/core-1.0.0-rc01.aar/5e2f0e7247226d936772aa03ba9f9729/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/core-1.0.0-rc01.aar/5e2f0e7247226d936772aa03ba9f9729/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.core/core/1.0.0-rc01/8d831f6070e5a313209229401239c9f5626b743/core-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..7db9137e
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc02_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.core:core:1.0.0-rc02@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/core-1.0.0-rc02.aar/dae6fd9f2276520a37309c9a9d8a5add/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/core-1.0.0-rc02.aar/dae6fd9f2276520a37309c9a9d8a5add/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/core-1.0.0-rc02.aar/dae6fd9f2276520a37309c9a9d8a5add/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.core/core/1.0.0-rc02/8d831f6070e5a313209229401239c9f5626b743/core-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..42bdcbe8
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-1.0.0-rc01.aar/89545a7703555fd03f2bfcfefd0fcffe/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-1.0.0-rc01.aar/89545a7703555fd03f2bfcfefd0fcffe/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.cursoradapter/cursoradapter/1.0.0-rc01/8fbe5c8e6903291374b1b3e3b61ecf1a5f7081cc/cursoradapter-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..3e688d8a
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-1.0.0-rc02.aar/4c6bb89b9037148533d7ad2b9db06666/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-1.0.0-rc02.aar/4c6bb89b9037148533d7ad2b9db06666/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.cursoradapter/cursoradapter/1.0.0-rc02/8fbe5c8e6903291374b1b3e3b61ecf1a5f7081cc/cursoradapter-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..10880748
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.customview:customview:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-1.0.0-rc01.aar/ffe0cfedce4cb20599b13f85fdf4d5a3/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-1.0.0-rc01.aar/ffe0cfedce4cb20599b13f85fdf4d5a3/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.customview/customview/1.0.0-rc01/d8c4e67cb1150c2089f3708eb11457e6de54935a/customview-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..d4b00330
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.customview:customview:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-1.0.0-rc02.aar/103448901cd06bdbfef3b8a43f7281b0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-1.0.0-rc02.aar/103448901cd06bdbfef3b8a43f7281b0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.customview/customview/1.0.0-rc02/d8c4e67cb1150c2089f3708eb11457e6de54935a/customview-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..5509d124
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.documentfile:documentfile:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-1.0.0-rc01.aar/1c8bf2e16a14b3720d06c0eee63c4700/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-1.0.0-rc01.aar/1c8bf2e16a14b3720d06c0eee63c4700/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.documentfile/documentfile/1.0.0-rc01/25035b279ec0b87c6770c3d1a2481b21ae55f0eb/documentfile-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..e755d487
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.documentfile:documentfile:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-1.0.0-rc02.aar/0234a93eec465c915e25d3c3543ea2d7/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-1.0.0-rc02.aar/0234a93eec465c915e25d3c3543ea2d7/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.documentfile/documentfile/1.0.0-rc02/25035b279ec0b87c6770c3d1a2481b21ae55f0eb/documentfile-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..6f520679
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc01_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0-rc01@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-1.0.0-rc01.aar/5c983a29328d7a256443ed282f00b06f/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-1.0.0-rc01.aar/5c983a29328d7a256443ed282f00b06f/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-1.0.0-rc01.aar/5c983a29328d7a256443ed282f00b06f/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.drawerlayout/drawerlayout/1.0.0-rc01/579d463100a2f5871aa012de9190c5c85285ca6e/drawerlayout-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..50373305
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc02_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0-rc02@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-1.0.0-rc02.aar/149c9b167124df13c4bebc30aeecdbd0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-1.0.0-rc02.aar/149c9b167124df13c4bebc30aeecdbd0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-1.0.0-rc02.aar/149c9b167124df13c4bebc30aeecdbd0/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.drawerlayout/drawerlayout/1.0.0-rc02/579d463100a2f5871aa012de9190c5c85285ca6e/drawerlayout-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..9249b36e
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc01_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.fragment:fragment:1.0.0-rc01@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/fragment-1.0.0-rc01.aar/c68f322a107cafa5822c3899d94a957a/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/fragment-1.0.0-rc01.aar/c68f322a107cafa5822c3899d94a957a/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/fragment-1.0.0-rc01.aar/c68f322a107cafa5822c3899d94a957a/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.fragment/fragment/1.0.0-rc01/3fbb483080b436121e0ab877f8bb51612253d26c/fragment-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..246fd4a0
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc02_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.fragment:fragment:1.0.0-rc02@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/fragment-1.0.0-rc02.aar/324cb498e24b7c67f5a0f4dfd2b8702d/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/fragment-1.0.0-rc02.aar/324cb498e24b7c67f5a0f4dfd2b8702d/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/fragment-1.0.0-rc02.aar/324cb498e24b7c67f5a0f4dfd2b8702d/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.fragment/fragment/1.0.0-rc02/2cc1cca636b5a695489a2c94729b253d83dcfdf9/fragment-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_gridlayout_gridlayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_gridlayout_gridlayout_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..6b400fe0
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_gridlayout_gridlayout_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.gridlayout:gridlayout:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/gridlayout-1.0.0-rc01.aar/afe09fea9af66dc762f5f79528db3bcd/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/gridlayout-1.0.0-rc01.aar/afe09fea9af66dc762f5f79528db3bcd/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.gridlayout/gridlayout/1.0.0-rc01/407863106cb19fd2961fef59377553b1dbb73098/gridlayout-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..8f13e246
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.interpolator:interpolator:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-1.0.0-rc01.aar/934727e40da4ab2553e89b156a00d327/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-1.0.0-rc01.aar/934727e40da4ab2553e89b156a00d327/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.interpolator/interpolator/1.0.0-rc01/95e2e13461ae6ffeb950751bc07a6b078960f22c/interpolator-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..6f09fdaa
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.interpolator:interpolator:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-1.0.0-rc02.aar/1b81b6702ac2a26d2f9038f5dffd687d/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-1.0.0-rc02.aar/1b81b6702ac2a26d2f9038f5dffd687d/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.interpolator/interpolator/1.0.0-rc02/95e2e13461ae6ffeb950751bc07a6b078960f22c/interpolator-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..c175a967
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.legacy:legacy-preference-v14:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-preference-v14-1.0.0-rc01.aar/5ca2d090ca7b26d56551559e95b128eb/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-preference-v14-1.0.0-rc01.aar/5ca2d090ca7b26d56551559e95b128eb/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-preference-v14/1.0.0-rc01/5b8f86fea035328fc9e8c660773037a3401ce25f/legacy-preference-v14-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..8e370698
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-core-ui-1.0.0-rc01.aar/92dcea1831361d6cb5cf9a658af0993b/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-core-ui-1.0.0-rc01.aar/92dcea1831361d6cb5cf9a658af0993b/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-support-core-ui/1.0.0-rc01/4963b25977adbd0f74191a8487421b6a134c0783/legacy-support-core-ui-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..688ed477
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-core-ui-1.0.0-rc02.aar/f6b0b685d3f62d3b980917e0fca82c25/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-core-ui-1.0.0-rc02.aar/f6b0b685d3f62d3b980917e0fca82c25/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-support-core-ui/1.0.0-rc02/4963b25977adbd0f74191a8487421b6a134c0783/legacy-support-core-ui-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..ab4142c6
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-core-utils-1.0.0-rc01.aar/d9b52501440ae9b59b45d7c3d65ccd1f/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-core-utils-1.0.0-rc01.aar/d9b52501440ae9b59b45d7c3d65ccd1f/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-support-core-utils/1.0.0-rc01/e15d47e17d665f6d7faee67257d27d91d79dad24/legacy-support-core-utils-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..20ce60ad
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-core-utils-1.0.0-rc02.aar/fddea6d16398233067dee62ce03aefac/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-core-utils-1.0.0-rc02.aar/fddea6d16398233067dee62ce03aefac/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-support-core-utils/1.0.0-rc02/e15d47e17d665f6d7faee67257d27d91d79dad24/legacy-support-core-utils-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v13_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v13_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..7bbd1b13
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v13_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.legacy:legacy-support-v13:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-v13-1.0.0-rc01.aar/cce10cbfe7168fdb432e523ed2884f7c/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-v13-1.0.0-rc01.aar/cce10cbfe7168fdb432e523ed2884f7c/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-support-v13/1.0.0-rc01/51d30af541972d5b0a49665f1364424e19a13f9e/legacy-support-v13-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..e8a044e3
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.legacy:legacy-support-v4:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-v4-1.0.0-rc01.aar/072e865587e063c095afe83eca82cb14/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-v4-1.0.0-rc01.aar/072e865587e063c095afe83eca82cb14/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.legacy/legacy-support-v4/1.0.0-rc01/5b8f86fea035328fc9e8c660773037a3401ce25f/legacy-support-v4-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_rc01_jar.xml
new file mode 100644
index 00000000..cba5f7ef
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_rc01_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0-rc01@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.0.0-rc01/5a3ff8721477d3d67070a6ae0f342bdc0b3dff3/lifecycle-common-2.0.0-rc01.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.0.0-rc01/3242c8c7afb1476da0c107ddf3dd796370d82288/lifecycle-common-2.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_rc01_aar.xml
new file mode 100644
index 00000000..f7573617
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0-rc01@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/lifecycle-livedata-core-2.0.0-rc01.aar/9801a2e2a2c5290f8ca0dafa42041f0f/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/lifecycle-livedata-core-2.0.0-rc01.aar/9801a2e2a2c5290f8ca0dafa42041f0f/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-livedata-core/2.0.0-rc01/f18afc55b51d2ee611bc8501e98cd8c11b566f6d/lifecycle-livedata-core-2.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_rc01_aar.xml
new file mode 100644
index 00000000..6a4313dc
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0-rc01@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/lifecycle-runtime-2.0.0-rc01.aar/2700acd9ac05707950f0d55bca1c6991/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/lifecycle-runtime-2.0.0-rc01.aar/2700acd9ac05707950f0d55bca1c6991/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-runtime/2.0.0-rc01/42e2e6fa2229948bc32d0479b9d7b1cc9620b7b9/lifecycle-runtime-2.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_rc01_aar.xml
new file mode 100644
index 00000000..5c3720d4
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0-rc01@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/lifecycle-viewmodel-2.0.0-rc01.aar/358c975ed5427a503806f1a2f4167f76/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/lifecycle-viewmodel-2.0.0-rc01.aar/358c975ed5427a503806f1a2f4167f76/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-viewmodel/2.0.0-rc01/ee0e94505332ad6d0c76e592d3f27ca96e604cb7/lifecycle-viewmodel-2.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..641f52b6
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.loader:loader:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-1.0.0-rc01.aar/9fd6908d067c355f5d7ddc0dd769a180/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-1.0.0-rc01.aar/9fd6908d067c355f5d7ddc0dd769a180/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.loader/loader/1.0.0-rc01/8b0612c3b5dd4c5b775bcb18a6d673acbeb167ca/loader-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..dae25f7c
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.loader:loader:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-1.0.0-rc02.aar/c868518d81c106157f6152cc36086b0b/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-1.0.0-rc02.aar/c868518d81c106157f6152cc36086b0b/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.loader/loader/1.0.0-rc02/8b0612c3b5dd4c5b775bcb18a6d673acbeb167ca/loader-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..e351befe
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-1.0.0-rc01.aar/74334835ec8900ecfed2a35688bc3475/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-1.0.0-rc01.aar/74334835ec8900ecfed2a35688bc3475/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.localbroadcastmanager/localbroadcastmanager/1.0.0-rc01/3b4f514fb7e9d605790cbb7e85922f3097e89218/localbroadcastmanager-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..373b4071
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-1.0.0-rc02.aar/b7a5868e4f543d96956746fa09569468/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-1.0.0-rc02.aar/b7a5868e4f543d96956746fa09569468/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.localbroadcastmanager/localbroadcastmanager/1.0.0-rc02/3b4f514fb7e9d605790cbb7e85922f3097e89218/localbroadcastmanager-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_media_media_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_media_media_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..45ccecd7
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_media_media_1_0_0_rc02_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.media:media:1.0.0-rc02@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/media-1.0.0-rc02.aar/c91bdace05070e517727bc4df6646b7e/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/media-1.0.0-rc02.aar/c91bdace05070e517727bc4df6646b7e/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/media-1.0.0-rc02.aar/c91bdace05070e517727bc4df6646b7e/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.media/media/1.0.0-rc02/144eb2a5d5cfd745daaea88781ca91ec0c3fafd4/media-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_mediarouter_mediarouter_1_0_0_beta01_aar.xml b/.idea/libraries/Gradle__androidx_mediarouter_mediarouter_1_0_0_beta01_aar.xml
new file mode 100644
index 00000000..09bd36e8
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_mediarouter_mediarouter_1_0_0_beta01_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.mediarouter:mediarouter:1.0.0-beta01@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/mediarouter-1.0.0-beta01.aar/1423cb97ed802c11b3c360d85bd4f855/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/mediarouter-1.0.0-beta01.aar/1423cb97ed802c11b3c360d85bd4f855/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/mediarouter-1.0.0-beta01.aar/1423cb97ed802c11b3c360d85bd4f855/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.mediarouter/mediarouter/1.0.0-beta01/fa3ed6424823a14d548199a1ec5eb1050ef6b5ff/mediarouter-1.0.0-beta01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_multidex_1_0_3_aar.xml b/.idea/libraries/Gradle__androidx_multidex_multidex_2_0_0_aar.xml
similarity index 55%
rename from .idea/libraries/Gradle__com_android_support_multidex_1_0_3_aar.xml
rename to .idea/libraries/Gradle__androidx_multidex_multidex_2_0_0_aar.xml
index f5cd5f01..2757e5dc 100644
--- a/.idea/libraries/Gradle__com_android_support_multidex_1_0_3_aar.xml
+++ b/.idea/libraries/Gradle__androidx_multidex_multidex_2_0_0_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
-  <library name="Gradle: com.android.support:multidex:1.0.3@aar">
+  <library name="Gradle: androidx.multidex:multidex:2.0.0@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/multidex-1.0.3.aar/e287e64a1cf40bdef49253b9e877d4ec/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/multidex-1.0.3.aar/e287e64a1cf40bdef49253b9e877d4ec/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/multidex-2.0.0.aar/0afaebef07fb62d867bcc7c447e06249/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/multidex-2.0.0.aar/0afaebef07fb62d867bcc7c447e06249/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__androidx_palette_palette_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_palette_palette_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..6b9ceb07
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_palette_palette_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.palette:palette:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/palette-1.0.0-rc02.aar/48e367adc7a7c6cbba3dfb59b1344920/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/palette-1.0.0-rc02.aar/48e367adc7a7c6cbba3dfb59b1344920/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.palette/palette/1.0.0-rc02/ac19937d38ce2cd9445fc16379d986fd556a52f6/palette-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_preference_preference_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_preference_preference_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..beb9434d
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_preference_preference_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.preference:preference:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/preference-1.0.0-rc01.aar/c15ffb0f2e40928144a47a2499c4a8ee/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/preference-1.0.0-rc01.aar/c15ffb0f2e40928144a47a2499c4a8ee/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.preference/preference/1.0.0-rc01/96c64e1fe1a1601630b55ef83a1da463c07957e7/preference-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..99c73563
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc01_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.print:print:1.0.0-rc01@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-1.0.0-rc01.aar/b975930be81a1eb8cf58d125aaafb1e2/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-1.0.0-rc01.aar/b975930be81a1eb8cf58d125aaafb1e2/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-1.0.0-rc01.aar/b975930be81a1eb8cf58d125aaafb1e2/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.print/print/1.0.0-rc01/27fc373e01001cdf54da0aa7a41c4bdfa6534e20/print-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..1b9ca5fc
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc02_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.print:print:1.0.0-rc02@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-1.0.0-rc02.aar/075751a55a4b0a6bad556aa90bf2cc44/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-1.0.0-rc02.aar/075751a55a4b0a6bad556aa90bf2cc44/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-1.0.0-rc02.aar/075751a55a4b0a6bad556aa90bf2cc44/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.print/print/1.0.0-rc02/27fc373e01001cdf54da0aa7a41c4bdfa6534e20/print-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..4b5aea8f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc01_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.recyclerview:recyclerview:1.0.0-rc01@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-1.0.0-rc01.aar/0125c7385875377e03025ef8e1036663/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-1.0.0-rc01.aar/0125c7385875377e03025ef8e1036663/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-1.0.0-rc01.aar/0125c7385875377e03025ef8e1036663/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.0.0-rc01/bb1c2a507570b0637ea921fb4de536f67d195b0d/recyclerview-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..ca5e535b
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc02_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.recyclerview:recyclerview:1.0.0-rc02@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-1.0.0-rc02.aar/7d0edb40311aa97880d7d4dab0cef267/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-1.0.0-rc02.aar/7d0edb40311aa97880d7d4dab0cef267/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-1.0.0-rc02.aar/7d0edb40311aa97880d7d4dab0cef267/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.0.0-rc02/bb1c2a507570b0637ea921fb4de536f67d195b0d/recyclerview-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..3c64480d
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-1.0.0-rc01.aar/daf3454ccdcb8ed51882d162d0e99433/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-1.0.0-rc01.aar/daf3454ccdcb8ed51882d162d0e99433/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.slidingpanelayout/slidingpanelayout/1.0.0-rc01/db4dfe0ad63715015472c7c2f2b1e43054fcac7a/slidingpanelayout-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..79190e36
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-1.0.0-rc02.aar/04a6972159b540e4341c55a4b39a5475/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-1.0.0-rc02.aar/04a6972159b540e4341c55a4b39a5475/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.slidingpanelayout/slidingpanelayout/1.0.0-rc02/db4dfe0ad63715015472c7c2f2b1e43054fcac7a/slidingpanelayout-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..c9a5d05f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc01_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0-rc01@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-1.0.0-rc01.aar/4bd6dc612e00360dcf1b6f09bdfb4968/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-1.0.0-rc01.aar/4bd6dc612e00360dcf1b6f09bdfb4968/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-1.0.0-rc01.aar/4bd6dc612e00360dcf1b6f09bdfb4968/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.swiperefreshlayout/swiperefreshlayout/1.0.0-rc01/f8d74aeb7cb603d49941a448939c200cd8e606b4/swiperefreshlayout-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..f6c237c3
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc02_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0-rc02@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-1.0.0-rc02.aar/ea61aa4e5a20aa175327cf7aae837ae8/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-1.0.0-rc02.aar/ea61aa4e5a20aa175327cf7aae837ae8/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-1.0.0-rc02.aar/ea61aa4e5a20aa175327cf7aae837ae8/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.swiperefreshlayout/swiperefreshlayout/1.0.0-rc02/f8d74aeb7cb603d49941a448939c200cd8e606b4/swiperefreshlayout-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..950aca19
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_rc01_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.transition:transition:1.0.0-rc01@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-1.0.0-rc01.aar/03a286211fe9691c5642bf52ad5a7c87/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-1.0.0-rc01.aar/03a286211fe9691c5642bf52ad5a7c87/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-1.0.0-rc01.aar/03a286211fe9691c5642bf52ad5a7c87/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.transition/transition/1.0.0-rc01/31ad8f938f2f9407236ad5c24e35dd0b552f3265/transition-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..af83e36b
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.vectordrawable:vectordrawable:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/vectordrawable-1.0.0-rc01.aar/c71aa8837c7e92f13aa9de5bc77a1eaa/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/vectordrawable-1.0.0-rc01.aar/c71aa8837c7e92f13aa9de5bc77a1eaa/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.vectordrawable/vectordrawable/1.0.0-rc01/4da3e7bac36d1a043156e629761561bf142277a7/vectordrawable-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..d4ed3331
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.vectordrawable:vectordrawable:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/vectordrawable-1.0.0-rc02.aar/a936d396e7636fbe0c7e21e39644aa31/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/vectordrawable-1.0.0-rc02.aar/a936d396e7636fbe0c7e21e39644aa31/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.vectordrawable/vectordrawable/1.0.0-rc02/4da3e7bac36d1a043156e629761561bf142277a7/vectordrawable-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..c2b66f8f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/vectordrawable-animated-1.0.0-rc01.aar/f4f7cb5d62369021d22a668a16ed4c91/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/vectordrawable-animated-1.0.0-rc01.aar/f4f7cb5d62369021d22a668a16ed4c91/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.vectordrawable/vectordrawable-animated/1.0.0-rc01/23bd585f5a2a7e70c0b5a13878862aaf43e8d7f7/vectordrawable-animated-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..62f4eb96
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/vectordrawable-animated-1.0.0-rc02.aar/2dd29c12b235dc2daac10fe3f0b2b452/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/vectordrawable-animated-1.0.0-rc02.aar/2dd29c12b235dc2daac10fe3f0b2b452/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.vectordrawable/vectordrawable-animated/1.0.0-rc02/23bd585f5a2a7e70c0b5a13878862aaf43e8d7f7/vectordrawable-animated-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..42c812f1
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-1.0.0-rc01.aar/9f5a61d4a6b3625db756f4b1f6c7e123/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-1.0.0-rc01.aar/9f5a61d4a6b3625db756f4b1f6c7e123/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.versionedparcelable/versionedparcelable/1.0.0-rc01/48038d43b5d0b3deacff10515aa693b65f49790b/versionedparcelable-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..83af483f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-1.0.0-rc02.aar/e29d654cdcbc6bb2e94f89f26925dcc9/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-1.0.0-rc02.aar/e29d654cdcbc6bb2e94f89f26925dcc9/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.versionedparcelable/versionedparcelable/1.0.0-rc02/48038d43b5d0b3deacff10515aa693b65f49790b/versionedparcelable-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..dbdc3faf
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc01_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.viewpager:viewpager:1.0.0-rc01@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-1.0.0-rc01.aar/9441c9055e5a694a56f43670ba375e54/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-1.0.0-rc01.aar/9441c9055e5a694a56f43670ba375e54/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.viewpager/viewpager/1.0.0-rc01/ef4c8ae3ef0951b7691e6c810899d350062a4703/viewpager-1.0.0-rc01-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc02_aar.xml
new file mode 100644
index 00000000..c968a3f7
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc02_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: androidx.viewpager:viewpager:1.0.0-rc02@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-1.0.0-rc02.aar/0edbf25b1a178ed10303897723f4a235/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-1.0.0-rc02.aar/0edbf25b1a178ed10303897723f4a235/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.viewpager/viewpager/1.0.0-rc02/ef4c8ae3ef0951b7691e6c810899d350062a4703/viewpager-1.0.0-rc02-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_afollestad_material_cab_0_1_12_aar.xml b/.idea/libraries/Gradle__com_afollestad_material_cab_0_1_12_aar.xml
index e86042c7..0d5d2c98 100644
--- a/.idea/libraries/Gradle__com_afollestad_material_cab_0_1_12_aar.xml
+++ b/.idea/libraries/Gradle__com_afollestad_material_cab_0_1_12_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.afollestad:material-cab:0.1.12@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/material-cab-0.1.12.aar/d820cab3f674d1561bfe32a18ce513bc/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/material-cab-0.1.12.aar/d820cab3f674d1561bfe32a18ce513bc/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-material-cab-0.1.12.aar/1f14c61f8811f56a220790dbfafa2f2e/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-material-cab-0.1.12.aar/1f14c61f8811f56a220790dbfafa2f2e/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.afollestad/material-cab/0.1.12/165c2a54378ab503b8033df5fe52b9466bd8f37d/material-cab-0.1.12-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_rc01_aar.xml
deleted file mode 100644
index 641af6d8..00000000
--- a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:animated-vector-drawable:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0-rc01.aar/ee290c6ec2be3e22a6e1531e61e714f3/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0-rc01.aar/ee290c6ec2be3e22a6e1531e61e714f3/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_rc01_aar.xml
deleted file mode 100644
index 1b3b33fc..00000000
--- a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:appcompat-v7:28.0.0-rc01@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0-rc01.aar/441ecbe58bf3d430b0c7444ecb4f5eff/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0-rc01.aar/441ecbe58bf3d430b0c7444ecb4f5eff/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0-rc01.aar/441ecbe58bf3d430b0c7444ecb4f5eff/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_rc01_aar.xml
deleted file mode 100644
index c61d406f..00000000
--- a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:asynclayoutinflater:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0-rc01.aar/738ec5ca089b2a0bb0a2a58e43d0ddba/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0-rc01.aar/738ec5ca089b2a0bb0a2a58e43d0ddba/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_rc01_aar.xml
deleted file mode 100644
index 4e6acf11..00000000
--- a/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:cardview-v7:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-28.0.0-rc01.aar/6751988a21e91290f6aaa9e2953f7e7a/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-28.0.0-rc01.aar/6751988a21e91290f6aaa9e2953f7e7a/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_collections_28_0_0_rc01_jar.xml b/.idea/libraries/Gradle__com_android_support_collections_28_0_0_rc01_jar.xml
deleted file mode 100644
index 2482ff99..00000000
--- a/.idea/libraries/Gradle__com_android_support_collections_28_0_0_rc01_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:collections:28.0.0-rc01@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0-rc01/936bb431338ec51ccd899b3bf100b3961af3c25d/collections-28.0.0-rc01.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_rc01_aar.xml
deleted file mode 100644
index 54a784c3..00000000
--- a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:coordinatorlayout:28.0.0-rc01@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0-rc01.aar/ea4c4a5516ed91173760ca264dc64bf7/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0-rc01.aar/ea4c4a5516ed91173760ca264dc64bf7/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0-rc01.aar/ea4c4a5516ed91173760ca264dc64bf7/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_rc01_aar.xml
deleted file mode 100644
index d9bce5ad..00000000
--- a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:cursoradapter:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0-rc01.aar/18e3e549ee07789603139be13b616a84/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0-rc01.aar/18e3e549ee07789603139be13b616a84/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_rc01_aar.xml
deleted file mode 100644
index ff1a9ca8..00000000
--- a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:customview:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-28.0.0-rc01.aar/ea12bf63c3ed290adab3102001ba0db4/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-28.0.0-rc01.aar/ea12bf63c3ed290adab3102001ba0db4/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_design_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_design_28_0_0_rc01_aar.xml
deleted file mode 100644
index 3d29e77d..00000000
--- a/.idea/libraries/Gradle__com_android_support_design_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:design:28.0.0-rc01@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-28.0.0-rc01.aar/d043168c1abc5291e43712a727c612c3/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-28.0.0-rc01.aar/d043168c1abc5291e43712a727c612c3/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-28.0.0-rc01.aar/d043168c1abc5291e43712a727c612c3/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_rc01_aar.xml
deleted file mode 100644
index 3c04e271..00000000
--- a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:documentfile:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0-rc01.aar/8f9925eeb68928b2fc90ff504e39bfb0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0-rc01.aar/8f9925eeb68928b2fc90ff504e39bfb0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_rc01_aar.xml
deleted file mode 100644
index fe30d501..00000000
--- a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:drawerlayout:28.0.0-rc01@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0-rc01.aar/d3bc5fcf0ad475c51a56446f2300bd89/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0-rc01.aar/d3bc5fcf0ad475c51a56446f2300bd89/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0-rc01.aar/d3bc5fcf0ad475c51a56446f2300bd89/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_gridlayout_v7_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_gridlayout_v7_28_0_0_rc01_aar.xml
deleted file mode 100644
index a55345db..00000000
--- a/.idea/libraries/Gradle__com_android_support_gridlayout_v7_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:gridlayout-v7:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/gridlayout-v7-28.0.0-rc01.aar/3260551aa4d4c50bd8a16429e158b674/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/gridlayout-v7-28.0.0-rc01.aar/3260551aa4d4c50bd8a16429e158b674/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_rc01_aar.xml
deleted file mode 100644
index 966908c5..00000000
--- a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:interpolator:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0-rc01.aar/1da9a9b1be9ef14858f491148363097c/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0-rc01.aar/1da9a9b1be9ef14858f491148363097c/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_rc01_aar.xml
deleted file mode 100644
index 1ae52e40..00000000
--- a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:loader:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-28.0.0-rc01.aar/8592242ca5a41acd1ef2e1d802fc2567/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-28.0.0-rc01.aar/8592242ca5a41acd1ef2e1d802fc2567/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_rc01_aar.xml
deleted file mode 100644
index 719e4d34..00000000
--- a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:localbroadcastmanager:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0-rc01.aar/521072b8fe3076dbec239bfefcdc64cc/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0-rc01.aar/521072b8fe3076dbec239bfefcdc64cc/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_media2_28_0_0_alpha02_aar.xml b/.idea/libraries/Gradle__com_android_support_media2_28_0_0_alpha02_aar.xml
deleted file mode 100644
index a31b58dc..00000000
--- a/.idea/libraries/Gradle__com_android_support_media2_28_0_0_alpha02_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:media2:28.0.0-alpha02@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/media2-28.0.0-alpha02.aar/689b8c6866a75c025806a2b9b0277b00/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/media2-28.0.0-alpha02.aar/689b8c6866a75c025806a2b9b0277b00/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/media2-28.0.0-alpha02.aar/689b8c6866a75c025806a2b9b0277b00/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_mediarouter_v7_28_0_0_alpha5_aar.xml b/.idea/libraries/Gradle__com_android_support_mediarouter_v7_28_0_0_alpha5_aar.xml
deleted file mode 100644
index a478030f..00000000
--- a/.idea/libraries/Gradle__com_android_support_mediarouter_v7_28_0_0_alpha5_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:mediarouter-v7:28.0.0-alpha5@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/mediarouter-v7-28.0.0-alpha5.aar/cc906a617b4213a46d3bef33217c51b9/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/mediarouter-v7-28.0.0-alpha5.aar/cc906a617b4213a46d3bef33217c51b9/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/mediarouter-v7-28.0.0-alpha5.aar/cc906a617b4213a46d3bef33217c51b9/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_palette_v7_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_palette_v7_28_0_0_rc01_aar.xml
deleted file mode 100644
index 45b0de27..00000000
--- a/.idea/libraries/Gradle__com_android_support_palette_v7_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:palette-v7:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/palette-v7-28.0.0-rc01.aar/4e0cf36bedb6010a369225b11cf5a5af/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/palette-v7-28.0.0-rc01.aar/4e0cf36bedb6010a369225b11cf5a5af/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_preference_v14_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_preference_v14_28_0_0_rc01_aar.xml
deleted file mode 100644
index 1fd51769..00000000
--- a/.idea/libraries/Gradle__com_android_support_preference_v14_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:preference-v14:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/preference-v14-28.0.0-rc01.aar/2d1b9e6653a794cd24013d3556be0c49/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/preference-v14-28.0.0-rc01.aar/2d1b9e6653a794cd24013d3556be0c49/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_preference_v7_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_preference_v7_28_0_0_rc01_aar.xml
deleted file mode 100644
index 7d09b610..00000000
--- a/.idea/libraries/Gradle__com_android_support_preference_v7_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:preference-v7:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/preference-v7-28.0.0-rc01.aar/300ab6ed58efbb62b8546d4776a7c048/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/preference-v7-28.0.0-rc01.aar/300ab6ed58efbb62b8546d4776a7c048/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_print_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_print_28_0_0_rc01_aar.xml
deleted file mode 100644
index 148936c2..00000000
--- a/.idea/libraries/Gradle__com_android_support_print_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:print:28.0.0-rc01@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0-rc01.aar/d601d03424e2f72912624569c829314c/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0-rc01.aar/d601d03424e2f72912624569c829314c/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0-rc01.aar/d601d03424e2f72912624569c829314c/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_rc01_aar.xml
deleted file mode 100644
index 16e8b32b..00000000
--- a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:recyclerview-v7:28.0.0-rc01@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0-rc01.aar/fcfc4106cfe24e70ebbe7ac05a297ba9/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0-rc01.aar/fcfc4106cfe24e70ebbe7ac05a297ba9/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0-rc01.aar/fcfc4106cfe24e70ebbe7ac05a297ba9/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_rc01_aar.xml
deleted file mode 100644
index bf31affd..00000000
--- a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:slidingpanelayout:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0-rc01.aar/b865598e4a09a6add5bc4ddf96503573/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0-rc01.aar/b865598e4a09a6add5bc4ddf96503573/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_rc01_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_rc01_jar.xml
deleted file mode 100644
index 900dd12b..00000000
--- a/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_rc01_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-annotations:28.0.0-rc01@jar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0-rc01/4fec72569449246ee917f3249147f8e47910b119/support-annotations-28.0.0-rc01.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_rc01_aar.xml
deleted file mode 100644
index ed87505a..00000000
--- a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-compat:28.0.0-rc01@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0-rc01.aar/4ca67956c7c3aac5174c3a8ea51a7f5f/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0-rc01.aar/4ca67956c7c3aac5174c3a8ea51a7f5f/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0-rc01.aar/4ca67956c7c3aac5174c3a8ea51a7f5f/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_rc01_aar.xml
deleted file mode 100644
index 0115c828..00000000
--- a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-core-ui:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0-rc01.aar/c4ad696316bba270c3663874724186ab/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0-rc01.aar/c4ad696316bba270c3663874724186ab/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_rc01_aar.xml
deleted file mode 100644
index e6659a91..00000000
--- a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-core-utils:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0-rc01.aar/890463e4e576899ea09b73dff8056828/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0-rc01.aar/890463e4e576899ea09b73dff8056828/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_rc01_aar.xml
deleted file mode 100644
index 668ee506..00000000
--- a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-fragment:28.0.0-rc01@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0-rc01.aar/dec466f8e113ba56b9bfb87ce83fcfb8/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0-rc01.aar/dec466f8e113ba56b9bfb87ce83fcfb8/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0-rc01.aar/dec466f8e113ba56b9bfb87ce83fcfb8/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_rc01_aar.xml
deleted file mode 100644
index f4ba576b..00000000
--- a/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-media-compat:28.0.0-rc01@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-28.0.0-rc01.aar/d4427296c6f0f519d31edc5ecb71658b/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-28.0.0-rc01.aar/d4427296c6f0f519d31edc5ecb71658b/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-28.0.0-rc01.aar/d4427296c6f0f519d31edc5ecb71658b/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_rc01_aar.xml
deleted file mode 100644
index 2b4badce..00000000
--- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:support-vector-drawable:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0-rc01.aar/8d766b29a9530e1c2e935e7dcc70bd5f/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0-rc01.aar/8d766b29a9530e1c2e935e7dcc70bd5f/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_rc01_aar.xml
deleted file mode 100644
index 73f5426e..00000000
--- a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:swiperefreshlayout:28.0.0-rc01@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0-rc01.aar/bf2fc95110aa42635f84b164e5f5f650/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0-rc01.aar/bf2fc95110aa42635f84b164e5f5f650/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0-rc01.aar/bf2fc95110aa42635f84b164e5f5f650/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_transition_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_rc01_aar.xml
deleted file mode 100644
index 5d8bf334..00000000
--- a/.idea/libraries/Gradle__com_android_support_transition_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:transition:28.0.0-rc01@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-28.0.0-rc01.aar/be05a0b5af423416f57f2b39a0c4e1a5/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-28.0.0-rc01.aar/be05a0b5af423416f57f2b39a0c4e1a5/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-28.0.0-rc01.aar/be05a0b5af423416f57f2b39a0c4e1a5/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_rc01_aar.xml
deleted file mode 100644
index 046a7636..00000000
--- a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:versionedparcelable:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0-rc01.aar/d92bc3989941d0ed5ec97098d384096c/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0-rc01.aar/d92bc3989941d0ed5ec97098d384096c/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_rc01_aar.xml
deleted file mode 100644
index 7f239a66..00000000
--- a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_rc01_aar.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.android.support:viewpager:28.0.0-rc01@aar">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0-rc01.aar/f7b20ac44fd5f8b1256a8db1b29e433e/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0-rc01.aar/f7b20ac44fd5f8b1256a8db1b29e433e/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_github_kabouzeid_RecyclerView_FastScroll_1_0_16_kmod_aar.xml b/.idea/libraries/Gradle__com_github_kabouzeid_RecyclerView_FastScroll_1_0_16_kmod_aar.xml
deleted file mode 100644
index 7b4913a0..00000000
--- a/.idea/libraries/Gradle__com_github_kabouzeid_RecyclerView_FastScroll_1_0_16_kmod_aar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.github.kabouzeid:RecyclerView-FastScroll:1.0.16-kmod@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/RecyclerView-FastScroll-1.0.16-kmod.aar/5404fd1c32c3c0d7cf5ec4eecc6c2668/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/RecyclerView-FastScroll-1.0.16-kmod.aar/5404fd1c32c3c0d7cf5ec4eecc6c2668/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/RecyclerView-FastScroll-1.0.16-kmod.aar/5404fd1c32c3c0d7cf5ec4eecc6c2668/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_rc01_aar.xml
new file mode 100644
index 00000000..804977ec
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_rc01_aar.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: com.google.android.material:material:1.0.0-rc01@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/material-1.0.0-rc01.aar/c970095cebd946919258718b3d430b95/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/material-1.0.0-rc01.aar/c970095cebd946919258718b3d430b95/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/material-1.0.0-rc01.aar/c970095cebd946919258718b3d430b95/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_8_8_1.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_8_8_1.xml
deleted file mode 100644
index d0af7db6..00000000
--- a/.idea/libraries/Gradle__com_jakewharton_butterknife_8_8_1.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.jakewharton:butterknife-8.8.1">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/butterknife-8.8.1.aar/27780bbb9f4257ba6b794d9f5613ef01/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/butterknife-8.8.1.aar/27780bbb9f4257ba6b794d9f5613ef01/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife/8.8.1/9ab020267dec74a72a89e4aa6d04e34a13072f74/butterknife-8.8.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife/8.8.1/1de300f9b877d30cea69c2ba84a450549f023ab8/butterknife-8.8.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_SNAPSHOT_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_SNAPSHOT_aar.xml
new file mode 100644
index 00000000..d924940f
--- /dev/null
+++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_SNAPSHOT_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: com.jakewharton:butterknife:9.0.0-SNAPSHOT@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/butterknife-9.0.0-SNAPSHOT.aar/1f4760e5d21ef6ed20e057d413f4e5c1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/butterknife-9.0.0-SNAPSHOT.aar/1f4760e5d21ef6ed20e057d413f4e5c1/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife/9.0.0-SNAPSHOT/2d7af8abce2bc9f29a633620361b5b0eddde2ef3/butterknife-9.0.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0_SNAPSHOT_jar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0_SNAPSHOT_jar.xml
new file mode 100644
index 00000000..aca9857c
--- /dev/null
+++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0_SNAPSHOT_jar.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.jakewharton:butterknife-annotations:9.0.0-SNAPSHOT@jar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-annotations/9.0.0-SNAPSHOT/90de05ef24335b708fe13b3b1e99278e6cfda0e8/butterknife-annotations-9.0.0-SNAPSHOT.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-annotations/9.0.0-SNAPSHOT/4b8c200170703134fba908c96c05f710b03e1078/butterknife-annotations-9.0.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_simplecityapps_recyclerview_fastscroll_1_0_18_aar.xml b/.idea/libraries/Gradle__com_simplecityapps_recyclerview_fastscroll_1_0_18_aar.xml
new file mode 100644
index 00000000..fb0caf52
--- /dev/null
+++ b/.idea/libraries/Gradle__com_simplecityapps_recyclerview_fastscroll_1_0_18_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: com.simplecityapps:recyclerview-fastscroll:1.0.18@aar">
+    <ANNOTATIONS>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-recyclerview-fastscroll-1.0.18.aar/ca1e2037a0a3e58cf634cf189766746c/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-recyclerview-fastscroll-1.0.18.aar/ca1e2037a0a3e58cf634cf189766746c/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-recyclerview-fastscroll-1.0.18.aar/ca1e2037a0a3e58cf634cf189766746c/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.simplecityapps/recyclerview-fastscroll/1.0.18/d66bc1e29aae9a94a2593130605ec540484c0d75/recyclerview-fastscroll-1.0.18-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index bef72af7..9138ca8d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/RetroMusicPlayer.iml" filepath="$PROJECT_DIR$/.idea/RetroMusicPlayer.iml" />
+      <module fileurl="file://$PROJECT_DIR$/RetroMusicPlayer.iml" filepath="$PROJECT_DIR$/RetroMusicPlayer.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/appthemehelper/appthemehelper.iml" filepath="$PROJECT_DIR$/appthemehelper/appthemehelper.iml" />
     </modules>
diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml
new file mode 100644
index 00000000..d0185928
--- /dev/null
+++ b/.idea/navEditor.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="navEditor-manualLayoutAlgorithm2">
+    <option name="myPositions">
+      <map>
+        <entry key="nav_graph.xml">
+          <value>
+            <LayoutPositions>
+              <option name="myPositions">
+                <map>
+                  <entry key="bannerHomeFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="40" />
+                            <option name="y" value="40" />
+                          </Point>
+                        </option>
+                        <option name="myPositions">
+                          <map>
+                            <entry key="action_bannerHomeFragment2_to_foldersFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                            <entry key="action_bannerHomeFragment2_to_libraryFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                            <entry key="action_bannerHomeFragment_to_settingsActivity">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                          </map>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="foldersFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="393" />
+                            <option name="y" value="170" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="libraryFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="383" />
+                            <option name="y" value="-147" />
+                          </Point>
+                        </option>
+                        <option name="myPositions">
+                          <map>
+                            <entry key="action_libraryFragment_to_songsFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                          </map>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="settingsActivity">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="399" />
+                            <option name="y" value="484" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="songsFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="626" />
+                            <option name="y" value="-389" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </LayoutPositions>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/RetroMusicPlayer.iml b/RetroMusicPlayer.iml
index 16d29d91..909cad65 100644
--- a/RetroMusicPlayer.iml
+++ b/RetroMusicPlayer.iml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="RetroMusicPlayer" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":" />
+      </configuration>
+    </facet>
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
@@ -11,9 +16,9 @@
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 2e4360fa..633aa6b8 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -8,11 +8,11 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="normalDebug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleNormalDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileNormalDebugSources" />
+        <option name="SELECTED_BUILD_VARIANT" value="normalRelease" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleNormalRelease" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileNormalReleaseSources" />
         <afterSyncTasks>
-          <task>generateNormalDebugSources</task>
+          <task>generateNormalReleaseSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -23,46 +23,32 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/normalDebug/compileNormalDebugJavaWithJavac/classes" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/normalDebugUnitTest/compileNormalDebugUnitTestJavaWithJavac/classes" />
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/normalRelease/compileNormalReleaseJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/normalReleaseUnitTest/compileNormalReleaseUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/normal/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/normalDebug/processNormalDebugResources/r" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/normalDebug/compileNormalDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/normal/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/normalDebug/compileNormalDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/normal/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/normal/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/aidl" isTestSource="false" />
-      <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/apt/androidTest/normal/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/normalDebugAndroidTest/processNormalDebugAndroidTestResources/r" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/normalDebugAndroidTest/compileNormalDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/normal/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/normalDebugAndroidTest/compileNormalDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/normal/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/normal/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/aidl" isTestSource="true" />
-      <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/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" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/normal/release" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/normalRelease/processNormalReleaseResources/r" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/normalRelease/compileNormalReleaseAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/normal/release" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/normalRelease/compileNormalReleaseRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/normal/release" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/normal/release" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/normal/release" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/normal/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/normal/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/normal/assets" type="java-resource" />
@@ -84,27 +70,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -172,82 +151,87 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0-rc01@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.bumptech.glide:okhttp3-integration:1.5.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:palette-v7:28.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.ksoichiro:android-observablescrollview:1.6.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.preference:preference:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0-rc01@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.4.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:mediarouter-v7:28.0.0-alpha5@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0-rc02@jar" level="project" />
     <orderEntry type="library" name="Gradle: uk.co.chrisjenx:calligraphy:2.3.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-cast-framework:16.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0-rc01@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.palette:palette:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.navigation:navigation-runtime:1.0.0-alpha05@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.gridlayout:gridlayout:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.navigation:navigation-common:1.0.0-alpha05@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:3.11.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:gridlayout-v7:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:preference-v7:28.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:15.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0-rc01@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava2:2.4.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.anjlab.android.iab.v3:library:1.0.44@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.4.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:15.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.kabouzeid:RecyclerView-FastScroll:1.0.16-kmod@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:media2:28.0.0-alpha02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.mediarouter:mediarouter:1.0.0-beta01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.0.0-rc02@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.android.support:cursoradapter:28.0.0-rc01@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.jakewharton:butterknife-annotations:9.0.0-SNAPSHOT@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0-rc01@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: com.android.support:print:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.navigation:navigation-ui:1.0.0-alpha05@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.transition:transition:1.0.0-rc01@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: com.r0adkll:slidableactivity:2.0.6@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.1.9@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0-rc01@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: com.android.support:viewpager:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4:26.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:design:28.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: org.nanohttpd:nanohttpd:2.3.1@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:15.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.simplecityapps:recyclerview-fastscroll:1.0.18@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.afollestad:material-cab:0.1.12@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.sothree.slidinguppanel:library:3.4.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:transition:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-preference-v14:1.0.0-rc01@aar" level="project" />
     <orderEntry type="library" name="Gradle: me.zhanghai.android.materialprogressbar:library:1.4.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.jakewharton:butterknife:9.0.0-SNAPSHOT@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-cast:16.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0-rc01@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:preference-v14:28.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0-rc01@aar" 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.google.android.gms:play-services-flags:15.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: com.android.support:loader:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:multidex:1.0.3@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.media:media:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0-rc02@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v13:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.navigation:navigation-fragment:1.0.0-alpha05@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.afollestad.material-dialogs:commons:0.9.6.0@aar" level="project" />
     <orderEntry type="module" module-name="appthemehelper" />
+    <orderEntry type="module" module-name="appthemehelper" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 643562ac..69bc0a5b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,29 +11,40 @@ android {
         vectorDrawables.useSupportLibrary = true
 
         applicationId "code.name.monkey.retromusic"
-        versionCode 214
-        versionName '1.7.200'
+        versionCode 216
+        versionName '1.8.100'
 
         multiDexEnabled true
 
         buildConfigField("String", "LASTFM_API_KEY", "\"${getProperty(getProperties('../public.properties'), 'LASTFM_API_KEY')}\"")
         buildConfigField("String", "GOOGLE_PLAY_LICENSE_KEY", "\"${getProperty(getProperties('../public.properties'), 'GOOGLE_PLAY_LICENSE_KEY')}\"")
     }
-
+    signingConfigs {
+        release {
+            Properties properties = getProperties('/Users/hemanths/Desktop/KeepSafe/retro.properties')
+            storeFile file(getProperty(properties, 'storeFile'))
+            keyAlias getProperty(properties, 'keyAlias')
+            storePassword getProperty(properties, 'storePassword')
+            keyPassword getProperty(properties, 'keyPassword')
+        }
+    }
     buildTypes {
         release {
             minifyEnabled true
             shrinkResources true
-            zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            resValue "string", "cast_app_id", "1234"
+            resValue "string", "cast_app_id", "BA9C3F5E"
+            signingConfig signingConfigs.release
         }
         debug {
             applicationIdSuffix '.debug'
             versionNameSuffix ' DEBUG'
             resValue "string", "cast_app_id", "BA9C3F5E"
+
         }
     }
+
+
     flavorDimensions "default"
     productFlavors {
         normal {
@@ -57,6 +68,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
     configurations.all {
         resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
     }
@@ -71,7 +83,6 @@ android {
             }
         }
     }*/
-
 }
 
 def getProperties(String fileName) {
@@ -92,7 +103,7 @@ static def getDate() {
 }
 
 ext {
-    supportLibVersion = "28.0.0-rc01"
+    supportLibVersion = '1.0.0-rc01'
     firebase = "11.8.0"
     retrofit = "2.3.0"
     butterKnife = "9.0.0-SNAPSHOT"
@@ -100,19 +111,21 @@ ext {
 }
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
-    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
-    implementation "com.android.support:gridlayout-v7:$supportLibVersion"
-    implementation "com.android.support:cardview-v7:$supportLibVersion"
-    implementation "com.android.support:palette-v7:$supportLibVersion"
-    implementation "com.android.support:design:$supportLibVersion"
-    implementation "com.android.support:support-annotations:$supportLibVersion"
-    implementation "com.android.support:preference-v7:$supportLibVersion"
-    implementation "com.android.support:preference-v14:$supportLibVersion"
+    implementation 'androidx.multidex:multidex:2.0.0'
+    implementation "androidx.fragment:fragment:$supportLibVersion"
+    implementation "androidx.appcompat:appcompat:$supportLibVersion"
+    implementation "androidx.recyclerview:recyclerview:$supportLibVersion"
+    implementation "androidx.gridlayout:gridlayout:$supportLibVersion"
+    implementation "androidx.cardview:cardview:$supportLibVersion"
+    implementation "androidx.palette:palette:$supportLibVersion"
+    implementation "androidx.annotation:annotation:$supportLibVersion"
+    implementation "androidx.preference:preference:$supportLibVersion"
+    implementation "androidx.legacy:legacy-support-v13:$supportLibVersion"
+    implementation "androidx.legacy:legacy-preference-v14:$supportLibVersion"
+    implementation "com.google.android.material:material:$supportLibVersion"
 
     //For casting
-    implementation "com.android.support:mediarouter-v7:28.0.0-alpha5"
+    implementation 'androidx.mediarouter:mediarouter:1.0.0-beta01'
     implementation 'com.google.android.gms:play-services-cast-framework:16.0.1'
 
     implementation "com.squareup.retrofit2:retrofit:2.4.0"
@@ -133,7 +146,7 @@ dependencies {
         transitive = true
     }
     implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0'
-    implementation 'com.github.kabouzeid:RecyclerView-FastScroll:1.0.16-kmod'
+    implementation 'com.simplecityapps:recyclerview-fastscroll:1.0.18'
     implementation 'com.anjlab.android.iab.v3:library:1.0.44'
 
     /*UI Library*/
@@ -145,4 +158,9 @@ dependencies {
     implementation 'com.sothree.slidinguppanel:library:3.4.0'
     implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3'
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
+
+    def nav_version = "1.0.0-alpha05"
+
+    implementation "android.arch.navigation:navigation-fragment:$nav_version"
+    implementation "android.arch.navigation:navigation-ui:$nav_version"
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 7e896c52..040c6309 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -72,4 +72,10 @@
 #  native *** n*(...);
 #}
 
-#-keep class org.jaudiotagger.** { *; }
\ No newline at end of file
+#-keep class org.jaudiotagger.** { *; }
+
+#For cast
+-keep class code.name.monkey.retromusic.cast.CastOptionsProvider { *; }
+-keep class android.support.** { *; }
+-keep class com.google.** { *; }
+-keep class java.nio.file.** { *; }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9f97ae1a..bd399e13 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.RetroMusic.Light"
-        tools:replace="android:allowBackup">
+        >
         <activity
             android:name=".ui.activities.MainActivity"
             android:label="@string/app_name">
@@ -241,7 +241,7 @@
             android:value="code.name.monkey.retromusic.cast.CastOptionsProvider" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html
index f97039b2..955f7848 100644
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@@ -1 +1 @@
-<html>
<head>
    <style type="text/css">
        * {
        word-wrap: break-word;
        }
        {style-placeholder}
        a {
        color: #{link-color};
        }
        a:active {
        color: #{link-color-active};
        }
        ol {
        list-style-position: inside;
        padding-left: 0;
        padding-right: 0;
        }
        li {
        padding-top: 8px;
        }




    </style>
</head>
<body>

<p>You can view the changelog dialog again at any time from the <i>about</i> section.</p>


<h3>Version 1.7.200</h3>
<ol>
    <li><b>Fix:</b> same theme follows entire app</li>
    <li><b>Fix:</b> toggle home banner</li>
    <li><b>Fix:</b> playlist rename</li>
    <li><b>Added:</b> faq links about</li>
    <li><b>Added:</b> volume toggle for lock screen to support small screen</li>
    <li><b>Added:</b> on-click artist icon to artist details in album details screen</li>
    <li><b>Added:</b> circle style for album and artist lists</li>
    <li><b>Improved:</b> sleep timer</li>
</ol>

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




    </style>
</head>
<body>

<p>You can view the changelog dialog again at any time from the <i>about</i> section.</p>


<h3>Version 1.8.200</h3>
<ol>
    <li><b>Fix:</b> same theme follows entire app</li>
    <li><b>Fix:</b> playlist rename</li>
    <li><b>Fix:</b> toggle tab titles</li>
    <li><b>Fix:</b> adaptive controls for material theme </li>
    <li><b>Added:</b> cast play only one song per time(WIP)</li>
    <li><b>Added:</b> extra controls toggle for mini player</li>
    <li><b>Added:</b> album & grid style(play image)</li>
    <li><b>Added:</b> new navigation(WIP)</li>
    <li><b>Added:</b> faq links about</li>
    <li><b>Added:</b> genre tab to library</li>
    <li><b>Added:</b> volume toggle for lock screen to support small screen</li>
    <li><b>Added:</b> on-click artist icon to artist details in album details screen</li>
    <li><b>Added:</b> circle style for album and artist lists</li>
    <li><b>Added:</b> now playing album cover style chooser</li>
    <li><b>Improved:</b> sleep timer</li>
    <li><b>Improved:</b> home page UI</li>
    <li><b>Improved:</b> most of the dialog UI to follow theme(WIP)</li>
    <li><b>Removed:</b> toggle home banner(WIP)</li>
    <li><b>Removed:</b> home page genre</li>
    <li><b>Updated:</b> internal libs</li>
</ol>

<p><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a></p>
<p>*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/RetroApplication.java b/app/src/main/java/code/name/monkey/retromusic/RetroApplication.java
index 13cff8a8..e06aca08 100644
--- a/app/src/main/java/code/name/monkey/retromusic/RetroApplication.java
+++ b/app/src/main/java/code/name/monkey/retromusic/RetroApplication.java
@@ -1,8 +1,8 @@
 package code.name.monkey.retromusic;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.multidex.MultiDexApplication;
+import androidx.annotation.NonNull;
+import androidx.multidex.MultiDexApplication;
 
 import com.anjlab.android.iab.v3.BillingProcessor;
 import com.anjlab.android.iab.v3.TransactionDetails;
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutIconGenerator.java b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutIconGenerator.java
index 7c9eef61..2c0c0869 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutIconGenerator.java
+++ b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutIconGenerator.java
@@ -7,7 +7,7 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.graphics.drawable.LayerDrawable;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.TypedValue;
 
 import code.name.monkey.appthemehelper.ThemeStore;
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.java b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.java
index 4b90e941..95686dde 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.java
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.java
@@ -7,7 +7,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.RemoteViews;
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.java b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.java
index d7c08067..74326cf2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.java
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.java
@@ -6,8 +6,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.v7.graphics.Palette;
+import androidx.annotation.Nullable;
+import androidx.palette.graphics.Palette;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.RemoteViews;
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.java b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.java
index 120b9952..2e7f7b8b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.java
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.java
@@ -6,8 +6,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.v7.graphics.Palette;
+import androidx.annotation.Nullable;
+import androidx.palette.graphics.Palette;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.RemoteViews;
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.java b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.java
index 1d80a2d1..3dd0f670 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.java
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.java
@@ -6,8 +6,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.v7.graphics.Palette;
+import androidx.annotation.Nullable;
+import androidx.palette.graphics.Palette;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.RemoteViews;
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.java
index afa7f37d..77484b0a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.java
@@ -1,11 +1,11 @@
 package code.name.monkey.retromusic.dialogs;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.java
index 4602d50b..4917337d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.java
@@ -6,9 +6,6 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.DialogFragment;
 import android.view.View;
 
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -19,6 +16,9 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.DialogFragment;
 import code.name.monkey.retromusic.R;
 
 /**
@@ -26,13 +26,15 @@ import code.name.monkey.retromusic.R;
  */
 public class BlacklistFolderChooserDialog extends DialogFragment implements MaterialDialog.ListCallback {
 
+    String initialPath = Environment.getExternalStorageDirectory().getAbsolutePath();
     private File parentFolder;
     private File[] parentContents;
     private boolean canGoUp = false;
-
     private FolderCallback callback;
 
-    String initialPath = Environment.getExternalStorageDirectory().getAbsolutePath();
+    public static BlacklistFolderChooserDialog create() {
+        return new BlacklistFolderChooserDialog();
+    }
 
     private String[] getContentsArray() {
         if (parentContents == null) {
@@ -66,10 +68,6 @@ public class BlacklistFolderChooserDialog extends DialogFragment implements Mate
         return null;
     }
 
-    public static BlacklistFolderChooserDialog create() {
-        return new BlacklistFolderChooserDialog();
-    }
-
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/ChangelogDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/ChangelogDialog.java
index a453f8c7..f8010fa9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/ChangelogDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/ChangelogDialog.java
@@ -1 +1 @@
-package code.name.monkey.retromusic.dialogs;

import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebView;

import com.afollestad.materialdialogs.internal.ThemeSingleton;

import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Objects;

import butterknife.BindView;
import butterknife.ButterKnife;
import code.name.monkey.appthemehelper.util.ATHUtil;
import code.name.monkey.appthemehelper.util.ColorUtil;
import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.util.PreferenceUtil;
import code.name.monkey.retromusic.views.RoundedBottomSheetDialogFragment;

public class ChangelogDialog extends RoundedBottomSheetDialogFragment {

    @BindView(R.id.web_view)
    WebView webView;

    public static ChangelogDialog create() {
        return new ChangelogDialog();
    }

    public static void setChangelogRead(@NonNull Context context) {
        try {
            PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
            int currentVersion = pInfo.versionCode;
            PreferenceUtil.getInstance(context).setLastChangeLogVersion(currentVersion);
        } catch (PackageManager.NameNotFoundException e) {
            e.printStackTrace();
        }
    }

    private static String colorToHex(int color) {
        return Integer.toHexString(color).substring(2);
    }

    @Nullable
    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
        View layout = inflater.inflate(R.layout.dialog_changelog, container, false);
        ButterKnife.bind(this, layout);
        return layout;
    }

    @Override
    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);
        try {
            // Load from phonograph-changelog.html in the assets folder
            StringBuilder buf = new StringBuilder();
            InputStream json = Objects.requireNonNull(getActivity()).getAssets().open
                    ("retro-changelog.html");
            BufferedReader in = new BufferedReader(new InputStreamReader(json, "UTF-8"));
            String str;
            while ((str = in.readLine()) != null)
                buf.append(str);
            in.close();

            // Inject color values for WebView body background and links
            final String backgroundColor = colorToHex(ATHUtil.resolveColor(getActivity(), R.attr.md_background_color, Color.parseColor(ThemeSingleton.get().darkTheme ? "#424242" : "#ffffff")));
            final String contentColor = ThemeSingleton.get().darkTheme ? "#ffffff" : "#000000";
            webView.loadData(buf.toString()
                            .replace("{style-placeholder}",
                                    String.format("body { background-color: %s; color: %s; }", backgroundColor, contentColor))
                            .replace("{link-color}", colorToHex(ThemeSingleton.get().positiveColor.getDefaultColor()))
                            .replace("{link-color-active}", colorToHex(ColorUtil.lightenColor(ThemeSingleton.get().positiveColor.getDefaultColor())))
                    , "text/html", "UTF-8");
        } catch (Throwable e) {
            webView.loadData("<h1>Unable to load</h1><p>" + e.getLocalizedMessage() + "</p>", "text/html", "UTF-8");
        }
        setChangelogRead(getActivity());
    }
}

\ No newline at end of file
+package code.name.monkey.retromusic.dialogs;

import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.Color;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebView;

import com.afollestad.materialdialogs.internal.ThemeSingleton;

import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Objects;

import butterknife.BindView;
import butterknife.ButterKnife;
import code.name.monkey.appthemehelper.util.ATHUtil;
import code.name.monkey.appthemehelper.util.ColorUtil;
import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.util.PreferenceUtil;
import code.name.monkey.retromusic.views.RoundedBottomSheetDialogFragment;

public class ChangelogDialog extends RoundedBottomSheetDialogFragment {

    @BindView(R.id.web_view)
    WebView webView;

    public static ChangelogDialog create() {
        return new ChangelogDialog();
    }

    private static void setChangelogRead(@NonNull Context context) {
        try {
            PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
            int currentVersion = pInfo.versionCode;
            PreferenceUtil.getInstance(context).setLastChangeLogVersion(currentVersion);
        } catch (PackageManager.NameNotFoundException e) {
            e.printStackTrace();
        }
    }

    private static String colorToHex(int color) {
        return Integer.toHexString(color).substring(2);
    }

    @Nullable
    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
        View layout = inflater.inflate(R.layout.dialog_changelog, container, false);
        ButterKnife.bind(this, layout);
        return layout;
    }

    @Override
    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);
        try {
            // Load from phonograph-changelog.html in the assets folder
            StringBuilder buf = new StringBuilder();
            InputStream json = Objects.requireNonNull(getActivity()).getAssets().open
                    ("retro-changelog.html");
            BufferedReader in = new BufferedReader(new InputStreamReader(json, "UTF-8"));
            String str;
            while ((str = in.readLine()) != null)
                buf.append(str);
            in.close();

            // Inject color values for WebView body background and links
            final String backgroundColor = colorToHex(ATHUtil.resolveColor(getActivity(), R.attr.md_background_color, Color.parseColor(ThemeSingleton.get().darkTheme ? "#424242" : "#ffffff")));
            final String contentColor = ThemeSingleton.get().darkTheme ? "#ffffff" : "#000000";
            webView.loadData(buf.toString()
                            .replace("{style-placeholder}",
                                    String.format("body { background-color: %s; color: %s; }", backgroundColor, contentColor))
                            .replace("{link-color}", colorToHex(ThemeSingleton.get().positiveColor.getDefaultColor()))
                            .replace("{link-color-active}", colorToHex(ColorUtil.lightenColor(ThemeSingleton.get().positiveColor.getDefaultColor())))
                    , "text/html", "UTF-8");
        } catch (Throwable e) {
            webView.loadData("<h1>Unable to load</h1><p>" + e.getLocalizedMessage() + "</p>", "text/html", "UTF-8");
        }
        setChangelogRead(getActivity());
    }
}

\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/ClearSmartPlaylistDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/ClearSmartPlaylistDialog.java
index 2358c2aa..39be79a6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/ClearSmartPlaylistDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/ClearSmartPlaylistDialog.java
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic.dialogs;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
 import android.text.Html;
 
 import com.afollestad.materialdialogs.DialogAction;
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.java
index d92f96ef..3087159b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.java
@@ -1,24 +1,25 @@
 package code.name.monkey.retromusic.dialogs;
 
+import android.content.res.ColorStateList;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputEditText;
-import android.support.v7.widget.CardView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+
 import java.util.ArrayList;
 import java.util.Objects;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import code.name.monkey.appthemehelper.ThemeStore;
-import code.name.monkey.appthemehelper.util.ColorUtil;
-import code.name.monkey.appthemehelper.util.MaterialValueHelper;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.model.Song;
 import code.name.monkey.retromusic.util.PlaylistsUtil;
@@ -32,14 +33,17 @@ public class CreatePlaylistDialog extends RoundedBottomSheetDialogFragment {
     @BindView(R.id.option_1)
     TextInputEditText playlistName;
 
+    @BindView(R.id.action_new_playlist)
+    TextInputLayout textInputLayout;
+
     @BindView(R.id.action_cancel)
-    TextView actionCancel;
+    MaterialButton actionCancel;
 
     @BindView(R.id.action_create)
-    TextView actionCreate;
+    MaterialButton actionCreate;
 
-    @BindView(R.id.action_create_container)
-    CardView actionCreateContainer;
+    @BindView(R.id.title)
+    TextView title;
 
     @NonNull
     public static CreatePlaylistDialog create() {
@@ -76,16 +80,17 @@ public class CreatePlaylistDialog extends RoundedBottomSheetDialogFragment {
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         int accentColor = ThemeStore.accentColor(Objects.requireNonNull(getContext()));
-        actionCreateContainer.setCardBackgroundColor(ThemeStore.accentColor(getContext()));
+        actionCreate.setBackgroundTintList(ColorStateList.valueOf(accentColor));
+        actionCancel.setStrokeColor(ColorStateList.valueOf(accentColor));
+        actionCancel.setTextColor(accentColor);
+        playlistName.setHintTextColor(ColorStateList.valueOf(accentColor));
 
-        int primaryTextColor = MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil
-                .isColorLight(accentColor));
-        int secondaryTextColor = MaterialValueHelper.getSecondaryTextColor(getContext(), ColorUtil
-                .isColorLight(accentColor));
-
-        actionCreate.setTextColor(primaryTextColor);
-        actionCancel.setTextColor(secondaryTextColor);
+        textInputLayout.setBoxStrokeColor(accentColor);
+        textInputLayout.setDefaultHintTextColor(ColorStateList.valueOf(accentColor));
 
+        playlistName.setHintTextColor(accentColor);
+        playlistName.setTextColor(ThemeStore.textColorPrimary(getContext()));
+        title.setTextColor(ThemeStore.textColorPrimary(getContext()));
 
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.java
index 5e408ca8..6ae36080 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.java
@@ -1,19 +1,24 @@
 package code.name.monkey.retromusic.dialogs;
 
+import android.content.res.ColorStateList;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import java.util.ArrayList;
+import com.google.android.material.button.MaterialButton;
 
+import java.util.ArrayList;
+import java.util.Objects;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.model.Playlist;
 import code.name.monkey.retromusic.util.PlaylistsUtil;
@@ -23,11 +28,13 @@ import code.name.monkey.retromusic.views.RoundedBottomSheetDialogFragment;
 public class DeletePlaylistDialog extends RoundedBottomSheetDialogFragment {
 
     @BindView(R.id.action_delete)
-    TextView delete;
+    MaterialButton actionDelete;
+
     @BindView(R.id.title)
     TextView title;
+
     @BindView(R.id.action_cancel)
-    TextView cancel;
+    MaterialButton actionCancel;
 
     @NonNull
     public static DeletePlaylistDialog create(Playlist playlist) {
@@ -47,12 +54,14 @@ public class DeletePlaylistDialog extends RoundedBottomSheetDialogFragment {
 
     @Nullable
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View layout = inflater.inflate(R.layout.dialog_delete_playlist, container, false);
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        View layout = inflater.inflate(R.layout.dialog_delete, container, false);
         ButterKnife.bind(this, layout);
         return layout;
     }
 
+    @SuppressWarnings("ConstantConditions")
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
@@ -68,8 +77,16 @@ public class DeletePlaylistDialog extends RoundedBottomSheetDialogFragment {
             title = R.string.delete_playlist_title;
             content = Html.fromHtml(getString(R.string.delete_playlist_x, playlists.get(0).name));
         }
-        this.title.setText(title);
-        this.delete.setText(content);
+        this.title.setText(content);
+        this.actionDelete.setText(title);
+
+        this.title.setTextColor(ThemeStore.textColorPrimary(getContext()));
+
+        int accentColor = ThemeStore.accentColor(Objects.requireNonNull(getContext()));
+        actionDelete.setBackgroundTintList(ColorStateList.valueOf(accentColor));
+        actionCancel.setStrokeColor(ColorStateList.valueOf(accentColor));
+        actionCancel.setTextColor(accentColor);
+
     }
 
     @OnClick({R.id.action_cancel, R.id.action_delete})
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.java
index 8fcfe617..57ee8cce 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.java
@@ -1,14 +1,20 @@
 package code.name.monkey.retromusic.dialogs;
 
+import android.content.res.ColorStateList;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.google.android.material.button.MaterialButton;
+
+import java.util.ArrayList;
+import java.util.Objects;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -18,17 +24,15 @@ import code.name.monkey.retromusic.model.Song;
 import code.name.monkey.retromusic.util.MusicUtil;
 import code.name.monkey.retromusic.views.RoundedBottomSheetDialogFragment;
 
-import java.util.ArrayList;
-
 public class DeleteSongsDialog extends RoundedBottomSheetDialogFragment {
+    @BindView(R.id.action_delete)
+    MaterialButton actionDelete;
+
     @BindView(R.id.title)
     TextView title;
 
-    @BindView(R.id.action_delete)
-    TextView delete;
-
     @BindView(R.id.action_cancel)
-    TextView cancel;
+    MaterialButton actionCancel;
 
     @NonNull
     public static DeleteSongsDialog create(Song song) {
@@ -70,9 +74,10 @@ public class DeleteSongsDialog extends RoundedBottomSheetDialogFragment {
         super.onViewCreated(view, savedInstanceState);
 
         title.setTextColor(ThemeStore.textColorPrimary(getContext()));
-        delete.setTextColor(ThemeStore.textColorPrimary(getContext()));
-        cancel.setTextColor(ThemeStore.textColorPrimary(getContext()));
-
+        int accentColor = ThemeStore.accentColor(Objects.requireNonNull(getContext()));
+        actionDelete.setBackgroundTintList(ColorStateList.valueOf(accentColor));
+        actionCancel.setStrokeColor(ColorStateList.valueOf(accentColor));
+        actionCancel.setTextColor(accentColor);
 
         //noinspection unchecked,ConstantConditions
         final ArrayList<Song> songs = getArguments().getParcelableArrayList("songs");
@@ -91,7 +96,7 @@ public class DeleteSongsDialog extends RoundedBottomSheetDialogFragment {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
-        View layout = inflater.inflate(R.layout.dialog_delete_songs, container, false);
+        View layout = inflater.inflate(R.layout.dialog_delete, container, false);
         ButterKnife.bind(this, layout);
         return layout;
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/HomeOptionDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/HomeOptionDialog.java
index 2b235b34..5d59174f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/HomeOptionDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/HomeOptionDialog.java
@@ -2,10 +2,10 @@ package code.name.monkey.retromusic.dialogs;
 
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -40,10 +40,12 @@ import static code.name.monkey.retromusic.Constants.USER_PROFILE;
 public class HomeOptionDialog extends RoundedBottomSheetDialogFragment {
 
     private static final String TAG = "HomeOptionDialog";
-    static ButterKnife.Setter<TextView, Integer> textColor = (view, value, index) -> view.setTextColor(value.intValue());
+    private static ButterKnife.Setter<TextView, Integer> textColor = (view, value, index) -> view.setTextColor(value.intValue());
     Unbinder mUnbinder;
+
     @BindView(R.id.user_image_bottom)
     CircularImageView userImageBottom;
+
     @BindView(R.id.title_welcome)
     AppCompatTextView titleWelcome;
     @BindViews({R.id.tv_about, R.id.title_welcome, R.id.text, R.id.tv_buy_pro, R.id.tv_rate_app,
@@ -68,8 +70,7 @@ public class HomeOptionDialog extends RoundedBottomSheetDialogFragment {
         super.onViewCreated(view, savedInstanceState);
         loadImageFromStorage();
         //noinspection ConstantConditions
-        titleWelcome.setText(String.format("%s, %s!", getTimeOfTheDay(),
-                PreferenceUtil.getInstance(getContext()).getUserName()));
+        titleWelcome.setText(String.format("%s, %s!", getTimeOfTheDay(), PreferenceUtil.getInstance(getContext()).getUserName()));
     }
 
     private String getTimeOfTheDay() {
@@ -109,7 +110,6 @@ public class HomeOptionDialog extends RoundedBottomSheetDialogFragment {
             case R.id.action_rate:
                 NavigationUtil.goToPlayStore(getActivity());
                 break;
-
             case R.id.action_settings:
                 NavigationUtil.goToSettings(getActivity());
                 break;
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/MainOptionsBottomSheetDialogFragment.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/MainOptionsBottomSheetDialogFragment.java
new file mode 100644
index 00000000..19347449
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/MainOptionsBottomSheetDialogFragment.java
@@ -0,0 +1,64 @@
+package code.name.monkey.retromusic.dialogs;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import com.google.android.material.navigation.NavigationView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.ui.activities.MainActivity;
+
+public class MainOptionsBottomSheetDialogFragment extends BottomSheetDialogFragment implements NavigationView.OnNavigationItemSelectedListener {
+
+    @BindView(R.id.navigation_view)
+    NavigationView navigationView;
+
+    public static MainOptionsBottomSheetDialogFragment newInstance(int home) {
+
+        Bundle args = new Bundle();
+        args.putInt("selected", home);
+        MainOptionsBottomSheetDialogFragment fragment = new MainOptionsBottomSheetDialogFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View layout = inflater.inflate(R.layout.fragment_main_options, container, false);
+        ButterKnife.bind(this, layout);
+        return layout;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        navigationView.setNavigationItemSelectedListener(this);
+        switch (getArguments().getInt("selected")) {
+            default:
+            case MainActivity.HOME:
+                navigationView.setCheckedItem(R.id.action_home);
+                break;
+        }
+    }
+
+    @Override
+    public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
+        switch (menuItem.getItemId()) {
+            case R.id.action_home:
+                Toast.makeText(getContext(), menuItem.getTitle(), Toast.LENGTH_SHORT).show();
+                return true;
+            default:
+                return false;
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.java
index a3a80176..0fcf841a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.dialogs;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetDialogFragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -24,8 +24,10 @@ import code.name.monkey.retromusic.views.RoundedBottomSheetDialogFragment;
 public class RemoveFromPlaylistDialog extends RoundedBottomSheetDialogFragment {
     @BindView(R.id.action_remove)
     TextView remove;
+
     @BindView(R.id.title)
     TextView title;
+
     @BindView(R.id.action_cancel)
     TextView cancel;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.java
index 52a2dbdd..ff25c74b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.java
@@ -1,79 +1,101 @@
 package code.name.monkey.retromusic.dialogs;
 
+import android.content.res.ColorStateList;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
+import android.widget.TextView;
+
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+
+import java.util.Objects;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import code.name.monkey.appthemehelper.ThemeStore;
-import code.name.monkey.appthemehelper.util.TintHelper;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.util.PlaylistsUtil;
 import code.name.monkey.retromusic.views.RoundedBottomSheetDialogFragment;
-import java.util.Objects;
 
-/**
- * @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad)
- */
 public class RenamePlaylistDialog extends RoundedBottomSheetDialogFragment {
 
-  @BindView(R.id.option_1)
-  EditText playlistName;
-  @BindView(R.id.action_cancel)
-  Button cancel;
-  @BindView(R.id.action_rename)
-  Button rename;
+    @BindView(R.id.title)
+    TextView title;
 
-  @NonNull
-  public static RenamePlaylistDialog create(long playlistId) {
-    RenamePlaylistDialog dialog = new RenamePlaylistDialog();
-    Bundle args = new Bundle();
-    args.putLong("playlist_id", playlistId);
-    dialog.setArguments(args);
-    return dialog;
-  }
+    @BindView(R.id.option_1)
+    TextInputEditText playlistName;
 
-  @OnClick({R.id.action_cancel, R.id.action_rename})
-  void actions(View view) {
-    switch (view.getId()) {
-      case R.id.action_cancel:
-        dismiss();
-        break;
-      case R.id.action_rename:
-        if (!playlistName.toString().trim().equals("")) {
-          long playlistId = getArguments().getLong("playlist_id");
-          PlaylistsUtil.renamePlaylist(getActivity(), playlistId,
-              playlistName.getText().toString());
-        }
-        break;
+    @BindView(R.id.action_new_playlist)
+    TextInputLayout textInputLayout;
+
+    @BindView(R.id.action_cancel)
+    MaterialButton actionCancel;
+
+    @BindView(R.id.action_rename)
+    MaterialButton rename;
+
+    @NonNull
+    public static RenamePlaylistDialog create(long playlistId) {
+        RenamePlaylistDialog dialog = new RenamePlaylistDialog();
+        Bundle args = new Bundle();
+        args.putLong("playlist_id", playlistId);
+        dialog.setArguments(args);
+        return dialog;
     }
-    dismiss();
-  }
 
-  @Nullable
-  @Override
-  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-      @Nullable Bundle savedInstanceState) {
-    View layout = inflater.inflate(R.layout.dialog_playlist_rename, container, false);
-    ButterKnife.bind(this, layout);
-    return layout;
-  }
+    @OnClick({R.id.action_cancel, R.id.action_rename})
+    void actions(View view) {
+        switch (view.getId()) {
+            case R.id.action_cancel:
+                dismiss();
+                break;
+            case R.id.action_rename:
+                if (!playlistName.toString().trim().equals("")) {
+                    long playlistId = getArguments().getLong("playlist_id");
+                    PlaylistsUtil.renamePlaylist(getActivity(), playlistId,
+                            playlistName.getText().toString());
+                }
+                break;
+        }
+        dismiss();
+    }
 
-  @Override
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-    super.onViewCreated(view, savedInstanceState);
-    int accentColor = ThemeStore.accentColor(Objects.requireNonNull(getContext()));
-    TintHelper.setTintAuto(playlistName, accentColor, true);
-    TintHelper.setTintAuto(rename, accentColor, true);
-    cancel.setTextColor(accentColor);
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        View layout = inflater.inflate(R.layout.dialog_playlist_rename, container, false);
+        ButterKnife.bind(this, layout);
+        return layout;
+    }
 
-    long playlistId = getArguments().getLong("playlist_id");
-    playlistName.setText(PlaylistsUtil.getNameForPlaylist(getActivity(), playlistId));
-  }
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        int accentColor = ThemeStore.accentColor(Objects.requireNonNull(getContext()));
+        rename.setBackgroundTintList(ColorStateList.valueOf(accentColor));
+        actionCancel.setStrokeColor(ColorStateList.valueOf(accentColor));
+        actionCancel.setTextColor(accentColor);
+        playlistName.setHintTextColor(ColorStateList.valueOf(accentColor));
+
+        textInputLayout.setBoxStrokeColor(accentColor);
+        textInputLayout.setDefaultHintTextColor(ColorStateList.valueOf(accentColor));
+
+        playlistName.setHintTextColor(accentColor);
+
+        playlistName.setTextColor(ThemeStore.textColorPrimary(getContext()));
+        title.setTextColor(ThemeStore.textColorPrimary(getContext()));
+
+        long playlistId = 0;
+        if (getArguments() != null) {
+            playlistId = getArguments().getLong("playlist_id");
+        }
+        playlistName.setText(PlaylistsUtil.getNameForPlaylist(getActivity(), playlistId));
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/ScanMediaFolderChooserDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/ScanMediaFolderChooserDialog.java
index 89c8d125..b2edfbb1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/ScanMediaFolderChooserDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/ScanMediaFolderChooserDialog.java
@@ -1 +1 @@
-package code.name.monkey.retromusic.dialogs;

import android.Manifest;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.content.pm.PackageManager;
import android.media.MediaScannerConnection;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.DialogFragment;
import android.view.View;
import android.widget.Toast;

import com.afollestad.materialdialogs.MaterialDialog;

import java.io.File;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;

import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.misc.UpdateToastMediaScannerCompletionListener;
import code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFragment;
import code.name.monkey.retromusic.util.PreferenceUtil;

/**
 * @author Aidan Follestad (afollestad), modified by Karim Abou Zeid
 */
public class ScanMediaFolderChooserDialog extends DialogFragment implements MaterialDialog.ListCallback {

    String initialPath = PreferenceUtil.getInstance(getContext()).getStartDirectory().getAbsolutePath();
    private File parentFolder;
    private File[] parentContents;
    private boolean canGoUp = false;

    public static ScanMediaFolderChooserDialog create() {
        return new ScanMediaFolderChooserDialog();
    }

    private static void scanPaths(@NonNull WeakReference<Activity> activityWeakReference, @NonNull Context applicationContext, @Nullable String[] toBeScanned) {
        Activity activity = activityWeakReference.get();
        if (toBeScanned == null || toBeScanned.length < 1) {
            Toast.makeText(applicationContext, R.string.nothing_to_scan, Toast.LENGTH_SHORT).show();
        } else {
            MediaScannerConnection.scanFile(applicationContext, toBeScanned, null, activity != null ? new UpdateToastMediaScannerCompletionListener(activity, toBeScanned) : null);
        }
    }

    private String[] getContentsArray() {
        if (parentContents == null) {
            if (canGoUp) {
                return new String[]{".."};
            }
            return new String[]{};
        }
        String[] results = new String[parentContents.length + (canGoUp ? 1 : 0)];
        if (canGoUp) {
            results[0] = "..";
        }
        for (int i = 0; i < parentContents.length; i++) {
            results[canGoUp ? i + 1 : i] = parentContents[i].getName();
        }
        return results;
    }

    private File[] listFiles() {
        File[] contents = parentFolder.listFiles();
        List<File> results = new ArrayList<>();
        if (contents != null) {
            for (File fi : contents) {
                if (fi.isDirectory()) {
                    results.add(fi);
                }
            }
            Collections.sort(results, new FolderSorter());
            return results.toArray(new File[results.size()]);
        }
        return null;
    }

    @NonNull
    @Override
    public Dialog onCreateDialog(Bundle savedInstanceState) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
                && ActivityCompat.checkSelfPermission(
                getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE)
                != PackageManager.PERMISSION_GRANTED) {
            return new MaterialDialog.Builder(getActivity())
                    .title(R.string.md_error_label)
                    .content(R.string.md_storage_perm_error)
                    .positiveText(android.R.string.ok)
                    .build();
        }
        if (savedInstanceState == null) {
            savedInstanceState = new Bundle();
        }
        if (!savedInstanceState.containsKey("current_path")) {
            savedInstanceState.putString("current_path", initialPath);
        }
        parentFolder = new File(savedInstanceState.getString("current_path", File.pathSeparator));
        checkIfCanGoUp();
        parentContents = listFiles();
        MaterialDialog.Builder builder =
                new MaterialDialog.Builder(getActivity())
                        .title(parentFolder.getAbsolutePath())
                        .items((CharSequence[]) getContentsArray())
                        .itemsCallback(this)
                        .autoDismiss(false)
                        .onPositive((dialog, which) -> {
                            final Context applicationContext = getActivity().getApplicationContext();
                            final WeakReference<Activity> activityWeakReference = new WeakReference<>(getActivity());
                            dismiss();
                            new FoldersFragment.ListPathsAsyncTask(getActivity(), paths ->
                                    scanPaths(activityWeakReference, applicationContext, paths)).execute(new FoldersFragment.ListPathsAsyncTask.LoadingInfo(parentFolder, FoldersFragment.AUDIO_FILE_FILTER));
                        })
                        .onNegative((materialDialog, dialogAction) -> dismiss())
                        .positiveText(R.string.action_scan_directory)
                        .negativeText(android.R.string.cancel);
        return builder.build();
    }

    @Override
    public void onSelection(MaterialDialog materialDialog, View view, int i, CharSequence s) {
        if (canGoUp && i == 0) {
            parentFolder = parentFolder.getParentFile();
            if (parentFolder.getAbsolutePath().equals("/storage/emulated")) {
                parentFolder = parentFolder.getParentFile();
            }
            checkIfCanGoUp();
        } else {
            parentFolder = parentContents[canGoUp ? i - 1 : i];
            canGoUp = true;
            if (parentFolder.getAbsolutePath().equals("/storage/emulated")) {
                parentFolder = Environment.getExternalStorageDirectory();
            }
        }
        reload();
    }

    private void checkIfCanGoUp() {
        canGoUp = parentFolder.getParent() != null;
    }

    private void reload() {
        parentContents = listFiles();
        MaterialDialog dialog = (MaterialDialog) getDialog();
        dialog.setTitle(parentFolder.getAbsolutePath());
        dialog.setItems((CharSequence[]) getContentsArray());
    }

    @Override
    public void onSaveInstanceState(Bundle outState) {
        super.onSaveInstanceState(outState);
        outState.putString("current_path", parentFolder.getAbsolutePath());
    }

    private static class FolderSorter implements Comparator<File> {

        @Override
        public int compare(File lhs, File rhs) {
            return lhs.getName().compareTo(rhs.getName());
        }
    }
}
\ No newline at end of file
+package code.name.monkey.retromusic.dialogs;

import android.Manifest;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.content.pm.PackageManager;
import android.media.MediaScannerConnection;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.ActivityCompat;
import androidx.fragment.app.DialogFragment;
import android.view.View;
import android.widget.Toast;

import com.afollestad.materialdialogs.MaterialDialog;

import java.io.File;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;

import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.misc.UpdateToastMediaScannerCompletionListener;
import code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFragment;
import code.name.monkey.retromusic.util.PreferenceUtil;

/**
 * @author Aidan Follestad (afollestad), modified by Karim Abou Zeid
 */
public class ScanMediaFolderChooserDialog extends DialogFragment implements MaterialDialog.ListCallback {

    String initialPath = PreferenceUtil.getInstance(getContext()).getStartDirectory().getAbsolutePath();
    private File parentFolder;
    private File[] parentContents;
    private boolean canGoUp = false;

    public static ScanMediaFolderChooserDialog create() {
        return new ScanMediaFolderChooserDialog();
    }

    private static void scanPaths(@NonNull WeakReference<Activity> activityWeakReference, @NonNull Context applicationContext, @Nullable String[] toBeScanned) {
        Activity activity = activityWeakReference.get();
        if (toBeScanned == null || toBeScanned.length < 1) {
            Toast.makeText(applicationContext, R.string.nothing_to_scan, Toast.LENGTH_SHORT).show();
        } else {
            MediaScannerConnection.scanFile(applicationContext, toBeScanned, null, activity != null ? new UpdateToastMediaScannerCompletionListener(activity, toBeScanned) : null);
        }
    }

    private String[] getContentsArray() {
        if (parentContents == null) {
            if (canGoUp) {
                return new String[]{".."};
            }
            return new String[]{};
        }
        String[] results = new String[parentContents.length + (canGoUp ? 1 : 0)];
        if (canGoUp) {
            results[0] = "..";
        }
        for (int i = 0; i < parentContents.length; i++) {
            results[canGoUp ? i + 1 : i] = parentContents[i].getName();
        }
        return results;
    }

    private File[] listFiles() {
        File[] contents = parentFolder.listFiles();
        List<File> results = new ArrayList<>();
        if (contents != null) {
            for (File fi : contents) {
                if (fi.isDirectory()) {
                    results.add(fi);
                }
            }
            Collections.sort(results, new FolderSorter());
            return results.toArray(new File[results.size()]);
        }
        return null;
    }

    @NonNull
    @Override
    public Dialog onCreateDialog(Bundle savedInstanceState) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
                && ActivityCompat.checkSelfPermission(
                getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE)
                != PackageManager.PERMISSION_GRANTED) {
            return new MaterialDialog.Builder(getActivity())
                    .title(R.string.md_error_label)
                    .content(R.string.md_storage_perm_error)
                    .positiveText(android.R.string.ok)
                    .build();
        }
        if (savedInstanceState == null) {
            savedInstanceState = new Bundle();
        }
        if (!savedInstanceState.containsKey("current_path")) {
            savedInstanceState.putString("current_path", initialPath);
        }
        parentFolder = new File(savedInstanceState.getString("current_path", File.pathSeparator));
        checkIfCanGoUp();
        parentContents = listFiles();
        MaterialDialog.Builder builder =
                new MaterialDialog.Builder(getActivity())
                        .title(parentFolder.getAbsolutePath())
                        .items((CharSequence[]) getContentsArray())
                        .itemsCallback(this)
                        .autoDismiss(false)
                        .onPositive((dialog, which) -> {
                            final Context applicationContext = getActivity().getApplicationContext();
                            final WeakReference<Activity> activityWeakReference = new WeakReference<>(getActivity());
                            dismiss();
                            new FoldersFragment.ListPathsAsyncTask(getActivity(), paths ->
                                    scanPaths(activityWeakReference, applicationContext, paths)).execute(new FoldersFragment.ListPathsAsyncTask.LoadingInfo(parentFolder, FoldersFragment.AUDIO_FILE_FILTER));
                        })
                        .onNegative((materialDialog, dialogAction) -> dismiss())
                        .positiveText(R.string.action_scan_directory)
                        .negativeText(android.R.string.cancel);
        return builder.build();
    }

    @Override
    public void onSelection(MaterialDialog materialDialog, View view, int i, CharSequence s) {
        if (canGoUp && i == 0) {
            parentFolder = parentFolder.getParentFile();
            if (parentFolder.getAbsolutePath().equals("/storage/emulated")) {
                parentFolder = parentFolder.getParentFile();
            }
            checkIfCanGoUp();
        } else {
            parentFolder = parentContents[canGoUp ? i - 1 : i];
            canGoUp = true;
            if (parentFolder.getAbsolutePath().equals("/storage/emulated")) {
                parentFolder = Environment.getExternalStorageDirectory();
            }
        }
        reload();
    }

    private void checkIfCanGoUp() {
        canGoUp = parentFolder.getParent() != null;
    }

    private void reload() {
        parentContents = listFiles();
        MaterialDialog dialog = (MaterialDialog) getDialog();
        dialog.setTitle(parentFolder.getAbsolutePath());
        dialog.setItems((CharSequence[]) getContentsArray());
    }

    @Override
    public void onSaveInstanceState(Bundle outState) {
        super.onSaveInstanceState(outState);
        outState.putString("current_path", parentFolder.getAbsolutePath());
    }

    private static class FolderSorter implements Comparator<File> {

        @Override
        public int compare(File lhs, File rhs) {
            return lhs.getName().compareTo(rhs.getName());
        }
    }
}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.java
index 21e5ec94..29a43012 100755
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.java
@@ -5,14 +5,13 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.ColorStateList;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.ClipDrawable;
 import android.graphics.drawable.LayerDrawable;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,8 +19,14 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import java.util.Locale;
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.textfield.TextInputLayout;
 
+import java.util.Locale;
+import java.util.Objects;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -37,15 +42,18 @@ import static code.name.monkey.retromusic.Constants.ACTION_QUIT;
 public class SleepTimerDialog extends RoundedBottomSheetDialogFragment {
     @BindView(R.id.seek_arc)
     SeekBar seekArc;
+
     @BindView(R.id.timer_display)
     TextView timerDisplay;
-    @BindView(R.id.action_set)
-    TextView setButton;
-    @BindView(R.id.action_cancel)
-    TextView cancelButton;
-    @BindView(R.id.action_cancel_container)
-    View cancelButtonContainer;
 
+    @BindView(R.id.action_set)
+    MaterialButton setButton;
+
+    @BindView(R.id.action_cancel)
+    MaterialButton cancelButton;
+
+    @BindView(R.id.title)
+    TextView title;
     private int seekArcProgress;
     private TimerUpdater timerUpdater;
 
@@ -81,6 +89,14 @@ public class SleepTimerDialog extends RoundedBottomSheetDialogFragment {
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        int accentColor = ThemeStore.accentColor(Objects.requireNonNull(getContext()));
+        setButton.setBackgroundTintList(ColorStateList.valueOf(accentColor));
+        cancelButton.setStrokeColor(ColorStateList.valueOf(accentColor));
+        cancelButton.setTextColor(accentColor);
+
+        title.setTextColor(ThemeStore.textColorPrimary(getContext()));
+        timerDisplay.setTextColor(ThemeStore.textColorSecondary(getContext()));
+
         timerUpdater = new TimerUpdater();
 
         seekArcProgress = PreferenceUtil.getInstance(getActivity()).getLastSleepTimerValue();
@@ -174,7 +190,7 @@ public class SleepTimerDialog extends RoundedBottomSheetDialogFragment {
         @Override
         public void onFinish() {
             cancelButton.setText(null);
-            cancelButtonContainer.setVisibility(View.GONE);
+            cancelButton.setVisibility(View.GONE);
             //materialDialog.setActionButton(DialogAction.NEUTRAL, null);
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.java
index cb8d5a01..6d3a6930 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.java
@@ -2,9 +2,6 @@ package code.name.monkey.retromusic.dialogs;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetDialogFragment;
 import android.text.Html;
 import android.text.Spanned;
 import android.util.Log;
@@ -25,7 +22,8 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-import butterknife.BindView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import butterknife.BindViews;
 import butterknife.ButterKnife;
 import code.name.monkey.appthemehelper.ThemeStore;
@@ -40,6 +38,15 @@ import code.name.monkey.retromusic.views.RoundedBottomSheetDialogFragment;
 public class SongDetailDialog extends RoundedBottomSheetDialogFragment {
 
     public static final String TAG = SongDetailDialog.class.getSimpleName();
+    @BindViews({R.id.title,
+            R.id.file_name,
+            R.id.file_path,
+            R.id.file_size,
+            R.id.file_format,
+            R.id.track_length,
+            R.id.bitrate,
+            R.id.sampling_rate})
+    List<TextView> textViews;
 
     @NonNull
     public static SongDetailDialog create(Song song) {
@@ -67,16 +74,6 @@ public class SongDetailDialog extends RoundedBottomSheetDialogFragment {
         }
     }
 
-    @BindViews({R.id.title,
-            R.id.file_name,
-            R.id.file_path,
-            R.id.file_size,
-            R.id.file_format,
-            R.id.track_length,
-            R.id.bitrate,
-            R.id.sampling_rate})
-    List<TextView> textViews;
-
     @SuppressWarnings("ConstantConditions")
     @Nullable
     @Override
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.java
index 0454367c..92a49a38 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.java
@@ -3,9 +3,9 @@ package code.name.monkey.retromusic.dialogs;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetDialogFragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java b/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java
index 5835bfcd..d1505250 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java
@@ -2,7 +2,7 @@ package code.name.monkey.retromusic.glide;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.BitmapRequestBuilder;
 import com.bumptech.glide.DrawableRequestBuilder;
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/BlurTransformation.java b/app/src/main/java/code/name/monkey/retromusic/glide/BlurTransformation.java
index b4659b27..ef2bb7e6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/BlurTransformation.java
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/BlurTransformation.java
@@ -10,8 +10,8 @@ import android.renderscript.Element;
 import android.renderscript.RSRuntimeException;
 import android.renderscript.RenderScript;
 import android.renderscript.ScriptIntrinsicBlur;
-import android.support.annotation.FloatRange;
-import android.support.annotation.NonNull;
+import androidx.annotation.FloatRange;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/SongGlideRequest.java b/app/src/main/java/code/name/monkey/retromusic/glide/SongGlideRequest.java
index 24eb8e63..727804d3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/SongGlideRequest.java
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/SongGlideRequest.java
@@ -2,7 +2,7 @@ package code.name.monkey.retromusic.glide;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.glide.audiocover.AudioFileCover;
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteTranscoder;
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteWrapper.java b/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteWrapper.java
index e7c53bea..8c65631b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteWrapper.java
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteWrapper.java
@@ -1,7 +1,7 @@
 package code.name.monkey.retromusic.glide.palette;
 
 import android.graphics.Bitmap;
-import android.support.v7.graphics.Palette;
+import androidx.palette.graphics.Palette;
 
 public class BitmapPaletteWrapper {
     private final Bitmap mBitmap;
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.java b/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.java
index 5e9416eb..c976b74f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.java
@@ -1,7 +1,7 @@
 package code.name.monkey.retromusic.helper;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.java b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.java
index 77bfc472..8e8d66c0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.java
@@ -15,8 +15,8 @@ import android.os.Environment;
 import android.os.IBinder;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.widget.Toast;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.java b/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.java
index f3f886c2..4559a240 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.java
@@ -2,7 +2,7 @@ package code.name.monkey.retromusic.helper;
 
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 
 public class MusicProgressViewUpdateHelper extends Handler {
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.java b/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.java
index fb8c99e1..7aaa91ae 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.java
@@ -4,7 +4,7 @@ import android.app.SearchManager;
 import android.content.Context;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/ShuffleHelper.java b/app/src/main/java/code/name/monkey/retromusic/helper/ShuffleHelper.java
index 5e7b4182..46721017 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/ShuffleHelper.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/ShuffleHelper.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.helper;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import code.name.monkey.retromusic.model.Song;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/GenreMenuHelper.java b/app/src/main/java/code/name/monkey/retromusic/helper/menu/GenreMenuHelper.java
index 0c71de2d..f78ec189 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/GenreMenuHelper.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/menu/GenreMenuHelper.java
@@ -1,8 +1,8 @@
 package code.name.monkey.retromusic.helper.menu;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/PlaylistMenuHelper.java b/app/src/main/java/code/name/monkey/retromusic/helper/menu/PlaylistMenuHelper.java
index a6944221..214ae79c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/PlaylistMenuHelper.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/menu/PlaylistMenuHelper.java
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic.helper.menu;
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.widget.Toast;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.java b/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.java
index 5d182886..23265664 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.helper.menu;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.PopupMenu;
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongsMenuHelper.java b/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongsMenuHelper.java
index cb305243..e341e976 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongsMenuHelper.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongsMenuHelper.java
@@ -1,7 +1,7 @@
 package code.name.monkey.retromusic.helper.menu;
 
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
 
 import code.name.monkey.retromusic.model.Song;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/CabHolder.java b/app/src/main/java/code/name/monkey/retromusic/interfaces/CabHolder.java
index 76ba6f35..e55195de 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/CabHolder.java
+++ b/app/src/main/java/code/name/monkey/retromusic/interfaces/CabHolder.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.interfaces;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.afollestad.materialcab.MaterialCab;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/MainActivityFragmentCallbacks.java b/app/src/main/java/code/name/monkey/retromusic/interfaces/MainActivityFragmentCallbacks.java
index fd165510..81dbbccb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/MainActivityFragmentCallbacks.java
+++ b/app/src/main/java/code/name/monkey/retromusic/interfaces/MainActivityFragmentCallbacks.java
@@ -1,7 +1,5 @@
 package code.name.monkey.retromusic.interfaces;
 
-import android.support.v4.app.Fragment;
-
 /**
  * Created by hemanths on 14/08/17.
  */
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/PaletteColorHolder.java b/app/src/main/java/code/name/monkey/retromusic/interfaces/PaletteColorHolder.java
index 406ddf60..f20757c0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/PaletteColorHolder.java
+++ b/app/src/main/java/code/name/monkey/retromusic/interfaces/PaletteColorHolder.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.interfaces;
 
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 
 /**
  * @author Aidan Follestad (afollestad)
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.java
index fb12d1dc..a848a4b7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.java
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic.loaders;
 
 import android.content.Context;
 import android.provider.MediaStore.Audio.AudioColumns;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import code.name.monkey.retromusic.model.Album;
 import code.name.monkey.retromusic.model.Song;
 import code.name.monkey.retromusic.util.PreferenceUtil;
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistLoader.java
index 1c9ebd96..bab82011 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistLoader.java
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic.loaders;
 
 import android.content.Context;
 import android.provider.MediaStore.Audio.AudioColumns;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistSongLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistSongLoader.java
index e4344ee7..ecd0c10b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistSongLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistSongLoader.java
@@ -3,7 +3,7 @@ package code.name.monkey.retromusic.loaders;
 import android.content.Context;
 import android.database.Cursor;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import code.name.monkey.retromusic.model.Song;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/GenreLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/GenreLoader.java
index 5ca28f20..5f738cf7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/GenreLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/GenreLoader.java
@@ -5,8 +5,8 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.provider.BaseColumns;
 import android.provider.MediaStore.Audio.Genres;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/GenreSongsLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/GenreSongsLoader.java
index 11422e4d..5dd87c53 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/GenreSongsLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/GenreSongsLoader.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import code.name.monkey.retromusic.model.Song;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/HomeLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/HomeLoader.java
index 790f7336..cc181e79 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/HomeLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/HomeLoader.java
@@ -2,7 +2,7 @@ package code.name.monkey.retromusic.loaders;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistLoader.java
index 70ed160b..c382f283 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistLoader.java
@@ -6,8 +6,8 @@ import android.net.Uri;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.PlaylistsColumns;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import code.name.monkey.retromusic.model.Playlist;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/SearchLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/SearchLoader.java
index f8bbf7a8..46880686 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/SearchLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/SearchLoader.java
@@ -1,7 +1,7 @@
 package code.name.monkey.retromusic.loaders;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.java
index 45e3ed07..b89672aa 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.java
@@ -5,8 +5,8 @@ import android.database.Cursor;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/SortedCursor.java b/app/src/main/java/code/name/monkey/retromusic/loaders/SortedCursor.java
index 06ab0d27..0ee45182 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/SortedCursor.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/SortedCursor.java
@@ -17,8 +17,8 @@ package code.name.monkey.retromusic.loaders;
 
 import android.database.AbstractCursor;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/SortedLongCursor.java b/app/src/main/java/code/name/monkey/retromusic/loaders/SortedLongCursor.java
index aea82900..1d1ab4bb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/SortedLongCursor.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/SortedLongCursor.java
@@ -17,8 +17,8 @@ package code.name.monkey.retromusic.loaders;
 
 import android.database.AbstractCursor;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/TopAndRecentlyPlayedTracksLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/TopAndRecentlyPlayedTracksLoader.java
index 1bf59552..f9ef75f9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/TopAndRecentlyPlayedTracksLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/TopAndRecentlyPlayedTracksLoader.java
@@ -3,8 +3,8 @@ package code.name.monkey.retromusic.loaders;
 import android.content.Context;
 import android.database.Cursor;
 import android.provider.BaseColumns;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import code.name.monkey.retromusic.model.Album;
 import code.name.monkey.retromusic.model.Artist;
 import code.name.monkey.retromusic.model.Song;
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/AppBarStateChangeListener.java b/app/src/main/java/code/name/monkey/retromusic/misc/AppBarStateChangeListener.java
index 0f1f8a92..d8ad2463 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/AppBarStateChangeListener.java
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/AppBarStateChangeListener.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.misc;
 
-import android.support.design.widget.AppBarLayout;
+import com.google.android.material.appbar.AppBarLayout;
 
 /**
  * @author Hemanth S (h4h13).
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/CustomFragmentStatePagerAdapter.java b/app/src/main/java/code/name/monkey/retromusic/misc/CustomFragmentStatePagerAdapter.java
index ee733845..c7208755 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/CustomFragmentStatePagerAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/CustomFragmentStatePagerAdapter.java
@@ -18,11 +18,13 @@ package code.name.monkey.retromusic.misc;
 
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.app.FragmentTransaction;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.viewpager.widget.PagerAdapter;
+
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,7 +32,7 @@ import android.view.ViewGroup;
 import java.util.ArrayList;
 
 /**
- * Implementation of {@link android.support.v4.view.PagerAdapter} that
+ * Implementation of {@link PagerAdapter} that
  * uses a {@link Fragment} to manage each page. This class also handles
  * saving and restoring of fragment's state.
  * <p/>
@@ -65,7 +67,7 @@ import java.util.ArrayList;
  * {@sample development/samples/Support13Demos/res/layout/fragment_pager_list.xml
  * complete}
  */
-public abstract class CustomFragmentStatePagerAdapter extends android.support.v4.view.PagerAdapter {
+public abstract class CustomFragmentStatePagerAdapter extends PagerAdapter {
     public static final String TAG = CustomFragmentStatePagerAdapter.class.getSimpleName();
     private static final boolean DEBUG = false;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/CustomMediaRouteActionProvider.java b/app/src/main/java/code/name/monkey/retromusic/misc/CustomMediaRouteActionProvider.java
deleted file mode 100644
index b4ea251a..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/misc/CustomMediaRouteActionProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package code.name.monkey.retromusic.misc;
-
-import android.app.Activity;
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.MediaRouteActionProvider;
-import android.support.v7.app.MediaRouteButton;
-import android.support.v7.media.MediaRouteSelector;
-import android.util.Log;
-import android.view.ViewGroup;
-
-import code.name.monkey.retromusic.RetroApplication;
-import code.name.monkey.retromusic.views.CustomMediaRouteButton;
-
-public class CustomMediaRouteActionProvider extends MediaRouteActionProvider {
-    private static final String TAG = "MediaRteActProvider";
-
-    private Activity activity;
-
-    private MediaRouteSelector selector = MediaRouteSelector.EMPTY;
-    private CustomMediaRouteButton customMediaRouteButton;
-
-    public CustomMediaRouteActionProvider(Context context) {
-        super(context);
-    }
-
-    public void setActivity(@NonNull Activity activity) {
-        this.activity = activity;
-        if (customMediaRouteButton != null) {
-            customMediaRouteButton.setActivity(activity);
-        }
-    }
-
-    @Nullable
-    @Override
-    public MediaRouteButton getMediaRouteButton() {
-        return customMediaRouteButton;
-    }
-
-    /**
-     * Called when the media route button is being created.
-     */
-    @SuppressWarnings("deprecation")
-    @Override
-    public CustomMediaRouteButton onCreateMediaRouteButton() {
-        if (customMediaRouteButton != null) {
-            Log.e(TAG, "onCreateMediaRouteButton: This ActionProvider is already associated "
-                    + "with a menu item. Don't reuse MediaRouteActionProvider instances!  "
-                    + "Abandoning the old button...");
-        }
-
-        customMediaRouteButton = new CustomMediaRouteButton(getContext());
-        customMediaRouteButton.setActivity(activity);
-        customMediaRouteButton.setAlpha(RetroApplication.isProVersion() ? 1.0f : 0.5f);
-        customMediaRouteButton.setRouteSelector(selector);
-        customMediaRouteButton.setLayoutParams(new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                ViewGroup.LayoutParams.FILL_PARENT));
-        return customMediaRouteButton;
-    }
-} 
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/DialogAsyncTask.java b/app/src/main/java/code/name/monkey/retromusic/misc/DialogAsyncTask.java
index 57bb3b0c..c1e85a5f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/DialogAsyncTask.java
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/DialogAsyncTask.java
@@ -3,8 +3,8 @@ package code.name.monkey.retromusic.misc;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.lang.ref.WeakReference;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/NavigationIconClickListener.java b/app/src/main/java/code/name/monkey/retromusic/misc/NavigationIconClickListener.java
index d51a9632..0a028724 100755
--- a/app/src/main/java/code/name/monkey/retromusic/misc/NavigationIconClickListener.java
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/NavigationIconClickListener.java
@@ -5,13 +5,14 @@ import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.ColorStateList;
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.animation.Interpolator;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
 import butterknife.BindInt;
 import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.retromusic.R;
@@ -65,7 +66,7 @@ public class NavigationIconClickListener implements View.OnClickListener {
             throw new IllegalArgumentException("updateIcon() must be called on an ImageView");
         }
         updateIcon((ImageView) view);
-        final int translateY = (int) RetroUtil.convertDpToPixel(RetroUtil.isLandscape(view.getResources()) ? 3 * 48 : 5 * 48, view.getContext());
+        final int translateY = (int) RetroUtil.convertDpToPixel(getHeight(view.getContext()), view.getContext());
 
         ObjectAnimator animator = ObjectAnimator.ofFloat(sheet, "translationY", backdropShown ? translateY : 0);
         animator.setDuration(500);
@@ -76,6 +77,20 @@ public class NavigationIconClickListener implements View.OnClickListener {
         animator.start();
     }
 
+    private int getHeight(Context context) {
+        Resources resources = context.getResources();
+        if (RetroUtil.isLandscape(resources)) {
+            return 3 * 48;
+        } else if (RetroUtil.isTablet(resources)) {
+            if (RetroUtil.isLandscape(resources)) {
+                return 48;
+            } else {
+                return 2 * 48;
+            }
+        } else
+            return 5 * 48;
+    }
+
     private void updateIcon(ImageView view) {
         if (openIcon != null && closeIcon != null) {
             view.setImageTintList(ColorStateList.valueOf(ATHUtil.resolveColor(context, R.attr.iconColor)));
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/ScrollAwareFABBehavior.java b/app/src/main/java/code/name/monkey/retromusic/misc/ScrollAwareFABBehavior.java
index a189d20c..8f7bfd5a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/ScrollAwareFABBehavior.java
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/ScrollAwareFABBehavior.java
@@ -2,10 +2,10 @@ package code.name.monkey.retromusic.misc;
 
 import android.content.Context;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.NonNull;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/WeakContextAsyncTask.java b/app/src/main/java/code/name/monkey/retromusic/misc/WeakContextAsyncTask.java
index c637d128..a2a8b7dd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/WeakContextAsyncTask.java
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/WeakContextAsyncTask.java
@@ -1 +1 @@
-package code.name.monkey.retromusic.misc;

import android.content.Context;
import android.os.AsyncTask;
import android.support.annotation.Nullable;

import java.lang.ref.WeakReference;

public abstract class WeakContextAsyncTask<Params, Progress, Result> extends AsyncTask<Params, Progress, Result> {
    private WeakReference<Context> contextWeakReference;

    public WeakContextAsyncTask(Context context) {
        contextWeakReference = new WeakReference<>(context);
    }

    @Nullable
    protected Context getContext() {
        return contextWeakReference.get();
    }
} 
\ No newline at end of file
+package code.name.monkey.retromusic.misc;

import android.content.Context;
import android.os.AsyncTask;
import androidx.annotation.Nullable;

import java.lang.ref.WeakReference;

public abstract class WeakContextAsyncTask<Params, Progress, Result> extends AsyncTask<Params, Progress, Result> {
    private WeakReference<Context> contextWeakReference;

    public WeakContextAsyncTask(Context context) {
        contextWeakReference = new WeakReference<>(context);
    }

    @Nullable
    protected Context getContext() {
        return contextWeakReference.get();
    }
} 
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/WrappedAsyncTaskLoader.java b/app/src/main/java/code/name/monkey/retromusic/misc/WrappedAsyncTaskLoader.java
index c0345087..599fe6ea 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/WrappedAsyncTaskLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/WrappedAsyncTaskLoader.java
@@ -2,7 +2,7 @@
 package code.name.monkey.retromusic.misc;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 /**
  * <a href="http://code.google.com/p/android/issues/detail?id=14944">Issue
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/AbsCustomPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/AbsCustomPlaylist.java
index 55ca34f7..d2c22d62 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/AbsCustomPlaylist.java
+++ b/app/src/main/java/code/name/monkey/retromusic/model/AbsCustomPlaylist.java
@@ -2,7 +2,7 @@ package code.name.monkey.retromusic.model;
 
 import android.content.Context;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Album.java b/app/src/main/java/code/name/monkey/retromusic/model/Album.java
index 93bf4c45..9d556b8a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Album.java
+++ b/app/src/main/java/code/name/monkey/retromusic/model/Album.java
@@ -2,7 +2,7 @@ package code.name.monkey.retromusic.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.util.ArrayList;
 
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Artist.java b/app/src/main/java/code/name/monkey/retromusic/model/Artist.java
index 08e41e4b..7cec500a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Artist.java
+++ b/app/src/main/java/code/name/monkey/retromusic/model/Artist.java
@@ -2,7 +2,7 @@ package code.name.monkey.retromusic.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Home.java b/app/src/main/java/code/name/monkey/retromusic/model/Home.java
index 5f3ff631..2814bc9b 100755
--- a/app/src/main/java/code/name/monkey/retromusic/model/Home.java
+++ b/app/src/main/java/code/name/monkey/retromusic/model/Home.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.model;
 
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java
index c8019ad3..9e3291ba 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java
+++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic.model.smartplaylist;
 
 import android.content.Context;
 import android.os.Parcel;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
 
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.model.AbsCustomPlaylist;
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java
index abec592d..ea748bc2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java
+++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java
@@ -3,7 +3,7 @@ package code.name.monkey.retromusic.model.smartplaylist;
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java
index 3e726d63..ec8c5209 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java
+++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java
@@ -3,7 +3,7 @@ package code.name.monkey.retromusic.model.smartplaylist;
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 
 import code.name.monkey.retromusic.R;
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java
index 2decf3f7..ee155ce4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java
+++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java
@@ -3,7 +3,7 @@ package code.name.monkey.retromusic.model.smartplaylist;
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 
 import code.name.monkey.retromusic.R;
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java
index fdada0c5..b3763234 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java
+++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java
@@ -3,7 +3,7 @@ package code.name.monkey.retromusic.model.smartplaylist;
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 
 import code.name.monkey.retromusic.R;
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/Presenter.java b/app/src/main/java/code/name/monkey/retromusic/mvp/Presenter.java
index 73900b36..5bc63f1c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/Presenter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/Presenter.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.mvp;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import code.name.monkey.retromusic.Injection;
 import code.name.monkey.retromusic.providers.interfaces.Repository;
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumDetailsPresenter.java b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumDetailsPresenter.java
index 053eef11..b136089e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumDetailsPresenter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumDetailsPresenter.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.mvp.presenter;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import code.name.monkey.retromusic.model.Album;
 import code.name.monkey.retromusic.mvp.Presenter;
 import code.name.monkey.retromusic.mvp.contract.AlbumDetailsContract;
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumPresenter.java b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumPresenter.java
index 46bbc341..dc2ba3ef 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumPresenter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumPresenter.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.mvp.presenter;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.java b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.java
index 4dd503dc..0885f68a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.java
@@ -1,7 +1,7 @@
 package code.name.monkey.retromusic.mvp.presenter;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import code.name.monkey.retromusic.model.Artist;
 import code.name.monkey.retromusic.mvp.Presenter;
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistPresenter.java b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistPresenter.java
index 613e201f..9e2d3526 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistPresenter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistPresenter.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.mvp.presenter;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.java b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.java
index 0fd3e200..9f3e176e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.mvp.presenter;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenrePresenter.java b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenrePresenter.java
index cd9d9fa2..3542a689 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenrePresenter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenrePresenter.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.mvp.presenter;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.java b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.java
index 3511872d..4043c820 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.mvp.presenter;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import code.name.monkey.retromusic.RetroApplication;
 import code.name.monkey.retromusic.mvp.Presenter;
@@ -27,10 +27,6 @@ public class HomePresenter extends Presenter implements HomeContract.HomePresent
 
         loadSuggestions();
 
-        if (PreferenceUtil.getInstance(RetroApplication.getInstance()).isGenreShown()) {
-            loadGenres();
-        }
-
     }
 
     @Override
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistPresenter.java b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistPresenter.java
index 744a055c..3061072b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistPresenter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistPresenter.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.mvp.presenter;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.java b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.java
index 66b129df..44d20c3a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.mvp.presenter;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import code.name.monkey.retromusic.model.Playlist;
 import code.name.monkey.retromusic.mvp.Presenter;
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SearchPresenter.java b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SearchPresenter.java
index 21c012ba..2d4dbdb0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SearchPresenter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SearchPresenter.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.mvp.presenter;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SongPresenter.java b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SongPresenter.java
index d8098958..13aed8fe 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SongPresenter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SongPresenter.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.mvp.presenter;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreference.java b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreference.java
new file mode 100644
index 00000000..b4720730
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreference.java
@@ -0,0 +1,25 @@
+package code.name.monkey.retromusic.preferences;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference;
+
+
+public class AlbumCoverStylePreference extends ATEDialogPreference {
+    public AlbumCoverStylePreference(Context context) {
+        super(context);
+    }
+
+    public AlbumCoverStylePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public AlbumCoverStylePreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public AlbumCoverStylePreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.java b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.java
new file mode 100644
index 00000000..d8e0256c
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.java
@@ -0,0 +1,137 @@
+package code.name.monkey.retromusic.preferences;
+
+import android.annotation.SuppressLint;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.afollestad.materialdialogs.DialogAction;
+import com.afollestad.materialdialogs.MaterialDialog;
+import com.bumptech.glide.Glide;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.ui.fragments.AlbumCoverStyle;
+import code.name.monkey.retromusic.util.PreferenceUtil;
+import code.name.monkey.retromusic.util.ViewUtil;
+
+
+public class AlbumCoverStylePreferenceDialog extends DialogFragment implements
+        ViewPager.OnPageChangeListener, MaterialDialog.SingleButtonCallback {
+    public static final String TAG = AlbumCoverStylePreferenceDialog.class.getSimpleName();
+
+    private DialogAction whichButtonClicked;
+    private int viewPagerPosition;
+
+    public static AlbumCoverStylePreferenceDialog newInstance() {
+        return new AlbumCoverStylePreferenceDialog();
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        @SuppressLint("InflateParams") View view = LayoutInflater.from(getActivity()).inflate(R.layout.preference_dialog_now_playing_screen, null);
+        ViewPager viewPager = view.findViewById(R.id.now_playing_screen_view_pager);
+        viewPager.setAdapter(new AlbumCoverStyleAdapter(getActivity()));
+        viewPager.addOnPageChangeListener(this);
+        viewPager.setPageMargin((int) ViewUtil.convertDpToPixel(32, getResources()));
+        viewPager.setCurrentItem(PreferenceUtil.getInstance(getActivity()).getAlbumCoverStyle().ordinal());
+
+        return new MaterialDialog.Builder(getActivity())
+                .title(R.string.pref_title_album_cover_style)
+                .positiveText(android.R.string.ok)
+                .negativeText(android.R.string.cancel)
+                .onAny(this)
+                .customView(view, false)
+                .build();
+    }
+
+    @Override
+    public void onClick(@NonNull MaterialDialog dialog,
+                        @NonNull DialogAction which) {
+        whichButtonClicked = which;
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (whichButtonClicked == DialogAction.POSITIVE) {
+            AlbumCoverStyle nowPlayingScreen = AlbumCoverStyle.values()[viewPagerPosition];
+            PreferenceUtil.getInstance(getActivity()).setAlbumCoverStyle(nowPlayingScreen);
+        }
+    }
+
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+        this.viewPagerPosition = position;
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+
+    }
+
+    private static class AlbumCoverStyleAdapter extends PagerAdapter {
+
+        private Context context;
+
+        AlbumCoverStyleAdapter(Context context) {
+            this.context = context;
+        }
+
+        @NonNull
+        @Override
+        public Object instantiateItem(@NonNull ViewGroup collection, int position) {
+            AlbumCoverStyle albumCoverStyle = AlbumCoverStyle.values()[position];
+
+            LayoutInflater inflater = LayoutInflater.from(context);
+            ViewGroup layout = (ViewGroup) inflater.inflate(R.layout.preference_now_playing_screen_item, collection, false);
+            collection.addView(layout);
+
+            ImageView image = layout.findViewById(R.id.image);
+            TextView title = layout.findViewById(R.id.title);
+            Glide.with(context).load(albumCoverStyle.drawableResId).into(image);
+            title.setText(albumCoverStyle.titleRes);
+
+            return layout;
+        }
+
+        @Override
+        public void destroyItem(@NonNull ViewGroup collection,
+                                int position,
+                                @NonNull Object view) {
+            collection.removeView((View) view);
+        }
+
+        @Override
+        public int getCount() {
+            return AlbumCoverStyle.values().length;
+        }
+
+        @Override
+        public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
+            return view == object;
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return context.getString(AlbumCoverStyle.values()[position].titleRes);
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.java b/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.java
index 9f0a560a..495da2e4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.java
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic.preferences;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
 import android.text.Html;
 import android.view.View;
 import code.name.monkey.retromusic.R;
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.java b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.java
index 253901f1..83ab209a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.java
@@ -5,10 +5,10 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java
index 2382ff8a..3105c45c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java
@@ -7,7 +7,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Environment;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import code.name.monkey.retromusic.Constants;
 import code.name.monkey.retromusic.util.FileUtil;
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/HistoryStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/HistoryStore.java
index dfb4c511..8a8cbca2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/HistoryStore.java
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/HistoryStore.java
@@ -21,8 +21,8 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class HistoryStore extends SQLiteOpenHelper {
     public static final String DATABASE_NAME = "history.db";
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
index 86704afd..5770072d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
@@ -22,8 +22,8 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.provider.BaseColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import code.name.monkey.retromusic.loaders.SongLoader;
 import code.name.monkey.retromusic.model.Song;
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java
index 99f22e65..73610f4f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java
@@ -21,8 +21,8 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Interpolator;
 
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 30072bc6..23db6a19 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
@@ -1,8 +1,8 @@
 package code.name.monkey.retromusic.rest;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import code.name.monkey.retromusic.Constants;
 import code.name.monkey.retromusic.RetroApplication;
 import code.name.monkey.retromusic.rest.service.KuGouApiService;
diff --git a/app/src/main/java/code/name/monkey/retromusic/rest/LastFMRestClient.java b/app/src/main/java/code/name/monkey/retromusic/rest/LastFMRestClient.java
index b46674aa..4818ff6f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/rest/LastFMRestClient.java
+++ b/app/src/main/java/code/name/monkey/retromusic/rest/LastFMRestClient.java
@@ -1,8 +1,8 @@
 package code.name.monkey.retromusic.rest;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import code.name.monkey.retromusic.rest.service.LastFMService;
 import java.io.File;
 import okhttp3.Cache;
diff --git a/app/src/main/java/code/name/monkey/retromusic/rest/service/LastFMService.java b/app/src/main/java/code/name/monkey/retromusic/rest/service/LastFMService.java
index 4a0ab117..95af6488 100644
--- a/app/src/main/java/code/name/monkey/retromusic/rest/service/LastFMService.java
+++ b/app/src/main/java/code/name/monkey/retromusic/rest/service/LastFMService.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.rest.service;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import code.name.monkey.retromusic.BuildConfig;
 import code.name.monkey.retromusic.rest.model.LastFmAlbum;
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.java b/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.java
index d7a7e23b..729a93d6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.java
@@ -7,8 +7,8 @@ import android.media.MediaPlayer;
 import android.media.audiofx.AudioEffect;
 import android.net.Uri;
 import android.os.PowerManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.widget.Toast;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
index 0007eb23..24b96494 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
@@ -27,8 +27,8 @@ import android.os.PowerManager;
 import android.os.Process;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.support.v4.media.MediaMetadataCompat;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/WearBrowserService.java b/app/src/main/java/code/name/monkey/retromusic/service/WearBrowserService.java
index 5bf23cfe..f869e2b4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/WearBrowserService.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/WearBrowserService.java
@@ -23,8 +23,8 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.service.media.MediaBrowserService;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/daydream/RetroMusicAlbums.java b/app/src/main/java/code/name/monkey/retromusic/service/daydream/RetroMusicAlbums.java
index c42dae27..543ec6ac 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/daydream/RetroMusicAlbums.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/daydream/RetroMusicAlbums.java
@@ -5,11 +5,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.service.dreams.DreamService;
-import android.support.transition.TransitionManager;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.transition.TransitionManager;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotification.java b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotification.java
index d47f1dfc..b4a59d5a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotification.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotification.java
@@ -7,7 +7,7 @@ import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.service.MusicService;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.java b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.java
index cd424700..c2ab5de4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.java
@@ -9,8 +9,8 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.RemoteViews;
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.java b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.java
index 777b96ca..d52c897f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.java
@@ -13,8 +13,8 @@ import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.media.app.NotificationCompat.MediaStyle;
+import androidx.core.app.NotificationCompat;
+import androidx.media.app.NotificationCompat.MediaStyle;
 import android.text.Html;
 import code.name.monkey.retromusic.Constants;
 import code.name.monkey.retromusic.R;
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.java b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.java
index 7956ed23..e0eea837 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.java
@@ -14,8 +14,8 @@ import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 import android.widget.RemoteViews;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.appthemehelper.util.MaterialValueHelper;
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.java b/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.java
index 8863b36e..9b70a88e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.service.playback;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 
 public interface Playback {
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/CustPagerTransformer.java b/app/src/main/java/code/name/monkey/retromusic/transform/CustPagerTransformer.java
index 6e72fed3..2c72de20 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/CustPagerTransformer.java
+++ b/app/src/main/java/code/name/monkey/retromusic/transform/CustPagerTransformer.java
@@ -1,7 +1,7 @@
 package code.name.monkey.retromusic.transform;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 
 /**
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/NormalPageTransformer.java b/app/src/main/java/code/name/monkey/retromusic/transform/NormalPageTransformer.java
index 4ad5c7eb..76dd4873 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/NormalPageTransformer.java
+++ b/app/src/main/java/code/name/monkey/retromusic/transform/NormalPageTransformer.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.transform;
 
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 
 /**
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/ParallaxPagerTransformer.java b/app/src/main/java/code/name/monkey/retromusic/transform/ParallaxPagerTransformer.java
index c2479db4..a44310ac 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/ParallaxPagerTransformer.java
+++ b/app/src/main/java/code/name/monkey/retromusic/transform/ParallaxPagerTransformer.java
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic.transform;
 
 import android.annotation.TargetApi;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.ViewPager;
 import android.util.Log;
 import android.view.View;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.java
index 06433dca..41a79c9e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.java
@@ -5,8 +5,8 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.ShareCompat;
-import android.support.v7.widget.Toolbar;
+import androidx.core.app.ShareCompat;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java
index 4af3e0a9..887f3965 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java
@@ -2,19 +2,19 @@ package code.name.monkey.retromusic.ui.activities;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.util.Pair;
-import android.support.v7.widget.AppCompatTextView;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.core.content.ContextCompat;
+import androidx.core.util.Pair;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.SubMenu;
@@ -144,13 +144,13 @@ public class AlbumDetailsActivity extends AbsSlidingMusicPanelActivity implement
         }
 
         toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp);
+        setSupportActionBar(toolbar);
         //noinspection ConstantConditions
         getSupportActionBar().setTitle(null);
-        setSupportActionBar(toolbar);
+
 
         if (toolbar != null && !PreferenceUtil.getInstance(this).getFullScreenMode()) {
-            ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) toolbar
-                    .getLayoutParams();
+            ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) toolbar.getLayoutParams();
             params.topMargin = RetroUtil.getStatusBarHeight(this);
             toolbar.setLayoutParams(params);
         }
@@ -321,7 +321,7 @@ public class AlbumDetailsActivity extends AbsSlidingMusicPanelActivity implement
         moreTitle.setTextColor(themeColor);
 
         TintHelper.setTintAuto(shuffleButton, themeColor, true);
-        findViewById(R.id.root).setBackgroundColor(ThemeStore.primaryColor(this));
+        //findViewById(R.id.root).setBackgroundColor(ThemeStore.primaryColor(this));
     }
 
     @Override
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java
index 4853e1af..c2cbd774 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java
@@ -3,18 +3,18 @@ package code.name.monkey.retromusic.ui.activities;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.AppCompatTextView;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Html;
 import android.text.Spanned;
 import android.view.Menu;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.java
index 9a26b8df..9040d2f1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.activities;
 
 import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
-import android.support.v7.widget.SwitchCompat;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.appcompat.widget.Toolbar;
 import android.transition.TransitionManager;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ErrorHandlerActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ErrorHandlerActivity.java
index ab89e96b..6f0de686 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ErrorHandlerActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ErrorHandlerActivity.java
@@ -1 +1 @@
-package code.name.monkey.retromusic.ui.activities;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View;

import butterknife.OnClick;
import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.RetroApplication;

public class ErrorHandlerActivity extends AppCompatActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_error_handler);
    }

    @OnClick(R.id.clear_app_data)
    void clearAppDate(View view) {
        RetroApplication.deleteAppData();
    }

}
\ No newline at end of file
+package code.name.monkey.retromusic.ui.activities;

import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import android.view.View;

import butterknife.OnClick;
import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.RetroApplication;

public class ErrorHandlerActivity extends AppCompatActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_error_handler);
    }

    @OnClick(R.id.clear_app_data)
    void clearAppDate(View view) {
        RetroApplication.deleteAppData();
    }

}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java
index 888340a8..ceac8cb1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java
@@ -1,13 +1,13 @@
 package code.name.monkey.retromusic.ui.activities;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -40,16 +40,15 @@ import code.name.monkey.retromusic.mvp.presenter.GenreDetailsPresenter;
 import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity;
 import code.name.monkey.retromusic.ui.adapter.song.SongAdapter;
 import code.name.monkey.retromusic.util.RetroColorUtil;
-import code.name.monkey.retromusic.util.RetroUtil;
 import code.name.monkey.retromusic.util.ViewUtil;
 
 /**
  * @author Hemanth S (h4h13).
  */
 
-public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implements
-        GenreDetailsContract.GenreDetailsView, CabHolder {
+public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implements GenreDetailsContract.GenreDetailsView, CabHolder {
     public static final String EXTRA_GENRE_ID = "extra_genre_id";
+
     @BindView(R.id.recycler_view)
     RecyclerView recyclerView;
 
@@ -59,9 +58,6 @@ public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implement
     @BindView(android.R.id.empty)
     TextView empty;
 
-    @BindView(R.id.status_bar)
-    View statusBar;
-
     @BindView(R.id.action_shuffle)
     FloatingActionButton shuffleButton;
 
@@ -96,7 +92,6 @@ public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implement
         setTaskDescriptionColorAuto();
         setLightNavigationBar(true);
 
-        RetroUtil.statusBarHeight(statusBar);
 
         genre = getIntent().getParcelableExtra(EXTRA_GENRE_ID);
         presenter = new GenreDetailsPresenter(this, genre.id);
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.java
index dd6da123..cf8843f1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.activities;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.AppBarLayout;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.webkit.WebView;
 import android.widget.TextView;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LockScreenActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/LockScreenActivity.java
index 9b075d05..47dd9dbc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LockScreenActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/LockScreenActivity.java
@@ -1,7 +1,7 @@
 package code.name.monkey.retromusic.ui.activities;
 
 import android.os.Bundle;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.view.WindowManager;
 
 import com.bumptech.glide.Glide;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.java
index d3335770..c33fbd16 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.java
@@ -5,8 +5,8 @@ import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.view.MenuItem;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java
index 645c002c..4a29eff3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java
@@ -12,13 +12,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomNavigationView;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
@@ -28,8 +21,13 @@ import android.widget.FrameLayout;
 import com.afollestad.materialdialogs.MaterialDialog;
 
 import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import code.name.monkey.retromusic.R;
@@ -48,22 +46,18 @@ import code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFrag
 import code.name.monkey.retromusic.ui.fragments.mainactivity.home.BannerHomeFragment;
 import code.name.monkey.retromusic.ui.fragments.mainactivity.home.HomeFragment;
 import code.name.monkey.retromusic.util.PreferenceUtil;
-import io.reactivex.Observable;
 import io.reactivex.disposables.CompositeDisposable;
 
 public class MainActivity extends AbsSlidingMusicPanelActivity implements
-        SharedPreferences.OnSharedPreferenceChangeListener,
-        BottomNavigationView.OnNavigationItemSelectedListener {
+        SharedPreferences.OnSharedPreferenceChangeListener {
 
     public static final int APP_INTRO_REQUEST = 2323;
-    private static final String TAG = "MainActivity";
-    private static final int APP_USER_INFO_REQUEST = 9003;
-    private static final int REQUEST_CODE_THEME = 9002;
-
     public static final int LIBRARY = 1;
     public static final int FOLDERS = 3;
     public static final int HOME = 0;
-
+    private static final String TAG = "MainActivity";
+    private static final int APP_USER_INFO_REQUEST = 9003;
+    private static final int REQUEST_CODE_THEME = 9002;
     @Nullable
     MainActivityFragmentCallbacks currentFragment;
 
@@ -112,10 +106,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements
         } else {
             restoreCurrentFragment();
         }
-        //getBottomNavigationView().setOnNavigationItemSelectedListener(this);
         checkShowChangelog();
-
-
     }
 
 
@@ -178,19 +169,9 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements
                 .findFragmentById(R.id.fragment_container);
     }
 
-    @Override
-    public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-        PreferenceUtil.getInstance(this).setLastPage(item.getItemId());
-        disposable.add(Observable.just(item.getItemId())
-                .throttleFirst(3, TimeUnit.SECONDS)
-                .subscribe(this::setCurrentFragment));
-        return true;
-    }
-
-    public void setCurrentFragment(int menuItem) {
-        PreferenceUtil.getInstance(this).setLastMusicChooser(menuItem);
-        switch (menuItem) {
-            default:
+    public void setCurrentFragment(int key) {
+        PreferenceUtil.getInstance(this).setLastMusicChooser(key);
+        switch (key) {
             case LIBRARY:
                 setCurrentFragment(LibraryFragment.newInstance(), false, LibraryFragment.TAG);
                 break;
@@ -198,7 +179,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements
                 setCurrentFragment(FoldersFragment.newInstance(this), false, FoldersFragment.TAG);
                 break;
             case HOME:
-                setCurrentFragment(PreferenceUtil.getInstance(this).toggleHomeBanner() ? HomeFragment.newInstance() : BannerHomeFragment.newInstance(), false, HomeFragment.TAG);
+                setCurrentFragment(BannerHomeFragment.newInstance(), false, HomeFragment.TAG);
                 break;
         }
     }
@@ -336,7 +317,9 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements
                 key.equals(PreferenceUtil.TOGGLE_SEPARATE_LINE) ||
                 key.equals(PreferenceUtil.ALBUM_GRID_STYLE) ||
                 key.equals(PreferenceUtil.ARTIST_GRID_STYLE) ||
-                key.equals(PreferenceUtil.TOGGLE_HOME_BANNER)) postRecreate();
+                key.equals(PreferenceUtil.TOGGLE_HOME_BANNER) ||
+                key.equals(PreferenceUtil.TOGGLE_ADD_CONTROLS) ||
+                key.equals(PreferenceUtil.ALBUM_COVER_STYLE)) postRecreate();
     }
 
     private void showPromotionalOffer() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.java
index e6adf5df..24c1ef7b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.java
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic.ui.activities;
 
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.design.widget.AppBarLayout;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.widget.TextView;
 
 import butterknife.BindDrawable;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java
index 9d2a7487..532b89e3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java
@@ -1,12 +1,6 @@
 package code.name.monkey.retromusic.ui.activities;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -15,6 +9,8 @@ import android.view.animation.DecelerateInterpolator;
 import android.widget.TextView;
 
 import com.afollestad.materialcab.MaterialCab;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator;
 import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator;
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
@@ -23,6 +19,10 @@ import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 
 import java.util.ArrayList;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -45,7 +45,6 @@ import code.name.monkey.retromusic.ui.adapter.song.PlaylistSongAdapter;
 import code.name.monkey.retromusic.ui.adapter.song.SongAdapter;
 import code.name.monkey.retromusic.util.PlaylistsUtil;
 import code.name.monkey.retromusic.util.RetroColorUtil;
-import code.name.monkey.retromusic.util.RetroUtil;
 import code.name.monkey.retromusic.util.ViewUtil;
 
 public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity implements CabHolder,
@@ -72,9 +71,6 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
     @BindView(R.id.title)
     TextView title;
 
-    @BindView(R.id.status_bar)
-    View statusBar;
-
     private Playlist playlist;
     private MaterialCab cab;
     private SongAdapter adapter;
@@ -88,7 +84,6 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
         super.onCreate(savedInstanceState);
         ButterKnife.bind(this);
 
-        RetroUtil.statusBarHeight(statusBar);
         setStatusbarColorAuto();
         setNavigationbarColorAuto();
         setTaskDescriptionColorAuto();
@@ -178,24 +173,22 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
     }
 
     private void setUpToolBar() {
+        title.setText(playlist.name);
         title.setTextColor(ThemeStore.textColorPrimary(this));
         TintHelper.setTintAuto(shuffleButton, ThemeStore.accentColor(this), true);
 
         int primaryColor = ThemeStore.primaryColor(this);
         toolbar.setBackgroundColor(primaryColor);
         appBarLayout.setBackgroundColor(primaryColor);
-        toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp);
-        title.setText(playlist.name);
 
         setTitle(null);
         setSupportActionBar(toolbar);
+        toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp);
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(
-                playlist instanceof AbsCustomPlaylist ? R.menu.menu_smart_playlist_detail
-                        : R.menu.menu_playlist_detail, menu);
+        getMenuInflater().inflate(playlist instanceof AbsCustomPlaylist ? R.menu.menu_smart_playlist_detail : R.menu.menu_playlist_detail, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ProVersionActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ProVersionActivity.java
index c855f8d9..b6ac1748 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ProVersionActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ProVersionActivity.java
@@ -3,10 +3,10 @@ package code.name.monkey.retromusic.ui.activities;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
@@ -26,7 +26,6 @@ import code.name.monkey.retromusic.BuildConfig;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.RetroApplication;
 import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity;
-import code.name.monkey.retromusic.util.RetroUtil;
 
 /**
  * @author Hemanth S (h4h13).
@@ -48,9 +47,6 @@ public class ProVersionActivity extends AbsBaseActivity implements
     @BindView(R.id.app_bar)
     AppBarLayout appBar;
 
-    @BindView(R.id.status_bar)
-    View statusBar;
-
     @BindView(R.id.title)
     TextView title;
 
@@ -63,7 +59,7 @@ public class ProVersionActivity extends AbsBaseActivity implements
         setContentView(R.layout.activity_pro_version);
         setDrawUnderStatusBar(true);
         ButterKnife.bind(this);
-        RetroUtil.statusBarHeight(statusBar);
+
         setStatusbarColorAuto();
         setNavigationbarColorAuto();
         setTaskDescriptionColorAuto();
@@ -75,9 +71,10 @@ public class ProVersionActivity extends AbsBaseActivity implements
 
         toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp);
         toolbar.setNavigationOnClickListener(v -> onBackPressed());
+        title.setTextColor(ThemeStore.textColorPrimary(this));
         setSupportActionBar(toolbar);
         //noinspection ConstantConditions
-        getSupportActionBar().setTitle("RetroMusic Pro");
+        getSupportActionBar().setTitle(null);
 
         restoreButton.setEnabled(false);
         purchaseButton.setEnabled(false);
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.java
index 72df9acc..0049d533 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.java
@@ -5,10 +5,10 @@ import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.os.Bundle;
 import android.speech.RecognizerIntent;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView.OnQueryTextListener;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.SearchView.OnQueryTextListener;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.View;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.java
index 39ae966e..69540d12 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.java
@@ -2,16 +2,16 @@ package code.name.monkey.retromusic.ui.activities;
 
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.design.widget.AppBarLayout;
-import android.support.transition.TransitionManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.transition.TransitionManager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.widget.FrameLayout;
 import android.widget.TextView;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.java
index fb6956a8..e95e55e5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.java
@@ -4,14 +4,6 @@ import android.content.Intent;
 import android.graphics.Paint;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -25,6 +17,7 @@ import com.afollestad.materialdialogs.internal.MDTintHelper;
 import com.anjlab.android.iab.v3.BillingProcessor;
 import com.anjlab.android.iab.v3.SkuDetails;
 import com.anjlab.android.iab.v3.TransactionDetails;
+import com.google.android.material.appbar.AppBarLayout;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -34,6 +27,13 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.java
index f8af7616..a552415d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.java
@@ -9,10 +9,10 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.app.ActivityCompat;
 import android.view.KeyEvent;
 import android.view.View;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsMusicServiceActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsMusicServiceActivity.java
index 97b50cf4..4a690e68 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsMusicServiceActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsMusicServiceActivity.java
@@ -9,8 +9,8 @@ import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java
index 183c5b8f..c96e9cb9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java
@@ -4,10 +4,6 @@ import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.FloatRange;
-import android.support.annotation.LayoutRes;
-import android.support.v4.app.Fragment;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
@@ -18,11 +14,16 @@ import com.google.android.gms.cast.framework.media.widget.ExpandedControllerActi
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout.PanelState;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.FloatRange;
+import androidx.annotation.LayoutRes;
+import androidx.fragment.app.Fragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.cast.CastHelper;
 import code.name.monkey.retromusic.helper.MusicPlayerRemote;
 import code.name.monkey.retromusic.ui.fragments.MiniPlayerFragment;
 import code.name.monkey.retromusic.ui.fragments.NowPlayingScreen;
@@ -42,9 +43,7 @@ import code.name.monkey.retromusic.ui.fragments.player.simple.SimplePlayerFragme
 import code.name.monkey.retromusic.util.PreferenceUtil;
 import code.name.monkey.retromusic.util.ViewUtil;
 
-public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivity implements
-        SlidingUpPanelLayout.PanelSlideListener,
-        PlayerFragment.Callbacks {
+public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivity implements SlidingUpPanelLayout.PanelSlideListener, PlayerFragment.Callbacks {
 
     public static final String TAG = AbsSlidingMusicPanelActivity.class.getSimpleName();
 
@@ -68,7 +67,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
             return;
         }
         //MusicPlayerRemote.pauseSong();
-        //CastHelper.startCasting(castSession, MusicPlayerRemote.getCurrentSong());
+        CastHelper.startCasting(castSession, MusicPlayerRemote.getCurrentSong());
     }
 
     @Override
@@ -104,7 +103,6 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
                     }
                 });
 
-        //setupBottomView();
         slidingUpPanelLayout.addPanelSlideListener(this);
 
     }
@@ -163,16 +161,6 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
                 .findFragmentById(R.id.mini_player_fragment);
     }
 
-    /* private void setupBottomView() {
-         bottomNavigationView.setSelectedItemId(PreferenceUtil.getInstance(this).getLastPage());
-         bottomNavigationView.setBackgroundColor(ThemeStore.primaryColor(this));
-         bottomNavigationView.enableAnimation(false);
-         bottomNavigationView.enableItemShiftingMode(false);
-         bottomNavigationView.enableShiftingMode(false);
-         bottomNavigationView.setTextSize(10f);
-         bottomNavigationView.setTextVisibility(PreferenceUtil.getInstance(this).tabTitles());
-     }
- */
     @Override
     protected void onResume() {
         super.onResume();
@@ -215,9 +203,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
 
     @Override
     public void onPanelSlide(View panel, @FloatRange(from = 0, to = 1) float slideOffset) {
-        //bottomNavigationView.setTranslationY(slideOffset * 400);
         setMiniPlayerAlphaProgress(slideOffset);
-        //findViewById(R.id.player_fragment_container).setAlpha(slideOffset);
     }
 
     @Override
@@ -266,9 +252,9 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
     }
 
     private void setLightStatusBar() {
-        super.setLightStatusbar(!PreferenceUtil.getInstance(this).getAdaptiveColor() &&
-                ColorUtil.isColorLight(ThemeStore.primaryColor(this)) && (
-                currentNowPlayingScreen == NowPlayingScreen.FLAT
+        super.setLightStatusbar(PreferenceUtil.getInstance(this).getAdaptiveColor() &&
+                ColorUtil.isColorLight(ThemeStore.primaryColor(this)) &&
+                (currentNowPlayingScreen == NowPlayingScreen.FLAT
                         || currentNowPlayingScreen == NowPlayingScreen.PLAIN
                         || currentNowPlayingScreen == NowPlayingScreen.SIMPLE
                         || currentNowPlayingScreen == NowPlayingScreen.NORMAL
@@ -340,6 +326,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
             slidingUpPanelLayout.setPanelHeight(0);
             collapsePanel();
         } else {
+            //slidingUpPanelLayout.setPanelHeight(getCastSession() != null ? getResources().getDimensionPixelSize(R.dimen.mini_player_height_expanded) : getResources().getDimensionPixelSize(R.dimen.mini_player_height));
             slidingUpPanelLayout.setPanelHeight(getResources().getDimensionPixelSize(R.dimen.mini_player_height));
         }
     }
@@ -443,5 +430,6 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
         super.showCastMiniController();
         hideBottomBar(true);
         findViewById(R.id.castMiniController).setVisibility(View.VISIBLE);
+        MusicPlayerRemote.pauseSong();
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.java
index c336e31d..9f12828d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.java
@@ -5,8 +5,8 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.ColorInt;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.core.content.ContextCompat;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.java
index 2836a5aa..ba2afae1 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.java
@@ -6,9 +6,9 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.java
index c74f4f01..d13b6c45 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.java
@@ -6,10 +6,10 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.AppBarLayout;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java
index b9655e59..5eaa010a 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java
@@ -2,9 +2,9 @@ package code.name.monkey.retromusic.ui.activities.tageditor;
 
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.AppBarLayout;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.widget.EditText;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/WriteTagsAsyncTask.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/WriteTagsAsyncTask.java
index 0c53ae7b..8d181da7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/WriteTagsAsyncTask.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/WriteTagsAsyncTask.java
@@ -5,8 +5,8 @@ import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.media.MediaScannerConnection;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.java
index fdee5b6a..fba5e4ca 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.adapter;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.java
index 9f45384d..e7f217e9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.java
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic.ui.adapter;
 
 import android.app.Activity;
 import android.graphics.PorterDuff;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.java
index 6d4317a7..8198722d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.adapter;
 
-import android.support.annotation.NonNull;
-import android.support.v4.util.Pair;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.core.util.Pair;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SongFileAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SongFileAdapter.java
index 960b81d6..8a110673 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SongFileAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SongFileAdapter.java
@@ -2,10 +2,10 @@ package code.name.monkey.retromusic.ui.adapter;
 
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.java
index c161a9f0..e45bfe57 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.java
@@ -1,11 +1,6 @@
 package code.name.monkey.retromusic.ui.adapter.album;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.util.Pair;
-import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -17,7 +12,11 @@ import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 import java.util.ArrayList;
 import java.util.List;
 
-import code.name.monkey.appthemehelper.ThemeStore;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.util.Pair;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.appthemehelper.util.MaterialValueHelper;
 import code.name.monkey.retromusic.R;
@@ -47,7 +46,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
     protected int itemLayoutRes;
 
     protected boolean usePalette = false;
-    private int textColor;
+
 
     public AlbumAdapter(@NonNull AppCompatActivity activity, ArrayList<Album> dataSet,
                         @LayoutRes int itemLayoutRes, boolean usePalette,
@@ -58,7 +57,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
         this.itemLayoutRes = itemLayoutRes;
         this.usePalette = usePalette;
         setHasStableIds(true);
-        this.textColor = ThemeStore.textColorPrimary(activity);
+
     }
 
     public AlbumAdapter(@NonNull AppCompatActivity activity, ArrayList<Album> dataSet,
@@ -123,7 +122,6 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
 
         if (holder.title != null) {
             holder.title.setText(getAlbumTitle(album));
-            holder.title.setTextColor(textColor);
         }
         if (holder.text != null) {
             holder.text.setText(getAlbumText(album));
@@ -138,12 +136,10 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
         if (holder.paletteColorContainer != null) {
             holder.paletteColorContainer.setBackgroundColor(color);
             if (holder.title != null) {
-                holder.title.setTextColor(
-                        MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)));
+                holder.title.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)));
             }
             if (holder.text != null) {
-                holder.text.setTextColor(
-                        MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)));
+                holder.text.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)));
             }
         }
     }
@@ -224,12 +220,6 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
         return MusicUtil.getSectionName(sectionName);
     }
 
-    public void setTextColor(int textColor) {
-        this.textColor = textColor;
-        notifyDataSetChanged();
-    }
-
-
     public class ViewHolder extends MediaEntryViewHolder {
 
         public ViewHolder(@NonNull final View itemView) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.java
index 17b12b05..b6340c7a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.java
@@ -2,9 +2,6 @@ package code.name.monkey.retromusic.ui.adapter.album;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,6 +11,9 @@ import com.bumptech.glide.Glide;
 
 import java.util.ArrayList;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -117,36 +117,29 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
 
         private int getLayout() {
             int layout;
-            //noinspection ConstantConditions
-            switch (PreferenceUtil.getInstance(getContext()).getNowPlayingScreen()) {
-                case BLUR_CARD:
+            switch (PreferenceUtil.getInstance(getContext()).getAlbumCoverStyle()) {
+                default:
+                case NORMAL:
+                    layout = R.layout.fragment_album_cover;
+                    break;
+                case FLAT:
+                    layout = R.layout.fragment_album_flat_cover;
+                    break;
+                case CIRCLE:
+                    layout = R.layout.fragment_album_circle_cover;
+                    break;
+                case CARD:
                     layout = R.layout.fragment_album_card_cover;
                     break;
                 case MATERIAL:
                     layout = R.layout.fragment_album_material_cover;
                     break;
-                case PLAIN:
-                case FLAT:
-                    layout = R.layout.fragment_album_flat_cover;
+                case CAROUSAL:
+                    layout = R.layout.fragment_album_carousal_cover;
                     break;
-                case CARD:
                 case FULL:
-                case ADAPTIVE:
                     layout = R.layout.fragment_album_full_cover;
                     break;
-                default:
-                case NORMAL:
-                    layout = R.layout.fragment_album_cover;
-                    break;
-
-            }
-            if (PreferenceUtil.getInstance(getContext()).carouselEffect() &&
-                    !(PreferenceUtil.getInstance(getContext()).getNowPlayingScreen()
-                            == NowPlayingScreen.FULL)) {
-                layout = R.layout.fragment_carousal_album_cover;
-            }
-            if (PreferenceUtil.getInstance(getContext()).circularAlbumArt()) {
-                layout = R.layout.fragment_album_circle_cover;
             }
             return layout;
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWithAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWithAdapter.java
index 3748514a..348619b3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWithAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWithAdapter.java
@@ -18,8 +18,8 @@ package code.name.monkey.retromusic.ui.adapter.album;
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.support.annotation.NonNull;
-import android.support.v4.util.Pair;
+import androidx.annotation.NonNull;
+import androidx.core.util.Pair;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.java
index 3007e6db..1d28988e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.adapter.album;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.java
index f839f343..01b7138e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.java
@@ -1,10 +1,10 @@
 package code.name.monkey.retromusic.ui.adapter.artist;
 
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.util.Pair;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.util.Pair;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/AbsMultiSelectAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/AbsMultiSelectAdapter.java
index acb29829..d557916f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/AbsMultiSelectAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/AbsMultiSelectAdapter.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.adapter.base;
 
 import android.content.Context;
-import android.support.annotation.MenuRes;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.MenuRes;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.java
index de396794..c020cee7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.java
@@ -1,10 +1,10 @@
 package code.name.monkey.retromusic.ui.adapter.base;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
@@ -17,8 +17,7 @@ import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.retromusic.R;
 
 
-public class MediaEntryViewHolder extends RecyclerView.ViewHolder
-        implements View.OnClickListener, View.OnLongClickListener {
+public class MediaEntryViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
 
     @Nullable
     @BindView(R.id.image)
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/home/HomeAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/home/HomeAdapter.java
deleted file mode 100644
index 393e909c..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/home/HomeAdapter.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package code.name.monkey.retromusic.ui.adapter.home;
-
-import android.app.Activity;
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.DisplayMetrics;
-import android.view.Display;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.util.ArrayList;
-
-import code.name.monkey.retromusic.R;
-import code.name.monkey.retromusic.model.Album;
-import code.name.monkey.retromusic.model.Artist;
-import code.name.monkey.retromusic.model.Genre;
-import code.name.monkey.retromusic.model.Home;
-import code.name.monkey.retromusic.model.Song;
-import code.name.monkey.retromusic.ui.adapter.CollageSongAdapter;
-import code.name.monkey.retromusic.ui.adapter.GenreAdapter;
-import code.name.monkey.retromusic.ui.adapter.album.AlbumAdapter;
-import code.name.monkey.retromusic.ui.adapter.artist.ArtistAdapter;
-import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder;
-
-public class HomeAdapter extends RecyclerView.Adapter<HomeAdapter.ViewHolder> {
-
-    private static final int ALBUMS = 0;
-    private static final int ARTISTS = 1;
-    private static final int GENERS = 2;
-    private static final int SUGGESTIONS = 3;
-    private Activity activity;
-    private ArrayList<Home> sections = new ArrayList<>();
-
-
-    public HomeAdapter(Activity activity) {
-        this.activity = activity;
-    }
-
-    @NonNull
-    @Override
-    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        Context context = parent.getContext();
-        return new ViewHolder(LayoutInflater.from(context).inflate(R.layout.home_section_recycler_view,
-                parent, false));
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        Home home = sections.get(position);
-        ArrayList arrayList = home.getList();
-        if (arrayList.get(0) instanceof Album) {
-            return ALBUMS;
-        } else if (arrayList.get(0) instanceof Artist) {
-            return ARTISTS;
-        } else if (arrayList.get(0) instanceof Genre) {
-            return GENERS;
-        } else {
-            return SUGGESTIONS;
-        }
-    }
-
-    private DisplayMetrics getDisplayMetrics() {
-        Display display = activity.getWindowManager().getDefaultDisplay();
-        DisplayMetrics metrics = new DisplayMetrics();
-        display.getMetrics(metrics);
-        return metrics;
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        Home home = sections.get(position);
-
-        if (holder.title != null) {
-            holder.title.setText(home.getSectionTitle());
-        }
-        ArrayList arrayList = home.getList();
-        if (arrayList.get(0) instanceof Album) {
-            AlbumAdapter albumAdapter = new AlbumAdapter((AppCompatActivity) activity,
-                    (ArrayList<Album>) arrayList, R.layout.item_image);
-            if (holder.recyclerView != null) {
-                holder.recyclerView.setLayoutManager(new GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false));
-                holder.recyclerView.setAdapter(albumAdapter);
-            }
-        } else if (arrayList.get(0) instanceof Artist) {
-            ArtistAdapter artistAdapter = new ArtistAdapter((AppCompatActivity) activity, (ArrayList<Artist>) arrayList, R.layout.item_artist);
-            GridLayoutManager layoutManager = new GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false);
-            if (holder.recyclerView != null) {
-                holder.recyclerView.setLayoutManager(layoutManager);
-                holder.recyclerView.setAdapter(artistAdapter);
-            }
-        } else if (arrayList.get(0) instanceof Genre) {
-            GenreAdapter genreAdapter = new GenreAdapter(activity, (ArrayList<Genre>) arrayList, R.layout.item_list);
-            if (holder.recyclerView != null) {
-                holder.recyclerView.setLayoutManager(new LinearLayoutManager(activity));
-                holder.recyclerView.setAdapter(genreAdapter);
-            }
-        } else if (arrayList.get(0) instanceof Song) {
-            CollageSongAdapter collageSongAdapter = new CollageSongAdapter(activity, (ArrayList<Song>) arrayList);
-            if (holder.recyclerView != null) {
-                holder.recyclerView.setLayoutManager(new LinearLayoutManager(activity));
-                holder.recyclerView.setAdapter(collageSongAdapter);
-            }
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return sections.size();
-    }
-
-    public void swapData(ArrayList<Home> sections) {
-        this.sections = sections;
-        notifyDataSetChanged();
-    }
-
-    public class ViewHolder extends MediaEntryViewHolder {
-
-
-        public ViewHolder(View itemView) {
-            super(itemView);
-        }
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/AddToPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/AddToPlaylist.java
index 718bff8f..699fc8ee 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/AddToPlaylist.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/AddToPlaylist.java
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic.ui.adapter.playlist;
 
 import android.app.Activity;
 import android.app.Dialog;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.java
index 7ae8e1a4..972f800e 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.java
@@ -2,11 +2,11 @@ package code.name.monkey.retromusic.ui.adapter.playlist;
 
 import android.graphics.Bitmap;
 import android.graphics.PorterDuff;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.PopupMenu;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.PopupMenu;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.java
index bcbf6cc0..dfe89524 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.adapter.song;
 
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/OrderablePlaylistSongAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/OrderablePlaylistSongAdapter.java
index fc77ffeb..a5887904 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/OrderablePlaylistSongAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/OrderablePlaylistSongAdapter.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.adapter.song;
 
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.java
index 027c3d7d..b69e124b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.java
@@ -2,10 +2,6 @@ package code.name.monkey.retromusic.ui.adapter.song;
 
 import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
@@ -17,6 +13,10 @@ import com.h6ah4i.android.widget.advrecyclerview.draggable.annotation.DraggableI
 
 import java.util.ArrayList;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.helper.MusicPlayerRemote;
 import code.name.monkey.retromusic.interfaces.CabHolder;
@@ -25,8 +25,7 @@ import code.name.monkey.retromusic.util.MusicUtil;
 import code.name.monkey.retromusic.util.ViewUtil;
 
 
-public class PlayingQueueAdapter extends SongAdapter implements
-        DraggableItemAdapter<PlayingQueueAdapter.ViewHolder> {
+public class PlayingQueueAdapter extends SongAdapter implements DraggableItemAdapter<PlayingQueueAdapter.ViewHolder> {
 
     private static final int HISTORY = 0;
     private static final int CURRENT = 1;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.java
index eb2ae048..14df6bfd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.java
@@ -1,10 +1,10 @@
 package code.name.monkey.retromusic.ui.adapter.song;
 
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.util.Pair;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.util.Pair;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/ShuffleButtonSongAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/ShuffleButtonSongAdapter.java
index ec53d505..c358cae6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/ShuffleButtonSongAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/ShuffleButtonSongAdapter.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.adapter.song;
 
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SimpleSongAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SimpleSongAdapter.java
index 050e8427..25923cce 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SimpleSongAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SimpleSongAdapter.java
@@ -1,8 +1,8 @@
 package code.name.monkey.retromusic.ui.adapter.song;
 
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.java
index 374174de..29a4180b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.java
@@ -1,11 +1,6 @@
 package code.name.monkey.retromusic.ui.adapter.song;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.util.Pair;
-import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -17,6 +12,11 @@ import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 
 import java.util.ArrayList;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.util.Pair;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.appthemehelper.util.MaterialValueHelper;
 import code.name.monkey.retromusic.R;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.java
new file mode 100644
index 00000000..b22e5672
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.java
@@ -0,0 +1,28 @@
+package code.name.monkey.retromusic.ui.fragments;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+import code.name.monkey.retromusic.R;
+
+
+public enum AlbumCoverStyle {
+    NORMAL(R.string.normal, R.drawable.album_cover_card, 0),
+    FLAT(R.string.flat, R.drawable.album_cover_square, 1),
+    CIRCLE(R.string.circular, R.drawable.album_cover_circle, 2),
+    MATERIAL(R.string.material, R.drawable.album_cover_card, 3),
+    CARD(R.string.card, R.drawable.album_cover_card, 4),
+    CAROUSAL(R.string.carousal, R.drawable.album_cover_carousal, 5),
+    FULL(R.string.full, R.drawable.album_cover_full, 6);
+
+    @StringRes
+    public final int titleRes;
+    @DrawableRes
+    public final int drawableResId;
+    public final int id;
+
+    AlbumCoverStyle(@StringRes int titleRes, @DrawableRes int drawableResId, int id) {
+        this.titleRes = titleRes;
+        this.drawableResId = drawableResId;
+        this.id = id;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.java
index 664377dc..04603a82 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.java
@@ -6,8 +6,6 @@ import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -17,8 +15,11 @@ import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import butterknife.Unbinder;
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.util.ATHUtil;
@@ -28,6 +29,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper;
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler;
 import code.name.monkey.retromusic.ui.fragments.base.AbsMusicServiceFragment;
 import code.name.monkey.retromusic.util.PreferenceUtil;
+import code.name.monkey.retromusic.util.RetroUtil;
 import code.name.monkey.retromusic.views.PlayPauseDrawable;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 
@@ -74,9 +76,13 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
         view.setBackgroundColor(ThemeStore.primaryColor(getContext()));
         view.setOnTouchListener(new FlingPlayBackController(getActivity()));
         setUpMiniPlayer();
-
-        next.setVisibility(PreferenceUtil.getInstance(getContext()).isExtraMiniExtraControls() ? View.VISIBLE : View.GONE);
-        previous.setVisibility(PreferenceUtil.getInstance(getContext()).isExtraMiniExtraControls() ? View.VISIBLE : View.GONE);
+        if (RetroUtil.isTablet(getResources())) {
+            next.setVisibility(View.VISIBLE);
+            previous.setVisibility(View.VISIBLE);
+        } else {
+            next.setVisibility(PreferenceUtil.getInstance(getContext()).isExtraMiniExtraControls() ? View.VISIBLE : View.GONE);
+            previous.setVisibility(PreferenceUtil.getInstance(getContext()).isExtraMiniExtraControls() ? View.VISIBLE : View.GONE);
+        }
     }
 
     @Override
@@ -155,6 +161,18 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
         getView().setBackgroundColor(playerFragmentColor);
     }
 
+    @OnClick({R.id.action_prev, R.id.action_next})
+    void onClicks(View view) {
+        switch (view.getId()) {
+            case R.id.action_next:
+                MusicPlayerRemote.playNextSong();
+                break;
+            case R.id.action_prev:
+                MusicPlayerRemote.back();
+                break;
+        }
+    }
+
     public static class FlingPlayBackController implements View.OnTouchListener {
 
         GestureDetector flingPlayBackController;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/NowPlayingScreen.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/NowPlayingScreen.java
index d32d9d0f..b5b232db 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/NowPlayingScreen.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/NowPlayingScreen.java
@@ -1,7 +1,7 @@
 package code.name.monkey.retromusic.ui.fragments;
 
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
 
 import code.name.monkey.retromusic.R;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/PlayingQueueFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/PlayingQueueFragment.java
index 33719764..7724f1ba 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/PlayingQueueFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/PlayingQueueFragment.java
@@ -1,11 +1,6 @@
 package code.name.monkey.retromusic.ui.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +10,11 @@ import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemA
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
 import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/VolumeFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/VolumeFragment.java
index f9a4e927..8eb84bca 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/VolumeFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/VolumeFragment.java
@@ -6,9 +6,9 @@ import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.media.AudioManager;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -57,7 +57,7 @@ public class VolumeFragment extends Fragment implements SeekBar.OnSeekBarChangeL
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         //noinspection ConstantConditions
-        setColor(ThemeStore.textColorSecondary(getContext()));
+        setTintable(ThemeStore.textColorSecondary(getContext()));
     }
 
     @Override
@@ -146,7 +146,7 @@ public class VolumeFragment extends Fragment implements SeekBar.OnSeekBarChangeL
         setProgressBarColor(Color.WHITE);
     }
 
-    public void setProgressBarColor(int newColor) {
+    private void setProgressBarColor(int newColor) {
         TintHelper.setTintAuto(volumeSeekbar, newColor, false);
         volumeDown.setColorFilter(newColor, PorterDuff.Mode.SRC_IN);
         volumeUp.setColorFilter(newColor, PorterDuff.Mode.SRC_IN);
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
index a4ee752a..741c7696 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.fragments.base;
 
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import code.name.monkey.retromusic.R;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewFragment.java
index b0eea8b5..69032277 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewFragment.java
@@ -1,13 +1,13 @@
 package code.name.monkey.retromusic.ui.fragments.base;
 
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.AppBarLayout.OnOffsetChangedListener;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -64,13 +64,6 @@ public abstract class AbsLibraryPagerRecyclerViewFragment<A extends RecyclerView
         }
         recyclerView.setLayoutManager(layoutManager);
         recyclerView.setAdapter(adapter);
-        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-                super.onScrolled(recyclerView, dx, dy);
-                getLibraryFragment().addAppbarLayoutElevation(recyclerView.canScrollVertically(RecyclerView.NO_POSITION) ? 6f : 0f);
-            }
-        });
     }
 
     @Override
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.java
index 9c1462fa..2a2e95db 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.java
@@ -21,6 +21,7 @@ public abstract class AbsMainActivityFragment extends AbsMusicServiceFragment {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         setHasOptionsMenu(true);
+        getMainActivity().setStatusbarColorAuto();
         getMainActivity().setNavigationbarColorAuto();
         getMainActivity().setLightNavigationBar(true);
         getMainActivity().setTaskDescriptionColorAuto();
@@ -29,17 +30,14 @@ public abstract class AbsMainActivityFragment extends AbsMusicServiceFragment {
 
 
     // WORKAROUND
-    public void setStatusbarColor(View view, int color) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            final View statusBar = view.findViewById(R.id.status_bar);
-            if (statusBar != null) {
-                RetroUtil.statusBarHeight(statusBar);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    statusBar.setBackgroundColor(color);
-                    getMainActivity().setLightStatusbarAuto(color);
-                } else {
-                    statusBar.setBackgroundColor(color);
-                }
+    private void setStatusbarColor(View view, int color) {
+        final View statusBar = view.findViewById(R.id.status_bar);
+        if (statusBar != null) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                statusBar.setBackgroundColor(color);
+                getMainActivity().setLightStatusbarAuto(color);
+            } else {
+                statusBar.setBackgroundColor(color);
             }
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMusicServiceFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMusicServiceFragment.java
index b9bca32f..83db0426 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMusicServiceFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMusicServiceFragment.java
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic.ui.fragments.base;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 
 import code.name.monkey.retromusic.interfaces.MusicServiceEventListener;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.java
index 01a744ea..802de39a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.java
@@ -2,19 +2,21 @@ package code.name.monkey.retromusic.ui.fragments.base;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
+import android.media.MediaMetadataRetriever;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import android.provider.MediaStore;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog;
@@ -28,7 +30,6 @@ import code.name.monkey.retromusic.interfaces.PaletteColorHolder;
 import code.name.monkey.retromusic.model.Song;
 import code.name.monkey.retromusic.ui.activities.tageditor.AbsTagEditorActivity;
 import code.name.monkey.retromusic.ui.activities.tageditor.SongTagEditorActivity;
-import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment;
 import code.name.monkey.retromusic.util.MusicUtil;
 import code.name.monkey.retromusic.util.NavigationUtil;
 import code.name.monkey.retromusic.util.PreferenceUtil;
@@ -36,7 +37,6 @@ import code.name.monkey.retromusic.util.RetroUtil;
 
 public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implements Toolbar.OnMenuItemClickListener, PaletteColorHolder {
     public static final String TAG = AbsPlayerFragment.class.getSimpleName();
-    private boolean isToolbarShown = true;
     private Callbacks callbacks;
     private AsyncTask updateIsFavoriteTask;
 
@@ -118,15 +118,14 @@ public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implemen
                 MusicUtil.setRingtone(getActivity(), song.id);
                 return true;
             case R.id.action_go_to_genre:
-        /*MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-        Uri trackUri = ContentUris
-            .withAppendedId(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, song.id);
-        retriever.setDataSource(getActivity(), trackUri);
-        String genre = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_GENRE);
-        if (genre == null) {
-          genre = "Not Specified";
-        }*/
-                Toast.makeText(getContext(), "Soon", Toast.LENGTH_SHORT).show();
+                MediaMetadataRetriever retriever = new MediaMetadataRetriever();
+                Uri trackUri = ContentUris.withAppendedId(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, song.id);
+                retriever.setDataSource(getActivity(), trackUri);
+                String genre = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_GENRE);
+                if (genre == null) {
+                    genre = "Not Specified";
+                }
+                Toast.makeText(getContext(), genre, Toast.LENGTH_SHORT).show();
                 return true;
         }
         return false;
@@ -136,55 +135,6 @@ public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implemen
         MusicUtil.toggleFavorite(getActivity(), song);
     }
 
-    protected boolean isToolbarShown() {
-        return isToolbarShown;
-    }
-
-    protected void setToolbarShown(boolean toolbarShown) {
-        isToolbarShown = toolbarShown;
-    }
-
-    protected void showToolbar(@Nullable final View toolbar) {
-        if (toolbar == null) {
-            return;
-        }
-        setToolbarShown(true);
-        toolbar.setVisibility(View.VISIBLE);
-        toolbar.animate().alpha(1f).setDuration(PlayerAlbumCoverFragment.VISIBILITY_ANIM_DURATION);
-    }
-
-    protected void hideToolbar(@Nullable final View toolbar) {
-        if (toolbar == null) {
-            return;
-        }
-
-        setToolbarShown(false);
-
-        toolbar.animate().alpha(0f).setDuration(PlayerAlbumCoverFragment.VISIBILITY_ANIM_DURATION)
-                .withEndAction(new Runnable() {
-                    @Override
-                    public void run() {
-                        toolbar.setVisibility(View.GONE);
-                    }
-                });
-    }
-
-    protected void toggleToolbar(@Nullable final View toolbar) {
-        if (isToolbarShown()) {
-            hideToolbar(toolbar);
-        } else {
-            showToolbar(toolbar);
-        }
-    }
-
-    protected void checkToggleToolbar(@Nullable final View toolbar) {
-        if (toolbar != null && !isToolbarShown() && toolbar.getVisibility() != View.GONE) {
-            hideToolbar(toolbar);
-        } else if (toolbar != null && isToolbarShown() && toolbar.getVisibility() != View.VISIBLE) {
-            showToolbar(toolbar);
-        }
-    }
-
     public abstract void onShow();
 
     public abstract void onHide();
@@ -243,8 +193,7 @@ public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implemen
                     Drawable drawable = RetroUtil.getTintedVectorDrawable(activity, res, toolbarIconColor());
                     getToolbar().getMenu().findItem(R.id.action_toggle_favorite)
                             .setIcon(drawable)
-                            .setTitle(isFavorite ? getString(R.string.action_remove_from_favorites)
-                                    : getString(R.string.action_add_to_favorites));
+                            .setTitle(isFavorite ? getString(R.string.action_remove_from_favorites) : getString(R.string.action_add_to_favorites));
                 }
             }
         }.execute(MusicPlayerRemote.getCurrentSong());
@@ -254,22 +203,15 @@ public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implemen
         return callbacks;
     }
 
-    protected void toggleStatusBar(ViewGroup viewGroup) {
-        if (!PreferenceUtil.getInstance(getContext()).getFullScreenMode()) {
-            RetroUtil.statusBarHeight(viewGroup);
-        }
-    }
-
-    protected void toggleStatusBar(View viewGroup) {
-        if (!PreferenceUtil.getInstance(getContext()).getFullScreenMode()) {
-            RetroUtil.statusBarHeight(viewGroup);
-        }
-    }
 
+    @SuppressWarnings("ConstantConditions")
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         view.setBackgroundColor(ThemeStore.primaryColor(getActivity()));
+        if (PreferenceUtil.getInstance(getContext()).getFullScreenMode()) {
+            view.findViewById(R.id.status_bar).setVisibility(View.GONE);
+        }
     }
 
     public interface Callbacks {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/intro/NameFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/intro/NameFragment.java
index e29e1e25..d936b041 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/intro/NameFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/intro/NameFragment.java
@@ -7,9 +7,9 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore.Images.Media;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.java
index fdc4e7dd..478fa149 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.java
@@ -1,12 +1,12 @@
 package code.name.monkey.retromusic.ui.fragments.mainactivity;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
 
 import java.util.ArrayList;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.model.Album;
 import code.name.monkey.retromusic.mvp.contract.AlbumContract;
@@ -15,9 +15,7 @@ import code.name.monkey.retromusic.ui.adapter.album.AlbumAdapter;
 import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 
-public class AlbumsFragment extends
-        AbsLibraryPagerRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridLayoutManager> implements
-        AlbumContract.AlbumView {
+public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridLayoutManager> implements AlbumContract.AlbumView {
 
     public static final String TAG = AlbumsFragment.class.getSimpleName();
 
@@ -44,10 +42,8 @@ public class AlbumsFragment extends
             //noinspection ConstantConditions
             itemLayoutRes = PreferenceUtil.getInstance(getContext()).getAlbumGridStyle(getContext());
         }
-        ArrayList<Album> dataSet =
-                getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet();
-        return new AlbumAdapter(getLibraryFragment().getMainActivity(), dataSet, itemLayoutRes,
-                loadUsePalette(), getLibraryFragment());
+        ArrayList<Album> dataSet = getAdapter() == null ? new ArrayList<>() : getAdapter().getDataSet();
+        return new AlbumAdapter(getLibraryFragment().getMainActivity(), dataSet, itemLayoutRes, loadUsePalette(), getLibraryFragment());
     }
 
     @Override
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/ArtistsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/ArtistsFragment.java
index 7e56ce9b..b780f23f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/ArtistsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/ArtistsFragment.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.fragments.mainactivity;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/GenreFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/GenreFragment.java
index 95772843..959ce19c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/GenreFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/GenreFragment.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.fragments.mainactivity;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.Menu;
 import android.view.MenuInflater;
 
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 e66d3791..312dba65 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
@@ -5,15 +5,16 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.BottomNavigationView;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import com.google.android.material.bottomnavigation.LabelVisibilityMode;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -81,15 +82,15 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
     @BindView(R.id.fragment_container)
     View contentContainer;
 
-    @BindView(R.id.coordinator_layout)
-    View coordinatorLayout;
-
     @BindView(R.id.menu_container)
     View menuContainer;
+
     @BindDrawable(R.drawable.ic_menu_white_24dp)
     Drawable menu;
+
     @BindDrawable(R.drawable.ic_close_white_24dp)
     Drawable close;
+
     private Unbinder unBinder;
     private MaterialCab cab;
     private FragmentManager fragmentManager;
@@ -114,12 +115,11 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
             bottomNavigationView.setOnNavigationItemSelectedListener(this::onOptionsItemSelected);
             int iconColor = ATHUtil.resolveColor(context, R.attr.iconColor);
             int accentColor = ThemeStore.accentColor(context);
-            NavigationViewUtil.setItemIconColors(bottomNavigationView, iconColor, accentColor);
-            NavigationViewUtil.setItemTextColors(bottomNavigationView, iconColor, accentColor);
+            NavigationViewUtil.setItemIconColors(bottomNavigationView, ColorUtil.withAlpha(iconColor, 0.5f), accentColor);
+            NavigationViewUtil.setItemTextColors(bottomNavigationView, ColorUtil.withAlpha(iconColor, 0.5f), accentColor);
 
-            if (PreferenceUtil.getInstance(getContext()).tabTitles()) {
-                bottomNavigationView.setItemTextAppearanceActive(R.style.HideTabTitleTextAppearance);
-                bottomNavigationView.setItemTextAppearanceInactive(R.style.HideTabTitleTextAppearance);
+            if (!PreferenceUtil.getInstance(getContext()).tabTitles()) {
+                bottomNavigationView.setLabelVisibilityMode(LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED);
             }
         }
     }
@@ -154,7 +154,6 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        setStatusbarColorAuto(view);
         setupBottomView();
         setupToolbar();
 
@@ -172,13 +171,13 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         TintHelper.setTintAuto(actionLibrary, ThemeStore.accentColor(getContext()), true);
 
         int primaryColor = ThemeStore.primaryColor(getContext());
-        int darkPrimaryColor = ColorUtil.darkenColor(primaryColor);
+
 
         TintHelper.setTintAuto(contentContainer, primaryColor, true);
 
-        toolbar.setBackgroundColor(darkPrimaryColor);
+        toolbar.setBackgroundColor(primaryColor);
         toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
-        appbar.setBackgroundColor(darkPrimaryColor);
+        appbar.setBackgroundColor(primaryColor);
         appbar.addOnOffsetChangedListener((appBarLayout, verticalOffset) ->
                 getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext())));
         getMainActivity().setTitle(null);
@@ -191,7 +190,6 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
                 menu,
                 close
         ));
-        coordinatorLayout.setBackgroundColor(ColorUtil.darkenColor(primaryColor));
     }
 
     public Fragment getCurrentFragment() {
@@ -544,9 +542,4 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
             }
         }
     }
-
-    public void addAppbarLayoutElevation(float v) {
-        //TransitionManager.beginDelayedTransition(appbar);
-        //appbar.setElevation(v);
-    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/PlaylistsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/PlaylistsFragment.java
index daa7e322..e9c298a6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/PlaylistsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/PlaylistsFragment.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.fragments.mainactivity;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/SongsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/SongsFragment.java
index b8e00c75..ab083cea 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/SongsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/SongsFragment.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.fragments.mainactivity;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
 
 import java.util.ArrayList;
 
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 79f2d64f..aa6e239b 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
@@ -7,15 +7,15 @@ import android.graphics.drawable.Drawable;
 import android.media.MediaScannerConnection;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -89,8 +89,8 @@ public class FoldersFragment extends AbsMainActivityFragment implements
             FileUtil.fileIsMimeType(file, "application/opus", MimeTypeMap.getSingleton()) ||
             FileUtil.fileIsMimeType(file, "application/ogg", MimeTypeMap.getSingleton()));
 
-    protected static final String PATH = "path";
-    protected static final String CRUMBS = "crumbs";
+    private static final String PATH = "path";
+    private static final String CRUMBS = "crumbs";
     private static final int LOADER_ID = LoaderIds.FOLDERS_FRAGMENT;
     @BindView(R.id.coordinator_layout)
     View coordinatorLayout;
@@ -182,7 +182,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
         }
     }
 
-    public void setCrumb(BreadCrumbLayout.Crumb crumb, boolean addToHistory) {
+    private void setCrumb(BreadCrumbLayout.Crumb crumb, boolean addToHistory) {
         if (crumb == null) {
             return;
         }
@@ -197,8 +197,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
     private void saveScrollPosition() {
         BreadCrumbLayout.Crumb crumb = getActiveCrumb();
         if (crumb != null) {
-            crumb.setScrollPosition(
-                    ((LinearLayoutManager) recyclerView.getLayoutManager()).findFirstVisibleItemPosition());
+            crumb.setScrollPosition(((LinearLayoutManager) recyclerView.getLayoutManager()).findFirstVisibleItemPosition());
         }
     }
 
@@ -256,7 +255,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        setStatusbarColorAuto(view);
+
         getMainActivity().getSlidingUpPanelLayout().setShadowHeight(0);
 
         setUpAppbarColor();
@@ -276,7 +275,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
 
         //noinspection ConstantConditions
         int primaryColor = ThemeStore.primaryColor(getContext());
-        int darkPrimaryColor = ColorUtil.darkenColor(primaryColor);
+
 
         toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
         //noinspection ConstantConditions
@@ -291,9 +290,8 @@ public class FoldersFragment extends AbsMainActivityFragment implements
                 close
         ));
         TintHelper.setTintAuto(container, primaryColor, true);
-        appbar.setBackgroundColor(darkPrimaryColor);
-        toolbar.setBackgroundColor(darkPrimaryColor);
-        coordinatorLayout.setBackgroundColor(darkPrimaryColor);
+        appbar.setBackgroundColor(primaryColor);
+        toolbar.setBackgroundColor(primaryColor);
 
         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.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java
index 852306a6..a029828b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java
@@ -4,31 +4,26 @@ import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.AnticipateInterpolator;
-import android.view.animation.AnticipateOvershootInterpolator;
-import android.view.animation.BounceInterpolator;
-import android.view.animation.LinearInterpolator;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.google.android.material.appbar.AppBarLayout;
+
 import java.io.File;
 import java.util.ArrayList;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindDrawable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -54,11 +49,11 @@ import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist;
 import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist;
 import code.name.monkey.retromusic.mvp.contract.HomeContract;
 import code.name.monkey.retromusic.mvp.presenter.HomePresenter;
-import code.name.monkey.retromusic.ui.activities.MainActivity;
-import code.name.monkey.retromusic.ui.adapter.GenreAdapter;
 import code.name.monkey.retromusic.ui.adapter.album.AlbumFullWithAdapter;
 import code.name.monkey.retromusic.ui.adapter.artist.ArtistAdapter;
 import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment;
+import code.name.monkey.retromusic.ui.fragments.mainactivity.LibraryFragment;
+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;
@@ -78,7 +73,7 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
     @BindView(R.id.toolbar)
     Toolbar toolbar;
 
-    @BindView(R.id.appbar)
+    @BindView(R.id.app_bar)
     AppBarLayout appbar;
 
     @BindView(R.id.menu_container)
@@ -111,18 +106,9 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
     @BindView(R.id.top_albums_container)
     View topAlbumContainer;
 
-    @BindView(R.id.genres)
-    RecyclerView genresRecyclerView;
-
-    @BindView(R.id.genre_container)
-    LinearLayout genreContainer;
-
     @BindView(R.id.content_container)
     View contentContainer;
 
-    @BindView(R.id.coordinator_layout)
-    View coordinatorLayout;
-
     @BindView(R.id.title)
     TextView title;
 
@@ -181,26 +167,25 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        setStatusbarColorAuto(view);
-        setTextColor();
         setupToolbar();
         loadImageFromStorage(userImage);
 
         homePresenter.subscribe();
-        checkPadding();
     }
 
     @SuppressWarnings("ConstantConditions")
     private void setupToolbar() {
+        //noinspection ConstantConditions
         int primaryColor = ThemeStore.primaryColor(getContext());
-        int darkPrimaryColor = ColorUtil.darkenColor(primaryColor);
+        TintHelper.setTintAuto(contentContainer, primaryColor, true);
 
-        toolbar.setBackgroundColor(darkPrimaryColor);
         toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
-        appbar.setBackgroundColor(darkPrimaryColor);
+        toolbar.setBackgroundColor(primaryColor);
+        appbar.setBackgroundColor(primaryColor);
         appbar.addOnOffsetChangedListener((appBarLayout, verticalOffset) ->
                 getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext())));
-        getMainActivity().setTitle(null);
+
+        getActivity().setTitle(null);
         getMainActivity().setSupportActionBar(toolbar);
         toolbar.setNavigationOnClickListener(new NavigationIconClickListener(
                 getContext(),
@@ -210,16 +195,10 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
                 menu,
                 close
         ));
-        coordinatorLayout.setBackgroundColor(ColorUtil.darkenColor(primaryColor));
-        TintHelper.setTintAuto(contentContainer, primaryColor, true);
-    }
-
-    private void setTextColor() {
-        int accentColor = ThemeStore.accentColor(getContext());
         title.setTextColor(ThemeStore.textColorPrimary(getContext()));
-        actionHome.setTextColor(MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(accentColor)));
+        actionHome.setTextColor(MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(ThemeStore.accentColor(getContext()))));
         actionHome.setBackgroundResource(R.drawable.et_bg_circular_top_corners);
-        TintHelper.setTintAuto(actionHome, accentColor, true);
+        TintHelper.setTintAuto(actionHome, ThemeStore.accentColor(getContext()), true);
     }
 
     @Override
@@ -261,22 +240,6 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
         homePresenter.subscribe();
     }
 
-    @Override
-    public void onServiceConnected() {
-        super.onServiceConnected();
-        checkPadding();
-    }
-
-    @Override
-    public void onQueueChanged() {
-        super.onQueueChanged();
-        checkPadding();
-    }
-
-    private void checkPadding() {
-        int height = getResources().getDimensionPixelSize(R.dimen.mini_player_height);
-        contentContainer.setPadding(0, 0, 0, MusicPlayerRemote.getPlayingQueue().isEmpty() ? height * 2 : 0);
-    }
 
     @Override
     public void recentArtist(ArrayList<Artist> artists) {
@@ -333,22 +296,18 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
 
     @Override
     public void geners(ArrayList<Genre> genres) {
-        genreContainer.setVisibility(View.VISIBLE);
-        genresRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        //noinspection ConstantConditions
-        GenreAdapter genreAdapter = new GenreAdapter(getActivity(), genres, R.layout.item_list);
-        genresRecyclerView.setAdapter(genreAdapter);
     }
 
 
-    @OnClick({R.id.last_added, R.id.top_played, R.id.search, R.id.action_shuffle, R.id.history,
-            R.id.user_image, R.id.action_library, R.id.action_settings, R.id.action_folders})
+    @OnClick({R.id.last_added, R.id.top_played, R.id.action_shuffle, R.id.history,
+            R.id.user_image, R.id.search, R.id.action_library, R.id.action_folders, R.id.action_settings})
     void startUserInfo(View view) {
         Activity activity = getActivity();
         if (activity != null) {
             switch (view.getId()) {
                 case R.id.action_shuffle:
-                    MusicPlayerRemote.openAndShuffleQueue(SongLoader.getAllSongs(activity).blockingFirst(), true);
+                    MusicPlayerRemote
+                            .openAndShuffleQueue(SongLoader.getAllSongs(activity).blockingFirst(), true);
                     break;
                 case R.id.last_added:
                     NavigationUtil.goToPlaylistNew(activity, new LastAddedPlaylist(activity));
@@ -363,10 +322,10 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
                     new HomeOptionDialog().show(getFragmentManager(), TAG);
                     break;
                 case R.id.action_folders:
-                    getMainActivity().setCurrentFragment(MainActivity.FOLDERS);
+                    getMainActivity().setCurrentFragment(FoldersFragment.newInstance(getContext()), false, TAG);
                     break;
                 case R.id.action_library:
-                    getMainActivity().setCurrentFragment(MainActivity.LIBRARY);
+                    getMainActivity().setCurrentFragment(LibraryFragment.newInstance(), false, TAG);
                     break;
                 case R.id.action_settings:
                     NavigationUtil.goToSettings(activity);
@@ -377,4 +336,11 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
             }
         }
     }
+
+    @Override
+    public void onPlayingMetaChanged() {
+        super.onPlayingMetaChanged();
+        homePresenter.loadRecentArtists();
+        homePresenter.loadRecentAlbums();
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/HomeFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/HomeFragment.java
index a709a254..1974e776 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/HomeFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/HomeFragment.java
@@ -4,34 +4,32 @@ import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.AnticipateOvershootInterpolator;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Random;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindDrawable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -63,7 +61,6 @@ import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment;
 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.RetroUtil;
 import code.name.monkey.retromusic.views.CircularImageView;
 import code.name.monkey.retromusic.views.MetalRecyclerViewPager;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -78,6 +75,7 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
 
     public static final String TAG = "HomeFragment";
     Unbinder unbinder;
+
     @BindView(R.id.home_toolbar)
     Toolbar toolbar;
 
@@ -123,15 +121,12 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
     @BindView(R.id.top_albums_container)
     View topAlbumContainer;
 
-    @BindView(R.id.genres)
-    RecyclerView genresRecyclerView;
-
-    @BindView(R.id.genre_container)
-    LinearLayout genreContainer;
-
     @BindView(R.id.content_container)
     View contentContainer;
 
+    @BindView(R.id.container)
+    View container;
+
     @BindView(R.id.title)
     TextView title;
 
@@ -241,17 +236,16 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
         loadImageFromStorage(userImage);
 
         homePresenter.subscribe();
-        checkPadding();
         getTimeOfTheDay();
     }
 
     @SuppressWarnings("ConstantConditions")
     private void setupToolbar() {
-        if (!PreferenceUtil.getInstance(getContext()).getFullScreenMode()) {
+        /*if (!PreferenceUtil.getInstance(getContext()).getFullScreenMode()) {
             ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) toolbar.getLayoutParams();
             params.topMargin = RetroUtil.getStatusBarHeight(getContext());
             toolbar.setLayoutParams(params);
-        }
+        }*/
 
         appbar.addOnOffsetChangedListener(new AppBarStateChangeListener() {
             @Override
@@ -275,7 +269,7 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
 
         int primaryColor = ThemeStore.primaryColor(getContext());
 
-        TintHelper.setTintAuto(coordinatorLayout, primaryColor, true);
+        TintHelper.setTintAuto(container, primaryColor, true);
         toolbarLayout.setStatusBarScrimColor(primaryColor);
         toolbarLayout.setContentScrimColor(primaryColor);
 
@@ -331,23 +325,6 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
         homePresenter.subscribe();
     }
 
-    @Override
-    public void onServiceConnected() {
-        super.onServiceConnected();
-        checkPadding();
-    }
-
-    @Override
-    public void onQueueChanged() {
-        super.onQueueChanged();
-        checkPadding();
-    }
-
-    private void checkPadding() {
-        int height = getResources().getDimensionPixelSize(R.dimen.mini_player_height);
-        contentContainer.setPadding(0, 0, 0, MusicPlayerRemote.getPlayingQueue().isEmpty() ? height * 2 : 0);
-    }
-
     @Override
     public void recentArtist(ArrayList<Artist> artists) {
         recentArtistContainer.setVisibility(View.VISIBLE);
@@ -403,11 +380,6 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
 
     @Override
     public void geners(ArrayList<Genre> genres) {
-        genreContainer.setVisibility(View.VISIBLE);
-        genresRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        //noinspection ConstantConditions
-        GenreAdapter genreAdapter = new GenreAdapter(getActivity(), genres, R.layout.item_list);
-        genresRecyclerView.setAdapter(genreAdapter);
     }
 
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.java
index 4e8754c9..e88eef6e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.java
@@ -1,12 +1,12 @@
 package code.name.monkey.retromusic.ui.fragments.player;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.ViewPager;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -62,14 +62,11 @@ public class PlayerAlbumCoverFragment extends AbsMusicServiceFragment implements
         viewPager.addOnPageChangeListener(this);
 
         //noinspection ConstantConditions
-        if (PreferenceUtil.getInstance(getContext()).carouselEffect() && !(
-                (PreferenceUtil.getInstance(getContext()).getNowPlayingScreen() == NowPlayingScreen.FULL) ||
-                        (PreferenceUtil.getInstance(getContext()).getNowPlayingScreen()
-                                == NowPlayingScreen.FLAT))) {
+        if (PreferenceUtil.getInstance(getContext()).carouselEffect() &&
+                !((PreferenceUtil.getInstance(getContext()).getNowPlayingScreen() == NowPlayingScreen.FULL))) {
             viewPager.setClipToPadding(false);
             viewPager.setPadding(96, 0, 96, 0);
             viewPager.setPageMargin(18);
-
             viewPager.setPageTransformer(false, new CustPagerTransformer(getContext()));
         } else {
             viewPager.setPageTransformer(true, new NormalPageTransformer());
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptiveFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptiveFragment.java
index 482a93e5..aa4dff49 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptiveFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptiveFragment.java
@@ -1,14 +1,14 @@
 package code.name.monkey.retromusic.ui.fragments.player.adaptive;
 
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -27,8 +27,6 @@ public class AdaptiveFragment extends AbsPlayerFragment implements Callbacks {
 
     @BindView(R.id.player_toolbar)
     Toolbar toolbar;
-    @BindView(R.id.status_bar)
-    View statusBar;
 
     private int lastColor;
     private AdaptivePlaybackControlsFragment playbackControlsFragment;
@@ -115,8 +113,6 @@ public class AdaptiveFragment extends AbsPlayerFragment implements Callbacks {
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        toggleStatusBar(statusBar);
-
         setUpSubFragments();
         setUpPlayerToolbar();
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptivePlaybackControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptivePlaybackControlsFragment.java
index 4db21270..ce723748 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptivePlaybackControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptivePlaybackControlsFragment.java
@@ -3,9 +3,9 @@ package code.name.monkey.retromusic.ui.fragments.player.adaptive;
 import android.animation.ObjectAnimator;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatSeekBar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatSeekBar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlaybackControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlaybackControlsFragment.java
index f8a337ae..8cca5889 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlaybackControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlaybackControlsFragment.java
@@ -4,11 +4,11 @@ import android.animation.ObjectAnimator;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.AppCompatSeekBar;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.AppCompatSeekBar;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlayerFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlayerFragment.java
index 3162f87a..1db54d4c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlayerFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlayerFragment.java
@@ -4,13 +4,13 @@ import android.app.Activity;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -48,15 +48,17 @@ public class BlurPlayerFragment extends AbsPlayerFragment implements
 
     @BindView(R.id.player_toolbar)
     Toolbar toolbar;
+
     @BindView(R.id.toolbar_container)
     View toolbarContainer;
+
     @BindView(R.id.gradient_background)
     ImageView colorBackground;
-    @BindView(R.id.status_bar)
-    View statusBar;
+
     @Nullable
     @BindView(R.id.recycler_view)
     RecyclerView recyclerView;
+
     @Nullable
     @BindView(R.id.title)
     TextView title;
@@ -65,8 +67,6 @@ public class BlurPlayerFragment extends AbsPlayerFragment implements
     private BlurPlaybackControlsFragment playbackControlsFragment;
     private Unbinder unbinder;
 
-    private RecyclerView.Adapter wrappedAdapter;
-    private RecyclerViewDragDropManager recyclerViewDragDropManager;
     private PlayingQueueAdapter playingQueueAdapter;
     private LinearLayoutManager layoutManager;
 
@@ -143,22 +143,11 @@ public class BlurPlayerFragment extends AbsPlayerFragment implements
 
     @Override
     public void onDestroyView() {
-        super.onDestroyView();
-        if (recyclerViewDragDropManager != null) {
-            recyclerViewDragDropManager.release();
-            recyclerViewDragDropManager = null;
-        }
-
         if (recyclerView != null) {
             recyclerView.setItemAnimator(null);
             recyclerView.setAdapter(null);
             recyclerView = null;
         }
-
-        if (wrappedAdapter != null) {
-            WrapperAdapterUtils.releaseAll(wrappedAdapter);
-            wrappedAdapter = null;
-        }
         playingQueueAdapter = null;
         layoutManager = null;
         super.onDestroyView();
@@ -177,8 +166,6 @@ public class BlurPlayerFragment extends AbsPlayerFragment implements
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        toggleStatusBar(statusBar);
-
         setUpSubFragments();
         setUpPlayerToolbar();
     }
@@ -245,7 +232,6 @@ public class BlurPlayerFragment extends AbsPlayerFragment implements
 
     private void setUpRecyclerView() {
         if (recyclerView != null) {
-            recyclerViewDragDropManager = new RecyclerViewDragDropManager();
             final GeneralItemAnimator animator = new RefactoredDefaultItemAnimator();
 
             playingQueueAdapter = new PlayingQueueAdapter(
@@ -255,14 +241,11 @@ public class BlurPlayerFragment extends AbsPlayerFragment implements
                     R.layout.item_song,
                     false,
                     null);
-            wrappedAdapter = recyclerViewDragDropManager.createWrappedAdapter(playingQueueAdapter);
-
             layoutManager = new LinearLayoutManager(getContext());
 
             recyclerView.setLayoutManager(layoutManager);
-            recyclerView.setAdapter(wrappedAdapter);
+            recyclerView.setAdapter(playingQueueAdapter);
             recyclerView.setItemAnimator(animator);
-            recyclerViewDragDropManager.attachRecyclerView(recyclerView);
             layoutManager.scrollToPositionWithOffset(MusicPlayerRemote.getPosition() + 1, 0);
         }
     }
@@ -307,13 +290,4 @@ public class BlurPlayerFragment extends AbsPlayerFragment implements
         }
 
     }
-
-    @Override
-    public void onPause() {
-        if (recyclerViewDragDropManager != null) {
-            recyclerViewDragDropManager.cancelDrag();
-        }
-        super.onPause();
-    }
-
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardFragment.java
index 355e9310..589959c5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardFragment.java
@@ -2,13 +2,13 @@ package code.name.monkey.retromusic.ui.fragments.player.card;
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -36,10 +36,10 @@ public class CardFragment extends AbsPlayerFragment implements PlayerAlbumCoverF
 
     @BindView(R.id.player_toolbar)
     Toolbar toolbar;
-    @BindView(R.id.status_bar)
-    View statusBar;
+
     @Nullable
     @BindView(R.id.recycler_view)
+
     RecyclerView recyclerView;
     @Nullable
     @BindView(R.id.title)
@@ -164,8 +164,6 @@ public class CardFragment extends AbsPlayerFragment implements PlayerAlbumCoverF
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        toggleStatusBar(statusBar);
-
         setUpSubFragments();
         setUpPlayerToolbar();
         setUpRecyclerView();
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardPlaybackControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardPlaybackControlsFragment.java
index e92c885b..bb6059f4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardPlaybackControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardPlaybackControlsFragment.java
@@ -3,11 +3,11 @@ package code.name.monkey.retromusic.ui.fragments.player.card;
 import android.animation.ObjectAnimator;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatSeekBar;
-import android.support.v7.widget.AppCompatTextView;
-import android.support.v7.widget.CardView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatSeekBar;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.cardview.widget.CardView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurFragment.java
index 794be029..c3a44c9d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurFragment.java
@@ -4,10 +4,10 @@ import android.app.Activity;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -34,8 +34,7 @@ public class CardBlurFragment extends AbsPlayerFragment implements
 
     @BindView(R.id.player_toolbar)
     Toolbar toolbar;
-    @BindView(R.id.status_bar)
-    View statusBar;
+
     @BindView(R.id.gradient_background)
     ImageView colorBackground;
 
@@ -126,8 +125,6 @@ public class CardBlurFragment extends AbsPlayerFragment implements
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        toggleStatusBar(statusBar);
-
         setUpSubFragments();
         setUpPlayerToolbar();
     }
@@ -137,8 +134,7 @@ public class CardBlurFragment extends AbsPlayerFragment implements
                 .findFragmentById(R.id.playback_controls_fragment);
 
         PlayerAlbumCoverFragment playerAlbumCoverFragment =
-                (PlayerAlbumCoverFragment) getChildFragmentManager()
-                        .findFragmentById(R.id.player_album_cover_fragment);
+                (PlayerAlbumCoverFragment) getChildFragmentManager().findFragmentById(R.id.player_album_cover_fragment);
         playerAlbumCoverFragment.setCallbacks(this);
         playerAlbumCoverFragment.removeEffect();
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.java
index a052d909..9a8b170b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.java
@@ -5,9 +5,9 @@ import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatSeekBar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatSeekBar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.java
index 74d10fdf..a2b0d7d7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.java
@@ -9,11 +9,11 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.graphics.Palette;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.palette.graphics.Palette;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -49,16 +49,19 @@ public class ColorFragment extends AbsPlayerFragment {
 
     @BindView(R.id.player_toolbar)
     Toolbar toolbar;
+
     @BindView(R.id.gradient_background)
     View colorBackground;
-    @BindView(R.id.status_bar)
-    View statusBar;
+
     @BindView(R.id.image)
     ImageView imageView;
+
     @BindView(R.id.lyrics)
     TextView lyricsView;
+
     @BindView(R.id.lyrics_container)
     View lyricsViewContainer;
+
     @BindView(R.id.album_cover_container)
     View imageViewContainer;
 
@@ -139,8 +142,6 @@ public class ColorFragment extends AbsPlayerFragment {
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        toggleStatusBar(statusBar);
-
         setUpSubFragments();
         setUpPlayerToolbar();
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorPlaybackControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorPlaybackControlsFragment.java
index 7efff6ff..fd775db1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorPlaybackControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorPlaybackControlsFragment.java
@@ -4,10 +4,10 @@ import android.animation.ObjectAnimator;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatSeekBar;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatSeekBar;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlaybackControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlaybackControlsFragment.java
index 075844c8..62078ff3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlaybackControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlaybackControlsFragment.java
@@ -3,8 +3,8 @@ package code.name.monkey.retromusic.ui.fragments.player.flat;
 import android.animation.ObjectAnimator;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlayerFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlayerFragment.java
index 6e4e7f55..cc16a8e6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlayerFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlayerFragment.java
@@ -4,9 +4,9 @@ import android.animation.ArgbEvaluator;
 import android.animation.ValueAnimator;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -33,12 +33,13 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements
 
     @BindView(R.id.player_toolbar)
     Toolbar toolbar;
+
     @BindView(R.id.gradient_background)
     View colorBackground;
+
     @BindView(R.id.toolbar_container)
     FrameLayout toolbarContainer;
-    @BindView(R.id.status_bar)
-    View statusBar;
+
 
     private Unbinder unbinder;
     private ValueAnimator valueAnimator;
@@ -91,8 +92,6 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        toggleStatusBar(statusBar);
-
         setUpPlayerToolbar();
         setUpSubFragments();
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlaybackControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlaybackControlsFragment.java
index ab26993d..7016b48b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlaybackControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlaybackControlsFragment.java
@@ -6,9 +6,9 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.ClipDrawable;
 import android.graphics.drawable.LayerDrawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.java
index cb1e0d22..89481c6b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.java
@@ -2,14 +2,14 @@ package code.name.monkey.retromusic.ui.fragments.player.full;
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/hmm/HmmPlaybackControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/hmm/HmmPlaybackControlsFragment.java
index 5af0059c..5b01251d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/hmm/HmmPlaybackControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/hmm/HmmPlaybackControlsFragment.java
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic.ui.fragments.player.hmm;
 
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/hmm/HmmPlayerFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/hmm/HmmPlayerFragment.java
index bdd890ae..38ce92f5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/hmm/HmmPlayerFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/hmm/HmmPlayerFragment.java
@@ -3,9 +3,9 @@ package code.name.monkey.retromusic.ui.fragments.player.hmm;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -42,16 +42,18 @@ public class HmmPlayerFragment extends AbsPlayerFragment implements
 
     @BindView(R.id.title)
     TextView title;
+
     @BindView(R.id.text)
     TextView text;
+
     @BindView(R.id.player_song_total_time)
     TextView totalTime;
+
     @BindView(R.id.progress_bar)
     ProgressBar progressBar;
+
     @BindView(R.id.player_toolbar)
     Toolbar toolbar;
-    @BindView(R.id.status_bar)
-    View statusBar;
 
     private MusicProgressViewUpdateHelper progressViewUpdateHelper;
     private Unbinder unBinder;
@@ -102,8 +104,6 @@ public class HmmPlayerFragment extends AbsPlayerFragment implements
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        toggleStatusBar(statusBar);
-
         progressBar.setOnClickListener(new PlayPauseButtonOnClickHandler());
         progressBar.setOnTouchListener(new MiniPlayerFragment.FlingPlayBackController(getActivity()));
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.java
index 0bb5b57a..5d9efe7c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.java
@@ -3,11 +3,11 @@ package code.name.monkey.retromusic.ui.fragments.player.lockscreen;
 import android.animation.ObjectAnimator;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatImageButton;
-import android.support.v7.widget.AppCompatSeekBar;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageButton;
+import androidx.appcompat.widget.AppCompatSeekBar;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.java
index e4882564..5089c608 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.java
@@ -3,10 +3,10 @@ package code.name.monkey.retromusic.ui.fragments.player.material;
 import android.animation.ObjectAnimator;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatSeekBar;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatSeekBar;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialFragment.java
index a78c799b..385a1088 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialFragment.java
@@ -1,10 +1,10 @@
 package code.name.monkey.retromusic.ui.fragments.player.material;
 
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,8 +28,6 @@ public class MaterialFragment extends AbsPlayerFragment implements PlayerAlbumCo
 
     @BindView(R.id.player_toolbar)
     Toolbar toolbar;
-    @BindView(R.id.status_bar)
-    View statusBar;
 
     private int lastColor;
     private MaterialControlsFragment playbackControlsFragment;
@@ -116,8 +114,6 @@ public class MaterialFragment extends AbsPlayerFragment implements PlayerAlbumCo
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        toggleStatusBar(statusBar);
-
         setUpSubFragments();
         setUpPlayerToolbar();
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerFragment.java
index 9914b72b..fd78de18 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerFragment.java
@@ -4,10 +4,10 @@ import android.animation.ArgbEvaluator;
 import android.animation.ValueAnimator;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -31,10 +31,9 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
 
     @BindView(R.id.player_toolbar)
     Toolbar toolbar;
+
     @BindView(R.id.gradient_background)
     View colorBackground;
-    @BindView(R.id.status_bar)
-    View statusBar;
 
     private int lastColor;
     private PlayerPlaybackControlsFragment playbackControlsFragment;
@@ -143,8 +142,6 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        toggleStatusBar(statusBar);
-
         setUpSubFragments();
         setUpPlayerToolbar();
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerPlaybackControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerPlaybackControlsFragment.java
index 4f0303e8..8de82bef 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerPlaybackControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerPlaybackControlsFragment.java
@@ -5,10 +5,10 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.ClipDrawable;
 import android.graphics.drawable.LayerDrawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatSeekBar;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatSeekBar;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -43,26 +43,37 @@ public class PlayerPlaybackControlsFragment extends AbsPlayerControlsFragment {
 
     @BindView(R.id.player_play_pause_button)
     ImageButton playPauseFab;
+
     @BindView(R.id.player_prev_button)
     ImageButton prevButton;
+
     @BindView(R.id.player_next_button)
     ImageButton nextButton;
+
     @BindView(R.id.player_repeat_button)
     ImageButton repeatButton;
+
     @BindView(R.id.player_shuffle_button)
     ImageButton shuffleButton;
+
     @BindView(R.id.player_progress_slider)
     AppCompatSeekBar progressSlider;
+
     @BindView(R.id.player_song_total_time)
     TextView songTotalTime;
+
     @BindView(R.id.player_song_current_progress)
     TextView songCurrentProgress;
+
     @BindView(R.id.title)
     AppCompatTextView title;
+
     @BindView(R.id.text)
     TextView text;
+
     @BindView(R.id.volume_fragment_container)
     View mVolumeContainer;
+
     private Unbinder unbinder;
     private PlayPauseDrawable playerFabPlayPauseDrawable;
     private int lastPlaybackControlsColor;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.java
index 19ccb6a7..ea097afa 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.java
@@ -3,8 +3,6 @@ package code.name.monkey.retromusic.ui.fragments.player.plain;
 import android.animation.ObjectAnimator;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +13,8 @@ import android.widget.ImageButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -42,20 +42,28 @@ public class PlainPlaybackControlsFragment extends AbsPlayerControlsFragment {
 
     @BindView(R.id.player_play_pause_button)
     ImageButton playPauseFab;
+
     @BindView(R.id.player_prev_button)
     ImageButton prevButton;
+
     @BindView(R.id.player_next_button)
     ImageButton nextButton;
+
     @BindView(R.id.player_repeat_button)
     ImageButton repeatButton;
+
     @BindView(R.id.player_shuffle_button)
     ImageButton shuffleButton;
+
     @BindView(R.id.player_progress_slider)
     SeekBar progressSlider;
+
     @BindView(R.id.player_song_total_time)
     TextView songTotalTime;
+
     @BindView(R.id.player_song_current_progress)
     TextView songCurrentProgress;
+
     @BindView(R.id.volume_fragment_container)
     View volumeContainer;
 
@@ -285,11 +293,10 @@ public class PlainPlaybackControlsFragment extends AbsPlayerControlsFragment {
                     MaterialValueHelper.getPrimaryDisabledTextColor(getActivity(), false);
         }
 
-        int finalColor = PreferenceUtil.getInstance(getContext()).getAdaptiveColor()
-                ? dark : ThemeStore.accentColor(getContext());
+        int finalColor = PreferenceUtil.getInstance(getContext()).getAdaptiveColor() ? dark : ThemeStore.accentColor(getContext());
 
 
-        setProgressBarColor(dark);
+        setProgressBarColor(finalColor);
         TintHelper.setTintAuto(playPauseFab, MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(finalColor)), false);
         TintHelper.setTintAuto(playPauseFab, finalColor, true);
 
@@ -298,15 +305,14 @@ public class PlainPlaybackControlsFragment extends AbsPlayerControlsFragment {
         updatePrevNextColor();
     }
 
-    public void setProgressBarColor(int newColor) {
+    private void setProgressBarColor(int newColor) {
         TintHelper.setTintAuto(progressSlider, newColor, false);
     }
 
     private void setUpPlayPauseFab() {
         playerFabPlayPauseDrawable = new PlayPauseDrawable(getActivity());
 
-        playPauseFab.setImageDrawable(
-                playerFabPlayPauseDrawable); // Note: set the drawable AFTER TintHelper.setTintAuto() was called
+        playPauseFab.setImageDrawable(playerFabPlayPauseDrawable); // Note: set the drawable AFTER TintHelper.setTintAuto() was called
         //playPauseFab.setColorFilter(MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(fabColor)), PorterDuff.Mode.SRC_IN);
         //playPauseFab.setOnClickListener(new PlayPauseButtonOnClickHandler());
         playPauseFab.post(() -> {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlayerFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlayerFragment.java
index f448fee5..da5be59b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlayerFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlayerFragment.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.fragments.player.plain;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,14 +30,15 @@ public class PlainPlayerFragment extends AbsPlayerFragment implements
 
     @BindView(R.id.title)
     TextView title;
+
     @BindView(R.id.text)
     TextView text;
+
     @BindView(R.id.player_toolbar)
     Toolbar toolbar;
+
     @BindView(R.id.toolbar_container)
     FrameLayout toolbarContainer;
-    @BindView(R.id.status_bar)
-    View statusBar;
 
     private Unbinder unbinder;
     private PlainPlaybackControlsFragment plainPlaybackControlsFragment;
@@ -89,7 +90,7 @@ public class PlainPlayerFragment extends AbsPlayerFragment implements
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        toggleStatusBar(statusBar);
+
         setUpSubFragments();
         setUpPlayerToolbar();
         title.setSelected(true);
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlaybackControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlaybackControlsFragment.java
index 8571f64d..75e78777 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlaybackControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlaybackControlsFragment.java
@@ -2,8 +2,8 @@ package code.name.monkey.retromusic.ui.fragments.player.simple;
 
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlayerFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlayerFragment.java
index 0ac6ecff..4ba7c132 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlayerFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlayerFragment.java
@@ -1,9 +1,9 @@
 package code.name.monkey.retromusic.ui.fragments.player.simple;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,8 +28,7 @@ public class SimplePlayerFragment extends AbsPlayerFragment implements
 
     @BindView(R.id.player_toolbar)
     Toolbar toolbar;
-    @BindView(R.id.status_bar)
-    View statusBar;
+
     private Unbinder unbinder;
     private SimplePlaybackControlsFragment simplePlaybackControlsFragment;
     private int lastColor;
@@ -53,7 +52,6 @@ public class SimplePlayerFragment extends AbsPlayerFragment implements
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        toggleStatusBar(statusBar);
         setUpSubFragments();
         setUpPlayerToolbar();
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.java
index 6f8814e8..f2945694 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.java
@@ -3,17 +3,19 @@ package code.name.monkey.retromusic.ui.fragments.settings;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceFragmentCompat;
+import code.name.monkey.retromusic.preferences.AlbumCoverStylePreference;
+import code.name.monkey.retromusic.preferences.AlbumCoverStylePreferenceDialog;
 import code.name.monkey.retromusic.preferences.BlacklistPreference;
 import code.name.monkey.retromusic.preferences.BlacklistPreferenceDialog;
 import code.name.monkey.retromusic.preferences.NowPlayingScreenPreference;
@@ -25,7 +27,7 @@ import code.name.monkey.retromusic.util.NavigationUtil;
  */
 
 public abstract class AbsSettingsFragment extends ATEPreferenceFragmentCompat {
-    protected void showProToastAndNavigate(String message) {
+    void showProToastAndNavigate(String message) {
         Toast.makeText(getContext(), message + " is Pro version feature.", Toast.LENGTH_SHORT).show();
         //noinspection ConstantConditions
         NavigationUtil.goToProVersion(getActivity());
@@ -37,7 +39,7 @@ public abstract class AbsSettingsFragment extends ATEPreferenceFragmentCompat {
                 .getString(preference.getKey(), ""));
     }
 
-    protected void setSummary(Preference preference, @NonNull Object value) {
+    void setSummary(Preference preference, @NonNull Object value) {
         String stringValue = value.toString();
         if (preference instanceof ListPreference) {
             ListPreference listPreference = (ListPreference) preference;
@@ -68,6 +70,8 @@ public abstract class AbsSettingsFragment extends ATEPreferenceFragmentCompat {
             return NowPlayingScreenPreferenceDialog.newInstance();
         } else if (preference instanceof BlacklistPreference) {
             return BlacklistPreferenceDialog.newInstance();
+        } else if (preference instanceof AlbumCoverStylePreference) {
+            return AlbumCoverStylePreferenceDialog.newInstance();
         }
         return super.onCreatePreferenceDialog(preference);
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AudioSettings.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AudioSettings.java
index 4135304f..1ae62cd8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AudioSettings.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AudioSettings.java
@@ -5,7 +5,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.media.audiofx.AudioEffect;
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.util.NavigationUtil;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ImageSettingFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ImageSettingFragment.java
index d34c0a32..80e7c29b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ImageSettingFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ImageSettingFragment.java
@@ -1,7 +1,7 @@
 package code.name.monkey.retromusic.ui.fragments.settings;
 
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import code.name.monkey.retromusic.R;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.java
index 0101f092..04dc8070 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.java
@@ -2,16 +2,16 @@ package code.name.monkey.retromusic.ui.fragments.settings;
 
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
 import butterknife.BindView;
 import butterknife.BindViews;
 import butterknife.ButterKnife;
@@ -24,17 +24,19 @@ import code.name.monkey.retromusic.views.IconImageView;
 
 public class MainSettingsFragment extends Fragment {
 
-    Unbinder unbinder;
     @BindViews({R.id.general_settings_icon, R.id.audio_settings_icon,
-            R.id.now_playing_settings_icon, R.id.image_settings_icon,
-            R.id.notification_settings_icon, R.id.other_settings_icon})
+            R.id.now_playing_settings_icon, R.id.personalize_settings_icon,
+            R.id.image_settings_icon, R.id.notification_settings_icon, R.id.other_settings_icon})
     List<IconImageView> icons;
-    ButterKnife.Action<View> apply = (view, index) -> {
+
+    @BindView(R.id.container)
+    ViewGroup container;
+
+    private Unbinder unbinder;
+    private ButterKnife.Action<View> apply = (view, index) -> {
         //noinspection ConstantConditions
         ((IconImageView) view).setColorFilter(ThemeStore.accentColor(getContext()), PorterDuff.Mode.SRC_IN);
     };
-    @BindView(R.id.container)
-    ViewGroup container;
 
     @Nullable
     @Override
@@ -54,7 +56,7 @@ public class MainSettingsFragment extends Fragment {
     }
 
     @OnClick({R.id.general_settings, R.id.audio_settings, R.id.now_playing_settings,
-            R.id.image_settings, R.id.notification_settings, R.id.other_settings})
+            R.id.image_settings, R.id.personalize_settings, R.id.notification_settings, R.id.other_settings})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.general_settings:
@@ -64,7 +66,10 @@ public class MainSettingsFragment extends Fragment {
                 inflateFragment(new AudioSettings(), R.string.pref_header_audio);
                 break;
             case R.id.now_playing_settings:
-                inflateFragment(new NowPlayingSettingsFragment(), R.string.personalize);
+                inflateFragment(new NowPlayingSettingsFragment(), R.string.now_playing);
+                break;
+            case R.id.personalize_settings:
+                inflateFragment(new PersonaizeSettingsFragment(), R.string.personalize);
                 break;
             case R.id.image_settings:
                 inflateFragment(new ImageSettingFragment(), R.string.pref_header_images);
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NotificationSettingsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NotificationSettingsFragment.java
index e2d6f2b8..9a61f0e3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NotificationSettingsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NotificationSettingsFragment.java
@@ -2,7 +2,7 @@ package code.name.monkey.retromusic.ui.fragments.settings;
 
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.preference.TwoStatePreference;
 
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.helper.MusicPlayerRemote;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NowPlayingSettingsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NowPlayingSettingsFragment.java
index 64722278..77ec51c3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NowPlayingSettingsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NowPlayingSettingsFragment.java
@@ -2,10 +2,10 @@ package code.name.monkey.retromusic.ui.fragments.settings;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.TwoStatePreference;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.preference.TwoStatePreference;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.RetroApplication;
 import code.name.monkey.retromusic.util.PreferenceUtil;
@@ -21,47 +21,27 @@ public class NowPlayingSettingsFragment extends AbsSettingsFragment implements
     @Override
     public void invalidateSettings() {
         updateNowPlayingScreenSummary();
+        updateAlbumCoverStyleSummary();
 
-        final TwoStatePreference cornerWindow = (TwoStatePreference) findPreference("corner_window");
-        cornerWindow.setOnPreferenceChangeListener((preference, newValue) -> {
-            if ((Boolean) newValue && !RetroApplication.isProVersion()) {
-                showProToastAndNavigate(getActivity().getString(R.string.pref_title_round_corners));
-                return false;
-            }
-            getActivity().recreate();
-            return true;
-        });
-        final TwoStatePreference carouselEffect = (TwoStatePreference) findPreference(
-                "carousel_effect");
+        final TwoStatePreference carouselEffect = (TwoStatePreference) findPreference("carousel_effect");
         carouselEffect.setOnPreferenceChangeListener((preference, newValue) -> {
             if ((Boolean) newValue && !RetroApplication.isProVersion()) {
-                showProToastAndNavigate(
-                        getActivity().getString(R.string.pref_title_toggle_carousel_effect));
+                showProToastAndNavigate(getActivity().getString(R.string.pref_title_toggle_carousel_effect));
                 return false;
             }
             return true;
         });
 
-        final TwoStatePreference toggleFullScreen = (TwoStatePreference) findPreference(
-                "toggle_full_screen");
-        toggleFullScreen.setOnPreferenceChangeListener((preference, newValue) -> {
-            getActivity().recreate();
-            return true;
-        });
     }
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.pref_now_playing_screen);
-        addPreferencesFromResource(R.xml.pref_ui);
-        addPreferencesFromResource(R.xml.pref_window);
-        addPreferencesFromResource(R.xml.pref_lockscreen);
     }
 
     private void updateNowPlayingScreenSummary() {
         //noinspection ConstantConditions
-        findPreference("now_playing_screen_id")
-                .setSummary(PreferenceUtil.getInstance(getActivity()).getNowPlayingScreen().titleRes);
+        findPreference("now_playing_screen_id").setSummary(PreferenceUtil.getInstance(getActivity()).getNowPlayingScreen().titleRes);
     }
 
     @Override
@@ -84,10 +64,17 @@ public class NowPlayingSettingsFragment extends AbsSettingsFragment implements
             case PreferenceUtil.NOW_PLAYING_SCREEN_ID:
                 updateNowPlayingScreenSummary();
                 break;
+            case PreferenceUtil.ALBUM_COVER_STYLE:
+                updateAlbumCoverStyleSummary();
+                break;
             case PreferenceUtil.CIRCULAR_ALBUM_ART:
             case PreferenceUtil.CAROUSEL_EFFECT:
                 invalidateSettings();
                 break;
         }
     }
+
+    private void updateAlbumCoverStyleSummary() {
+        findPreference("album_cover_style_id").setSummary(PreferenceUtil.getInstance(getActivity()).getAlbumCoverStyle().titleRes);
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/PersonaizeSettingsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/PersonaizeSettingsFragment.java
new file mode 100644
index 00000000..b1eb09d9
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/PersonaizeSettingsFragment.java
@@ -0,0 +1,65 @@
+package code.name.monkey.retromusic.ui.fragments.settings;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.preference.TwoStatePreference;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.RetroApplication;
+import code.name.monkey.retromusic.util.PreferenceUtil;
+
+public class PersonaizeSettingsFragment extends AbsSettingsFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
+    @SuppressWarnings("ConstantConditions")
+    @Override
+    public void invalidateSettings() {
+        final TwoStatePreference cornerWindow = (TwoStatePreference) findPreference("corner_window");
+        cornerWindow.setOnPreferenceChangeListener((preference, newValue) -> {
+            if ((Boolean) newValue && !RetroApplication.isProVersion()) {
+                showProToastAndNavigate(getActivity().getString(R.string.pref_title_round_corners));
+                return false;
+            }
+            getActivity().recreate();
+            return true;
+        });
+
+
+        final TwoStatePreference toggleFullScreen = (TwoStatePreference) findPreference("toggle_full_screen");
+        toggleFullScreen.setOnPreferenceChangeListener((preference, newValue) -> {
+            getActivity().recreate();
+            return true;
+        });
+    }
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        addPreferencesFromResource(R.xml.pref_ui);
+        addPreferencesFromResource(R.xml.pref_window);
+        addPreferencesFromResource(R.xml.pref_lockscreen);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        //noinspection ConstantConditions
+        PreferenceUtil.getInstance(getContext()).registerOnSharedPreferenceChangedListener(this);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        //noinspection ConstantConditions
+        PreferenceUtil.getInstance(getContext()).unregisterOnSharedPreferenceChangedListener(this);
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        switch (key) {
+            case PreferenceUtil.CAROUSEL_EFFECT:
+                invalidateSettings();
+                break;
+        }
+    }
+
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ThemeSettingsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ThemeSettingsFragment.java
index b33aaedd..9d89f89c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ThemeSettingsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ThemeSettingsFragment.java
@@ -3,9 +3,9 @@ package code.name.monkey.retromusic.ui.fragments.settings;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.core.content.ContextCompat;
+import androidx.preference.Preference;
+import androidx.preference.TwoStatePreference;
 
 import com.afollestad.materialdialogs.color.ColorChooserDialog;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/AnimationUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/AnimationUtil.java
index 7a7297be..9a4aa520 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/AnimationUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/AnimationUtil.java
@@ -1,7 +1,7 @@
 package code.name.monkey.retromusic.util;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.animation.AnimationUtils;
 import android.view.animation.LayoutAnimationController;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ArtistSignatureUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/ArtistSignatureUtil.java
index f747be56..b6b6fb91 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/ArtistSignatureUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/ArtistSignatureUtil.java
@@ -3,7 +3,7 @@ package code.name.monkey.retromusic.util;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.signature.StringSignature;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ColorUtils.java b/app/src/main/java/code/name/monkey/retromusic/util/ColorUtils.java
index 48854454..2e5cf1e9 100755
--- a/app/src/main/java/code/name/monkey/retromusic/util/ColorUtils.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/ColorUtils.java
@@ -1,7 +1,7 @@
 package code.name.monkey.retromusic.util;
 
 import android.graphics.Color;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 
 public class ColorUtils {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.java
index ca369a9d..752b4871 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.java
@@ -7,7 +7,7 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java
index 9dea5b9a..a4e7db1f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java
@@ -4,8 +4,8 @@ import android.content.Context;
 import android.database.Cursor;
 import android.os.Environment;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.webkit.MimeTypeMap;
 
 import java.io.BufferedReader;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ImageUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/ImageUtil.java
index 27533151..94b8601f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/ImageUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/ImageUtil.java
@@ -8,7 +8,7 @@ import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.media.ExifInterface;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java
index a7945a0b..cebb8c6a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java
@@ -12,9 +12,9 @@ import android.os.Environment;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.FileProvider;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java
index 4fb9d023..22e0e4ea 100755
--- a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java
@@ -4,11 +4,11 @@ import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.media.audiofx.AudioEffect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.util.Pair;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.util.Pair;
 import android.widget.Toast;
 
 import code.name.monkey.retromusic.R;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.java
index cb82867e..920224f4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.java
@@ -8,8 +8,8 @@ import android.net.Uri;
 import android.os.Environment;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.widget.Toast;
 
 import java.io.File;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
index 71db2d53..34900cbe 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
@@ -6,9 +6,6 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.TypedArray;
 import android.preference.PreferenceManager;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StyleRes;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
@@ -18,10 +15,15 @@ import java.io.File;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.RetroApplication;
 import code.name.monkey.retromusic.helper.SortOrder;
 import code.name.monkey.retromusic.model.CategoryInfo;
+import code.name.monkey.retromusic.ui.activities.MainActivity;
+import code.name.monkey.retromusic.ui.fragments.AlbumCoverStyle;
 import code.name.monkey.retromusic.ui.fragments.NowPlayingScreen;
 import code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFragment;
 
@@ -53,6 +55,7 @@ public final class PreferenceUtil {
     public static final String ALBUM_GRID_STYLE = "album_grid_style";
     public static final String ARTIST_GRID_STYLE = "artist_grid_style";
     public static final String TOGGLE_ADD_CONTROLS = "toggle_add_controls";
+    public static final String ALBUM_COVER_STYLE = "album_cover_style";
     private static final String GENRE_SORT_ORDER = "genre_sort_order";
     private static final String LIBRARY_CATEGORIES = "library_categories";
     private static final String LAST_PAGE = "last_start_page";
@@ -293,13 +296,11 @@ public final class PreferenceUtil {
     }
 
     public final int getLastMusicChooser() {
-        return mPreferences.getInt(LAST_MUSIC_CHOOSER, 0);
+        return mPreferences.getInt(LAST_MUSIC_CHOOSER, MainActivity.HOME);
     }
 
-    public void setLastMusicChooser(final int value) {
-        final SharedPreferences.Editor editor = mPreferences.edit();
-        editor.putInt(LAST_MUSIC_CHOOSER, value);
-        editor.apply();
+    public void setLastMusicChooser(int value) {
+        mPreferences.edit().putInt(LAST_MUSIC_CHOOSER, value).apply();
     }
 
     public final boolean coloredNotification() {
@@ -333,6 +334,22 @@ public final class PreferenceUtil {
         editor.apply();
     }
 
+    public final AlbumCoverStyle getAlbumCoverStyle() {
+        int id = mPreferences.getInt(ALBUM_COVER_STYLE, 0);
+        for (AlbumCoverStyle albumCoverStyle : AlbumCoverStyle.values()) {
+            if (albumCoverStyle.id == id) {
+                return albumCoverStyle;
+            }
+        }
+        return AlbumCoverStyle.CARD;
+    }
+
+    public void setAlbumCoverStyle(AlbumCoverStyle albumCoverStyle) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putInt(ALBUM_COVER_STYLE, albumCoverStyle.id);
+        editor.apply();
+    }
+
     public void setColoredAppShortcuts(final boolean value) {
         final SharedPreferences.Editor editor = mPreferences.edit();
         editor.putBoolean(COLORED_APP_SHORTCUTS, value);
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
index 64da365c..0109434a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
@@ -4,10 +4,10 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.Color;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.graphics.Palette;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.palette.graphics.Palette;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java
index 308764c3..2b57147b 100755
--- a/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java
@@ -19,12 +19,12 @@ import android.os.Build;
 import android.os.ResultReceiver;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.graphics.drawable.VectorDrawableCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
+import androidx.core.content.ContextCompat;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.View;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.java
index 912242eb..f4400c85 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.java
@@ -3,7 +3,7 @@ package code.name.monkey.retromusic.util;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Color;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java b/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java
index 8558519e..44c5b674 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java
@@ -6,8 +6,8 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.graphics.Palette;
+import androidx.annotation.VisibleForTesting;
+import androidx.palette.graphics.Palette;
 
 import java.util.List;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/schedulers/BaseSchedulerProvider.java b/app/src/main/java/code/name/monkey/retromusic/util/schedulers/BaseSchedulerProvider.java
index 6e610579..d3b0cd6b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/schedulers/BaseSchedulerProvider.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/schedulers/BaseSchedulerProvider.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.util.schedulers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import io.reactivex.Scheduler;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/schedulers/ImmediateScheduler.java b/app/src/main/java/code/name/monkey/retromusic/util/schedulers/ImmediateScheduler.java
index d5284bab..9491c580 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/schedulers/ImmediateScheduler.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/schedulers/ImmediateScheduler.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.util.schedulers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import io.reactivex.Scheduler;
 import io.reactivex.schedulers.Schedulers;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/schedulers/SchedulerProvider.java b/app/src/main/java/code/name/monkey/retromusic/util/schedulers/SchedulerProvider.java
index 1750f134..46e34916 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/schedulers/SchedulerProvider.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/schedulers/SchedulerProvider.java
@@ -1,6 +1,6 @@
 package code.name.monkey.retromusic.util.schedulers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import io.reactivex.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/AutofitRecyclerView.java b/app/src/main/java/code/name/monkey/retromusic/views/AutofitRecyclerView.java
deleted file mode 100644
index a513a46f..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/AutofitRecyclerView.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package code.name.monkey.retromusic.views;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.AttributeSet;
-
-/**
- * @author Hemanth S (h4h13).
- */
-public class AutofitRecyclerView extends RecyclerView {
-    private GridLayoutManager manager;
-    private int columnWidth = -1; //default value
-
-    public AutofitRecyclerView(Context context) {
-        super(context);
-        init(context, null);
-    }
-
-    public AutofitRecyclerView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(context, attrs);
-    }
-
-    public AutofitRecyclerView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        init(context, attrs);
-    }
-
-    private void init(Context context, AttributeSet attrs) {
-        if (attrs != null) {
-            int[] attrsArray = {android.R.attr.columnWidth};
-            TypedArray array = context.obtainStyledAttributes(attrs, attrsArray);
-            columnWidth = array.getDimensionPixelSize(0, -1);
-            array.recycle();
-        }
-
-        manager = new GridLayoutManager(getContext(), 1, GridLayoutManager.HORIZONTAL,false);
-        setLayoutManager(manager);
-    }
-
-    @Override
-    protected void onMeasure(int widthSpec, int heightSpec) {
-        super.onMeasure(widthSpec, heightSpec);
-        if (columnWidth > 0) {
-            int spanCount = Math.max(1, getMeasuredWidth() / columnWidth);
-            manager.setSpanCount(spanCount);
-        }
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationViewEx.java b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationViewEx.java
deleted file mode 100644
index eb13ed1d..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationViewEx.java
+++ /dev/null
@@ -1,1050 +0,0 @@
-package code.name.monkey.retromusic.views;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.Paint;
-import android.graphics.Typeface;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.internal.BottomNavigationItemView;
-import android.support.design.internal.BottomNavigationMenuView;
-import android.support.design.widget.BottomNavigationView;
-import android.support.transition.Transition;
-import android.support.transition.TransitionSet;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.util.SparseIntArray;
-import android.util.TypedValue;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Field;
-
-import code.name.monkey.appthemehelper.ThemeStore;
-import code.name.monkey.appthemehelper.util.ATHUtil;
-
-/**
- * Created by yu on 2016/11/10.
- */
-@SuppressLint("RestrictedApi")
-public class BottomNavigationViewEx extends BottomNavigationView {
-    // used for animation
-    private int mShiftAmount;
-    private float mScaleUpFactor;
-    private float mScaleDownFactor;
-    private boolean animationRecord;
-    private float mLargeLabelSize;
-    private float mSmallLabelSize;
-    private boolean visibilityTextSizeRecord;
-    private boolean visibilityHeightRecord;
-    private int mItemHeight;
-    private boolean textVisibility = true;
-    // used for animation end
-
-    // used for setupWithViewPager
-    private ViewPager mViewPager;
-    private MyOnNavigationItemSelectedListener mMyOnNavigationItemSelectedListener;
-    private BottomNavigationViewExOnPageChangeListener mPageChangeListener;
-    private BottomNavigationMenuView mMenuView;
-    private BottomNavigationItemView[] mButtons;
-    // used for setupWithViewPager end
-
-    public BottomNavigationViewEx(Context context) {
-        super(context);
-        tintColor( );
-    }
-
-    public BottomNavigationViewEx(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        tintColor( );
-    }
-
-    public BottomNavigationViewEx(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        tintColor( );
-    }
-
-    /**
-     * get text height by font size
-     *
-     * @param fontSize
-     * @return
-     */
-    private static int getFontHeight(float fontSize) {
-        Paint paint = new Paint();
-        paint.setTextSize(fontSize);
-        Paint.FontMetrics fm = paint.getFontMetrics();
-        return (int) Math.ceil(fm.descent - fm.top) + 2;
-    }
-
-    /**
-     * dp to px
-     *
-     * @param context
-     * @param dpValue dp
-     * @return px
-     */
-    public static int dp2px(Context context, float dpValue) {
-        final float scale = context.getResources().getDisplayMetrics().density;
-        return (int) (dpValue * scale + 0.5f);
-    }
-
-    private static void setItemIconColors(@NonNull BottomNavigationView view, @ColorInt int normalColor, @ColorInt int selectedColor) {
-        ColorStateList iconSl = new ColorStateList(new int[][]{{-16842912}, {16842912}}, new int[]{normalColor, selectedColor});
-        view.setItemIconTintList(iconSl);
-    }
-
-    private static void setItemTextColors(@NonNull BottomNavigationView view, @ColorInt int normalColor, @ColorInt int selectedColor) {
-        ColorStateList textSl = new ColorStateList(new int[][]{{-16842912}, {16842912}}, new int[]{normalColor, selectedColor});
-        view.setItemTextColor(textSl);
-    }
-
-    public void setIconAndTextColor(int i) {
-        tintColor(ATHUtil.resolveColor(getContext(), android.R.attr.textColorSecondary), i);
-    }
-
-    private void tintColor() {
-        int color = ATHUtil.resolveColor(getContext(), android.R.attr.textColorSecondary);
-        int accentColor = ThemeStore.accentColor(getContext());
-        tintColor(color, accentColor);
-    }
-
-    private void tintColor(int color, int accentColor) {
-        setItemIconColors(this, color, accentColor);
-        setItemTextColors(this, color, accentColor);
-    }
-
-    private void init() {
-        try {
-            addAnimationListener();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void addAnimationListener() {
-        /**
-         * 1. BottomNavigationMenuView mMenuView
-         * 2. private final BottomNavigationAnimationHelperBase mAnimationHelper;
-         * 3. private final TransitionSet mSet;
-         */
-        BottomNavigationMenuView mMenuView = getBottomNavigationMenuView();
-        Object mAnimationHelper = getField(mMenuView.getClass(), mMenuView, "mAnimationHelper");
-        TransitionSet mSet = getField(mAnimationHelper.getClass(), mAnimationHelper, "mSet");
-        mSet.addListener(new Transition.TransitionListener() {
-            @Override
-            public void onTransitionStart(@NonNull Transition transition) {
-            }
-
-            @Override
-            public void onTransitionEnd(@NonNull Transition transition) {
-                refreshTextViewVisibility();
-            }
-
-            @Override
-            public void onTransitionCancel(@NonNull Transition transition) {
-                refreshTextViewVisibility();
-            }
-
-            @Override
-            public void onTransitionPause(@NonNull Transition transition) {
-            }
-
-            @Override
-            public void onTransitionResume(@NonNull Transition transition) {
-            }
-        });
-    }
-
-    private void refreshTextViewVisibility() {
-        if (!textVisibility)
-            return;
-        // 1. get mMenuView
-        BottomNavigationMenuView mMenuView = getBottomNavigationMenuView();
-        // 2. get mButtons
-        BottomNavigationItemView[] mButtons = getBottomNavigationItemViews();
-
-        int currentItem = getCurrentItem();
-
-        // 3. get field mShiftingMode and TextView in mButtons
-        for (BottomNavigationItemView button : mButtons) {
-            TextView mLargeLabel = getField(button.getClass(), button, "mLargeLabel");
-            TextView mSmallLabel = getField(button.getClass(), button, "mSmallLabel");
-
-            if (mLargeLabel != null) {
-                mLargeLabel.clearAnimation();
-            }
-            if (mSmallLabel != null) {
-                mSmallLabel.clearAnimation();
-            }
-
-            // mShiftingMode
-            boolean mShiftingMode = getField(button.getClass(), button, "mShiftingMode");
-            boolean selected = button.getItemPosition() == currentItem;
-            if (mShiftingMode) {
-                if (selected) {
-                    mLargeLabel.setVisibility(VISIBLE);
-                } else {
-                    mLargeLabel.setVisibility(INVISIBLE);
-                }
-                mSmallLabel.setVisibility(INVISIBLE);
-            } else {
-                if (selected) {
-                    mLargeLabel.setVisibility(VISIBLE);
-                    mSmallLabel.setVisibility(INVISIBLE);
-                } else {
-                    mLargeLabel.setVisibility(INVISIBLE);
-                    mSmallLabel.setVisibility(VISIBLE);
-                }
-            }
-        }
-    }
-
-    /**
-     * change the visibility of icon
-     *
-     * @param visibility
-     */
-    public void setIconVisibility(boolean visibility) {
-        /*
-        1. get field in this class
-        private final BottomNavigationMenuView mMenuView;
-
-        2. get field in mButtons
-        private BottomNavigationItemView[] mButtons;
-
-        3. get mIcon in mButtons
-        private ImageView mIcon
-
-        4. set mIcon visibility gone
-
-        5. change mItemHeight to only text size in mMenuView
-         */
-        // 1. get mMenuView
-        final BottomNavigationMenuView mMenuView = getBottomNavigationMenuView();
-        // 2. get mButtons
-        BottomNavigationItemView[] mButtons = getBottomNavigationItemViews();
-        // 3. get mIcon in mButtons
-        for (BottomNavigationItemView button : mButtons) {
-            ImageView mIcon = getField(button.getClass(), button, "mIcon");
-            // 4. set mIcon visibility gone
-            mIcon.setVisibility(visibility ? View.VISIBLE : View.INVISIBLE);
-        }
-
-        // 5. change mItemHeight to only text size in mMenuView
-        if (!visibility) {
-            // if not record mItemHeight
-            if (!visibilityHeightRecord) {
-                visibilityHeightRecord = true;
-                mItemHeight = getItemHeight();
-            }
-
-            // change mItemHeight
-            BottomNavigationItemView button = mButtons[0];
-            if (null != button) {
-                final ImageView mIcon = getField(button.getClass(), button, "mIcon");
-//                System.out.println("mIcon.getMeasuredHeight():" + mIcon.getMeasuredHeight());
-                if (null != mIcon) {
-                    mIcon.post(new Runnable() {
-                        @Override
-                        public void run() {
-//                            System.out.println("mIcon.getMeasuredHeight():" + mIcon.getMeasuredHeight());
-                            setItemHeight(mItemHeight - mIcon.getMeasuredHeight());
-                        }
-                    });
-                }
-            }
-        } else {
-            // if not record the mItemHeight, we need do nothing.
-            if (!visibilityHeightRecord)
-                return;
-
-            // restore it
-            setItemHeight(mItemHeight);
-        }
-
-        mMenuView.updateMenuView();
-    }
-
-    /**
-     * change the visibility of text
-     *
-     * @param visibility
-     */
-    public void setTextVisibility(boolean visibility) {
-        this.textVisibility = visibility;
-        /*
-        1. get field in this class
-        private final BottomNavigationMenuView mMenuView;
-
-        2. get field in mButtons
-        private BottomNavigationItemView[] mButtons;
-
-        3. set text size in mButtons
-        private final TextView mLargeLabel
-        private final TextView mSmallLabel
-
-        4. change mItemHeight to only icon size in mMenuView
-         */
-        // 1. get mMenuView
-        BottomNavigationMenuView mMenuView = getBottomNavigationMenuView();
-        // 2. get mButtons
-        BottomNavigationItemView[] mButtons = getBottomNavigationItemViews();
-
-        // 3. change field mShiftingMode value in mButtons
-        for (BottomNavigationItemView button : mButtons) {
-            TextView mLargeLabel = getField(button.getClass(), button, "mLargeLabel");
-            TextView mSmallLabel = getField(button.getClass(), button, "mSmallLabel");
-
-            if (!visibility) {
-                // if not record the font size, record it
-                if (!visibilityTextSizeRecord && !animationRecord) {
-                    visibilityTextSizeRecord = true;
-                    mLargeLabelSize = mLargeLabel.getTextSize();
-                    mSmallLabelSize = mSmallLabel.getTextSize();
-                }
-
-                // if not visitable, set font size to 0
-                mLargeLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, 0);
-                mSmallLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, 0);
-
-            } else {
-                // if not record the font size, we need do nothing.
-                if (!visibilityTextSizeRecord)
-                    break;
-
-                // restore it
-                mLargeLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, mLargeLabelSize);
-                mSmallLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, mSmallLabelSize);
-            }
-        }
-
-        // 4 change mItemHeight to only icon size in mMenuView
-        if (!visibility) {
-            // if not record mItemHeight
-            if (!visibilityHeightRecord) {
-                visibilityHeightRecord = true;
-                mItemHeight = getItemHeight();
-            }
-
-            // change mItemHeight to only icon size in mMenuView
-            // private final int mItemHeight;
-
-            // change mItemHeight
-//            System.out.println("mLargeLabel.getMeasuredHeight():" + getFontHeight(mSmallLabelSize));
-            setItemHeight(mItemHeight - getFontHeight(mSmallLabelSize));
-
-        } else {
-            // if not record the mItemHeight, we need do nothing.
-            if (!visibilityHeightRecord)
-                return;
-            // restore mItemHeight
-            setItemHeight(mItemHeight);
-        }
-
-        mMenuView.updateMenuView();
-    }
-
-    /**
-     * enable or disable click item animation(text scale and icon move animation in no item shifting mode)
-     *
-     * @param enable It means the text won't scale and icon won't move when active it in no item shifting mode if false.
-     */
-    public void enableAnimation(boolean enable) {
-        /*
-        1. get field in this class
-        private final BottomNavigationMenuView mMenuView;
-
-        2. get field in mButtons
-        private BottomNavigationItemView[] mButtons;
-
-        3. chang mShiftAmount to 0 in mButtons
-        private final int mShiftAmount
-
-        change mScaleUpFactor and mScaleDownFactor to 1f in mButtons
-        private final float mScaleUpFactor
-        private final float mScaleDownFactor
-
-        4. change label font size in mButtons
-        private final TextView mLargeLabel
-        private final TextView mSmallLabel
-         */
-
-        // 1. get mMenuView
-        BottomNavigationMenuView mMenuView = getBottomNavigationMenuView();
-        // 2. get mButtons
-        BottomNavigationItemView[] mButtons = getBottomNavigationItemViews();
-        // 3. change field mShiftingMode value in mButtons
-        for (BottomNavigationItemView button : mButtons) {
-            TextView mLargeLabel = getField(button.getClass(), button, "mLargeLabel");
-            TextView mSmallLabel = getField(button.getClass(), button, "mSmallLabel");
-
-            // if disable animation, need animationRecord the source value
-            if (!enable) {
-                if (!animationRecord) {
-                    animationRecord = true;
-                    mShiftAmount = getField(button.getClass(), button, "mShiftAmount");
-                    mScaleUpFactor = getField(button.getClass(), button, "mScaleUpFactor");
-                    mScaleDownFactor = getField(button.getClass(), button, "mScaleDownFactor");
-
-                    mLargeLabelSize = mLargeLabel.getTextSize();
-                    mSmallLabelSize = mSmallLabel.getTextSize();
-
-//                    System.out.println("mShiftAmount:" + mShiftAmount + " mScaleUpFactor:"
-//                            + mScaleUpFactor + " mScaleDownFactor:" + mScaleDownFactor
-//                            + " mLargeLabel:" + mLargeLabelSize + " mSmallLabel:" + mSmallLabelSize);
-                }
-                // disable
-                setField(button.getClass(), button, "mShiftAmount", 0);
-                setField(button.getClass(), button, "mScaleUpFactor", 1);
-                setField(button.getClass(), button, "mScaleDownFactor", 1);
-
-                // let the mLargeLabel font size equal to mSmallLabel
-                mLargeLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, mSmallLabelSize);
-
-                // debug start
-//                mLargeLabelSize = mLargeLabel.getTextSize();
-//                System.out.println("mLargeLabel:" + mLargeLabelSize);
-                // debug end
-
-            } else {
-                // haven't change the value. It means it was the first call this method. So nothing need to do.
-                if (!animationRecord)
-                    return;
-                // enable animation
-                setField(button.getClass(), button, "mShiftAmount", mShiftAmount);
-                setField(button.getClass(), button, "mScaleUpFactor", mScaleUpFactor);
-                setField(button.getClass(), button, "mScaleDownFactor", mScaleDownFactor);
-                // restore
-                mLargeLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, mLargeLabelSize);
-            }
-        }
-        mMenuView.updateMenuView();
-    }
-
-    /**
-     * enable the shifting mode for navigation
-     *
-     * @param enable It will has a shift animation if true. Otherwise all items are the same width.
-     */
-    public void enableShiftingMode(boolean enable) {
-        /*
-        1. get field in this class
-        private final BottomNavigationMenuView mMenuView;
-
-        2. change field mShiftingMode value in mMenuView
-        private boolean mShiftingMode = true;
-         */
-        // 1. get mMenuView
-        BottomNavigationMenuView mMenuView = getBottomNavigationMenuView();
-        // 2. change field mShiftingMode value in mMenuView
-        setField(mMenuView.getClass(), mMenuView, "mShiftingMode", enable);
-
-        mMenuView.updateMenuView();
-    }
-
-    /**
-     * enable the shifting mode for each item
-     *
-     * @param enable It will has a shift animation for item if true. Otherwise the item text always be shown.
-     */
-    public void enableItemShiftingMode(boolean enable) {
-        /*
-        1. get field in this class
-        private final BottomNavigationMenuView mMenuView;
-
-        2. get field in this mMenuView
-        private BottomNavigationItemView[] mButtons;
-
-        3. change field mShiftingMode value in mButtons
-        private boolean mShiftingMode = true;
-         */
-        // 1. get mMenuView
-        BottomNavigationMenuView mMenuView = getBottomNavigationMenuView();
-        // 2. get mButtons
-        BottomNavigationItemView[] mButtons = getBottomNavigationItemViews();
-        // 3. change field mShiftingMode value in mButtons
-        for (BottomNavigationItemView button : mButtons) {
-            setField(button.getClass(), button, "mShiftingMode", enable);
-        }
-        mMenuView.updateMenuView();
-    }
-
-    /**
-     * get the current checked item position
-     *
-     * @return index of item, start from 0.
-     */
-    public int getCurrentItem() {
-        /*
-        1. get field in this class
-        private final BottomNavigationMenuView mMenuView;
-
-        2. get field in mMenuView
-        private BottomNavigationItemView[] mButtons;
-
-        3. get menu and traverse it to get the checked one
-         */
-
-        // 1. get mMenuView
-//        BottomNavigationMenuView mMenuView = getBottomNavigationMenuView();
-        // 2. get mButtons
-        BottomNavigationItemView[] mButtons = getBottomNavigationItemViews();
-        // 3. get menu and traverse it to get the checked one
-        Menu menu = getMenu();
-        for (int i = 0; i < mButtons.length; i++) {
-            if (menu.getItem(i).isChecked()) {
-                return i;
-            }
-        }
-        return 0;
-    }
-
-    /**
-     * set the current checked item
-     *
-     * @param item start from 0.
-     */
-    public void setCurrentItem(int item) {
-        // check bounds
-        if (item < 0 || item >= getMaxItemCount()) {
-            throw new ArrayIndexOutOfBoundsException("item is out of bounds, we expected 0 - "
-                    + (getMaxItemCount() - 1) + ". Actually " + item);
-        }
-
-        /*
-        1. get field in this class
-        private final BottomNavigationMenuView mMenuView;
-
-        2. get field in mMenuView
-        private BottomNavigationItemView[] mButtons;
-        private final OnClickListener mOnClickListener;
-
-        3. call mOnClickListener.onClick();
-         */
-        // 1. get mMenuView
-        BottomNavigationMenuView mMenuView = getBottomNavigationMenuView();
-        // 2. get mButtons
-        BottomNavigationItemView[] mButtons = getBottomNavigationItemViews();
-        // get mOnClickListener
-        View.OnClickListener mOnClickListener = getField(mMenuView.getClass(), mMenuView, "mOnClickListener");
-
-//        System.out.println("mMenuView:" + mMenuView + " mButtons:" + mButtons + " mOnClickListener" + mOnClickListener);
-        // 3. call mOnClickListener.onClick();
-        mOnClickListener.onClick(mButtons[item]);
-
-    }
-
-    /**
-     * get menu item position in menu
-     *
-     * @param item
-     * @return position if success, -1 otherwise
-     */
-    public int getMenuItemPosition(MenuItem item) {
-        // get item id
-        int itemId = item.getItemId();
-        // get meunu
-        Menu menu = getMenu();
-        int size = menu.size();
-        for (int i = 0; i < size; i++) {
-            if (menu.getItem(i).getItemId() == itemId) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * get OnNavigationItemSelectedListener
-     *
-     * @return
-     */
-    public OnNavigationItemSelectedListener getOnNavigationItemSelectedListener() {
-        // private OnNavigationItemSelectedListener mListener;
-        OnNavigationItemSelectedListener mListener = getField(BottomNavigationView.class, this, "mSelectedListener");
-        return mListener;
-    }
-
-    @Override
-    public void setOnNavigationItemSelectedListener(@Nullable OnNavigationItemSelectedListener listener) {
-        // if not set up with view pager, the same with father
-        if (null == mMyOnNavigationItemSelectedListener) {
-            super.setOnNavigationItemSelectedListener(listener);
-            return;
-        }
-
-        mMyOnNavigationItemSelectedListener.setOnNavigationItemSelectedListener(listener);
-    }
-
-    /**
-     * get private mMenuView
-     *
-     * @return
-     */
-    private BottomNavigationMenuView getBottomNavigationMenuView() {
-        if (null == mMenuView)
-            mMenuView = getField(BottomNavigationView.class, this, "mMenuView");
-        return mMenuView;
-    }
-
-    /**
-     * get private mButtons in mMenuView
-     *
-     * @return
-     */
-    public BottomNavigationItemView[] getBottomNavigationItemViews() {
-        if (null != mButtons)
-            return mButtons;
-        /*
-         * 1 private final BottomNavigationMenuView mMenuView;
-         * 2 private BottomNavigationItemView[] mButtons;
-         */
-        BottomNavigationMenuView mMenuView = getBottomNavigationMenuView();
-        mButtons = getField(mMenuView.getClass(), mMenuView, "mButtons");
-        return mButtons;
-    }
-
-    /**
-     * get private mButton in mMenuView at position
-     *
-     * @param position
-     * @return
-     */
-    public BottomNavigationItemView getBottomNavigationItemView(int position) {
-        return getBottomNavigationItemViews()[position];
-    }
-
-    /**
-     * get icon at position
-     *
-     * @param position
-     * @return
-     */
-    public ImageView getIconAt(int position) {
-        /*
-         * 1 private final BottomNavigationMenuView mMenuView;
-         * 2 private BottomNavigationItemView[] mButtons;
-         * 3 private ImageView mIcon;
-         */
-        BottomNavigationItemView mButtons = getBottomNavigationItemView(position);
-        ImageView mIcon = getField(BottomNavigationItemView.class, mButtons, "mIcon");
-        return mIcon;
-    }
-
-    /**
-     * get small label at position
-     * Each item has tow label, one is large, another is small.
-     *
-     * @param position
-     * @return
-     */
-    public TextView getSmallLabelAt(int position) {
-        /*
-         * 1 private final BottomNavigationMenuView mMenuView;
-         * 2 private BottomNavigationItemView[] mButtons;
-         * 3 private final TextView mSmallLabel;
-         */
-        BottomNavigationItemView mButtons = getBottomNavigationItemView(position);
-        TextView mSmallLabel = getField(BottomNavigationItemView.class, mButtons, "mSmallLabel");
-        return mSmallLabel;
-    }
-
-    /**
-     * get large label at position
-     * Each item has tow label, one is large, another is small.
-     *
-     * @param position
-     * @return
-     */
-    public TextView getLargeLabelAt(int position) {
-        /*
-         * 1 private final BottomNavigationMenuView mMenuView;
-         * 2 private BottomNavigationItemView[] mButtons;
-         * 3 private final TextView mLargeLabel;
-         */
-        BottomNavigationItemView mButtons = getBottomNavigationItemView(position);
-        TextView mLargeLabel = getField(BottomNavigationItemView.class, mButtons, "mLargeLabel");
-        return mLargeLabel;
-    }
-
-    /**
-     * return item count
-     *
-     * @return
-     */
-    public int getItemCount() {
-        BottomNavigationItemView[] bottomNavigationItemViews = getBottomNavigationItemViews();
-        if (null == bottomNavigationItemViews)
-            return 0;
-        return bottomNavigationItemViews.length;
-    }
-
-    /**
-     * set all item small TextView size
-     * Each item has tow label, one is large, another is small.
-     * Small one will be shown when item state is normal
-     * Large one will be shown when item checked.
-     *
-     * @param sp
-     */
-    public void setSmallTextSize(float sp) {
-        int count = getItemCount();
-        for (int i = 0; i < count; i++) {
-            getSmallLabelAt(i).setTextSize(sp);
-        }
-        mMenuView.updateMenuView();
-    }
-
-    /**
-     * set all item large TextView size
-     * Each item has tow label, one is large, another is small.
-     * Small one will be shown when item state is normal.
-     * Large one will be shown when item checked.
-     *
-     * @param sp
-     */
-    public void setLargeTextSize(float sp) {
-        int count = getItemCount();
-        for (int i = 0; i < count; i++) {
-            getLargeLabelAt(i).setTextSize(sp);
-        }
-        mMenuView.updateMenuView();
-    }
-
-    /**
-     * set all item large and small TextView size
-     * Each item has tow label, one is large, another is small.
-     * Small one will be shown when item state is normal
-     * Large one will be shown when item checked.
-     *
-     * @param sp
-     */
-    public void setTextSize(float sp) {
-        setLargeTextSize(sp);
-        setSmallTextSize(sp);
-    }
-
-    /**
-     * set item ImageView size which at position
-     *
-     * @param position position start from 0
-     * @param width    in dp
-     * @param height   in dp
-     */
-    public void setIconSizeAt(int position, float width, float height) {
-        ImageView icon = getIconAt(position);
-        // update size
-        ViewGroup.LayoutParams layoutParams = icon.getLayoutParams();
-        layoutParams.width = dp2px(getContext(), width);
-        layoutParams.height = dp2px(getContext(), height);
-        icon.setLayoutParams(layoutParams);
-
-        mMenuView.updateMenuView();
-    }
-
-    /**
-     * set all item ImageView size
-     *
-     * @param width  in dp
-     * @param height in dp
-     */
-    public void setIconSize(float width, float height) {
-        int count = getItemCount();
-        for (int i = 0; i < count; i++) {
-            setIconSizeAt(i, width, height);
-        }
-    }
-
-    /**
-     * get menu item height
-     *
-     * @return in px
-     */
-    public int getItemHeight() {
-        // 1. get mMenuView
-        final BottomNavigationMenuView mMenuView = getBottomNavigationMenuView();
-        // 2. get private final int mItemHeight in mMenuView
-        return getField(mMenuView.getClass(), mMenuView, "mItemHeight");
-    }
-
-    /**
-     * set menu item height
-     *
-     * @param height in px
-     */
-    public void setItemHeight(int height) {
-        // 1. get mMenuView
-        final BottomNavigationMenuView mMenuView = getBottomNavigationMenuView();
-        // 2. set private final int mItemHeight in mMenuView
-        setField(mMenuView.getClass(), mMenuView, "mItemHeight", height);
-
-        mMenuView.updateMenuView();
-    }
-
-    /**
-     * set Typeface for all item TextView
-     *
-     * @attr ref android.R.styleable#TextView_typeface
-     * @attr ref android.R.styleable#TextView_textStyle
-     */
-    public void setTypeface(Typeface typeface, int style) {
-        int count = getItemCount();
-        for (int i = 0; i < count; i++) {
-            getLargeLabelAt(i).setTypeface(typeface, style);
-            getSmallLabelAt(i).setTypeface(typeface, style);
-        }
-        mMenuView.updateMenuView();
-    }
-
-    /**
-     * set Typeface for all item TextView
-     *
-     * @attr ref android.R.styleable#TextView_typeface
-     */
-    public void setTypeface(Typeface typeface) {
-        int count = getItemCount();
-        for (int i = 0; i < count; i++) {
-            getLargeLabelAt(i).setTypeface(typeface);
-            getSmallLabelAt(i).setTypeface(typeface);
-        }
-        mMenuView.updateMenuView();
-    }
-
-    /**
-     * get private filed in this specific object
-     *
-     * @param targetClass
-     * @param instance    the filed owner
-     * @param fieldName
-     * @param <T>
-     * @return field if success, null otherwise.
-     */
-    private <T> T getField(Class targetClass, Object instance, String fieldName) {
-        try {
-            Field field = targetClass.getDeclaredField(fieldName);
-            field.setAccessible(true);
-            return (T) field.get(instance);
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * change the field value
-     *
-     * @param targetClass
-     * @param instance    the filed owner
-     * @param fieldName
-     * @param value
-     */
-    private void setField(Class targetClass, Object instance, String fieldName, Object value) {
-        try {
-            Field field = targetClass.getDeclaredField(fieldName);
-            field.setAccessible(true);
-            field.set(instance, value);
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * This method will link the given ViewPager and this BottomNavigationViewEx together so that
-     * changes in one are automatically reflected in the other. This includes scroll state changes
-     * and clicks.
-     *
-     * @param viewPager
-     */
-    public void setupWithViewPager(@Nullable final ViewPager viewPager) {
-        setupWithViewPager(viewPager, false);
-    }
-
-    /**
-     * This method will link the given ViewPager and this BottomNavigationViewEx together so that
-     * changes in one are automatically reflected in the other. This includes scroll state changes
-     * and clicks.
-     *
-     * @param viewPager
-     * @param smoothScroll whether ViewPager changed with smooth scroll animation
-     */
-    public void setupWithViewPager(@Nullable final ViewPager viewPager, boolean smoothScroll) {
-        if (mViewPager != null) {
-            // If we've already been setup with a ViewPager, remove us from it
-            if (mPageChangeListener != null) {
-                mViewPager.removeOnPageChangeListener(mPageChangeListener);
-            }
-        }
-
-        if (null == viewPager) {
-            mViewPager = null;
-            super.setOnNavigationItemSelectedListener(null);
-            return;
-        }
-
-        mViewPager = viewPager;
-
-        // Add our custom OnPageChangeListener to the ViewPager
-        if (mPageChangeListener == null) {
-            mPageChangeListener = new BottomNavigationViewExOnPageChangeListener(this);
-        }
-        viewPager.addOnPageChangeListener(mPageChangeListener);
-
-        // Now we'll add a navigation item selected listener to set ViewPager's current item
-        OnNavigationItemSelectedListener listener = getOnNavigationItemSelectedListener();
-        mMyOnNavigationItemSelectedListener = new MyOnNavigationItemSelectedListener(viewPager, this, smoothScroll, listener);
-        super.setOnNavigationItemSelectedListener(mMyOnNavigationItemSelectedListener);
-    }
-
-    public void enableShiftingMode(int position, boolean enable) {
-        //getBottomNavigationItemView(position).setShiftingMode(enable);
-    }
-
-    public void setItemBackground(int position, int background) {
-        getBottomNavigationItemView(position).setItemBackground(background);
-    }
-
-    public void setIconTintList(int position, ColorStateList tint) {
-        getBottomNavigationItemView(position).setIconTintList(tint);
-    }
-
-    public void setTextTintList(int position, ColorStateList tint) {
-        getBottomNavigationItemView(position).setTextColor(tint);
-    }
-
-    /**
-     * set margin top for all icons
-     *
-     * @param marginTop in px
-     */
-    public void setIconsMarginTop(int marginTop) {
-        for (int i = 0; i < getItemCount(); i++) {
-            setIconMarginTop(i, marginTop);
-        }
-    }
-
-    /**
-     * set margin top for icon
-     *
-     * @param position
-     * @param marginTop in px
-     */
-    public void setIconMarginTop(int position, int marginTop) {
-        /*
-        1. BottomNavigationItemView
-        2. private final int mDefaultMargin;
-         */
-        BottomNavigationItemView itemView = getBottomNavigationItemView(position);
-        setField(BottomNavigationItemView.class, itemView, "mDefaultMargin", marginTop);
-        mMenuView.updateMenuView();
-    }
-
-
-    /**
-     * A {@link ViewPager.OnPageChangeListener} class which contains the
-     * necessary calls back to the provided {@link BottomNavigationViewEx} so that the tab position is
-     * kept in sync.
-     * <p>
-     * <p>This class stores the provided BottomNavigationViewEx weakly, meaning that you can use
-     * {@link ViewPager#addOnPageChangeListener(ViewPager.OnPageChangeListener)
-     * addOnPageChangeListener(OnPageChangeListener)} without removing the listener and
-     * not cause a leak.
-     */
-    private static class BottomNavigationViewExOnPageChangeListener implements ViewPager.OnPageChangeListener {
-        private final WeakReference<BottomNavigationViewEx> mBnveRef;
-
-        public BottomNavigationViewExOnPageChangeListener(BottomNavigationViewEx bnve) {
-            mBnveRef = new WeakReference<>(bnve);
-        }
-
-        @Override
-        public void onPageScrollStateChanged(final int state) {
-        }
-
-        @Override
-        public void onPageScrolled(final int position, final float positionOffset,
-                                   final int positionOffsetPixels) {
-        }
-
-        @Override
-        public void onPageSelected(final int position) {
-            final BottomNavigationViewEx bnve = mBnveRef.get();
-            if (null != bnve)
-                bnve.setCurrentItem(position);
-//            Log.d("onPageSelected", "--------- position " + position + " ------------");
-        }
-    }
-
-    /**
-     * Decorate OnNavigationItemSelectedListener for setupWithViewPager
-     */
-    private static class MyOnNavigationItemSelectedListener implements OnNavigationItemSelectedListener {
-        private final WeakReference<ViewPager> viewPagerRef;
-        private OnNavigationItemSelectedListener listener;
-        private boolean smoothScroll;
-        private SparseIntArray items;// used for change ViewPager selected item
-        private int previousPosition = -1;
-
-
-        MyOnNavigationItemSelectedListener(ViewPager viewPager, BottomNavigationViewEx bnve, boolean smoothScroll, OnNavigationItemSelectedListener listener) {
-            this.viewPagerRef = new WeakReference<>(viewPager);
-            this.listener = listener;
-            this.smoothScroll = smoothScroll;
-
-            // create items
-            Menu menu = bnve.getMenu();
-            int size = menu.size();
-            items = new SparseIntArray(size);
-            for (int i = 0; i < size; i++) {
-                int itemId = menu.getItem(i).getItemId();
-                items.put(itemId, i);
-            }
-        }
-
-        public void setOnNavigationItemSelectedListener(OnNavigationItemSelectedListener listener) {
-            this.listener = listener;
-        }
-
-        @Override
-        public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-            int position = items.get(item.getItemId());
-            // only set item when item changed
-            if (previousPosition == position) {
-                return true;
-            }
-
-            // user listener
-            if (null != listener) {
-                boolean bool = listener.onNavigationItemSelected(item);
-                // if the selected is invalid, no need change the view pager
-                if (!bool)
-                    return false;
-            }
-
-            // change view pager
-            ViewPager viewPager = viewPagerRef.get();
-            if (null == viewPager)
-                return false;
-
-            viewPager.setCurrentItem(items.get(item.getItemId()), smoothScroll);
-
-            // update previous position
-            previousPosition = position;
-
-            return true;
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BottomSheetListView.java b/app/src/main/java/code/name/monkey/retromusic/views/BottomSheetListView.java
deleted file mode 100644
index b84e0a4d..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/BottomSheetListView.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package code.name.monkey.retromusic.views;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.widget.AbsListView;
-import android.widget.ListView;
-
-public class BottomSheetListView extends ListView {
-    public BottomSheetListView(Context context, AttributeSet p_attrs) {
-        super(context, p_attrs);
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        return true;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        if (canScrollVertically(this)) {
-            getParent().requestDisallowInterceptTouchEvent(true);
-        }
-        return super.onTouchEvent(ev);
-    }
-
-    public boolean canScrollVertically(AbsListView view) {
-        boolean canScroll = false;
-
-        if (view != null && view.getChildCount() > 0) {
-            boolean isOnTop = view.getFirstVisiblePosition() != 0 || view.getChildAt(0).getTop() != 0;
-            boolean isAllItemsVisible = isOnTop && view.getLastVisiblePosition() == view.getChildCount();
-
-            if (isOnTop || isAllItemsVisible) {
-                canScroll = true;
-            }
-        }
-
-        return canScroll;
-    }
-} 
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java b/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java
index 4f9019d7..cfcc14b9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java
@@ -5,8 +5,8 @@ import android.graphics.PorterDuff;
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/CircularImageView.java b/app/src/main/java/code/name/monkey/retromusic/views/CircularImageView.java
index bfbef58b..941efc8f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/CircularImageView.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/CircularImageView.java
@@ -11,7 +11,7 @@ import android.graphics.Paint;
 import android.graphics.Shader;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.util.Log;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/CustomMediaRouteButton.java b/app/src/main/java/code/name/monkey/retromusic/views/CustomMediaRouteButton.java
deleted file mode 100644
index d1798d58..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/CustomMediaRouteButton.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package code.name.monkey.retromusic.views;
-
-import android.app.Activity;
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.MediaRouteButton;
-import android.util.AttributeSet;
-import android.view.ContextThemeWrapper;
-
-import code.name.monkey.appthemehelper.util.ATHUtil;
-import code.name.monkey.retromusic.R;
-import code.name.monkey.retromusic.RetroApplication;
-import code.name.monkey.retromusic.util.NavigationUtil;
-
-public class CustomMediaRouteButton extends MediaRouteButton {
-
-    @Nullable
-    private Activity activity;
-
-    public CustomMediaRouteButton(Context context) {
-        this(context, null);
-    }
-
-    public CustomMediaRouteButton(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.mediaRouteButtonStyle);
-    }
-
-    public CustomMediaRouteButton(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(getThemedContext(context), attrs, defStyleAttr);
-    }
-
-    private static Context getThemedContext(Context context) {
-        return ATHUtil.isWindowBackgroundDark(context) ?
-                new ContextThemeWrapper(new ContextThemeWrapper(context, R.style.Theme_AppCompat), R.style.Theme_MediaRouter) :
-                new ContextThemeWrapper(new ContextThemeWrapper(context, R.style.Theme_AppCompat_Light), R.style.Theme_MediaRouter);
-    }
-
-    public void setActivity(@NonNull Activity activity) {
-        this.activity = activity;
-    }
-
-    @Override
-    public boolean showDialog() {
-
-        if (!RetroApplication.isProVersion()) {
-            if (activity != null) {
-                NavigationUtil.goToProVersion((Activity) getContext());
-            }
-            return false;
-        }
-
-        return super.showDialog();
-    }
-} 
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/IconImageView.java b/app/src/main/java/code/name/monkey/retromusic/views/IconImageView.java
index 42e3bbd2..61e913d4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/IconImageView.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/IconImageView.java
@@ -3,14 +3,13 @@ package code.name.monkey.retromusic.views;
 import android.content.Context;
 import android.graphics.PorterDuff;
 import android.util.AttributeSet;
-import android.widget.ImageView;
 
 import code.name.monkey.appthemehelper.util.ATHUtil;
 
 import code.name.monkey.retromusic.R;
 
 
-public class IconImageView extends android.support.v7.widget.AppCompatImageView {
+public class IconImageView extends androidx.appcompat.widget.AppCompatImageView {
     public IconImageView(Context context) {
         super(context);
         init(context);
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/LyricView.java b/app/src/main/java/code/name/monkey/retromusic/views/LyricView.java
index f0e98bef..226fa00e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/LyricView.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/LyricView.java
@@ -13,7 +13,7 @@ import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.os.Looper;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.java b/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.java
index 91caed13..a7a2907a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.java
@@ -17,12 +17,12 @@ package code.name.monkey.retromusic.views;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.PagerSnapHelper;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SnapHelper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.PagerSnapHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SnapHelper;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.view.View;
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/PlayPauseDrawable.java b/app/src/main/java/code/name/monkey/retromusic/views/PlayPauseDrawable.java
index 6e9cb3aa..a0cee1ea 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/PlayPauseDrawable.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/PlayPauseDrawable.java
@@ -8,14 +8,12 @@ import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorFilter;
-import android.graphics.CornerPathEffect;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
-import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Property;
 import android.view.animation.DecelerateInterpolator;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java b/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java
index 7f47b501..ca7df1d0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java
@@ -3,10 +3,11 @@ package code.name.monkey.retromusic.views;
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomSheetDialog;
-import android.support.design.widget.BottomSheetDialogFragment;
 
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+import androidx.annotation.NonNull;
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.retromusic.R;
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/SansFontCollapsingToolbarLayout.java b/app/src/main/java/code/name/monkey/retromusic/views/SansFontCollapsingToolbarLayout.java
deleted file mode 100644
index 03102229..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/SansFontCollapsingToolbarLayout.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package code.name.monkey.retromusic.views;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.util.AttributeSet;
-
-import code.name.monkey.appthemehelper.util.TypefaceHelper;
-import code.name.monkey.retromusic.R;
-
-/**
- * @author Hemanth S (h4h13).
- */
-
-public class SansFontCollapsingToolbarLayout extends CollapsingToolbarLayout {
-    public SansFontCollapsingToolbarLayout(Context context) {
-        super(context);
-        init(context);
-    }
-
-    public SansFontCollapsingToolbarLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(context);
-    }
-
-    public SansFontCollapsingToolbarLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init(context);
-    }
-
-    private void init(Context context) {
-        Typeface typefaceBold = TypefaceHelper.get(context, getResources().getString(R.string.circular_std_black));
-        setExpandedTitleTypeface(typefaceBold);
-        setCollapsedTitleTypeface(typefaceBold);
-
-    }
-
-    public void setTitle(int i) {
-        setTitle(getContext().getString(i));
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/StatusBarMarginFrameLayout.java b/app/src/main/java/code/name/monkey/retromusic/views/StatusBarMarginFrameLayout.java
new file mode 100644
index 00000000..b995a811
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/StatusBarMarginFrameLayout.java
@@ -0,0 +1,33 @@
+package code.name.monkey.retromusic.views;
+
+import android.content.Context;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.WindowInsets;
+import android.widget.FrameLayout;
+
+public class StatusBarMarginFrameLayout extends FrameLayout {
+
+
+    public StatusBarMarginFrameLayout(Context context) {
+        super(context);
+    }
+
+    public StatusBarMarginFrameLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public StatusBarMarginFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            MarginLayoutParams lp = (MarginLayoutParams) getLayoutParams();
+            lp.topMargin = insets.getSystemWindowInsetTop();
+            setLayoutParams(lp);
+        }
+        return super.onApplyWindowInsets(insets);
+    }
+} 
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/StatusBarView.java b/app/src/main/java/code/name/monkey/retromusic/views/StatusBarView.java
new file mode 100644
index 00000000..0350dc9e
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/StatusBarView.java
@@ -0,0 +1,37 @@
+package code.name.monkey.retromusic.views;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.util.AttributeSet;
+import android.view.View;
+
+public class StatusBarView extends View {
+
+
+    public StatusBarView(Context context) {
+        super(context);
+    }
+
+    public StatusBarView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public StatusBarView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public static int getStatusBarHeight(Resources r) {
+        int result = 0;
+        int resourceId = r.getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            result = r.getDimensionPixelSize(resourceId);
+        }
+        return result;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        setMeasuredDimension(
+                MeasureSpec.getSize(widthMeasureSpec), getStatusBarHeight(getResources()));
+    }
+} 
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/ThemeableMediaRouteActionProvider.java b/app/src/main/java/code/name/monkey/retromusic/views/ThemeableMediaRouteActionProvider.java
index 43bb2127..93a77bb2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/ThemeableMediaRouteActionProvider.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/ThemeableMediaRouteActionProvider.java
@@ -3,11 +3,11 @@ package code.name.monkey.retromusic.views;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.app.MediaRouteActionProvider;
-import android.support.v7.app.MediaRouteButton;
-import android.support.v7.view.ContextThemeWrapper;
+import androidx.annotation.Nullable;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.mediarouter.app.MediaRouteActionProvider;
+import androidx.mediarouter.app.MediaRouteButton;
+import androidx.appcompat.view.ContextThemeWrapper;
 
 import code.name.monkey.appthemehelper.ThemeStore;
 
@@ -33,12 +33,12 @@ public class ThemeableMediaRouteActionProvider extends MediaRouteActionProvider
 
     private void colorWorkaroundForCastIcon(MediaRouteButton button) {
         if (button == null) return;
-        Context castContext = new ContextThemeWrapper(getContext(), android.support.v7.mediarouter.R.style.Theme_MediaRouter);
+        Context castContext = new ContextThemeWrapper(getContext(), androidx.mediarouter.R.style.Theme_MediaRouter);
 
         TypedArray a = castContext.obtainStyledAttributes(null,
-                android.support.v7.mediarouter.R.styleable.MediaRouteButton, android.support.v7.mediarouter.R.attr.mediaRouteButtonStyle, 0);
+                androidx.mediarouter.R.styleable.MediaRouteButton, androidx.mediarouter.R.attr.mediaRouteButtonStyle, 0);
         Drawable drawable = a.getDrawable(
-                android.support.v7.mediarouter.R.styleable.MediaRouteButton_externalRouteEnabledDrawable);
+                androidx.mediarouter.R.styleable.MediaRouteButton_externalRouteEnabledDrawable);
         a.recycle();
         if (drawable != null) {
             DrawableCompat.setTint(drawable, ThemeStore.textColorPrimary(getContext()));
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java b/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java
index 023480b9..36474210 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java
@@ -5,7 +5,7 @@ import android.graphics.Canvas;
 import android.util.AttributeSet;
 import android.view.Gravity;
 
-public class VerticalTextView extends android.support.v7.widget.AppCompatTextView {
+public class VerticalTextView extends androidx.appcompat.widget.AppCompatTextView {
     final boolean topDown;
 
     public VerticalTextView(Context context, AttributeSet attrs) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeContentObserver.java b/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeContentObserver.java
index 7938da1d..15bf7dbf 100644
--- a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeContentObserver.java
+++ b/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeContentObserver.java
@@ -4,7 +4,7 @@ import android.database.ContentObserver;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class AudioVolumeContentObserver extends ContentObserver {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.java b/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.java
index 53ff9593..497f9c34 100644
--- a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.java
+++ b/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.java
@@ -3,7 +3,7 @@ package code.name.monkey.retromusic.volume;
 import android.content.Context;
 import android.media.AudioManager;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class AudioVolumeObserver {
 
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_card.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_card.webp
new file mode 100644
index 00000000..3ea37804
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/album_cover_card.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_carousal.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_carousal.webp
new file mode 100644
index 00000000..e67863f8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/album_cover_carousal.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_circle.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_circle.webp
new file mode 100644
index 00000000..14850397
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/album_cover_circle.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_full.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_full.webp
new file mode 100644
index 00000000..f4c765b5
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/album_cover_full.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_square.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_square.webp
new file mode 100644
index 00000000..73d5a6d9
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/album_cover_square.webp differ
diff --git a/app/src/main/res/drawable/bg_bottom_sheet_dialog_fragment.xml b/app/src/main/res/drawable/bg_bottom_sheet_dialog_fragment.xml
index fbe53f28..e460a9b6 100644
--- a/app/src/main/res/drawable/bg_bottom_sheet_dialog_fragment.xml
+++ b/app/src/main/res/drawable/bg_bottom_sheet_dialog_fragment.xml
@@ -4,8 +4,6 @@
     <corners
         android:topLeftRadius="12dp"
         android:topRightRadius="12dp" />
-    <padding
-        android:bottom="8dp"
-        android:top="12dp" />
+    <padding android:bottom="8dp" />
     <solid android:color="?attr/cardBackgroundColor" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_guitar_acoustic_white_24dp.xml b/app/src/main/res/drawable/ic_guitar_acoustic_white_24dp.xml
new file mode 100644
index 00000000..01d22f1e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_guitar_acoustic_white_24dp.xml
@@ -0,0 +1,10 @@
+<!-- drawable/guitar_acoustic.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M19.59,3H22V5H20.41L16.17,9.24C15.8,8.68 15.32,8.2 14.76,7.83L19.59,3M12,8A4,4 0 0,1 16,12C16,13.82 14.77,15.42 13,15.87V16A5,5 0 0,1 8,21A5,5 0 0,1 3,16A5,5 0 0,1 8,11H8.13C8.58,9.24 10.17,8 12,8M12,10.5A1.5,1.5 0 0,0 10.5,12A1.5,1.5 0 0,0 12,13.5A1.5,1.5 0 0,0 13.5,12A1.5,1.5 0 0,0 12,10.5M6.94,14.24L6.23,14.94L9.06,17.77L9.77,17.06L6.94,14.24Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_album.xml b/app/src/main/res/layout-land/activity_album.xml
index 034b439d..58e6b6a9 100644
--- a/app/src/main/res/layout-land/activity_album.xml
+++ b/app/src/main/res/layout-land/activity_album.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal">
@@ -25,12 +24,12 @@
                 android:scaleType="centerCrop"
                 android:transitionName="@string/transition_album_art" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48" />
         </FrameLayout>
 
-        <android.support.v4.widget.NestedScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -64,7 +63,7 @@
                         android:orientation="vertical"
                         android:padding="16dp">
 
-                        <android.support.v7.widget.AppCompatTextView
+                        <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/title"
                             fontPath="@string/circular_std_black"
                             android:layout_width="match_parent"
@@ -73,7 +72,7 @@
                             android:textAppearance="@style/TextAppearance.AppCompat.Title"
                             tools:ignore="MissingPrefix" />
 
-                        <android.support.v7.widget.AppCompatTextView
+                        <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/text"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -93,7 +92,7 @@
 
                 </LinearLayout>
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/song_title"
                     fontPath="@string/circular_std_black"
                     android:layout_width="match_parent"
@@ -104,7 +103,7 @@
                     android:textColor="?android:attr/textColorPrimary"
                     tools:ignore="MissingPrefix" />
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler_view"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -119,16 +118,16 @@
                     fontPath="@string/circular_std_black"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingBottom="12dp"
-                    android:paddingEnd="16dp"
                     android:paddingStart="16dp"
                     android:paddingTop="12dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="12dp"
                     android:text="@string/songs"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                     android:visibility="gone"
                     tools:ignore="MissingPrefix" />
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/more_recycler_view"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -136,7 +135,7 @@
                     android:visibility="gone" />
             </LinearLayout>
 
-        </android.support.v4.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
     </LinearLayout>
 
     <View
@@ -144,7 +143,7 @@
         android:layout_height="72dp"
         android:background="@drawable/shadow_down_strong" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/action_shuffle_all"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -153,5 +152,5 @@
         android:padding="16dp"
         app:srcCompat="@drawable/ic_shuffle_white_24dp" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout-land/activity_album_tag_editor.xml b/app/src/main/res/layout-land/activity_album_tag_editor.xml
index 760b15be..29e8ee6c 100644
--- a/app/src/main/res/layout-land/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout-land/activity_album_tag_editor.xml
@@ -1,18 +1,18 @@
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/gradient_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             app:layout_collapseMode="pin"
@@ -25,17 +25,17 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:text="@string/edit_cover" />
-        </android.support.v7.widget.Toolbar>
-    </android.support.design.widget.AppBarLayout>
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginEnd="96dp"
         android:layout_marginStart="96dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:cardCornerRadius="8dp"
@@ -54,7 +54,7 @@
                     app:layout_collapseMode="parallax"
                     app:layout_collapseParallaxMultiplier="0.5">
 
-                    <android.support.v7.widget.AppCompatImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/image"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -79,7 +79,7 @@
                     android:orientation="vertical"
                     android:padding="8dp">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -94,9 +94,9 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -112,9 +112,9 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -130,13 +130,13 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
-                        <android.support.design.widget.TextInputEditText
+                        <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/year"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -148,18 +148,18 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
                 </LinearLayout>
             </LinearLayout>
-        </android.support.v7.widget.CardView>
-    </android.support.v4.widget.NestedScrollView>
+        </androidx.cardview.widget.CardView>
+    </androidx.core.widget.NestedScrollView>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/save_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         app:srcCompat="@drawable/ic_save_white_24dp" />
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-land/activity_artist_details.xml b/app/src/main/res/layout-land/activity_artist_details.xml
index c7057e51..ce4b9263 100644
--- a/app/src/main/res/layout-land/activity_artist_details.xml
+++ b/app/src/main/res/layout-land/activity_artist_details.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
@@ -23,12 +23,12 @@
                 android:scaleType="centerCrop"
                 android:transitionName="@string/transition_album_art" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48" />
         </FrameLayout>
 
-        <android.support.v4.widget.NestedScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -44,7 +44,7 @@
                     android:layout_height="@dimen/status_bar_padding" />
 
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:id="@+id/content"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -71,7 +71,7 @@
                                 android:orientation="vertical"
                                 android:padding="16dp">
 
-                                <android.support.v7.widget.AppCompatTextView
+                                <androidx.appcompat.widget.AppCompatTextView
                                     android:id="@+id/title"
                                     fontPath="@string/circular_std_black"
                                     android:layout_width="match_parent"
@@ -80,7 +80,7 @@
                                     android:textAppearance="@style/TextAppearance.AppCompat.Title"
                                     tools:ignore="MissingPrefix" />
 
-                                <android.support.v7.widget.AppCompatTextView
+                                <androidx.appcompat.widget.AppCompatTextView
                                     android:id="@+id/text"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
@@ -98,7 +98,7 @@
 
                             </LinearLayout>
 
-                            <android.support.design.widget.FloatingActionButton
+                            <com.google.android.material.floatingactionbutton.FloatingActionButton
                                 android:id="@+id/action_shuffle_all"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -109,7 +109,7 @@
                                 app:srcCompat="@drawable/ic_shuffle_white_24dp" />
                         </LinearLayout>
 
-                        <android.support.v7.widget.AppCompatTextView
+                        <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/biography_title"
                             fontPath="@string/circular_std_black"
                             android:layout_width="match_parent"
@@ -121,7 +121,7 @@
                             android:visibility="gone"
                             tools:ignore="MissingPrefix" />
 
-                        <android.support.v7.widget.AppCompatTextView
+                        <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/biography"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -131,7 +131,7 @@
                             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                             android:visibility="gone" />
 
-                        <android.support.v7.widget.AppCompatTextView
+                        <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/album_title"
                             fontPath="@string/circular_std_black"
                             android:layout_width="match_parent"
@@ -141,13 +141,13 @@
                             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                             android:textColor="?android:attr/textColorPrimary" />
 
-                        <android.support.v7.widget.RecyclerView
+                        <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/album_recycler_view"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:nestedScrollingEnabled="false" />
 
-                        <android.support.v7.widget.AppCompatTextView
+                        <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/song_title"
                             fontPath="@string/circular_std_black"
                             android:layout_width="match_parent"
@@ -158,7 +158,7 @@
                             android:textColor="?android:attr/textColorPrimary"
                             tools:ignore="MissingPrefix" />
 
-                        <android.support.v7.widget.RecyclerView
+                        <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/recycler_view"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -166,9 +166,9 @@
 
 
                     </LinearLayout>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
-        </android.support.v4.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
     </LinearLayout>
 
     <View
@@ -176,4 +176,4 @@
         android:layout_height="72dp"
         android:background="@drawable/shadow_down_strong" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-land/activity_settings.xml b/app/src/main/res/layout-land/activity_settings.xml
index ecb848b9..2000fea7 100644
--- a/app/src/main/res/layout-land/activity_settings.xml
+++ b/app/src/main/res/layout-land/activity_settings.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:titleEnabled="false">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48"
                 app:layout_collapseMode="pin"
@@ -31,9 +31,9 @@
                     style="@style/BigTitleTextAppearance"
                     android:text="@string/action_settings" />
 
-            </android.support.v7.widget.Toolbar>
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+            </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
         android:id="@+id/background"
@@ -53,5 +53,5 @@
             android:layout_height="wrap_content"
             android:layout_weight="1" />
     </LinearLayout>
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml
index 7cf177d7..bb5c144f 100644
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@@ -15,7 +15,7 @@
 
     </FrameLayout>
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinator_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -23,8 +23,8 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="60dp"
-            android:layout_marginEnd="60dp">
+            android:layout_marginStart="@dimen/horizontal_margin"
+            android:layout_marginEnd="@dimen/horizontal_margin">
 
             <include layout="@layout/retro_backdrop" />
         </FrameLayout>
@@ -34,8 +34,8 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <android.support.design.widget.AppBarLayout
-                android:id="@+id/appbar"
+            <com.google.android.material.appbar.AppBarLayout
+                android:id="@+id/app_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
@@ -43,14 +43,14 @@
                 app:elevation="0dp"
                 tools:ignore="UnusedAttribute">
 
-                <android.support.design.widget.CollapsingToolbarLayout
+                <com.google.android.material.appbar.CollapsingToolbarLayout
                     android:id="@+id/collapsing_toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:layout_scrollFlags="scroll|enterAlways"
                     app:titleEnabled="false">
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/toolbar"
                         style="@style/Toolbar48"
                         app:layout_collapseMode="pin"
@@ -68,16 +68,16 @@
                             android:layout_gravity="end"
                             android:layout_marginEnd="16dp"
                             app:civ_border="false" />
-                    </android.support.v7.widget.Toolbar>
-                </android.support.design.widget.CollapsingToolbarLayout>
-            </android.support.design.widget.AppBarLayout>
+                    </androidx.appcompat.widget.Toolbar>
+                </com.google.android.material.appbar.CollapsingToolbarLayout>
+            </com.google.android.material.appbar.AppBarLayout>
 
-            <android.support.v4.widget.NestedScrollView
+            <androidx.core.widget.NestedScrollView
                 android:id="@+id/content_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="60dp"
-                android:layout_marginEnd="60dp"
+                android:layout_marginStart="@dimen/horizontal_margin"
+                android:layout_marginEnd="@dimen/horizontal_margin"
                 android:layout_weight="1"
                 android:background="@drawable/bg_circular_top_corners"
                 android:elevation="@dimen/card_elevation"
@@ -96,7 +96,7 @@
 
                     <include layout="@layout/home_section_content" />
                 </LinearLayout>
-            </android.support.v4.widget.NestedScrollView>
+            </androidx.core.widget.NestedScrollView>
         </LinearLayout>
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_blur.xml b/app/src/main/res/layout-land/fragment_blur.xml
index 125fa528..d5b85ecb 100644
--- a/app/src/main/res/layout-land/fragment_blur.xml
+++ b/app/src/main/res/layout-land/fragment_blur.xml
@@ -7,7 +7,7 @@
     android:clickable="true"
     android:focusable="true">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/gradient_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -79,7 +79,7 @@
                     android:layout_weight="0"
                     tools:background="@color/md_red_A700">
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/player_toolbar"
                         style="@style/Toolbar48"
                         android:layout_height="48dp"
diff --git a/app/src/main/res/layout-land/fragment_card_blur_player.xml b/app/src/main/res/layout-land/fragment_card_blur_player.xml
index fca780ec..770a0cd7 100644
--- a/app/src/main/res/layout-land/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml
@@ -7,7 +7,7 @@
     android:clickable="true"
     android:focusable="true">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/gradient_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -40,7 +40,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:navigationIcon="@drawable/ic_close_white_24dp"
@@ -78,7 +78,7 @@
                         tools:text="@string/action_share" />
 
                 </LinearLayout>
-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>
 
         </FrameLayout>
 
diff --git a/app/src/main/res/layout-land/fragment_card_player.xml b/app/src/main/res/layout-land/fragment_card_player.xml
index b4e750bd..4d0706d1 100644
--- a/app/src/main/res/layout-land/fragment_card_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_player.xml
@@ -39,7 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:navigationIcon="@drawable/ic_close_white_24dp"
@@ -51,7 +51,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="64dp"
@@ -73,7 +73,7 @@
                     tools:layout="@layout/fragment_card_player_playback_controls" />
             </FrameLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
     <include layout="@layout/shadow_statusbar_toolbar" />
diff --git a/app/src/main/res/layout-land/fragment_color_player.xml b/app/src/main/res/layout-land/fragment_color_player.xml
index 0c76ecc3..67f346c8 100644
--- a/app/src/main/res/layout-land/fragment_color_player.xml
+++ b/app/src/main/res/layout-land/fragment_color_player.xml
@@ -36,7 +36,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     app:cardCornerRadius="8dp"
@@ -63,7 +63,7 @@
                             android:layout_height="wrap_content"
                             android:padding="16dp">
 
-                            <android.support.v7.widget.AppCompatTextView
+                            <androidx.appcompat.widget.AppCompatTextView
                                 android:id="@+id/lyrics"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -76,7 +76,7 @@
                         </FrameLayout>
                     </ScrollView>
 
-                    <android.support.v7.widget.AppCompatImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/expand"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
                         android:padding="16dp"
                         app:srcCompat="@drawable/ic_unfold_more_black_24dp"
                         app:tint="@color/md_white_1000" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
             </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
@@ -112,7 +112,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0">
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/player_toolbar"
                         style="@style/Toolbar48"
                         android:layout_height="48dp"
diff --git a/app/src/main/res/layout-land/fragment_flat_player.xml b/app/src/main/res/layout-land/fragment_flat_player.xml
index ff7a6a2c..4a309d0b 100644
--- a/app/src/main/res/layout-land/fragment_flat_player.xml
+++ b/app/src/main/res/layout-land/fragment_flat_player.xml
@@ -56,7 +56,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0">
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/player_toolbar"
                         style="@style/Toolbar48"
                         android:layout_height="48dp"
diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml
index 036dc18e..56e0ebf9 100644
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:ignore="UnusedAttribute">
 
-        <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
-            app:contentScrim="?attr/colorPrimary"
-            app:expandedTitleGravity="top"
-            app:expandedTitleMarginStart="16dp"
-            app:expandedTitleMarginTop="48dp"
-            app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
             app:statusBarScrim="?attr/colorPrimary">
 
@@ -39,7 +33,7 @@
 
             </FrameLayout>
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/home_toolbar"
                 style="@style/Toolbar48"
                 tools:ignore="UnusedAttribute">
@@ -77,11 +71,11 @@
                         android:layout_weight="0"
                         app:civ_border="false" />
                 </LinearLayout>
-            </android.support.v7.widget.Toolbar>
-        </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+            </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -105,5 +99,5 @@
 
             <include layout="@layout/home_section_content" />
         </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
-</android.support.design.widget.CoordinatorLayout>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-land/fragment_material.xml b/app/src/main/res/layout-land/fragment_material.xml
index 0b1189af..24b06479 100644
--- a/app/src/main/res/layout-land/fragment_material.xml
+++ b/app/src/main/res/layout-land/fragment_material.xml
@@ -63,7 +63,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0">
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/player_toolbar"
                         style="@style/Toolbar48"
                         android:layout_height="48dp"
diff --git a/app/src/main/res/layout-land/fragment_plain_player.xml b/app/src/main/res/layout-land/fragment_plain_player.xml
index 41ad33c9..01d40e1a 100644
--- a/app/src/main/res/layout-land/fragment_plain_player.xml
+++ b/app/src/main/res/layout-land/fragment_plain_player.xml
@@ -100,7 +100,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0">
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/player_toolbar"
                         style="@style/Toolbar48"
                         android:layout_height="48dp"
diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml
index 24518660..5b1bd00a 100755
--- a/app/src/main/res/layout-land/fragment_player.xml
+++ b/app/src/main/res/layout-land/fragment_player.xml
@@ -55,7 +55,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0">
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/player_toolbar"
                         style="@style/Toolbar48"
                         android:layout_height="48dp"
diff --git a/app/src/main/res/layout-land/fragment_simple_player.xml b/app/src/main/res/layout-land/fragment_simple_player.xml
index 866ab45b..be4bc75d 100644
--- a/app/src/main/res/layout-land/fragment_simple_player.xml
+++ b/app/src/main/res/layout-land/fragment_simple_player.xml
@@ -67,7 +67,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0">
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/player_toolbar"
                         style="@style/Toolbar48"
                         android:layout_height="48dp"
diff --git a/app/src/main/res/layout-land/pager_item.xml b/app/src/main/res/layout-land/pager_item.xml
new file mode 100644
index 00000000..27f20670
--- /dev/null
+++ b/app/src/main/res/layout-land/pager_item.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root_layout"
+    android:layout_width="400dp"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/image_container"
+        android:layout_width="match_parent"
+        android:layout_height="182dp"
+        app:cardCornerRadius="12dp"
+        app:cardUseCompatPadding="true">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/play_songs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="12dp"
+            android:background="@drawable/color_circle_gradient"
+            android:backgroundTint="@color/eighty_percent_black_overlay"
+            android:padding="8dp"
+            app:srcCompat="@drawable/ic_play_arrow_white_24dp" />
+    </androidx.cardview.widget.CardView>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="8dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="8dp"
+        android:textColor="?android:attr/textColorSecondary"
+        tools:ignore="MissingPrefix"
+        tools:text="My top tracks" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/title"
+        fontPath="@string/circular_std_black"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:padding="8dp"
+        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+        android:textColor="?android:attr/textColorPrimary"
+        tools:ignore="MissingPrefix"
+        tools:text="My top tracks" />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/fragment_mini_player.xml b/app/src/main/res/layout-sw600dp/fragment_mini_player.xml
new file mode 100644
index 00000000..a9771bda
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/fragment_mini_player.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:background="@android:color/transparent"
+    android:clickable="true"
+    android:focusable="false"
+    android:transitionName="@string/transition_mini_player"
+    tools:ignore="UnusedAttribute">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <code.name.monkey.retromusic.views.IconImageView
+            android:id="@+id/mini_player_image"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center_vertical"
+            android:layout_margin="16dp"
+            android:scaleType="centerCrop"
+            app:srcCompat="@drawable/ic_keyboard_arrow_up_24dp"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:id="@+id/mini_player_title"
+            android:layout_width="0dp"
+            android:gravity="center"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:singleLine="true"  />
+
+        <code.name.monkey.retromusic.views.IconImageView
+            android:id="@+id/action_prev"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center_vertical"
+            android:background="?roundSelector"
+            android:padding="8dp"
+            app:srcCompat="@drawable/ic_skip_previous_white_24dp" />
+
+        <code.name.monkey.retromusic.views.IconImageView
+            android:id="@+id/mini_player_play_pause_button"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center_vertical"
+            android:background="?roundSelector"
+            android:scaleType="center"
+            tools:ignore="ContentDescription" />
+
+        <code.name.monkey.retromusic.views.IconImageView
+            android:id="@+id/action_next"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="16dp"
+            android:background="?roundSelector"
+            android:padding="8dp"
+            app:srcCompat="@drawable/ic_skip_next_white_24dp" />
+    </LinearLayout>
+
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/progress_bar"
+        style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="3dp"
+        android:layout_gravity="bottom"
+        android:progress="20"
+        app:mpb_progressStyle="horizontal"
+        app:mpb_showProgressBackground="false"
+        app:mpb_useIntrinsicPadding="false" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/pager_item.xml b/app/src/main/res/layout-sw600dp/pager_item.xml
similarity index 74%
rename from app/src/main/res/layout-xlarge/pager_item.xml
rename to app/src/main/res/layout-sw600dp/pager_item.xml
index c81624bd..c798fd10 100644
--- a/app/src/main/res/layout-xlarge/pager_item.xml
+++ b/app/src/main/res/layout-sw600dp/pager_item.xml
@@ -7,49 +7,51 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/image_container"
         android:layout_width="match_parent"
-        android:layout_height="282dp"
-        android:layout_margin="8dp"
-        app:cardCornerRadius="8dp">
+        android:layout_height="182dp"
+        app:cardCornerRadius="12dp"
+        app:cardUseCompatPadding="true">
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop" />
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/play_songs"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="12dp"
             android:background="@drawable/color_circle_gradient"
-            android:backgroundTint="@color/twenty_percent_black_overlay"
-            android:padding="12dp"
+            android:backgroundTint="@color/eighty_percent_black_overlay"
+            android:padding="8dp"
             app:srcCompat="@drawable/ic_play_arrow_white_24dp" />
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:ellipsize="end"
         android:maxLines="1"
-        android:paddingEnd="8dp"
         android:paddingStart="8dp"
         android:paddingTop="8dp"
+        android:paddingEnd="8dp"
         android:textColor="?android:attr/textColorSecondary"
         tools:ignore="MissingPrefix"
         tools:text="My top tracks" />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/title"
         fontPath="@string/circular_std_black"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:maxLines="2"
+        android:ellipsize="end"
+        android:maxLines="1"
         android:padding="8dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
         android:textColor="?android:attr/textColorPrimary"
diff --git a/app/src/main/res/layout-xlarge-land/activity_album.xml b/app/src/main/res/layout-xlarge-land/activity_album.xml
index 698289ca..eb096a38 100644
--- a/app/src/main/res/layout-xlarge-land/activity_album.xml
+++ b/app/src/main/res/layout-xlarge-land/activity_album.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/artist_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -20,12 +20,12 @@
         android:layout_gravity="bottom"
         android:background="@drawable/shadow_up_home" />
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
@@ -37,13 +37,13 @@
                 android:layout_width="320dp"
                 android:layout_height="wrap_content" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48" />
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="fill_vertical"
@@ -73,7 +73,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0">
 
-                    <android.support.v7.widget.AppCompatImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/image"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -88,7 +88,7 @@
                     android:orientation="vertical"
                     android:padding="16dp">
 
-                    <android.support.v7.widget.AppCompatTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/title"
                         fontPath="@string/circular_std_black"
                         android:layout_width="match_parent"
@@ -97,7 +97,7 @@
                         android:textAppearance="@style/TextAppearance.AppCompat.Display2"
                         tools:ignore="MissingPrefix" />
 
-                    <android.support.v7.widget.AppCompatTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/text"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -118,7 +118,7 @@
 
             </LinearLayout>
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/song_title"
                 fontPath="@string/circular_std_black"
                 android:layout_width="match_parent"
@@ -132,7 +132,7 @@
                 android:textColor="?android:attr/textColorPrimary"
                 tools:ignore="MissingPrefix" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -156,7 +156,7 @@
                 android:visibility="gone"
                 tools:ignore="MissingPrefix" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/more_recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -164,9 +164,9 @@
                 android:visibility="gone" />
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/action_shuffle_all"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -178,4 +178,4 @@
         android:layout_width="match_parent"
         android:layout_height="72dp"
         android:background="@drawable/shadow_down_strong" />
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge-land/activity_album_tag_editor.xml b/app/src/main/res/layout-xlarge-land/activity_album_tag_editor.xml
index 46a3981e..c708bbd0 100644
--- a/app/src/main/res/layout-xlarge-land/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout-xlarge-land/activity_album_tag_editor.xml
@@ -1,18 +1,18 @@
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/gradient_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             app:layout_collapseMode="pin">
@@ -24,17 +24,17 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:text="@string/edit_cover" />
-        </android.support.v7.widget.Toolbar>
-    </android.support.design.widget.AppBarLayout>
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginEnd="156dp"
         android:layout_marginStart="156dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:cardCornerRadius="8dp"
@@ -53,7 +53,7 @@
                     app:layout_collapseMode="parallax"
                     app:layout_collapseParallaxMultiplier="0.5">
 
-                    <android.support.v7.widget.AppCompatImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/image"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -78,7 +78,7 @@
                     android:orientation="vertical"
                     android:padding="8dp">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -93,9 +93,9 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -111,9 +111,9 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -129,13 +129,13 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
-                        <android.support.design.widget.TextInputEditText
+                        <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/year"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -147,18 +147,18 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
                 </LinearLayout>
             </LinearLayout>
-        </android.support.v7.widget.CardView>
-    </android.support.v4.widget.NestedScrollView>
+        </androidx.cardview.widget.CardView>
+    </androidx.core.widget.NestedScrollView>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/save_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         app:srcCompat="@drawable/ic_save_white_24dp" />
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-xlarge-land/activity_artist_details.xml b/app/src/main/res/layout-xlarge-land/activity_artist_details.xml
index 32c0e352..89f5c177 100644
--- a/app/src/main/res/layout-xlarge-land/activity_artist_details.xml
+++ b/app/src/main/res/layout-xlarge-land/activity_artist_details.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
         android:transitionName="@string/transition_artist_image" />
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
@@ -31,14 +31,14 @@
                 android:layout_height="wrap_content"
                 app:layout_collapseMode="parallax" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48"
                 app:layout_collapseMode="pin" />
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="fill_vertical"
@@ -68,7 +68,7 @@
                     android:layout_weight="1"
                     android:orientation="vertical">
 
-                    <android.support.v7.widget.AppCompatTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/title"
                         fontPath="@string/circular_std_black"
                         android:layout_width="match_parent"
@@ -77,7 +77,7 @@
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
                         tools:ignore="MissingPrefix" />
 
-                    <android.support.v7.widget.AppCompatTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/text"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -95,7 +95,7 @@
 
                 </LinearLayout>
 
-                <android.support.design.widget.FloatingActionButton
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/action_shuffle_all"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -104,7 +104,7 @@
                     app:srcCompat="@drawable/ic_shuffle_white_24dp" />
             </LinearLayout>
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/biography_title"
                 fontPath="@string/circular_std_black"
                 android:layout_width="match_parent"
@@ -119,7 +119,7 @@
                 android:visibility="gone"
                 tools:ignore="MissingPrefix" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/biography"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -129,7 +129,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:visibility="gone" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/album_title"
                 fontPath="@string/circular_std_black"
                 android:layout_width="match_parent"
@@ -142,13 +142,13 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                 android:textColor="?android:attr/textColorPrimary" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/album_recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:nestedScrollingEnabled="false" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/song_title"
                 fontPath="@string/circular_std_black"
                 android:layout_width="match_parent"
@@ -162,18 +162,18 @@
                 android:textColor="?android:attr/textColorPrimary"
                 tools:ignore="MissingPrefix" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:nestedScrollingEnabled="false" />
 
         </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="72dp"
         android:background="@drawable/shadow_down_strong" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-xlarge-land/activity_artist_details_blur.xml b/app/src/main/res/layout-xlarge-land/activity_artist_details_blur.xml
index 465d99aa..b0e4a35c 100755
--- a/app/src/main/res/layout-xlarge-land/activity_artist_details_blur.xml
+++ b/app/src/main/res/layout-xlarge-land/activity_artist_details_blur.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
                 android:background="@android:color/transparent"
                 app:layout_collapseMode="parallax">
 
-                <android.support.v7.widget.AppCompatImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/image"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -32,10 +32,10 @@
                     android:transitionName="@string/transition_artist_image" />
 
             </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/gradient_background"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
         app:behavior_overlapTop="24dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
                         android:orientation="vertical"
                         android:padding="16dp">
 
-                        <android.support.v7.widget.AppCompatTextView
+                        <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/title"
                             fontPath="@string/circular_std_black"
                             android:layout_width="match_parent"
@@ -76,7 +76,7 @@
                             android:textAppearance="@style/TextAppearance.AppCompat.Title"
                             tools:ignore="MissingPrefix" />
 
-                        <android.support.v7.widget.AppCompatTextView
+                        <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/text"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -94,7 +94,7 @@
 
                     </LinearLayout>
 
-                    <android.support.design.widget.FloatingActionButton
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton
                         android:id="@+id/action_shuffle_all"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -103,7 +103,7 @@
                         app:srcCompat="@drawable/ic_shuffle_white_24dp" />
                 </LinearLayout>
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/biography_title"
                     fontPath="@string/circular_std_black"
                     android:layout_width="match_parent"
@@ -115,7 +115,7 @@
                     android:visibility="gone"
                     tools:ignore="MissingPrefix" />
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/biography"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -125,7 +125,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                     android:visibility="gone" />
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/album_title"
                     fontPath="@string/circular_std_black"
                     android:layout_width="match_parent"
@@ -135,13 +135,13 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                     android:textColor="?android:attr/textColorPrimary" />
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/album_recycler_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:nestedScrollingEnabled="false" />
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/song_title"
                     fontPath="@string/circular_std_black"
                     android:layout_width="match_parent"
@@ -152,15 +152,15 @@
                     android:textColor="?android:attr/textColorPrimary"
                     tools:ignore="MissingPrefix" />
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:nestedScrollingEnabled="false" />
 
             </LinearLayout>
-        </android.support.v7.widget.CardView>
-    </android.support.v4.widget.NestedScrollView>
+        </androidx.cardview.widget.CardView>
+    </androidx.core.widget.NestedScrollView>
 
     <View
         android:layout_width="match_parent"
@@ -185,7 +185,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.v7.widget.AppCompatImageButton
+            <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/menu_close"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -196,7 +196,7 @@
                 app:backgroundTint="@color/twenty_percent_black_overlay"
                 app:srcCompat="@drawable/ic_close_white_24dp" />
 
-            <android.support.v7.widget.AppCompatImageButton
+            <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/menu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -210,4 +210,4 @@
         </FrameLayout>
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
index 3711b5cb..1b8d04c8 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
@@ -15,102 +15,88 @@
 
     </FrameLayout>
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinator_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.design.widget.AppBarLayout
-            android:id="@+id/appbar"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:focusable="true"
-            tools:ignore="UnusedAttribute">
+            android:layout_marginStart="@dimen/horizontal_margin"
+            android:layout_marginEnd="@dimen/horizontal_margin">
 
-            <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
-                android:id="@+id/collapsing_toolbar"
+            <include layout="@layout/retro_backdrop" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <com.google.android.material.appbar.AppBarLayout
+                android:id="@+id/app_bar"
                 android:layout_width="match_parent"
-                android:layout_height="96dp"
-                app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
-                app:expandedTitleGravity="top"
-                app:expandedTitleMarginStart="16dp"
-                app:expandedTitleMarginTop="48dp"
-                app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:elevation="0dp"
+                app:elevation="0dp"
+                tools:ignore="UnusedAttribute">
 
-                <View
+                <com.google.android.material.appbar.CollapsingToolbarLayout
+                    android:id="@+id/collapsing_toolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    app:layout_collapseMode="parallax"
-                    app:layout_collapseParallaxMultiplier="0.7" />
+                    android:layout_height="wrap_content"
+                    app:layout_scrollFlags="scroll|enterAlways"
+                    app:titleEnabled="false">
 
-                <android.support.v7.widget.Toolbar
-                    android:id="@+id/home_toolbar"
-                    style="@style/Toolbar"
-                    tools:ignore="UnusedAttribute">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <code.name.monkey.retromusic.views.IconImageView
-                            android:id="@+id/search"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="0"
-                            android:padding="16dp"
-                            android:src="@drawable/ic_search_white_24dp" />
+                    <androidx.appcompat.widget.Toolbar
+                        android:id="@+id/toolbar"
+                        style="@style/Toolbar48"
+                        app:layout_collapseMode="pin"
+                        tools:ignore="UnusedAttribute">
 
                         <TextView
                             android:id="@+id/title"
-                            fontPath="@string/circular_std_black"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:text="@string/app_name"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                            android:textColor="?android:attr/textColorPrimary"
-                            tools:ignore="MissingPrefix" />
+                            style="@style/BigTitleTextAppearance"
+                            android:text="@string/app_name" />
 
                         <code.name.monkey.retromusic.views.CircularImageView
                             android:id="@+id/user_image"
                             android:layout_width="36dp"
                             android:layout_height="36dp"
+                            android:layout_gravity="end"
                             android:layout_marginEnd="16dp"
-                            android:layout_weight="0"
                             app:civ_border="false" />
-                    </LinearLayout>
-                </android.support.v7.widget.Toolbar>
-            </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
-        </android.support.design.widget.AppBarLayout>
+                    </androidx.appcompat.widget.Toolbar>
+                </com.google.android.material.appbar.CollapsingToolbarLayout>
+            </com.google.android.material.appbar.AppBarLayout>
 
-        <android.support.v4.widget.NestedScrollView
-            android:id="@+id/container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="4dp"
-            android:layout_marginStart="128dp"
-            android:layout_marginEnd="128dp"
-            android:background="@drawable/bg_bottom_sheet_dialog_fragment"
-            android:elevation="@dimen/card_elevation"
-            app:behavior_overlapTop="24dp"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <LinearLayout
+            <androidx.core.widget.NestedScrollView
                 android:id="@+id/content_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:descendantFocusability="blocksDescendants"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:orientation="vertical">
+                android:layout_marginStart="@dimen/horizontal_margin"
+                android:layout_marginEnd="@dimen/horizontal_margin"
+                android:layout_weight="1"
+                android:background="@color/md_white_1000"
+                android:elevation="@dimen/card_elevation"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-                <include layout="@layout/abs_playlists" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:descendantFocusability="blocksDescendants"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:orientation="vertical">
 
-                <include layout="@layout/home_section_content" />
-            </LinearLayout>
-        </android.support.v4.widget.NestedScrollView>
-    </android.support.design.widget.CoordinatorLayout>
+                    <include layout="@layout/abs_playlists" />
+
+                    <include layout="@layout/home_section_content" />
+                </LinearLayout>
+            </androidx.core.widget.NestedScrollView>
+        </LinearLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge-land/fragment_blur.xml b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
index a5cf3aa1..89e86ea1 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
@@ -1,134 +1,134 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:clickable="true"
-  android:focusable="true">
-
-  <android.support.v7.widget.AppCompatImageView
-    android:id="@+id/gradient_background"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:scaleType="centerCrop"
-    tools:src="@drawable/hemanth_s"/>
+    android:clickable="true"
+    android:focusable="true">
 
-  <View
-    android:id="@+id/mask"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/md_black_1000"
-    android:visibility="gone"/>
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/gradient_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        tools:src="@drawable/hemanth_s" />
 
-  <View
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/shadow_up"/>
+    <View
+        android:id="@+id/mask"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/md_black_1000"
+        android:visibility="gone" />
 
-  <FrameLayout
-    android:id="@+id/toolbar_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    tools:background="@color/md_red_A700">
-
-    <android.support.v7.widget.Toolbar
-      android:id="@+id/player_toolbar"
-      style="@style/Toolbar48"
-      android:layout_height="48dp"
-      android:navigationIcon="@drawable/ic_close_white_24dp"
-      app:navigationIcon="@drawable/ic_close_white_24dp"/>
-  </FrameLayout>
-
-  <include layout="@layout/shadow_statusbar_toolbar"/>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_above="@id/toolbar_container"
-    android:orientation="vertical">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/shadow_up" />
 
     <FrameLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content">
+        android:id="@+id/toolbar_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        tools:background="@color/md_red_A700">
 
-      <include layout="@layout/status_bar"/>
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/player_toolbar"
+            style="@style/Toolbar48"
+            android:layout_height="48dp"
+            android:navigationIcon="@drawable/ic_close_white_24dp"
+            app:navigationIcon="@drawable/ic_close_white_24dp" />
     </FrameLayout>
 
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:orientation="horizontal">
+    <include layout="@layout/shadow_statusbar_toolbar" />
 
-      <LinearLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:padding="24dp"
-        android:gravity="center"
+        android:layout_above="@id/toolbar_container"
         android:orientation="vertical">
 
-        <TextView
-          android:id="@+id/title"
-          fontPath="@string/circular_std_black"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_gravity="center_horizontal"
-          android:padding="12dp"
-          android:text="Queue"
-          android:textAppearance="@style/TextAppearance.AppCompat.Display2"
-          android:textColor="?android:attr/textColorPrimary"
-          tools:ignore="MissingPrefix"/>
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        <android.support.v7.widget.RecyclerView
-          android:id="@+id/recycler_view"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:layout_gravity="center_horizontal"/>
-
-      </LinearLayout>
-
-      <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
-          android:id="@+id/now_playing_container"
-          android:layout_width="400dp"
-          android:layout_height="match_parent"
-          android:layout_gravity="center_horizontal"
-          android:orientation="vertical">
-
-          <code.name.monkey.retromusic.views.WidthFitSquareLayout
-            android:id="@+id/album_cover_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:layout_gravity="center_horizontal">
-
-            <fragment
-              android:id="@+id/player_album_cover_fragment"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"/>
-          </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-          <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="1"
-            tools:background="@color/md_white_1000">
+            android:orientation="horizontal">
 
-            <fragment
-              android:id="@+id/playback_controls_fragment"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"/>
-          </FrameLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="24dp">
+
+                <TextView
+                    android:id="@+id/title"
+                    fontPath="@string/circular_std_black"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:padding="12dp"
+                    android:text="Queue"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Display2"
+                    android:textColor="?android:attr/textColorPrimary"
+                    tools:ignore="MissingPrefix" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_horizontal" />
+
+            </LinearLayout>
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1">
+
+                <LinearLayout
+                    android:id="@+id/now_playing_container"
+                    android:layout_width="400dp"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_horizontal"
+                    android:orientation="vertical">
+
+                    <code.name.monkey.retromusic.views.WidthFitSquareLayout
+                        android:id="@+id/album_cover_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_weight="0">
+
+                        <fragment
+                            android:id="@+id/player_album_cover_fragment"
+                            android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent" />
+                    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        tools:background="@color/md_white_1000">
+
+                        <fragment
+                            android:id="@+id/playback_controls_fragment"
+                            android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent" />
+                    </FrameLayout>
+                </LinearLayout>
+            </FrameLayout>
         </LinearLayout>
-      </FrameLayout>
     </LinearLayout>
-  </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge-land/fragment_card_blur_player.xml b/app/src/main/res/layout-xlarge-land/fragment_card_blur_player.xml
index fca780ec..770a0cd7 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_card_blur_player.xml
@@ -7,7 +7,7 @@
     android:clickable="true"
     android:focusable="true">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/gradient_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -40,7 +40,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:navigationIcon="@drawable/ic_close_white_24dp"
@@ -78,7 +78,7 @@
                         tools:text="@string/action_share" />
 
                 </LinearLayout>
-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>
 
         </FrameLayout>
 
diff --git a/app/src/main/res/layout-xlarge-land/fragment_home.xml b/app/src/main/res/layout-xlarge-land/fragment_home.xml
index 5950ab0b..e8efb0c5 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_home.xml
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:focusable="true"
         tools:ignore="UnusedAttribute">
 
-        <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
             app:contentScrim="?attr/colorPrimary"
-            app:expandedTitleGravity="top"
-            app:expandedTitleMarginStart="24dp"
-            app:expandedTitleMarginTop="62dp"
-            app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed"
             app:statusBarScrim="?attr/colorPrimary">
 
             <ImageView
@@ -34,7 +28,7 @@
                 app:layout_collapseParallaxMultiplier="0.7"
                 tools:ignore="ContentDescription" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/home_toolbar"
                 style="@style/Toolbar"
                 tools:ignore="UnusedAttribute">
@@ -72,13 +66,11 @@
                         android:layout_weight="0"
                         app:civ_border="false" />
                 </LinearLayout>
-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-        </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
-
-    </android.support.design.widget.AppBarLayout>
-
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -102,5 +94,5 @@
 
             <include layout="@layout/home_section_content" />
         </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
-</android.support.design.widget.CoordinatorLayout>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-xlarge-land/fragment_player.xml b/app/src/main/res/layout-xlarge-land/fragment_player.xml
index e36bb916..dd0ccf0e 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_player.xml
@@ -21,7 +21,7 @@
         android:layout_alignParentBottom="true"
         android:layout_gravity="bottom">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/player_toolbar"
             android:layout_width="match_parent"
             android:layout_height="48dp"
diff --git a/app/src/main/res/layout-xlarge/activity_about_content.xml b/app/src/main/res/layout-xlarge/activity_about_content.xml
index e6cf1859..b03e6dfd 100644
--- a/app/src/main/res/layout-xlarge/activity_about_content.xml
+++ b/app/src/main/res/layout-xlarge/activity_about_content.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.gridlayout.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:grid="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -34,4 +34,4 @@
     <include layout="@layout/card_other"/>
 
   </LinearLayout>
-</android.support.v7.widget.GridLayout>
\ No newline at end of file
+</androidx.gridlayout.widget.GridLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/activity_album.xml b/app/src/main/res/layout-xlarge/activity_album.xml
index 19be8d9c..9d817805 100644
--- a/app/src/main/res/layout-xlarge/activity_album.xml
+++ b/app/src/main/res/layout-xlarge/activity_album.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/artist_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -20,12 +20,12 @@
         android:layout_gravity="bottom"
         android:background="@drawable/shadow_up_home" />
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
@@ -37,20 +37,20 @@
                 android:layout_width="320dp"
                 android:layout_height="wrap_content" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48"
                 app:layout_collapseMode="pin"
                 app:title="" />
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="fill_vertical"
-        android:layout_marginEnd="96dp"
         android:layout_marginStart="96dp"
+        android:layout_marginEnd="96dp"
         android:fillViewport="true"
         android:overScrollMode="never"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -66,15 +66,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp">
+                android:padding="16dp">
 
                 <code.name.monkey.retromusic.views.WidthFitSquareLayout
                     android:layout_width="196dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="0">
 
-                    <android.support.v7.widget.AppCompatImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/image"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -87,10 +86,10 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:orientation="vertical"
-                    android:paddingEnd="16dp"
-                    android:paddingStart="16dp">
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp">
 
-                    <android.support.v7.widget.AppCompatTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/title"
                         fontPath="@string/circular_std_black"
                         android:layout_width="match_parent"
@@ -99,7 +98,7 @@
                         android:textAppearance="@style/TextAppearance.AppCompat.Display1"
                         tools:ignore="MissingPrefix" />
 
-                    <android.support.v7.widget.AppCompatTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/text"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -118,21 +117,21 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/song_title"
                 fontPath="@string/circular_std_black"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="12dp"
-                android:paddingEnd="24dp"
                 android:paddingStart="24dp"
                 android:paddingTop="12dp"
+                android:paddingEnd="24dp"
+                android:paddingBottom="12dp"
                 android:text="@string/songs"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                 android:textColor="?android:attr/textColorPrimary"
                 tools:ignore="MissingPrefix" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -147,34 +146,34 @@
                 fontPath="@string/circular_std_black"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="12dp"
-                android:paddingEnd="16dp"
                 android:paddingStart="16dp"
                 android:paddingTop="12dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="12dp"
                 android:text="@string/songs"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                 android:visibility="gone"
                 tools:ignore="MissingPrefix" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/more_recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:nestedScrollingEnabled="false"
                 android:visibility="gone" />
         </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="72dp"
         android:background="@drawable/shadow_down_strong" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/action_shuffle_all"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="16dp"
         app:srcCompat="@drawable/ic_shuffle_white_24dp" />
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/activity_album_tag_editor.xml b/app/src/main/res/layout-xlarge/activity_album_tag_editor.xml
index a808f044..4597f6bc 100644
--- a/app/src/main/res/layout-xlarge/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout-xlarge/activity_album_tag_editor.xml
@@ -1,16 +1,16 @@
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/gradient_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp">
@@ -22,17 +22,17 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:text="@string/edit_cover" />
-        </android.support.v7.widget.Toolbar>
-    </android.support.design.widget.AppBarLayout>
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginEnd="96dp"
         android:layout_marginStart="96dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:cardCornerRadius="8dp"
@@ -51,7 +51,7 @@
                     app:layout_collapseMode="parallax"
                     app:layout_collapseParallaxMultiplier="0.5">
 
-                    <android.support.v7.widget.AppCompatImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/image"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -76,7 +76,7 @@
                     android:orientation="vertical"
                     android:padding="8dp">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -91,9 +91,9 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -109,9 +109,9 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -127,13 +127,13 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
-                        <android.support.design.widget.TextInputEditText
+                        <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/year"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -145,18 +145,18 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
                 </LinearLayout>
             </LinearLayout>
-        </android.support.v7.widget.CardView>
-    </android.support.v4.widget.NestedScrollView>
+        </androidx.cardview.widget.CardView>
+    </androidx.core.widget.NestedScrollView>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/save_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         app:srcCompat="@drawable/ic_save_white_24dp" />
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-xlarge/activity_artist_details.xml b/app/src/main/res/layout-xlarge/activity_artist_details.xml
index a5b71957..3d362b16 100644
--- a/app/src/main/res/layout-xlarge/activity_artist_details.xml
+++ b/app/src/main/res/layout-xlarge/activity_artist_details.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
         android:transitionName="@string/transition_artist_image" />
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
@@ -31,14 +31,14 @@
                 android:layout_height="wrap_content"
                 app:layout_collapseMode="parallax" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48"
                 app:layout_collapseMode="pin" />
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="fill_vertical"
@@ -69,7 +69,7 @@
                     android:layout_weight="1"
                     android:orientation="vertical">
 
-                    <android.support.v7.widget.AppCompatTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/title"
                         fontPath="@string/circular_std_black"
                         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
                         tools:ignore="MissingPrefix" />
 
-                    <android.support.v7.widget.AppCompatTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/text"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
 
                 </LinearLayout>
 
-                <android.support.design.widget.FloatingActionButton
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/action_shuffle_all"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -105,7 +105,7 @@
                     app:srcCompat="@drawable/ic_shuffle_white_24dp" />
             </LinearLayout>
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/biography_title"
                 fontPath="@string/circular_std_black"
                 android:layout_width="match_parent"
@@ -120,7 +120,7 @@
                 android:visibility="gone"
                 tools:ignore="MissingPrefix" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/biography"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -130,7 +130,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:visibility="gone" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/album_title"
                 fontPath="@string/circular_std_black"
                 android:layout_width="match_parent"
@@ -143,13 +143,13 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                 android:textColor="?android:attr/textColorPrimary" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/album_recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:nestedScrollingEnabled="false" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/song_title"
                 fontPath="@string/circular_std_black"
                 android:layout_width="match_parent"
@@ -163,7 +163,7 @@
                 android:textColor="?android:attr/textColorPrimary"
                 tools:ignore="MissingPrefix" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -171,11 +171,11 @@
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="72dp"
         android:background="@drawable/shadow_down_strong" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml b/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml
index 6791a843..19eccd88 100644
--- a/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml
+++ b/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml
@@ -5,7 +5,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
-  <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+  <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/player_album_art_frame"
     android:layout_width="match_parent"
@@ -17,7 +17,7 @@
     app:cardPreventCornerOverlap="false"
     app:cardUseCompatPadding="true">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
       android:id="@+id/player_image"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
@@ -28,5 +28,5 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/shadow_up_home"/>
-  </android.support.v7.widget.CardView>
+  </androidx.cardview.widget.CardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/fragment_blur.xml b/app/src/main/res/layout-xlarge/fragment_blur.xml
index 225855ca..ceed2cb0 100644
--- a/app/src/main/res/layout-xlarge/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge/fragment_blur.xml
@@ -7,7 +7,7 @@
   android:clickable="true"
   android:focusable="true">
 
-  <android.support.v7.widget.AppCompatImageView
+  <androidx.appcompat.widget.AppCompatImageView
     android:id="@+id/gradient_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -77,7 +77,7 @@
       android:layout_weight="0"
       tools:background="@color/md_red_A700">
 
-      <android.support.v7.widget.Toolbar
+      <androidx.appcompat.widget.Toolbar
         android:id="@+id/player_toolbar"
         style="@style/Toolbar48"
         android:layout_height="48dp"
diff --git a/app/src/main/res/layout-xlarge/fragment_card_blur_player.xml b/app/src/main/res/layout-xlarge/fragment_card_blur_player.xml
index c71f5100..bef72c37 100644
--- a/app/src/main/res/layout-xlarge/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout-xlarge/fragment_card_blur_player.xml
@@ -7,7 +7,7 @@
     android:clickable="true"
     android:focusable="true">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/gradient_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -39,7 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:navigationIcon="@drawable/ic_close_white_24dp"
@@ -77,7 +77,7 @@
                         tools:text="@string/action_share" />
 
                 </LinearLayout>
-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>
 
         </FrameLayout>
 
diff --git a/app/src/main/res/layout-xlarge/fragment_home.xml b/app/src/main/res/layout-xlarge/fragment_home.xml
index 2c3145ce..0e955899 100644
--- a/app/src/main/res/layout-xlarge/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge/fragment_home.xml
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:focusable="true"
         tools:ignore="UnusedAttribute">
 
-        <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
             app:contentScrim="?attr/colorPrimary"
-            app:expandedTitleGravity="top"
-            app:expandedTitleMarginStart="16dp"
-            app:expandedTitleMarginTop="48dp"
-            app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed"
             app:statusBarScrim="?attr/colorPrimary">
 
             <ImageView
@@ -34,7 +28,7 @@
                 app:layout_collapseParallaxMultiplier="0.7"
                 tools:ignore="ContentDescription" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/home_toolbar"
                 style="@style/Toolbar"
                 tools:ignore="UnusedAttribute">
@@ -72,13 +66,11 @@
                         android:layout_weight="0"
                         app:civ_border="false" />
                 </LinearLayout>
-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-        </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
-
-    </android.support.design.widget.AppBarLayout>
-
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -103,5 +95,5 @@
             <include layout="@layout/home_section_content" />
 
         </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/fragment_name.xml b/app/src/main/res/layout-xlarge/fragment_name.xml
index dc6c6497..01e99ac4 100644
--- a/app/src/main/res/layout-xlarge/fragment_name.xml
+++ b/app/src/main/res/layout-xlarge/fragment_name.xml
@@ -32,7 +32,7 @@
             android:text="@string/summary_user_info"
             android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginBottom="-16dp"
@@ -54,7 +54,7 @@
                     android:orientation="vertical"
                     android:padding="16dp">
 
-                    <android.support.design.widget.TextInputEditText
+                    <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/name"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
-                    <android.support.v7.widget.AppCompatImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/image"
                         android:layout_width="match_parent"
                         android:layout_height="128dp"
@@ -104,7 +104,7 @@
                         app:srcCompat="@drawable/ic_edit_white_24dp" />
                 </FrameLayout>
             </LinearLayout>
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
     <ImageButton
diff --git a/app/src/main/res/layout-xlarge/fragment_player.xml b/app/src/main/res/layout-xlarge/fragment_player.xml
index 1661a1ac..66874ad5 100644
--- a/app/src/main/res/layout-xlarge/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge/fragment_player.xml
@@ -60,7 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:layout_height="48dp"
diff --git a/app/src/main/res/layout-xlarge/item_artist.xml b/app/src/main/res/layout-xlarge/item_artist.xml
index 30012231..99e4c17e 100644
--- a/app/src/main/res/layout-xlarge/item_artist.xml
+++ b/app/src/main/res/layout-xlarge/item_artist.xml
@@ -19,7 +19,7 @@
             tools:src="@drawable/hemanth_s" />
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout-xlarge/item_image.xml b/app/src/main/res/layout-xlarge/item_image.xml
index b6f3ab61..f67298eb 100644
--- a/app/src/main/res/layout-xlarge/item_image.xml
+++ b/app/src/main/res/layout-xlarge/item_image.xml
@@ -10,7 +10,7 @@
       android:layout_height="match_parent"
       android:orientation="vertical">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
           android:id="@+id/image_container_card"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
@@ -19,13 +19,13 @@
           app:cardElevation="4dp"
           app:cardPreventCornerOverlap="true">
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
               android:id="@+id/image"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:scaleType="centerCrop"
               />
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml
index fc23462d..abcaef50 100644
--- a/app/src/main/res/layout/abs_playlists.xml
+++ b/app/src/main/res/layout/abs_playlists.xml
@@ -6,8 +6,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <android.support.design.card.MaterialCardView
-        android:id="@+id/search"
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:cardCornerRadius="8dp"
@@ -15,8 +14,10 @@
         app:cardUseCompatPadding="true">
 
         <LinearLayout
+            android:id="@+id/search"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?rectSelector"
             android:gravity="center_vertical">
 
             <code.name.monkey.retromusic.views.IconImageView
@@ -35,9 +36,9 @@
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
 
         </LinearLayout>
-    </android.support.design.card.MaterialCardView>
+    </com.google.android.material.card.MaterialCardView>
 
-    <android.support.v7.widget.AppCompatTextView xmlns:tools="http://schemas.android.com/tools"
+    <androidx.appcompat.widget.AppCompatTextView xmlns:tools="http://schemas.android.com/tools"
         fontPath="@string/circular_std_black"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -61,7 +62,7 @@
             android:layout_weight="1"
             android:orientation="vertical">
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -70,7 +71,7 @@
                 app:srcCompat="@drawable/ic_access_time_white_24dp"
                 app:tint="@color/md_white_1000" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -87,7 +88,7 @@
             android:layout_weight="1"
             android:orientation="vertical">
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -96,7 +97,7 @@
                 app:srcCompat="@drawable/ic_library_add_white_24dp"
                 app:tint="@color/md_white_1000" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -113,7 +114,7 @@
             android:layout_weight="1"
             android:orientation="vertical">
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -122,7 +123,7 @@
                 app:srcCompat="@drawable/ic_trending_up_white_24dp"
                 app:tint="@color/md_white_1000" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -139,7 +140,7 @@
             android:layout_weight="1"
             android:orientation="vertical">
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -148,7 +149,7 @@
                 app:srcCompat="@drawable/ic_shuffle_white_24dp"
                 app:tint="@color/md_white_1000" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 5845f40e..cb73e72f 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,51 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <android.support.design.widget.CollapsingToolbarLayout xmlns:tools="http://schemas.android.com/tools"
-            android:id="@+id/collapsing_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
-            app:titleEnabled="false">
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar48"
+            app:layout_collapseMode="pin">
 
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                style="@style/Toolbar48"
-                app:layout_collapseMode="pin">
+            <TextView
+                android:id="@+id/title"
+                fontPath="@string/circular_std_black"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/action_about"
+                android:textAppearance="@style/TextAppearance.AppCompat.Large"
+                tools:ignore="MissingPrefix" />
 
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
 
-                <TextView
-                    android:id="@+id/title"
-                    fontPath="@string/circular_std_black"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:text="@string/action_about"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Large"
-                    tools:ignore="MissingPrefix" />
-
-            </android.support.v7.widget.Toolbar>
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
-
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:elevation="@dimen/card_elevation"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <include layout="@layout/activity_about_content" />
 
-    </android.support.v4.widget.NestedScrollView>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml
index 5bf68c10..6b2295f0 100755
--- a/app/src/main/res/layout/activity_album.xml
+++ b/app/src/main/res/layout/activity_album.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -24,7 +23,7 @@
                 android:background="@android:color/transparent"
                 app:layout_collapseMode="parallax">
 
-                <android.support.v7.widget.AppCompatImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/image"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -39,15 +38,14 @@
 
             </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
-                style="@style/Toolbar48"
-                app:layout_collapseMode="pin"
-                app:title="" />
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+                style="@style/Toolbar48" />
 
-    <android.support.v4.widget.NestedScrollView
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -124,7 +122,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                 tools:ignore="MissingPrefix" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -144,16 +142,16 @@
                 android:visibility="gone"
                 tools:ignore="MissingPrefix" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/more_recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:nestedScrollingEnabled="false"
                 android:visibility="gone" />
         </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/action_shuffle_all"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -161,4 +159,4 @@
         android:layout_margin="16dp"
         app:layout_behavior="code.name.monkey.retromusic.misc.ScrollAwareFABBehavior"
         app:srcCompat="@drawable/ic_shuffle_white_24dp" />
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album_style_2.xml b/app/src/main/res/layout/activity_album_style_2.xml
index 2b1180a8..1c154b7c 100644
--- a/app/src/main/res/layout/activity_album_style_2.xml
+++ b/app/src/main/res/layout/activity_album_style_2.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -54,7 +54,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
 
-                            <android.support.v7.widget.AppCompatImageButton
+                            <androidx.appcompat.widget.AppCompatImageButton
                                 android:id="@+id/menu_close"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
                                 app:backgroundTint="@color/twenty_percent_black_overlay"
                                 app:srcCompat="@drawable/ic_close_white_24dp" />
 
-                            <android.support.v7.widget.AppCompatImageButton
+                            <androidx.appcompat.widget.AppCompatImageButton
                                 android:id="@+id/menu"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
                         </FrameLayout>
                     </LinearLayout>
 
-                    <android.support.v7.widget.CardView
+                    <androidx.cardview.widget.CardView
                         android:id="@+id/image_container"
                         android:layout_width="260dp"
                         android:layout_height="260dp"
@@ -88,7 +88,7 @@
                         app:cardElevation="8dp"
                         app:cardUseCompatPadding="true">
 
-                        <android.support.v7.widget.AppCompatImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/image"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
@@ -96,7 +96,7 @@
                             android:scaleType="centerCrop"
                             android:transitionName="@string/transition_album_art"
                             tools:src="@drawable/hemanth_s" />
-                    </android.support.v7.widget.CardView>
+                    </androidx.cardview.widget.CardView>
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -105,7 +105,7 @@
                         android:orientation="vertical"
                         android:padding="16dp">
 
-                        <android.support.v7.widget.AppCompatTextView
+                        <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/title"
                             fontPath="@string/circular_std_black"
                             android:layout_width="match_parent"
@@ -115,7 +115,7 @@
                             android:textAppearance="@style/TextAppearance.AppCompat.Title"
                             tools:ignore="MissingPrefix" />
 
-                        <android.support.v7.widget.AppCompatTextView
+                        <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/text"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -142,16 +142,16 @@
                     android:background="@drawable/shadow_down_strong" />
 
             </FrameLayout>
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:overScrollMode="never"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -206,7 +206,7 @@
 
                 </LinearLayout>
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/song_title"
                     fontPath="@string/circular_std_black"
                     android:layout_width="match_parent"
@@ -220,16 +220,16 @@
                     android:textColor="?android:attr/textColorPrimary"
                     tools:ignore="MissingPrefix" />
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler_view"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:nestedScrollingEnabled="false" />
             </LinearLayout>
-        </android.support.v7.widget.CardView>
-    </android.support.v4.widget.NestedScrollView>
+        </androidx.cardview.widget.CardView>
+    </androidx.core.widget.NestedScrollView>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/action_shuffle_all"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -237,4 +237,4 @@
         android:layout_margin="16dp"
         app:srcCompat="@drawable/ic_shuffle_white_24dp" />
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index 3acb22a5..79323654 100755
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -1,18 +1,18 @@
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/gradient_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
             app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp">
@@ -24,15 +24,15 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:text="@string/edit_cover" />
-        </android.support.v7.widget.Toolbar>
-    </android.support.design.widget.AppBarLayout>
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:cardCornerRadius="8dp"
@@ -51,7 +51,7 @@
                     app:layout_collapseMode="parallax"
                     app:layout_collapseParallaxMultiplier="0.5">
 
-                    <android.support.v7.widget.AppCompatImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/image"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -76,7 +76,7 @@
                     android:orientation="vertical"
                     android:padding="8dp">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -91,9 +91,9 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -109,9 +109,9 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
@@ -127,13 +127,13 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
 
-                        <android.support.design.widget.TextInputEditText
+                        <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/year"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -145,18 +145,18 @@
                             android:maxLines="1"
                             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
                 </LinearLayout>
             </LinearLayout>
-        </android.support.v7.widget.CardView>
-    </android.support.v4.widget.NestedScrollView>
+        </androidx.cardview.widget.CardView>
+    </androidx.core.widget.NestedScrollView>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/save_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         app:srcCompat="@drawable/ic_save_white_24dp" />
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_artist_details.xml b/app/src/main/res/layout/activity_artist_details.xml
index fb99ea63..e93b3154 100755
--- a/app/src/main/res/layout/activity_artist_details.xml
+++ b/app/src/main/res/layout/activity_artist_details.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -25,7 +25,7 @@
                 android:background="@android:color/transparent"
                 app:layout_collapseMode="parallax">
 
-                <android.support.v7.widget.AppCompatImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/image"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -40,14 +40,14 @@
 
             </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48"
                 app:layout_collapseMode="pin" />
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
                     android:paddingStart="16dp"
                     android:paddingEnd="0dp">
 
-                    <android.support.v7.widget.AppCompatTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/title"
                         fontPath="@string/circular_std_black"
                         android:layout_width="match_parent"
@@ -85,7 +85,7 @@
                         tools:ignore="MissingPrefix"
                         tools:text="Title" />
 
-                    <android.support.v7.widget.AppCompatTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/text"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -104,7 +104,7 @@
 
                 </LinearLayout>
 
-                <android.support.design.widget.FloatingActionButton
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/action_shuffle_all"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -114,7 +114,7 @@
                     android:src="@drawable/ic_shuffle_white_24dp" />
             </LinearLayout>
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/biography_title"
                 fontPath="@string/circular_std_black"
                 android:layout_width="match_parent"
@@ -126,7 +126,7 @@
                 android:visibility="gone"
                 tools:ignore="MissingPrefix" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/biography"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -136,7 +136,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:visibility="gone" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/album_title"
                 fontPath="@string/circular_std_black"
                 android:layout_width="match_parent"
@@ -146,13 +146,13 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                 android:textColor="?android:attr/textColorPrimary" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/album_recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:nestedScrollingEnabled="false" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/song_title"
                 fontPath="@string/circular_std_black"
                 android:layout_width="match_parent"
@@ -163,12 +163,12 @@
                 android:textColor="?android:attr/textColorPrimary"
                 tools:ignore="MissingPrefix" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:nestedScrollingEnabled="false" />
 
         </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
-</android.support.design.widget.CoordinatorLayout>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_artist_details_blur.xml b/app/src/main/res/layout/activity_artist_details_blur.xml
index 52bf6611..b09badc7 100755
--- a/app/src/main/res/layout/activity_artist_details_blur.xml
+++ b/app/src/main/res/layout/activity_artist_details_blur.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/root"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
-  <android.support.design.widget.AppBarLayout
+  <com.google.android.material.appbar.AppBarLayout
     android:id="@+id/app_bar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <android.support.design.widget.CollapsingToolbarLayout
+    <com.google.android.material.appbar.CollapsingToolbarLayout
       android:id="@+id/collapsing_toolbar"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -33,13 +33,13 @@
           android:gravity="center"
           android:orientation="vertical">
 
-          <android.support.v7.widget.CardView
+          <androidx.cardview.widget.CardView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:cardCornerRadius="8dp"
             app:cardElevation="8dp"
             app:cardUseCompatPadding="true">
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
               android:id="@+id/image"
               android:layout_width="196dp"
               android:layout_height="196dp"
@@ -47,7 +47,7 @@
               android:scaleType="centerCrop"
               android:transitionName="@string/transition_artist_image"
               />
-          </android.support.v7.widget.CardView>
+          </androidx.cardview.widget.CardView>
           <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
             android:padding="16dp"
             android:orientation="vertical">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
               android:id="@+id/title"
               fontPath="@string/circular_std_black"
               android:layout_width="match_parent"
@@ -66,7 +66,7 @@
               tools:ignore="MissingPrefix"
               tools:text="Title"/>
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
               android:id="@+id/text"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
@@ -86,11 +86,11 @@
           </LinearLayout>
         </LinearLayout>
       </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-    </android.support.design.widget.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-  </android.support.design.widget.AppBarLayout>
+  </com.google.android.material.appbar.AppBarLayout>
 
-  <android.support.v4.widget.NestedScrollView
+  <androidx.core.widget.NestedScrollView
     android:id="@+id/gradient_background"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -116,7 +116,7 @@
         android:text="@string/action_shuffle_all"
         tools:ignore="MissingPrefix"
         />
-      <android.support.v7.widget.AppCompatTextView
+      <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/biography_title"
         fontPath="@string/circular_std_black"
         android:layout_width="match_parent"
@@ -128,7 +128,7 @@
         android:visibility="gone"
         tools:ignore="MissingPrefix"/>
 
-      <android.support.v7.widget.AppCompatTextView
+      <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/biography"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -138,7 +138,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
         android:visibility="gone"/>
 
-      <android.support.v7.widget.AppCompatTextView
+      <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/album_title"
         fontPath="@string/circular_std_black"
         android:layout_width="match_parent"
@@ -148,14 +148,14 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
         android:textColor="?android:attr/textColorPrimary"/>
 
-      <android.support.v7.widget.RecyclerView
+      <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/album_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:nestedScrollingEnabled="false"/>
 
-      <android.support.v7.widget.AppCompatTextView
+      <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/song_title"
         fontPath="@string/circular_std_black"
         android:layout_width="match_parent"
@@ -166,7 +166,7 @@
         android:textColor="?android:attr/textColorPrimary"
         tools:ignore="MissingPrefix"/>
 
-      <android.support.v7.widget.RecyclerView
+      <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -174,7 +174,7 @@
 
     </LinearLayout>
 
-  </android.support.v4.widget.NestedScrollView>
+  </androidx.core.widget.NestedScrollView>
 
   <View
     android:layout_width="match_parent"
@@ -191,7 +191,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content">
 
-      <android.support.v7.widget.AppCompatImageButton
+      <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/menu_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -202,7 +202,7 @@
         app:backgroundTint="@color/twenty_percent_black_overlay"
         app:srcCompat="@drawable/ic_close_white_24dp"/>
 
-      <android.support.v7.widget.AppCompatImageButton
+      <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/menu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -216,4 +216,4 @@
     </FrameLayout>
   </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_donation.xml b/app/src/main/res/layout/activity_donation.xml
index ee921c64..866ec149 100644
--- a/app/src/main/res/layout/activity_donation.xml
+++ b/app/src/main/res/layout/activity_donation.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:titleEnabled="false">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48"
                 app:layout_collapseMode="pin"
@@ -31,16 +31,16 @@
                     style="@style/BigTitleTextAppearance"
                     android:text="@string/support_development" />
 
-            </android.support.v7.widget.Toolbar>
-        </android.support.design.widget.CollapsingToolbarLayout>
+            </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:background="?dividerColor" />
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -50,7 +50,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/donation"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -76,7 +76,7 @@
                     android:layout_height="wrap_content"
                     android:indeterminate="true" />
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="sans-serif"
@@ -88,7 +88,7 @@
 
             </LinearLayout>
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/list"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
                 android:paddingEnd="6dp"
                 android:scrollbarStyle="outsideOverlay" />
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:cardCornerRadius="12dp"
@@ -111,7 +111,7 @@
                     android:gravity="center_horizontal"
                     android:orientation="vertical">
 
-                    <android.support.v7.widget.AppCompatTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         fontPath="@string/circular_std_black"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -121,7 +121,7 @@
                         android:textColor="@color/md_white_1000"
                         tools:ignore="MissingPrefix" />
 
-                    <android.support.v7.widget.AppCompatTextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingStart="16dp"
@@ -130,9 +130,9 @@
                         android:textColor="@color/md_white_1000" />
 
 
-                    <android.support.v7.widget.AppCompatButton
+                    <com.google.android.material.button.MaterialButton
                         android:id="@+id/donate"
-                        style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
+                        style="@style/Widget.MaterialComponents.Button.TextButton"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="end"
@@ -140,7 +140,7 @@
                         android:textColor="@color/md_white_1000" />
 
                 </LinearLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_equalizer.xml b/app/src/main/res/layout/activity_equalizer.xml
index 25bfda51..eefa588b 100644
--- a/app/src/main/res/layout/activity_equalizer.xml
+++ b/app/src/main/res/layout/activity_equalizer.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <android.support.design.widget.CollapsingToolbarLayout xmlns:tools="http://schemas.android.com/tools"
+        <com.google.android.material.appbar.CollapsingToolbarLayout xmlns:tools="http://schemas.android.com/tools"
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
             app:titleEnabled="false">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48"
                 app:layout_collapseMode="pin"
@@ -38,7 +38,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Large"
                     tools:ignore="MissingPrefix" />
 
-                <android.support.v7.widget.SwitchCompat
+                <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/equalizer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -46,12 +46,12 @@
                     android:layout_marginEnd="16dp"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
-            </android.support.v7.widget.Toolbar>
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+            </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -156,5 +156,5 @@
                 android:padding="16dp"
                 android:text="*Warning: It's alpha version. We don't recommend to use Equalizer, We believe without using Equalizer songs has better sound quality." />
         </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_error_handler.xml b/app/src/main/res/layout/activity_error_handler.xml
index ba755c19..634f1a32 100644
--- a/app/src/main/res/layout/activity_error_handler.xml
+++ b/app/src/main/res/layout/activity_error_handler.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">

    <android.support.design.widget.AppBarLayout
        android:id="@+id/app_bar"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:elevation="0dp"
        app:elevation="0dp">

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


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

        </android.support.v7.widget.Toolbar>

        <View
            android:layout_width="match_parent"
            android:layout_height="1dp"
            android:background="?dividerColor" />
    </android.support.design.widget.AppBarLayout>

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

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

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

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

    <android.support.v7.widget.CardView
        android:id="@+id/clear_app_data"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom"
        android:layout_margin="8dp"
        app:cardBackgroundColor="@color/md_blue_A200"
        app:cardCornerRadius="6dp"
        app:cardUseCompatPadding="true">

        <TextView
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:gravity="center"
            android:paddingStart="20dp"
            android:paddingTop="12dp"
            android:paddingEnd="20dp"
            android:paddingBottom="12dp"
            android:text="@string/clear_app_data"
            android:textColor="@color/md_white_1000" />
    </android.support.v7.widget.CardView>

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

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

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


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

        </androidx.appcompat.widget.Toolbar>

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

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

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

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

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

    <androidx.cardview.widget.CardView
        android:id="@+id/clear_app_data"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom"
        android:layout_margin="8dp"
        app:cardBackgroundColor="@color/md_blue_A200"
        app:cardCornerRadius="6dp"
        app:cardUseCompatPadding="true">

        <TextView
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:gravity="center"
            android:paddingStart="20dp"
            android:paddingTop="12dp"
            android:paddingEnd="20dp"
            android:paddingBottom="12dp"
            android:text="@string/clear_app_data"
            android:textColor="@color/md_white_1000" />
    </androidx.cardview.widget.CardView>

</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_genre_details.xml b/app/src/main/res/layout/activity_genre_details.xml
deleted file mode 100644
index d96b1b4d..00000000
--- a/app/src/main/res/layout/activity_genre_details.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:ignore="UnusedAttribute">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
-
-    <android.support.design.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <android.support.design.widget.AppBarLayout
-            android:id="@+id/app_bar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:focusable="true"
-            tools:ignore="UnusedAttribute">
-
-            <code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout
-                android:id="@+id/collapsing_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="96dp"
-                app:collapsedTitleTextAppearance="@style/CollapsedTitleAppearance"
-                app:expandedTitleGravity="top"
-                app:expandedTitleMarginStart="16dp"
-                app:expandedTitleMarginTop="48dp"
-                app:expandedTitleTextAppearance="@style/ExpandedTitleAppearance"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-                <android.support.v7.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    style="@style/Toolbar48"
-                    tools:ignore="UnusedAttribute" />
-            </code.name.monkey.retromusic.views.SansFontCollapsingToolbarLayout>
-
-            <ViewStub
-                android:id="@+id/cab_stub"
-                android:layout_width="match_parent"
-                android:layout_height="48dp" />
-
-        </android.support.design.widget.AppBarLayout>
-
-        <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
-            android:id="@+id/recycler_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:scrollbars="none"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-        <TextView
-            android:id="@android:id/empty"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:fontFamily="sans-serif-light"
-            android:text="@string/playlist_empty_text"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="@dimen/empty_text_size"
-            android:visibility="gone" />
-
-        <include layout="@layout/horizontal_progress" />
-
-        <android.support.design.widget.FloatingActionButton
-            android:id="@+id/action_shuffle"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="16dp"
-            android:src="@drawable/ic_shuffle_white_24dp"
-            app:layout_behavior="code.name.monkey.retromusic.misc.ScrollAwareFABBehavior" />
-    </android.support.design.widget.CoordinatorLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml
index 5cd4e2ed..d1ba7dbd 100644
--- a/app/src/main/res/layout/activity_license.xml
+++ b/app/src/main/res/layout/activity_license.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/coordinator_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
             app:titleEnabled="false">
 
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48"
                 app:layout_collapseMode="pin"
@@ -33,11 +33,11 @@
                     style="@style/BigTitleTextAppearance"
                     android:text="@string/licenses" />
 
-            </android.support.v7.widget.Toolbar>
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+            </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="fill_vertical"
@@ -47,5 +47,5 @@
             android:id="@+id/license"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
-    </android.support.v4.widget.NestedScrollView>
-</android.support.design.widget.CoordinatorLayout>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_lock_screen_old_style.xml b/app/src/main/res/layout/activity_lock_screen_old_style.xml
index 434dbd6d..b67c6a17 100644
--- a/app/src/main/res/layout/activity_lock_screen_old_style.xml
+++ b/app/src/main/res/layout/activity_lock_screen_old_style.xml
@@ -29,7 +29,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="0">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginBottom="16dp"
@@ -43,7 +43,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop" />
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
     <TextView
diff --git a/app/src/main/res/layout/activity_lyrics.xml b/app/src/main/res/layout/activity_lyrics.xml
index 485abb2f..6c8c96aa 100644
--- a/app/src/main/res/layout/activity_lyrics.xml
+++ b/app/src/main/res/layout/activity_lyrics.xml
@@ -63,7 +63,7 @@
     android:paddingEnd="12dp"
     android:orientation="horizontal">
 
-    <android.support.v7.widget.AppCompatRadioButton
+    <RadioButton
       android:id="@+id/synced_lyrics"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -72,12 +72,11 @@
       android:padding="8dp"
       android:background="@drawable/toggle_outline_buttons"
       android:button="@null"
-      android:checked="true"
       android:gravity="center"
       android:text="@string/synced_lyrics"
       android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"/>
 
-    <android.support.v7.widget.AppCompatRadioButton
+    <RadioButton
       android:id="@+id/normal_lyrics"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -92,7 +91,7 @@
 
   </RadioGroup>
 
-  <android.support.v7.widget.CardView
+  <androidx.cardview.widget.CardView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_weight="1"
@@ -141,5 +140,5 @@
         app:textAlign="left"
         app:textSize="18sp"/>
     </FrameLayout>
-  </android.support.v7.widget.CardView>
+  </androidx.cardview.widget.CardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_content.xml b/app/src/main/res/layout/activity_main_content.xml
index 635aa8eb..a9e82bc6 100644
--- a/app/src/main/res/layout/activity_main_content.xml
+++ b/app/src/main/res/layout/activity_main_content.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/fragment_container"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"/>
\ No newline at end of file
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="0dp"
+        tools:ignore="UnusedAttribute">
+
+        <include layout="@layout/status_bar" />
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_drawer_layout.xml b/app/src/main/res/layout/activity_main_drawer_layout.xml
index 25b60e47..fbc83987 100644
--- a/app/src/main/res/layout/activity_main_drawer_layout.xml
+++ b/app/src/main/res/layout/activity_main_drawer_layout.xml
@@ -6,7 +6,7 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <android.support.design.internal.ScrimInsetsFrameLayout
+    <FrameLayout
         android:id="@+id/drawer_content_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_playing_queue.xml b/app/src/main/res/layout/activity_playing_queue.xml
index 63c39ca7..5c0baad6 100755
--- a/app/src/main/res/layout/activity_playing_queue.xml
+++ b/app/src/main/res/layout/activity_playing_queue.xml
@@ -1,50 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_scrollFlags="scroll|enterAlways"
             app:titleEnabled="false">
 
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
 
-                <View
-                    android:id="@+id/cab_stub"
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp" />
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar48"
+                app:layout_collapseMode="pin"
+                app:title=""
+                tools:ignore="UnusedAttribute">
 
-                <android.support.v7.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    style="@style/Toolbar48"
-                    app:layout_collapseMode="pin"
-                    app:title=""
-                    tools:ignore="UnusedAttribute">
+                <TextView
+                    android:id="@+id/title"
+                    style="@style/BigTitleTextAppearance"
+                    android:text="@string/queue" />
 
-                    <TextView
-                        android:id="@+id/title"
-                        style="@style/BigTitleTextAppearance"
-                        android:text="@string/queue"  />
-
-                </android.support.v7.widget.Toolbar>
-            </FrameLayout>
-        </android.support.design.widget.CollapsingToolbarLayout>
+            </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
 
         <TextView
             android:id="@+id/player_queue_sub_header"
@@ -60,11 +50,11 @@
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:background="?dividerColor" />
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml
index 68a1067d..cbceb443 100644
--- a/app/src/main/res/layout/activity_playlist_detail.xml
+++ b/app/src/main/res/layout/activity_playlist_detail.xml
@@ -15,18 +15,18 @@
         <include layout="@layout/status_bar" />
     </FrameLayout>
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:elevation="0dp"
-            app:elevation="0dp">
+            android:elevation="@dimen/card_elevation"
+            app:elevation="@dimen/card_elevation">
 
-            <android.support.design.widget.CollapsingToolbarLayout
+            <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="48dp" />
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/toolbar"
                         style="@style/Toolbar48"
                         app:layout_collapseMode="pin"
@@ -53,15 +53,15 @@
                             android:id="@+id/title"
                             style="@style/BigTitleTextAppearance" />
 
-                    </android.support.v7.widget.Toolbar>
+                    </androidx.appcompat.widget.Toolbar>
                 </FrameLayout>
-            </android.support.design.widget.CollapsingToolbarLayout>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="?dividerColor" />
-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
         <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
             android:id="@+id/recycler_view"
@@ -82,7 +82,7 @@
             android:textSize="@dimen/empty_text_size"
             android:visibility="gone" />
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/action_shuffle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -90,5 +90,5 @@
             android:layout_margin="16dp"
             android:src="@drawable/ic_shuffle_white_24dp"
             app:layout_behavior="code.name.monkey.retromusic.misc.ScrollAwareFABBehavior" />
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_pro_version.xml b/app/src/main/res/layout/activity_pro_version.xml
index 52f21e8f..3cd321fe 100644
--- a/app/src/main/res/layout/activity_pro_version.xml
+++ b/app/src/main/res/layout/activity_pro_version.xml
@@ -2,7 +2,6 @@
 <RelativeLayout 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"
@@ -16,65 +15,55 @@
         <include layout="@layout/status_bar" />
     </FrameLayout>
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/status_bar_container"
         android:layout_alignParentStart="true">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:elevation="0dp"
             app:elevation="0dp">
 
-            <android.support.design.widget.CollapsingToolbarLayout
+            <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:titleEnabled="false">
 
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
 
-                    <View
-                        android:id="@+id/cab_stub"
-                        android:layout_width="match_parent"
-                        android:layout_height="48dp" />
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar48"
+                    app:layout_collapseMode="pin"
+                    tools:ignore="UnusedAttribute">
 
-                    <android.support.v7.widget.Toolbar
-                        android:id="@+id/toolbar"
-                        style="@style/Toolbar48"
-                        app:layout_collapseMode="pin"
-                        app:title=""
-                        tools:ignore="UnusedAttribute">
+                    <TextView
+                        android:id="@+id/title"
+                        style="@style/BigTitleTextAppearance"
+                        android:text="@string/buy_retromusic_pro" />
 
-                        <TextView
-                            android:id="@+id/title"
-                            style="@style/BigTitleTextAppearance"
-                            android:text="@string/buy_retromusic_pro" />
-
-                    </android.support.v7.widget.Toolbar>
-                </FrameLayout>
-            </android.support.design.widget.CollapsingToolbarLayout>
+                </androidx.appcompat.widget.Toolbar>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="?dividerColor" />
-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
-        <android.support.v4.widget.NestedScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
             <include layout="@layout/activity_pro_version_content" />
-        </android.support.v4.widget.NestedScrollView>
-    </android.support.design.widget.CoordinatorLayout>
+        </androidx.core.widget.NestedScrollView>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
     <TextView
diff --git a/app/src/main/res/layout/activity_pro_version_content.xml b/app/src/main/res/layout/activity_pro_version_content.xml
index e83e2bfa..2f05ff4c 100644
--- a/app/src/main/res/layout/activity_pro_version_content.xml
+++ b/app/src/main/res/layout/activity_pro_version_content.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:cardCornerRadius="12dp"
@@ -153,7 +153,7 @@
                     android:text="@string/restore"
                     android:textColor="@color/md_white_1000" />
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -174,12 +174,12 @@
                         android:paddingTop="16dp"
                         android:text="@string/purchase"
                         android:textColor="@color/md_white_1000" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
             </LinearLayout>
 
         </LinearLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 6176c8aa..3460ca57 100755
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -18,7 +18,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/search"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -56,13 +56,13 @@
                     android:padding="8dp"
                     app:srcCompat="@drawable/ic_mic_white_24dp" />
             </LinearLayout>
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@android:id/empty"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
                 android:visibility="gone"
                 tools:visibility="visible" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 05c9f910..d21a85f5 100755
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:titleEnabled="false">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 style="@style/Toolbar48"
                 app:layout_collapseMode="pin"
@@ -30,9 +30,9 @@
                     style="@style/BigTitleTextAppearance"
                     android:text="@string/action_settings" />
 
-            </android.support.v7.widget.Toolbar>
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+            </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
 
     <FrameLayout
@@ -41,5 +41,5 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index 88767dcf..69b684c3 100755
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -1,4 +1,4 @@
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -6,20 +6,20 @@
     android:focusable="true"
     android:focusableInTouchMode="true">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:ignore="UnusedAttribute">
 
-            <android.support.design.widget.CollapsingToolbarLayout
+            <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
                         android:visibility="gone" />
                 </FrameLayout>
 
-                <android.support.v7.widget.Toolbar
+                <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
                     style="@style/Toolbar48"
                     app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
@@ -57,18 +57,18 @@
                         tools:ignore="MissingPrefix" />
 
 
-                </android.support.v7.widget.Toolbar>
-            </android.support.design.widget.CollapsingToolbarLayout>
+                </androidx.appcompat.widget.Toolbar>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="?dividerColor" />
-        </android.support.design.widget.AppBarLayout>
-    </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -81,7 +81,7 @@
             android:padding="16dp">
 
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -97,9 +97,9 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Title"
                     android:textColor="?android:attr/textColorPrimary" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -114,10 +114,10 @@
                     android:maxLines="1"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title"
                     android:textColor="?android:attr/textColorPrimary" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -133,9 +133,9 @@
                     android:maxLines="1"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -151,14 +151,14 @@
                     android:maxLines="1"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
@@ -174,10 +174,10 @@
                         android:maxLines="1"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
@@ -194,10 +194,10 @@
                         android:maxLines="1"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -213,9 +213,9 @@
                     android:maxLines="1"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -230,14 +230,14 @@
                     android:inputType="textMultiLine"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/save_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -254,5 +254,5 @@
         android:visibility="gone" />
 
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index de2bbe60..83f3b5eb 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -8,4 +8,4 @@
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"  />
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/artist_sub_header.xml b/app/src/main/res/layout/artist_sub_header.xml
deleted file mode 100644
index f5c33b84..00000000
--- a/app/src/main/res/layout/artist_sub_header.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/title"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="8dp"
-    android:paddingEnd="16dp"
-    android:paddingStart="72dp"
-    android:paddingTop="16dp"
-    android:text="@string/songs"
-    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-    android:textColor="?attr/colorAccent"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bread_crumb.xml b/app/src/main/res/layout/bread_crumb.xml
index 222105cd..51b6262c 100644
--- a/app/src/main/res/layout/bread_crumb.xml
+++ b/app/src/main/res/layout/bread_crumb.xml
@@ -24,7 +24,7 @@
         tools:text="Storage"
         tools:textColor="#000" />
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:scaleType="fitXY"
diff --git a/app/src/main/res/layout/card_credit.xml b/app/src/main/res/layout/card_credit.xml
index 2a10b3ce..c5f8a6e7 100644
--- a/app/src/main/res/layout/card_credit.xml
+++ b/app/src/main/res/layout/card_credit.xml
@@ -1,185 +1,184 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical">
-
-  <android.support.v7.widget.CardView
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardCornerRadius="12dp"
-    app:cardElevation="8dp"
-    app:cardPreventCornerOverlap="false"
-    app:cardUseCompatPadding="true">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="@drawable/gradient_1"
-      android:orientation="vertical">
-
-      <TextView
-        fontPath="@string/circular_std_black"
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp"
-        android:text="@string/credit_title"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-        android:textColor="@color/md_white_1000"
-        tools:ignore="MissingPrefix"/>
-
-      <LinearLayout
-        android:id="@+id/marko_name_link"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="16dp"
-        android:paddingEnd="0dp"
-        android:background="?attr/rectSelector"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center_vertical"
-        android:minHeight="@dimen/md_listitem_height"
-        android:orientation="horizontal"
-        tools:ignore="PrivateResource">
-
-        <code.name.monkey.retromusic.views.NetworkImageView
-          android:layout_width="40dp"
-          android:layout_height="40dp"
-          app:civ_border="false"
-          app:civ_shadow="false"
-          app:url_link="https://avatars2.githubusercontent.com/u/35743654?s=400&amp;u=f8b4a90a352a661625ae71d455a82aaa9bc3316b&amp;v=4"/>
+        app:cardCornerRadius="12dp"
+        app:cardPreventCornerOverlap="false"
+        app:cardUseCompatPadding="true">
 
         <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:paddingTop="8dp"
-          android:paddingBottom="8dp"
-          android:paddingStart="16dp"
-          android:paddingEnd="16dp"
-          android:orientation="vertical">
-
-          <android.support.v7.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/marko_name"
-            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-            android:textColor="@color/md_white_1000"/>
+            android:background="@drawable/gradient_1"
+            android:orientation="vertical">
 
-          <android.support.v7.widget.AppCompatTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:alpha="0.85"
-            android:text="@string/marko_summary"
-            android:textColor="@color/md_white_1000"/>
+            <TextView
+                fontPath="@string/circular_std_black"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="12dp"
+                android:text="@string/credit_title"
+                android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                android:textColor="@color/md_white_1000"
+                tools:ignore="MissingPrefix" />
+
+            <LinearLayout
+                android:id="@+id/marko_name_link"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/rectSelector"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:minHeight="@dimen/md_listitem_height"
+                android:orientation="horizontal"
+                android:paddingStart="16dp"
+                android:paddingEnd="0dp"
+                tools:ignore="PrivateResource">
+
+                <code.name.monkey.retromusic.views.NetworkImageView
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    app:civ_border="false"
+                    app:civ_shadow="false"
+                    app:url_link="https://avatars2.githubusercontent.com/u/35743654?s=400&amp;u=f8b4a90a352a661625ae71d455a82aaa9bc3316b&amp;v=4" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingStart="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="8dp">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/marko_name"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                        android:textColor="@color/md_white_1000" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:alpha="0.85"
+                        android:text="@string/marko_summary"
+                        android:textColor="@color/md_white_1000" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/gaurav_singh_link"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/rectSelector"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:minHeight="@dimen/md_listitem_height"
+                android:orientation="horizontal"
+                android:paddingStart="16dp"
+                android:paddingEnd="0dp"
+                tools:ignore="PrivateResource">
+
+                <code.name.monkey.retromusic.views.NetworkImageView
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    app:civ_border="false"
+                    app:civ_shadow="false"
+                    app:url_link="https://cdn5.telesco.pe/file/Gnko_d39iKSqzKhsVK53sjUFz_sfLKe_OpxFE9kR-VUEjDbm6SOr8CT09tyI3zhDSuTowqOhNY4nogFx1Z8QbixyZLAWccl94JdX4dqkPrZyHMS9K7xUzq-wgZCoNIbO8_eAnGOy8Gmu3-uzLuQf2u3G7BRIxm5mzqwqGoeX7_V-fcs3Lr6Br7hPFeCHSm1U39I69E3R9ovs-kPfxCpze-riCjD-QhwwOEOfiudx9OmkmLJGvYugX2EpHSBFfNh6WFQEvBAvR6xPrXul3LxZEebH0xwz5HX-bmyuoxdGaW0J4ywDgiiu4I7cfUJe8lKqWwkPQRg8zTtYNiG3MZio7w.jpg" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingStart="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="8dp">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/gaurav_singh_name"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                        android:textColor="@color/md_white_1000" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:alpha="0.85"
+                        android:text="@string/moderator"
+                        android:textColor="@color/md_white_1000" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/yt_gaming_link"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/rectSelector"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:minHeight="@dimen/md_listitem_height"
+                android:orientation="horizontal"
+                android:paddingStart="16dp"
+                android:paddingEnd="0dp"
+                tools:ignore="PrivateResource">
+
+                <code.name.monkey.retromusic.views.NetworkImageView
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    app:civ_border="false"
+                    app:civ_shadow="false"
+                    app:url_link="https://cdn.discordapp.com/attachments/469540889883181077/471361944385880065/91_98910_29110_20180616_17122501.jpg" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingStart="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="8dp">
+
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/yt_gaming_name"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                        android:textColor="@color/md_white_1000" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:alpha="0.85"
+                        android:text="@string/yt_gaming_summary"
+                        android:textColor="@color/md_white_1000" />
+                </LinearLayout>
+            </LinearLayout>
         </LinearLayout>
-      </LinearLayout>
+    </androidx.cardview.widget.CardView>
 
-      <LinearLayout
-        android:id="@+id/gaurav_singh_link"
-        android:layout_width="match_parent"
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/made_text"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingStart="16dp"
-        android:paddingEnd="0dp"
-        android:background="?attr/rectSelector"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center_vertical"
-        android:minHeight="@dimen/md_listitem_height"
-        android:orientation="horizontal"
-        tools:ignore="PrivateResource">
-
-        <code.name.monkey.retromusic.views.NetworkImageView
-          android:layout_width="40dp"
-          android:layout_height="40dp"
-          app:civ_border="false"
-          app:civ_shadow="false"
-          app:url_link="https://cdn5.telesco.pe/file/Gnko_d39iKSqzKhsVK53sjUFz_sfLKe_OpxFE9kR-VUEjDbm6SOr8CT09tyI3zhDSuTowqOhNY4nogFx1Z8QbixyZLAWccl94JdX4dqkPrZyHMS9K7xUzq-wgZCoNIbO8_eAnGOy8Gmu3-uzLuQf2u3G7BRIxm5mzqwqGoeX7_V-fcs3Lr6Br7hPFeCHSm1U39I69E3R9ovs-kPfxCpze-riCjD-QhwwOEOfiudx9OmkmLJGvYugX2EpHSBFfNh6WFQEvBAvR6xPrXul3LxZEebH0xwz5HX-bmyuoxdGaW0J4ywDgiiu4I7cfUJe8lKqWwkPQRg8zTtYNiG3MZio7w.jpg"/>
-
-        <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:paddingTop="8dp"
-          android:paddingBottom="8dp"
-          android:paddingStart="16dp"
-          android:paddingEnd="16dp"
-          android:orientation="vertical">
-
-          <android.support.v7.widget.AppCompatTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/gaurav_singh_name"
-            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-            android:textColor="@color/md_white_1000"/>
-
-          <android.support.v7.widget.AppCompatTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:alpha="0.85"
-            android:text="@string/moderator"
-            android:textColor="@color/md_white_1000"/>
-        </LinearLayout>
-      </LinearLayout>
-
-      <LinearLayout
-        android:id="@+id/yt_gaming_link"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="16dp"
-        android:paddingEnd="0dp"
-        android:background="?attr/rectSelector"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center_vertical"
-        android:minHeight="@dimen/md_listitem_height"
-        android:orientation="horizontal"
-        tools:ignore="PrivateResource">
-
-        <code.name.monkey.retromusic.views.NetworkImageView
-          android:layout_width="40dp"
-          android:layout_height="40dp"
-          app:civ_border="false"
-          app:civ_shadow="false"
-          app:url_link="https://cdn.discordapp.com/attachments/469540889883181077/471361944385880065/91_98910_29110_20180616_17122501.jpg"/>
-
-        <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:paddingTop="8dp"
-          android:paddingBottom="8dp"
-          android:paddingStart="16dp"
-          android:paddingEnd="16dp"
-          android:orientation="vertical">
-
-
-          <android.support.v7.widget.AppCompatTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/yt_gaming_name"
-            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-            android:textColor="@color/md_white_1000"/>
-
-          <android.support.v7.widget.AppCompatTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:alpha="0.85"
-            android:text="@string/yt_gaming_summary"
-            android:textColor="@color/md_white_1000"/>
-        </LinearLayout>
-      </LinearLayout>
-    </LinearLayout>
-  </android.support.v7.widget.CardView>
-
-  <android.support.v7.widget.AppCompatTextView
-    android:id="@+id/made_text"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:padding="16dp"
-    android:gravity="center"
-    android:text="@string/made_with_love"
-    android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
-    android:textColor="?android:attr/textColorSecondary"
-    android:textSize="12sp"/>
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:padding="16dp"
+        android:text="@string/made_with_love"
+        android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="12sp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_donate.xml b/app/src/main/res/layout/card_donate.xml
deleted file mode 100644
index 22a582dd..00000000
--- a/app/src/main/res/layout/card_donate.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardCornerRadius="12dp"
-    app:cardElevation="8dp"
-    app:cardPreventCornerOverlap="false"
-    app:cardUseCompatPadding="true">
-
-    <LinearLayout
-        android:id="@+id/donation"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/gradient_4"
-        android:orientation="vertical">
-
-        <TextView
-            fontPath="@string/circular_std_black"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:text="@string/support_development"
-            android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="@color/md_white_1000"
-            tools:ignore="MissingPrefix" />
-
-
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingEnd="16dp"
-            android:paddingStart="16dp">
-
-            <android.support.v7.widget.CardView
-                android:id="@+id/pro_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/social_buttons"
-                android:foreground="?rectSelector"
-                app:cardCornerRadius="24dp"
-                app:cardElevation="6dp"
-                app:cardPreventCornerOverlap="false"
-                app:cardUseCompatPadding="true">
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:id="@+id/buy_pro"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:background="@drawable/gradient_7"
-                    android:gravity="center"
-                    android:padding="16dp"
-                    android:text="@string/buy_retromusic_pro"
-                    android:textColor="@color/md_white_1000" />
-            </android.support.v7.widget.CardView>
-
-        </LinearLayout>
-    </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_luis_gomez.xml b/app/src/main/res/layout/card_luis_gomez.xml
deleted file mode 100644
index 032a230e..00000000
--- a/app/src/main/res/layout/card_luis_gomez.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardCornerRadius="12dp"
-    app:cardElevation="8dp"
-    app:cardPreventCornerOverlap="false"
-    app:cardUseCompatPadding="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/gradient_2"
-        android:orientation="vertical"
-        android:padding="8dp">
-
-        <TextView
-            fontPath="@string/circular_std_black"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:text="Special thanks to"
-            android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="@color/md_white_1000"
-            tools:ignore="MissingPrefix" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/rectSelector"
-            android:clickable="true"
-            android:gravity="center_vertical"
-            android:minHeight="@dimen/md_listitem_height"
-            android:orientation="horizontal">
-
-            <code.name.monkey.retromusic.views.CircularImageView
-                android:id="@+id/luis_gomez_profile"
-                android:layout_width="52dp"
-                android:layout_height="52dp"
-                android:layout_margin="8dp"
-                app:civ_border_width="0dp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingBottom="8dp"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp">
-
-
-                <TextView
-                    style="@style/TextAppearance.AppCompat.Subhead"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/luis_gomez"
-                    android:textColor="@color/md_white_1000" />
-
-                <TextView
-                    style="@style/TextAppearance.AppCompat.Caption"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:alpha="0.85"
-                    android:text="@string/luis_gomez_summary"
-                    android:textColor="@color/md_white_1000" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingEnd="0dp"
-            android:paddingStart="72dp">
-
-
-            <ImageButton
-                android:id="@+id/luisGomezGooglePlus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?roundSelector"
-                android:gravity="start|center_vertical"
-                android:padding="16dp"
-                android:textColor="@color/md_white_1000"
-                app:srcCompat="@drawable/ic_google_plus_white_24dp" />
-
-            <ImageButton
-                android:id="@+id/luisGomezTwitter"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?roundSelector"
-                android:padding="16dp"
-                android:textColor="@color/md_white_1000"
-                app:srcCompat="@drawable/ic_twitter_white_24dp" />
-        </LinearLayout>
-    </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_other.xml b/app/src/main/res/layout/card_other.xml
index 11204146..416ea7c3 100644
--- a/app/src/main/res/layout/card_other.xml
+++ b/app/src/main/res/layout/card_other.xml
@@ -1,126 +1,119 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView 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:tools="http://schemas.android.com/tools"
-    android:orientation="vertical">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardCornerRadius="12dp"
+    app:cardPreventCornerOverlap="false"
+    app:cardUseCompatPadding="true">
 
-    <android.support.v7.widget.CardView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:cardCornerRadius="12dp"
-        app:cardElevation="8dp"
-        app:cardPreventCornerOverlap="false"
-        app:cardUseCompatPadding="true">
+        android:background="@drawable/gradient_3"
+        android:orientation="vertical"
+        android:padding="8dp">
+
+        <TextView
+            fontPath="@string/circular_std_black"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="12dp"
+            android:text="@string/others"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="@color/md_white_1000"
+            tools:ignore="MissingPrefix" />
+
+        <LinearLayout
+            android:id="@+id/changelog"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/rectSelector"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="vertical"
+            android:paddingStart="16dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="16dp"
+            android:paddingBottom="8dp"
+            tools:ignore="PrivateResource">
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/changelog"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                android:textColor="@color/md_white_1000" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:alpha="0.85"
+                android:text="@string/changelog_summary"
+                android:textColor="@color/md_white_1000" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/open_source"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/rectSelector"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="vertical"
+            android:paddingStart="16dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="16dp"
+            android:paddingBottom="8dp"
+            tools:ignore="PrivateResource">
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/pref_title_open_source_licences"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                android:textColor="@color/md_white_1000" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:alpha="0.85"
+                android:text="@string/pref_summary_open_source_licences"
+                android:textColor="@color/md_white_1000" />
+        </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/gradient_3"
+            android:background="?attr/rectSelector"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
             android:orientation="vertical"
-            android:padding="8dp">
+            android:paddingStart="16dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="16dp"
+            android:paddingBottom="8dp"
+            tools:ignore="PrivateResource">
 
-            <TextView
-                fontPath="@string/circular_std_black"
-                tools:ignore="MissingPrefix"
+
+            <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:text="@string/others"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                android:text="@string/version"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                 android:textColor="@color/md_white_1000" />
 
-            <LinearLayout
-                android:id="@+id/changelog"
-                tools:ignore="PrivateResource"
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/app_version"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/rectSelector"
-                android:gravity="center_vertical"
-                android:minHeight="@dimen/md_listitem_height"
-                android:orientation="vertical"
-                android:paddingBottom="8dp"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp">
-
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/changelog"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="@color/md_white_1000" />
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:alpha="0.85"
-                    android:text="@string/changelog_summary"
-                    android:textColor="@color/md_white_1000" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/open_source"
-                tools:ignore="PrivateResource"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/rectSelector"
-                android:gravity="center_vertical"
-                android:minHeight="@dimen/md_listitem_height"
-                android:orientation="vertical"
-                android:paddingBottom="8dp"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp">
-
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/pref_title_open_source_licences"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="@color/md_white_1000" />
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:alpha="0.85"
-                    android:text="@string/pref_summary_open_source_licences"
-                    android:textColor="@color/md_white_1000" />
-            </LinearLayout>
-
-            <LinearLayout
-                tools:ignore="PrivateResource"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/rectSelector"
-                android:gravity="center_vertical"
-                android:minHeight="@dimen/md_listitem_height"
-                android:orientation="vertical"
-                android:paddingBottom="8dp"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp">
-
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/version"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="@color/md_white_1000" />
-
-                <android.support.v7.widget.AppCompatTextView
-                    android:id="@+id/app_version"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:alpha="0.85"
-                    android:text="0.0.0"
-                    android:textColor="@color/md_white_1000" />
-            </LinearLayout>
-
+                android:alpha="0.85"
+                android:text="0.0.0"
+                android:textColor="@color/md_white_1000" />
         </LinearLayout>
-    </android.support.v7.widget.CardView>
-</LinearLayout>
\ No newline at end of file
+
+    </LinearLayout>
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_retro_info.xml b/app/src/main/res/layout/card_retro_info.xml
index 7ab6ffbb..beb8ad77 100644
--- a/app/src/main/res/layout/card_retro_info.xml
+++ b/app/src/main/res/layout/card_retro_info.xml
@@ -1,294 +1,293 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  app:cardCornerRadius="12dp"
-  app:cardElevation="8dp"
-  app:cardPreventCornerOverlap="false"
-  app:cardUseCompatPadding="true">
-
-  <LinearLayout
-    android:id="@+id/app_support"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="8dp"
-    android:background="@drawable/gradient_6"
-    android:orientation="vertical">
-
-    <TextView
-      fontPath="@string/circular_std_black"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:padding="12dp"
-      android:text="@string/support_development"
-      android:textAppearance="@style/TextAppearance.AppCompat.Title"
-      android:textColor="@color/md_white_1000"
-      tools:ignore="MissingPrefix"/>
+    app:cardCornerRadius="12dp"
+    app:cardPreventCornerOverlap="false"
+    app:cardUseCompatPadding="true">
 
     <LinearLayout
-      android:id="@+id/app_github"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="?attr/rectSelector"
-      android:clickable="true"
-      android:focusable="true"
-      android:gravity="center_vertical"
-      android:minHeight="@dimen/md_listitem_height"
-      android:orientation="horizontal"
-      tools:ignore="PrivateResource">
-
-      <android.support.v7.widget.AppCompatImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:contentDescription="@string/social_buttons"
-        app:srcCompat="@drawable/ic_github_circle_white_24dp"
-        app:tint="@color/md_white_1000"/>
-
-      <LinearLayout
+        android:id="@+id/app_support"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:orientation="vertical">
+        android:background="@drawable/gradient_6"
+        android:orientation="vertical"
+        android:padding="8dp">
+
+        <TextView
+            fontPath="@string/circular_std_black"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="12dp"
+            android:text="@string/support_development"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="@color/md_white_1000"
+            tools:ignore="MissingPrefix" />
+
+        <LinearLayout
+            android:id="@+id/app_github"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/rectSelector"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            tools:ignore="PrivateResource">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/social_buttons"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_github_circle_white_24dp"
+                app:tint="@color/md_white_1000" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
 
 
-        <android.support.v7.widget.AppCompatTextView
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/git_hub"
-          android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-          android:textColor="@color/md_white_1000"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/git_hub"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    android:textColor="@color/md_white_1000" />
 
-        <android.support.v7.widget.AppCompatTextView
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:alpha="0.85"
-          android:text="@string/git_hub_summary"
-          android:textColor="@color/md_white_1000"/>
-      </LinearLayout>
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.85"
+                    android:text="@string/git_hub_summary"
+                    android:textColor="@color/md_white_1000" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/app_translation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/rectSelector"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            tools:ignore="PrivateResource">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/social_buttons"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_flag_white_24dp"
+                app:tint="@color/md_white_1000" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/translate"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    android:textColor="@color/md_white_1000" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.85"
+                    android:text="@string/translate_community"
+                    android:textColor="@color/md_white_1000" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/app_rate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/rectSelector"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            tools:ignore="PrivateResource">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/social_buttons"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_star_white_24dp"
+                app:tint="@color/md_white_1000" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/rate_app"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    android:textColor="@color/md_white_1000" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.85"
+                    android:text="@string/rate_on_google_play_summary"
+                    android:textColor="@color/md_white_1000" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/donate_link"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/rectSelector"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            tools:ignore="PrivateResource">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/social_buttons"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_card_giftcard_white_24dp"
+                app:tint="@color/md_white_1000" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/donate"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    android:textColor="@color/md_white_1000" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.85"
+                    android:text="@string/donate_summary"
+                    android:textColor="@color/md_white_1000" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/app_share"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/rectSelector"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            tools:ignore="PrivateResource">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/social_buttons"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_share_white_24dp"
+                app:tint="@color/md_white_1000" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/action_share"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    android:textColor="@color/md_white_1000" />
+
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/faq_link"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/rectSelector"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            tools:ignore="PrivateResource">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/social_buttons"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_help_white_24dp"
+                app:tint="@color/md_white_1000" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/faq"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    android:textColor="@color/md_white_1000" />
+
+            </LinearLayout>
+        </LinearLayout>
     </LinearLayout>
-
-    <LinearLayout
-      android:id="@+id/app_translation"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="?attr/rectSelector"
-      android:clickable="true"
-      android:focusable="true"
-      android:gravity="center_vertical"
-      android:minHeight="@dimen/md_listitem_height"
-      android:orientation="horizontal"
-      tools:ignore="PrivateResource">
-
-      <android.support.v7.widget.AppCompatImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:contentDescription="@string/social_buttons"
-        app:srcCompat="@drawable/ic_flag_white_24dp"
-        app:tint="@color/md_white_1000"/>
-
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:orientation="vertical">
-
-
-        <android.support.v7.widget.AppCompatTextView
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/translate"
-          android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-          android:textColor="@color/md_white_1000"/>
-
-        <android.support.v7.widget.AppCompatTextView
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:alpha="0.85"
-          android:text="@string/translate_community"
-          android:textColor="@color/md_white_1000"/>
-      </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-      android:id="@+id/app_rate"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="?attr/rectSelector"
-      android:clickable="true"
-      android:focusable="true"
-      android:gravity="center_vertical"
-      android:minHeight="@dimen/md_listitem_height"
-      android:orientation="horizontal"
-      tools:ignore="PrivateResource">
-
-      <android.support.v7.widget.AppCompatImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:contentDescription="@string/social_buttons"
-        app:srcCompat="@drawable/ic_star_white_24dp"
-        app:tint="@color/md_white_1000"/>
-
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:orientation="vertical">
-
-
-        <android.support.v7.widget.AppCompatTextView
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/rate_app"
-          android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-          android:textColor="@color/md_white_1000"/>
-
-        <android.support.v7.widget.AppCompatTextView
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:alpha="0.85"
-          android:text="@string/rate_on_google_play_summary"
-          android:textColor="@color/md_white_1000"/>
-      </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-      android:id="@+id/donate_link"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="?attr/rectSelector"
-      android:clickable="true"
-      android:focusable="true"
-      android:gravity="center_vertical"
-      android:minHeight="@dimen/md_listitem_height"
-      android:orientation="horizontal"
-      tools:ignore="PrivateResource">
-
-      <android.support.v7.widget.AppCompatImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:contentDescription="@string/social_buttons"
-        app:srcCompat="@drawable/ic_card_giftcard_white_24dp"
-        app:tint="@color/md_white_1000"/>
-
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:orientation="vertical">
-
-
-        <android.support.v7.widget.AppCompatTextView
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/donate"
-          android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-          android:textColor="@color/md_white_1000"/>
-
-        <android.support.v7.widget.AppCompatTextView
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:alpha="0.85"
-          android:text="@string/donate_summary"
-          android:textColor="@color/md_white_1000"/>
-      </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-      android:id="@+id/app_share"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="?attr/rectSelector"
-      android:clickable="true"
-      android:focusable="true"
-      android:gravity="center_vertical"
-      android:minHeight="@dimen/md_listitem_height"
-      android:orientation="horizontal"
-      tools:ignore="PrivateResource">
-
-      <android.support.v7.widget.AppCompatImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:contentDescription="@string/social_buttons"
-        app:srcCompat="@drawable/ic_share_white_24dp"
-        app:tint="@color/md_white_1000"/>
-
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:orientation="vertical">
-
-
-        <android.support.v7.widget.AppCompatTextView
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/action_share"
-          android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-          android:textColor="@color/md_white_1000"/>
-
-      </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-      android:id="@+id/faq_link"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="?attr/rectSelector"
-      android:clickable="true"
-      android:focusable="true"
-      android:gravity="center_vertical"
-      android:minHeight="@dimen/md_listitem_height"
-      android:orientation="horizontal"
-      tools:ignore="PrivateResource">
-
-      <android.support.v7.widget.AppCompatImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:contentDescription="@string/social_buttons"
-        app:srcCompat="@drawable/ic_help_white_24dp"
-        app:tint="@color/md_white_1000"/>
-
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:orientation="vertical">
-
-
-        <android.support.v7.widget.AppCompatTextView
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/faq"
-          android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-          android:textColor="@color/md_white_1000"/>
-
-      </LinearLayout>
-    </LinearLayout>
-  </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_social.xml b/app/src/main/res/layout/card_social.xml
index ca0d8e9a..13b9469a 100644
--- a/app/src/main/res/layout/card_social.xml
+++ b/app/src/main/res/layout/card_social.xml
@@ -1,255 +1,248 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="wrap_content"
+    app:cardCornerRadius="12dp"
+    app:cardPreventCornerOverlap="false"
+    app:cardUseCompatPadding="true">
 
-    <android.support.v7.widget.CardView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:cardCornerRadius="12dp"
-        app:cardElevation="8dp"
-        app:cardPreventCornerOverlap="false"
-        app:cardUseCompatPadding="true">
+        android:background="@drawable/gradient_8"
+        android:orientation="vertical"
+        android:padding="8dp">
 
-        <LinearLayout
+
+        <TextView
+            fontPath="@string/circular_std_black"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/gradient_8"
-            android:orientation="vertical"
-            android:padding="8dp">
+            android:padding="12dp"
+            android:text="@string/social"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="@color/md_white_1000"
+            tools:ignore="MissingPrefix" />
 
+        <LinearLayout
+            android:id="@+id/instagram_link"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/rectSelector"
+            android:clickable="true"
+            android:focusable="true"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            tools:ignore="PrivateResource">
 
-            <TextView
-                fontPath="@string/circular_std_black"
-                android:layout_width="match_parent"
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:text="@string/social"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="@color/md_white_1000"
-                tools:ignore="MissingPrefix" />
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_instagram"
+                app:tint="@color/md_white_1000" />
 
             <LinearLayout
-                android:id="@+id/instagram_link"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/rectSelector"
-                android:clickable="true"
-                android:focusable="true"
-                android:minHeight="@dimen/md_listitem_height"
-                android:orientation="horizontal"
-                tools:ignore="PrivateResource">
+                android:orientation="vertical"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
 
-                <android.support.v7.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:padding="16dp"
-                    app:srcCompat="@drawable/ic_instagram"
-                    app:tint="@color/md_white_1000" />
 
-                <LinearLayout
+                <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingStart="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="16dp"
-                    android:paddingBottom="8dp">
+                    android:text="@string/instagram_page"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    android:textColor="@color/md_white_1000" />
 
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/instagram_page"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                        android:textColor="@color/md_white_1000" />
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:alpha="0.85"
-                        android:text="@string/instagram_page_summary"
-                        android:textColor="@color/md_white_1000" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/twitter_link"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/rectSelector"
-                android:clickable="true"
-                android:focusable="true"
-                android:minHeight="@dimen/md_listitem_height"
-                android:orientation="horizontal"
-                tools:ignore="PrivateResource">
-
-                <android.support.v7.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:padding="16dp"
-                    app:srcCompat="@drawable/ic_twitter_white_24dp"
-                    app:tint="@color/md_white_1000" />
-
-                <LinearLayout
+                <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingStart="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="16dp"
-                    android:paddingBottom="8dp">
-
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/twitter_page"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                        android:textColor="@color/md_white_1000" />
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:alpha="0.85"
-                        android:text="@string/twitter_page_summary"
-                        android:textColor="@color/md_white_1000" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/discord_link"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/rectSelector"
-                android:clickable="true"
-                android:focusable="true"
-                android:minHeight="@dimen/md_listitem_height"
-                android:orientation="horizontal"
-                tools:ignore="PrivateResource">
-
-                <android.support.v7.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:padding="16dp"
-                    app:srcCompat="@drawable/ic_discord_white_24dp"
-                    app:tint="@color/md_white_1000" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingStart="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="16dp"
-                    android:paddingBottom="8dp">
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/discord_page"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                        android:textColor="@color/md_white_1000" />
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:alpha="0.85"
-                        android:text="@string/discord_summary"
-                        android:textColor="@color/md_white_1000" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/telegram_link"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/rectSelector"
-                android:clickable="true"
-                android:focusable="true"
-                android:minHeight="@dimen/md_listitem_height"
-                android:orientation="horizontal"
-                tools:ignore="PrivateResource">
-
-                <android.support.v7.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:padding="16dp"
-                    app:srcCompat="@drawable/ic_telegram_white"
-                    app:tint="@color/md_white_1000" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingStart="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="16dp"
-                    android:paddingBottom="8dp">
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/telegram_group"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                        android:textColor="@color/md_white_1000" />
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:alpha="0.85"
-                        android:text="@string/telegram_group_summary"
-                        android:textColor="@color/md_white_1000" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/app_google_plus"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/rectSelector"
-                android:clickable="true"
-                android:focusable="true"
-                android:minHeight="@dimen/md_listitem_height"
-                android:orientation="horizontal"
-                tools:ignore="PrivateResource">
-
-                <android.support.v7.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:contentDescription="@string/social_buttons"
-                    android:padding="16dp"
-                    app:srcCompat="@drawable/ic_google_circles_communities_white_24dp"
-                    app:tint="@color/md_white_1000" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingStart="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="16dp"
-                    android:paddingBottom="8dp">
-
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/google_plus"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                        android:textColor="@color/md_white_1000" />
-
-                    <android.support.v7.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:alpha="0.85"
-                        android:text="@string/google_plus_community"
-                        android:textColor="@color/md_white_1000" />
-                </LinearLayout>
+                    android:alpha="0.85"
+                    android:text="@string/instagram_page_summary"
+                    android:textColor="@color/md_white_1000" />
             </LinearLayout>
         </LinearLayout>
-    </android.support.v7.widget.CardView>
-</LinearLayout>
\ No newline at end of file
+
+        <LinearLayout
+            android:id="@+id/twitter_link"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/rectSelector"
+            android:clickable="true"
+            android:focusable="true"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            tools:ignore="PrivateResource">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_twitter_white_24dp"
+                app:tint="@color/md_white_1000" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/twitter_page"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    android:textColor="@color/md_white_1000" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.85"
+                    android:text="@string/twitter_page_summary"
+                    android:textColor="@color/md_white_1000" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/discord_link"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/rectSelector"
+            android:clickable="true"
+            android:focusable="true"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            tools:ignore="PrivateResource">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_discord_white_24dp"
+                app:tint="@color/md_white_1000" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/discord_page"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    android:textColor="@color/md_white_1000" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.85"
+                    android:text="@string/discord_summary"
+                    android:textColor="@color/md_white_1000" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/telegram_link"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/rectSelector"
+            android:clickable="true"
+            android:focusable="true"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            tools:ignore="PrivateResource">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_telegram_white"
+                app:tint="@color/md_white_1000" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/telegram_group"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    android:textColor="@color/md_white_1000" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.85"
+                    android:text="@string/telegram_group_summary"
+                    android:textColor="@color/md_white_1000" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/app_google_plus"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/rectSelector"
+            android:clickable="true"
+            android:focusable="true"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            tools:ignore="PrivateResource">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/social_buttons"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_google_circles_communities_white_24dp"
+                app:tint="@color/md_white_1000" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/google_plus"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    android:textColor="@color/md_white_1000" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.85"
+                    android:text="@string/google_plus_community"
+                    android:textColor="@color/md_white_1000" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_banner_home.xml b/app/src/main/res/layout/content_banner_home.xml
new file mode 100644
index 00000000..b5ddfaa9
--- /dev/null
+++ b/app/src/main/res/layout/content_banner_home.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/content_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:background="@color/md_white_1000"
+    android:elevation="@dimen/card_elevation"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:showIn="@layout/fragment_banner_home">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:descendantFocusability="blocksDescendants"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical">
+
+        <include layout="@layout/abs_playlists" />
+
+        <include layout="@layout/home_section_content" />
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
+        
+        
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_add_to_playlist.xml b/app/src/main/res/layout/dialog_add_to_playlist.xml
index 8908cbd7..2d4dc77e 100644
--- a/app/src/main/res/layout/dialog_add_to_playlist.xml
+++ b/app/src/main/res/layout/dialog_add_to_playlist.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical">
-
-  <LinearLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-      android:id="@+id/title"
-      fontPath="@string/circular_std_black"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:padding="14dp"
-      android:text="@string/add_playlist_title"
-      android:textAppearance="@style/TextAppearance.AppCompat.Title"
-      tools:ignore="MissingPrefix"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
-    <code.name.monkey.retromusic.views.IconImageView
-      android:id="@+id/action_add_playlist"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_weight="0"
-      android:padding="12dp"
-      android:text="@string/new_playlist_title"
-      app:srcCompat="@drawable/ic_playlist_add_white_24dp"/>
-  </LinearLayout>
+        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+            android:id="@+id/title"
+            fontPath="@string/circular_std_black"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="14dp"
+            android:text="@string/add_playlist_title"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            tools:ignore="MissingPrefix" />
 
-  <View
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="?dividerColor"/>
+        <code.name.monkey.retromusic.views.IconImageView
+            android:id="@+id/action_add_playlist"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:padding="12dp"
+            android:text="@string/new_playlist_title"
+            app:srcCompat="@drawable/ic_playlist_add_white_24dp" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?dividerColor" />
 
 
-  <android.support.v7.widget.RecyclerView
-    android:id="@+id/playlists"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"/>
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/playlists"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_changelog.xml b/app/src/main/res/layout/dialog_changelog.xml
index 65162132..e6b4cdde 100644
--- a/app/src/main/res/layout/dialog_changelog.xml
+++ b/app/src/main/res/layout/dialog_changelog.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:paddingLeft="16dp"
    android:paddingRight="16dp">

    <WebView
        android:id="@+id/web_view"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:scrollbars="none" />

</FrameLayout>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:padding="12dp" >

    <WebView
        android:id="@+id/web_view"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:scrollbars="none" />

</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_create_playlist.xml b/app/src/main/res/layout/dialog_create_playlist.xml
index 6daaae40..cd2b91f6 100644
--- a/app/src/main/res/layout/dialog_create_playlist.xml
+++ b/app/src/main/res/layout/dialog_create_playlist.xml
@@ -5,33 +5,44 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="8dp">
+    android:padding="12dp">
 
-    <TextView
+    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
         fontPath="@string/circular_std_black"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
         android:padding="6dp"
+        android:id="@+id/title"
         android:text="@string/new_playlist_title"
         android:textAppearance="@style/TextAppearance.AppCompat.Title"
         android:textColor="?android:attr/textColorPrimary"
         tools:ignore="MissingPrefix" />
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/action_new_playlist"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:boxBackgroundMode="outline"
+        app:boxCollapsedPaddingTop="16dp"
+        app:boxCornerRadiusBottomEnd="8dp"
+        app:boxCornerRadiusBottomStart="8dp"
+        app:boxCornerRadiusTopEnd="8dp"
+        app:boxCornerRadiusTopStart="8dp"
+        app:boxStrokeColor="@color/md_grey_700"
+        app:boxStrokeWidth="1dp"
+        app:hintEnabled="true">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/option_1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@null"
             android:hint="@string/playlist_name_empty"
             android:inputType="textPersonName|textCapWords|text"
-            android:paddingTop="14dp"
-            android:paddingBottom="14dp"
+            android:padding="16dp"
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -39,48 +50,22 @@
         android:gravity="end"
         android:padding="12dp">
 
-        <android.support.v7.widget.CardView
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/action_cancel"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
-            app:cardBackgroundColor="@color/md_white_1000"
-            app:cardCornerRadius="6dp"
-            app:cardElevation="0dp"
-            app:cardUseCompatPadding="true">
+            android:text="@string/cancel_current_timer"
+            app:strokeColor="@color/md_grey_700"
+            app:strokeWidth="1dp" />
 
-            <TextView
-                android:id="@+id/action_cancel"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:paddingStart="28dp"
-                android:paddingTop="12dp"
-                android:paddingEnd="28dp"
-                android:paddingBottom="12dp"
-                android:text="@string/cancel_current_timer"
-                android:textColor="@color/black_p50" />
-        </android.support.v7.widget.CardView>
-
-        <android.support.v7.widget.CardView
-            android:id="@+id/action_create_container"
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/action_create"
+            style="@style/Widget.MaterialComponents.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
-            app:cardBackgroundColor="@color/md_red_A400"
-            app:cardCornerRadius="6dp"
-            app:cardUseCompatPadding="true">
-
-            <TextView
-                android:id="@+id/action_create"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:paddingStart="28dp"
-                android:paddingTop="12dp"
-                android:paddingEnd="28dp"
-                android:paddingBottom="12dp"
-                android:text="@string/create_action"
-                android:textColor="@color/md_white_1000" />
-        </android.support.v7.widget.CardView>
+            android:layout_marginStart="12dp"
+            android:text="@string/create_action"
+            app:backgroundTint="@color/md_pink_A400" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_delete.xml b/app/src/main/res/layout/dialog_delete.xml
new file mode 100644
index 00000000..a926e4c1
--- /dev/null
+++ b/app/src/main/res/layout/dialog_delete.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/title"
+        fontPath="@string/circular_std_black"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
+        android:text="@string/remove_song_from_playlist_title"
+        android:textAppearance="@style/TextAppearance.AppCompat.Title"
+        android:textColor="?android:attr/textColorPrimary"
+        tools:ignore="MissingPrefix" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="end">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/action_cancel"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@android:string/cancel"
+            app:strokeColor="@color/md_pink_A400"
+            app:strokeWidth="1dp" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/action_delete"
+            style="@style/Widget.MaterialComponents.Button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:text="@string/remove_action"
+            app:backgroundTint="@color/md_pink_A400" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_delete_playlist.xml b/app/src/main/res/layout/dialog_delete_playlist.xml
deleted file mode 100644
index b33fd988..00000000
--- a/app/src/main/res/layout/dialog_delete_playlist.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/title"
-        fontPath="@string/circular_std_black"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="12dp"
-        android:text="@string/remove_song_from_playlist_title"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-        android:textColor="?android:attr/textColorPrimary"
-        tools:ignore="MissingPrefix" />
-
-    <TextView
-        android:id="@+id/action_delete"
-        style="@style/TextAppearance.AppCompat.Subhead"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="12dp"  />
-
-    <TextView
-        android:id="@+id/action_cancel"
-        style="@style/TextAppearance.AppCompat.Subhead"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="12dp"
-        android:text="@android:string/cancel" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_delete_songs.xml b/app/src/main/res/layout/dialog_delete_songs.xml
deleted file mode 100644
index 3481628c..00000000
--- a/app/src/main/res/layout/dialog_delete_songs.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/title"
-        fontPath="@string/circular_std_black"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="12dp"
-        android:text="@string/remove_song_from_playlist_title"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-        android:textColor="?android:attr/textColorPrimary"
-        tools:ignore="MissingPrefix" />
-
-    <TextView
-        android:id="@+id/action_delete"
-        style="@style/TextAppearance.AppCompat.Subhead"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="12dp"
-        android:text="@string/remove_action" />
-
-    <TextView
-        android:id="@+id/action_cancel"
-        style="@style/TextAppearance.AppCompat.Subhead"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="12dp"
-        android:text="@android:string/cancel" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_playlist_rename.xml b/app/src/main/res/layout/dialog_playlist_rename.xml
index 9469c2b9..67251b79 100644
--- a/app/src/main/res/layout/dialog_playlist_rename.xml
+++ b/app/src/main/res/layout/dialog_playlist_rename.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="8dp">
+    android:padding="12dp">
 
-    <TextView
+    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+        android:id="@+id/title"
         fontPath="@string/circular_std_black"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -17,15 +19,30 @@
         android:textColor="?android:attr/textColorPrimary"
         tools:ignore="MissingPrefix" />
 
-    <EditText
-        android:id="@+id/option_1"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/action_new_playlist"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/playlist_name_empty"
-        android:inputType="textPersonName|textCapWords|text"
-        android:paddingBottom="16dp"
-        android:paddingTop="16dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+        app:boxBackgroundMode="outline"
+        app:boxCollapsedPaddingTop="16dp"
+        app:boxCornerRadiusBottomEnd="8dp"
+        app:boxCornerRadiusBottomStart="8dp"
+        app:boxCornerRadiusTopEnd="8dp"
+        app:boxCornerRadiusTopStart="8dp"
+        app:boxStrokeColor="@color/md_grey_700"
+        app:boxStrokeWidth="1dp"
+        app:hintEnabled="true">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/option_1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:hint="@string/playlist_name_empty"
+            android:inputType="textPersonName|textCapWords|text"
+            android:padding="16dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+    </com.google.android.material.textfield.TextInputLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -33,20 +50,22 @@
         android:gravity="end"
         android:padding="12dp">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/action_cancel"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:text="@android:string/cancel" />
+            android:text="@string/cancel_current_timer"
+            app:strokeColor="@color/md_grey_700"
+            app:strokeWidth="1dp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/action_rename"
-            style="@style/Widget.AppCompat.Button.Colored"
+            style="@style/Widget.MaterialComponents.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:text="@string/rename_action" />
+            android:layout_marginStart="12dp"
+            android:text="@string/action_rename"
+            app:backgroundTint="@color/md_pink_A400" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_sleep_timer.xml b/app/src/main/res/layout/dialog_sleep_timer.xml
index d17e13ea..cf21d09d 100644
--- a/app/src/main/res/layout/dialog_sleep_timer.xml
+++ b/app/src/main/res/layout/dialog_sleep_timer.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@android:color/transparent">
+    android:background="@android:color/transparent"
+    android:padding="12dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -12,20 +13,23 @@
         android:orientation="vertical">
 
         <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+            android:id="@+id/title"
             fontPath="@string/circular_std_black"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="12dp"
+            android:layout_marginBottom="8dp"
+            android:padding="6dp"
             android:text="@string/action_sleep_timer"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="?android:attr/textColorPrimary"
             tools:ignore="MissingPrefix" />
 
         <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
             android:id="@+id/timer_display"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
+            android:paddingStart="6dp"
+            android:paddingTop="8dp"
             android:textAppearance="?android:textAppearanceLarge" />
 
 
@@ -34,7 +38,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:maxHeight="3dp"
-            android:padding="16dp"
+            android:paddingTop="12dp"
             android:progressDrawable="@drawable/color_progress_seek"
             android:splitTrack="false"
             android:thumb="@drawable/switch_thumb_material"
@@ -47,48 +51,26 @@
             android:gravity="end"
             android:orientation="horizontal">
 
-            <android.support.v7.widget.CardView
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/action_cancel"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end|bottom"
-                app:cardBackgroundColor="@color/md_green_A700"
-                app:cardCornerRadius="6dp"
-                app:cardUseCompatPadding="true">
+                android:text="@string/cancel_current_timer"
+                app:strokeColor="@color/md_grey_700"
+                app:strokeWidth="1dp"
+                tools:visibility="visible" />
 
-                <TextView
-                    android:id="@+id/action_set"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:paddingStart="28dp"
-                    android:paddingTop="12dp"
-                    android:paddingEnd="28dp"
-                    android:paddingBottom="12dp"
-                    android:text="@string/action_set"
-                    android:textColor="@color/md_white_1000" />
-            </android.support.v7.widget.CardView>
-
-            <android.support.v7.widget.CardView
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/action_set"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end|bottom"
-                app:cardBackgroundColor="@color/md_red_A400"
-                app:cardCornerRadius="6dp"
-                android:id="@+id/action_cancel_container"
-                app:cardUseCompatPadding="true">
+                android:layout_marginStart="12dp"
+                android:gravity="center"
+                android:text="@string/action_set"
+                android:textColor="@color/md_white_1000"
+                app:backgroundTint="@color/md_pink_A400" />
 
-                <TextView
-                    android:id="@+id/action_cancel"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:paddingStart="28dp"
-                    android:paddingTop="12dp"
-                    android:paddingEnd="28dp"
-                    android:paddingBottom="12dp"
-                    android:text="@string/cancel_current_timer"
-                    android:textColor="@color/md_white_1000" />
-            </android.support.v7.widget.CardView>
         </LinearLayout>
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/donate_layout.xml b/app/src/main/res/layout/donate_layout.xml
deleted file mode 100644
index bb9e9fd3..00000000
--- a/app/src/main/res/layout/donate_layout.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/gradient_5"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.AppCompatTextView
-        fontPath="@string/circular_std_black"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:padding="16dp"
-        android:text="@string/paypal"
-        android:textAppearance="@style/TextAppearance.AppCompat.Display2"
-        android:textColor="@color/md_white_1000"
-        tools:ignore="MissingPrefix" />
-
-    <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp"
-        android:text="@string/paypal_summary"
-        android:textColor="@color/md_white_1000" />
-
-
-    <android.support.v7.widget.AppCompatButton
-        android:id="@+id/donate"
-        style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:text="Donate"
-        android:textColor="@color/md_white_1000" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dream_service.xml b/app/src/main/res/layout/dream_service.xml
index 7b802201..91855935 100644
--- a/app/src/main/res/layout/dream_service.xml
+++ b/app/src/main/res/layout/dream_service.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_adaptive_cover.xml b/app/src/main/res/layout/fragment_adaptive_cover.xml
index 62ce18c1..4a901408 100644
--- a/app/src/main/res/layout/fragment_adaptive_cover.xml
+++ b/app/src/main/res/layout/fragment_adaptive_cover.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent">
 
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:cardCornerRadius="8dp"
@@ -24,5 +24,5 @@
                 android:scaleType="centerCrop"
                 tools:ignore="ContentDescription,UnusedAttribute" />
         </FrameLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml
index 2357100e..0a4ffb64 100644
--- a/app/src/main/res/layout/fragment_adaptive_player.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player.xml
@@ -27,7 +27,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
@@ -40,7 +40,7 @@
 
         </FrameLayout>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -54,7 +54,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
         <FrameLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_album_card_cover.xml b/app/src/main/res/layout/fragment_album_card_cover.xml
index 35f3ad84..054af9ac 100644
--- a/app/src/main/res/layout/fragment_album_card_cover.xml
+++ b/app/src/main/res/layout/fragment_album_card_cover.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/player_album_art_frame"
         android:layout_width="match_parent"
@@ -17,7 +17,7 @@
         app:cardCornerRadius="12dp"
         app:cardElevation="12dp">
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/player_image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -28,5 +28,5 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/shadow_up_home" />
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_carousal_album_cover.xml b/app/src/main/res/layout/fragment_album_carousal_cover.xml
similarity index 87%
rename from app/src/main/res/layout/fragment_carousal_album_cover.xml
rename to app/src/main/res/layout/fragment_album_carousal_cover.xml
index 21aa41fd..2996d4ae 100644
--- a/app/src/main/res/layout/fragment_carousal_album_cover.xml
+++ b/app/src/main/res/layout/fragment_album_carousal_cover.xml
@@ -7,7 +7,7 @@
     android:layout_gravity="center_vertical">
 
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -18,12 +18,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/player_image"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
                 tools:ignore="ContentDescription,UnusedAttribute" />
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_circle_cover.xml b/app/src/main/res/layout/fragment_album_circle_cover.xml
index 6706ce6a..b89ec22d 100644
--- a/app/src/main/res/layout/fragment_album_circle_cover.xml
+++ b/app/src/main/res/layout/fragment_album_circle_cover.xml
@@ -16,8 +16,7 @@
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
             app:civ_border="false"
-            app:civ_shadow="true"
-            app:civ_shadow_radius="8"
+            app:civ_shadow="false"
             tools:ignore="ContentDescription,UnusedAttribute" />
 
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
diff --git a/app/src/main/res/layout/fragment_album_cover.xml b/app/src/main/res/layout/fragment_album_cover.xml
index cb5e0901..e7fee7b4 100644
--- a/app/src/main/res/layout/fragment_album_cover.xml
+++ b/app/src/main/res/layout/fragment_album_cover.xml
@@ -7,7 +7,7 @@
     android:layout_gravity="center_vertical">
 
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/player_album_art_frame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -20,12 +20,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/player_image"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
                 tools:ignore="ContentDescription,UnusedAttribute" />
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_flat_cover.xml b/app/src/main/res/layout/fragment_album_flat_cover.xml
index 253d69d9..569ed482 100644
--- a/app/src/main/res/layout/fragment_album_flat_cover.xml
+++ b/app/src/main/res/layout/fragment_album_flat_cover.xml
@@ -1,31 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/player_album_art_frame"
+    <code.name.monkey.retromusic.views.WidthFitSquareLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:background="@android:color/black"
-        app:cardCornerRadius="8dp"
-        app:cardPreventCornerOverlap="true"
-        app:cardUseCompatPadding="true">
+        android:layout_margin="12dp">
 
-        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/player_image"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            tools:ignore="ContentDescription,UnusedAttribute" />
+    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-            <android.support.v7.widget.AppCompatImageView
-                android:id="@+id/player_image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop"
-                tools:ignore="ContentDescription,UnusedAttribute" />
-        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-    </android.support.v7.widget.CardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_material_cover.xml b/app/src/main/res/layout/fragment_album_material_cover.xml
index 63825660..e205d35e 100644
--- a/app/src/main/res/layout/fragment_album_material_cover.xml
+++ b/app/src/main/res/layout/fragment_album_material_cover.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/player_album_art_frame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -18,12 +18,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/player_image"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
                 tools:ignore="ContentDescription,UnusedAttribute" />
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_banner_home.xml b/app/src/main/res/layout/fragment_banner_home.xml
index 51f90ef2..55c54ad9 100644
--- a/app/src/main/res/layout/fragment_banner_home.xml
+++ b/app/src/main/res/layout/fragment_banner_home.xml
@@ -6,16 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:ignore="UnusedAttribute">
-
-        <include layout="@layout/status_bar" />
-
-    </FrameLayout>
-
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinator_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -27,8 +18,8 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <android.support.design.widget.AppBarLayout
-                android:id="@+id/appbar"
+            <com.google.android.material.appbar.AppBarLayout
+                android:id="@+id/app_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
@@ -36,14 +27,14 @@
                 app:elevation="0dp"
                 tools:ignore="UnusedAttribute">
 
-                <android.support.design.widget.CollapsingToolbarLayout
+                <com.google.android.material.appbar.CollapsingToolbarLayout
                     android:id="@+id/collapsing_toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:layout_scrollFlags="scroll|enterAlways"
                     app:titleEnabled="false">
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/toolbar"
                         style="@style/Toolbar48"
                         app:layout_collapseMode="pin"
@@ -61,16 +52,16 @@
                             android:layout_gravity="end"
                             android:layout_marginEnd="16dp"
                             app:civ_border="false" />
-                    </android.support.v7.widget.Toolbar>
-                </android.support.design.widget.CollapsingToolbarLayout>
-            </android.support.design.widget.AppBarLayout>
+                    </androidx.appcompat.widget.Toolbar>
+                </com.google.android.material.appbar.CollapsingToolbarLayout>
+            </com.google.android.material.appbar.AppBarLayout>
 
-            <android.support.v4.widget.NestedScrollView
+            <androidx.core.widget.NestedScrollView
                 android:id="@+id/content_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:background="@drawable/bg_circular_top_corners"
+                android:background="@color/md_white_1000"
                 android:elevation="@dimen/card_elevation"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
@@ -86,7 +77,7 @@
 
                     <include layout="@layout/home_section_content" />
                 </LinearLayout>
-            </android.support.v4.widget.NestedScrollView>
+            </androidx.core.widget.NestedScrollView>
         </LinearLayout>
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml
index 718e389c..cf47e91f 100644
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@@ -7,7 +7,7 @@
     android:clickable="true"
     android:focusable="true">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/gradient_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -70,7 +70,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:layout_height="48dp"
diff --git a/app/src/main/res/layout/fragment_blur_playback_controls.xml b/app/src/main/res/layout/fragment_blur_playback_controls.xml
index 98152cd4..774ae056 100644
--- a/app/src/main/res/layout/fragment_blur_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_blur_playback_controls.xml
@@ -62,7 +62,7 @@
         android:orientation="vertical"
         android:padding="8dp">
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -81,7 +81,7 @@
             android:textColor="@color/md_white_1000"
             tools:text="Title" />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_card_blur_player.xml b/app/src/main/res/layout/fragment_card_blur_player.xml
index 15ca04a2..25fd82b9 100644
--- a/app/src/main/res/layout/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player.xml
@@ -7,7 +7,7 @@
     android:clickable="true"
     android:focusable="true">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/gradient_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -44,7 +44,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="0">
 
-                <android.support.v7.widget.Toolbar
+                <androidx.appcompat.widget.Toolbar
                     android:id="@+id/player_toolbar"
                     style="@style/Toolbar48"
                     android:layout_height="48dp"
diff --git a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
index e4da9efa..db75ed47 100644
--- a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
@@ -179,7 +179,7 @@
                 tools:text="22.00" />
         </LinearLayout>
 
-        <android.support.v7.widget.AppCompatSeekBar
+        <androidx.appcompat.widget.AppCompatSeekBar
             android:id="@+id/player_progress_slider"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml
index 56d2c99f..6b7b6a96 100644
--- a/app/src/main/res/layout/fragment_card_player.xml
+++ b/app/src/main/res/layout/fragment_card_player.xml
@@ -41,7 +41,7 @@
             android:layout_weight="0">
 
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:navigationIcon="@drawable/ic_close_white_24dp"
@@ -53,7 +53,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="0"
@@ -74,7 +74,7 @@
                     tools:layout="@layout/fragment_card_player_playback_controls" />
             </FrameLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
     <include layout="@layout/shadow_statusbar_toolbar" />
diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml
index c35c915f..065331cc 100644
--- a/app/src/main/res/layout/fragment_color_player.xml
+++ b/app/src/main/res/layout/fragment_color_player.xml
@@ -27,7 +27,7 @@
             <include layout="@layout/status_bar" />
         </FrameLayout>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -44,7 +44,7 @@
                 android:layout_gravity="center_horizontal">
 
 
-                <android.support.v7.widget.AppCompatImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/image"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -64,7 +64,7 @@
                         android:layout_height="wrap_content"
                         android:padding="16dp">
 
-                        <android.support.v7.widget.AppCompatTextView
+                        <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/lyrics"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -77,7 +77,7 @@
                     </FrameLayout>
                 </ScrollView>
 
-                <android.support.v7.widget.AppCompatImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/expand"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -87,7 +87,7 @@
                     app:tint="@color/md_white_1000" />
             </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -109,7 +109,7 @@
             android:layout_weight="0">
 
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:layout_height="48dp"
diff --git a/app/src/main/res/layout/fragment_color_player_playback_controls.xml b/app/src/main/res/layout/fragment_color_player_playback_controls.xml
index 06750214..0091586a 100644
--- a/app/src/main/res/layout/fragment_color_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_color_player_playback_controls.xml
@@ -60,7 +60,7 @@
         android:gravity="center"
         android:orientation="vertical">
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
             android:textColor="?android:attr/textColorPrimary"
             tools:text="Title" />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml
index 44fe4822..7989535f 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -33,7 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:layout_height="48dp"
diff --git a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
index d640f788..e43a6269 100644
--- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
@@ -8,7 +8,7 @@
     android:orientation="vertical"
     tools:ignore="MissingPrefix">
 
-    <android.support.v7.widget.AppCompatSeekBar
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/player_progress_slider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -62,7 +62,7 @@
         android:paddingEnd="16dp"
         android:paddingStart="16dp">
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/text"
             fontPath="@string/circular_std_black"
             android:layout_width="wrap_content"
@@ -78,7 +78,7 @@
             android:textSize="12sp"
             tools:text="Title" />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title"
             fontPath="@string/circular_std_black"
             android:layout_width="wrap_content"
@@ -106,7 +106,7 @@
         android:paddingStart="16dp"
         tools:ignore="ContentDescription,UnusedAttribute">
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/player_play_pause_button"
             android:layout_width="52dp"
             android:layout_height="52dp"
@@ -126,7 +126,7 @@
             android:layout_centerVertical="true"
             android:layout_marginEnd="8dp">
 
-            <android.support.v7.widget.AppCompatImageButton
+            <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/player_repeat_button"
                 android:layout_width="72dp"
                 android:layout_height="72dp"
@@ -136,7 +136,7 @@
                 app:srcCompat="@drawable/ic_repeat_white_24dp"
                 tools:ignore="MissingPrefix" />
 
-            <android.support.v7.widget.AppCompatImageButton
+            <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/player_shuffle_button"
                 android:layout_width="72dp"
                 android:layout_height="72dp"
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index d63a6e79..f90f05d2 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -6,16 +6,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="0dp"
-        tools:ignore="UnusedAttribute">
-
-        <include layout="@layout/status_bar" />
-
-    </FrameLayout>
-
     <FrameLayout
         android:id="@+id/coordinator_layout"
         android:layout_width="match_parent"
@@ -29,7 +19,7 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <android.support.design.widget.AppBarLayout
+            <com.google.android.material.appbar.AppBarLayout
                 android:id="@+id/app_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -42,7 +32,7 @@
                     android:layout_height="wrap_content"
                     app:layout_collapseMode="pin">
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/toolbar"
                         style="@style/Toolbar48"
                         tools:ignore="UnusedAttribute">
@@ -53,14 +43,14 @@
                             android:text="@string/folders"
                             tools:ignore="MissingPrefix" />
 
-                    </android.support.v7.widget.Toolbar>
+                    </androidx.appcompat.widget.Toolbar>
 
                     <ViewStub
                         android:id="@+id/cab_stub"
                         android:layout_width="match_parent"
                         android:layout_height="48dp" />
                 </FrameLayout>
-            </android.support.design.widget.AppBarLayout>
+            </com.google.android.material.appbar.AppBarLayout>
 
 
             <FrameLayout
@@ -68,7 +58,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/bg_circular_top_corners"
+                android:background="@color/md_white_1000"
                 android:elevation="@dimen/card_elevation">
 
                 <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml
index c5a48131..a1f20d27 100644
--- a/app/src/main/res/layout/fragment_full.xml
+++ b/app/src/main/res/layout/fragment_full.xml
@@ -19,46 +19,39 @@
         android:layout_gravity="bottom"
         android:background="@drawable/shadow_up_full_theme" />
 
-    <FrameLayout
-        android:id="@+id/now_playing_container"
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
         android:orientation="vertical">
 
-
-        <LinearLayout
+        <fragment
+            android:id="@+id/playback_controls_fragment"
+            android:name="code.name.monkey.retromusic.ui.fragments.player.full.FullPlaybackControlsFragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            android:orientation="vertical">
+            tools:layout="@layout/fragment_full_player_controls" />
 
-            <fragment
-                android:id="@+id/playback_controls_fragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.player.full.FullPlaybackControlsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                tools:layout="@layout/fragment_full_player_controls" />
+        <FrameLayout
+            android:id="@+id/toolbar_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-            <FrameLayout
-                android:id="@+id/toolbar_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/player_toolbar"
+                style="@style/Toolbar48"
+                android:navigationIcon="@drawable/ic_close_white_24dp" />
 
-                <android.support.v7.widget.Toolbar
-                    android:id="@+id/player_toolbar"
-                    style="@style/Toolbar48"
-                    android:navigationIcon="@drawable/ic_close_white_24dp" />
+        </FrameLayout>
+    </LinearLayout>
 
-            </FrameLayout>
-        </LinearLayout>
-
-    </FrameLayout>
+    <include layout="@layout/status_bar" />
 
     <View
         android:layout_width="match_parent"
         android:layout_height="72dp"
         android:background="@drawable/shadow_down_strong" />
 
-
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_hmm_player.xml b/app/src/main/res/layout/fragment_hmm_player.xml
index 3f3d8d20..b6904bd2 100644
--- a/app/src/main/res/layout/fragment_hmm_player.xml
+++ b/app/src/main/res/layout/fragment_hmm_player.xml
@@ -96,7 +96,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/player_toolbar"
                         style="@style/Toolbar48"
                         android:layout_height="48dp"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4792e141..ae4aeb59 100755
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/coordinator_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/retro_backdrop" />
-
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:focusable="true"
         tools:ignore="UnusedAttribute">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="196dp"
@@ -30,40 +28,49 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
-                app:layout_collapseMode="pin"
+                app:layout_collapseMode="none"
                 tools:ignore="ContentDescription" />
 
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/home_toolbar"
-                style="@style/Toolbar"
-                tools:ignore="UnusedAttribute">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_collapseMode="pin">
+
+                <include layout="@layout/status_bar" />
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/home_toolbar"
+                    style="@style/Toolbar"
+                    tools:ignore="UnusedAttribute">
+
+                    <TextView
+                        android:id="@+id/title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:text="@string/app_name"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                        tools:ignore="MissingPrefix" />
+
+                    <code.name.monkey.retromusic.views.CircularImageView
+                        android:id="@+id/user_image"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:layout_gravity="end"
+                        android:layout_marginEnd="16dp"
+                        app:civ_border="false" />
+
+                </androidx.appcompat.widget.Toolbar>
+            </LinearLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
 
 
-                <TextView
-                    android:id="@+id/title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:text="@string/app_name"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                    tools:ignore="MissingPrefix" />
-
-                <code.name.monkey.retromusic.views.CircularImageView
-                    android:id="@+id/user_image"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_gravity="end"
-                    android:layout_marginEnd="16dp"
-                    app:civ_border="false" />
-
-            </android.support.v7.widget.Toolbar>
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
-
-
-    <android.support.v4.widget.NestedScrollView
-        android:id="@+id/content_container"
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/bg_circular_top_corners"
@@ -71,19 +78,27 @@
         app:behavior_overlapTop="24dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:descendantFocusability="blocksDescendants"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical">
+            android:layout_height="match_parent">
 
-            <include layout="@layout/abs_playlists" />
+            <include layout="@layout/retro_backdrop" />
 
-            <include layout="@layout/home_section_content" />
-        </LinearLayout>
+            <LinearLayout
+                android:id="@+id/content_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:descendantFocusability="blocksDescendants"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:orientation="vertical">
 
-    </android.support.v4.widget.NestedScrollView>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+                <include layout="@layout/abs_playlists" />
+
+                <include layout="@layout/home_section_content" />
+            </LinearLayout>
+        </RelativeLayout>
+    </androidx.core.widget.NestedScrollView>
+
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 0342a8df..e5d2055d 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -6,16 +6,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        tools:ignore="UnusedAttribute">
-
-        <include layout="@layout/status_bar" />
-
-    </FrameLayout>
-
     <FrameLayout
         android:id="@+id/coordinator_layout"
         android:layout_width="match_parent"
@@ -29,7 +19,7 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <android.support.design.widget.AppBarLayout
+            <com.google.android.material.appbar.AppBarLayout
                 android:id="@+id/app_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -42,7 +32,7 @@
                     android:layout_height="wrap_content"
                     app:layout_collapseMode="pin">
 
-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                         android:id="@+id/toolbar"
                         style="@style/Toolbar48"
                         tools:ignore="UnusedAttribute">
@@ -58,14 +48,14 @@
                             android:textAppearance="@style/TextAppearance.AppCompat.Large"
                             tools:ignore="MissingPrefix" />
 
-                    </android.support.v7.widget.Toolbar>
+                    </androidx.appcompat.widget.Toolbar>
 
                     <ViewStub
                         android:id="@+id/cab_stub"
                         android:layout_width="match_parent"
                         android:layout_height="48dp" />
                 </FrameLayout>
-            </android.support.design.widget.AppBarLayout>
+            </com.google.android.material.appbar.AppBarLayout>
 
 
             <FrameLayout
@@ -73,7 +63,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/bg_circular_top_corners"
+                android:background="@color/md_white_1000"
                 android:elevation="@dimen/card_elevation"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior" />
         </LinearLayout>
@@ -84,12 +74,11 @@
         android:layout_height="1dp"
         android:background="?dividerColor" />
 
-    <android.support.design.widget.BottomNavigationView
+    <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottom_navigation"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="0"
-        app:elevation="0dp"
         app:itemIconTint="@drawable/bottom_navigation_item_colors"
         app:itemTextColor="@drawable/bottom_navigation_item_colors"
         app:labelVisibilityMode="labeled"
diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
index a2a8b316..fb4e7a6b 100644
--- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
@@ -27,7 +27,7 @@
         android:paddingEnd="16dp"
         android:paddingStart="16dp">
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/player_song_current_progress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
             tools:text="22.00" />
 
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/player_song_total_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
         android:gravity="center"
         android:orientation="vertical">
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
             tools:text="Title" />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -99,7 +99,7 @@
         android:minHeight="72dp"
         tools:ignore="ContentDescription,UnusedAttribute">
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/player_prev_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -114,7 +114,7 @@
             tools:ignore="MissingPrefix"
             tools:tint="@color/md_black_1000" />
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/player_next_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -130,7 +130,7 @@
             tools:tint="@color/md_black_1000" />
 
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/player_play_pause_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
index 581eb877..2b395b0d 100644
--- a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
+++ b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/container"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content">
-
-  <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
-    android:id="@+id/recycler_view"
+    android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipToPadding="false"
-    android:scrollbars="none"/>
+    android:layout_height="wrap_content">
 
-  <TextView
-    android:id="@android:id/empty"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:fontFamily="sans-serif-light"
-    android:text="@string/empty"
-    android:textColor="?android:textColorSecondary"
-    android:visibility="gone"/>
+    <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:layoutAnimation="@anim/layout_animation_fall_down"
+        android:scrollbars="none" />
+
+    <TextView
+        android:id="@android:id/empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:fontFamily="sans-serif-light"
+        android:text="@string/empty"
+        android:textColor="?android:textColorSecondary"
+        android:visibility="gone" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_main_options.xml b/app/src/main/res/layout/fragment_main_options.xml
new file mode 100644
index 00000000..8596e4ce
--- /dev/null
+++ b/app/src/main/res/layout/fragment_main_options.xml
@@ -0,0 +1,15 @@
+<?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="wrap_content">
+
+
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/navigation_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        app:menu="@menu/menu_main_options" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml
index 6aad473d..887389d7 100644
--- a/app/src/main/res/layout/fragment_main_settings.xml
+++ b/app/src/main/res/layout/fragment_main_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -42,7 +42,7 @@
                     android:fontFamily="sans-serif"
                     android:singleLine="true"
                     android:text="@string/general_settings_title"
-                    android:textSize="@dimen/ate_default_textsize_subheading" />
+                    android:textSize="@dimen/ate_default_textsize_subheading"  />
 
                 <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
                     android:layout_width="wrap_content"
@@ -58,6 +58,50 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/now_playing_settings"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rectSelector"
+            android:gravity="center_vertical"
+            android:minHeight="72dp"
+            android:orientation="horizontal">
+
+            <code.name.monkey.retromusic.views.IconImageView
+                android:id="@+id/now_playing_settings_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                app:srcCompat="@drawable/ic_play_circle_filled_white_24dp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="marquee"
+                    android:fadingEdge="horizontal"
+                    android:fontFamily="sans-serif"
+                    android:singleLine="true"
+                    android:text="@string/now_playing"
+                    android:textSize="@dimen/ate_default_textsize_subheading" />
+
+                <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:fontFamily="sans-serif"
+                    android:maxLines="4"
+                    android:text="@string/now_playing_summary"
+                    android:textSize="@dimen/ate_default_textsize_body" />
+            </LinearLayout>
+
+        </LinearLayout>
+
         <LinearLayout
             android:id="@+id/audio_settings"
             android:layout_width="match_parent"
@@ -103,7 +147,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/now_playing_settings"
+            android:id="@+id/personalize_settings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?rectSelector"
@@ -112,7 +156,7 @@
             android:orientation="horizontal">
 
             <code.name.monkey.retromusic.views.IconImageView
-                android:id="@+id/now_playing_settings_icon"
+                android:id="@+id/personalize_settings_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="16dp"
@@ -266,4 +310,4 @@
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_material.xml b/app/src/main/res/layout/fragment_material.xml
index 1faec961..570a649a 100644
--- a/app/src/main/res/layout/fragment_material.xml
+++ b/app/src/main/res/layout/fragment_material.xml
@@ -53,7 +53,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:layout_height="48dp"
diff --git a/app/src/main/res/layout/fragment_material_playback_controls.xml b/app/src/main/res/layout/fragment_material_playback_controls.xml
index c440a734..721856d5 100644
--- a/app/src/main/res/layout/fragment_material_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_material_playback_controls.xml
@@ -61,7 +61,7 @@
         android:orientation="vertical"
         android:padding="8dp">
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -80,7 +80,7 @@
             android:textColor="?android:attr/textColorPrimary"
             tools:text="Title" />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml
index daed4b30..a9771bda 100644
--- a/app/src/main/res/layout/fragment_mini_player.xml
+++ b/app/src/main/res/layout/fragment_mini_player.xml
@@ -28,15 +28,10 @@
         <TextView
             android:id="@+id/mini_player_title"
             android:layout_width="0dp"
+            android:gravity="center"
             android:layout_height="match_parent"
-            android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            android:singleLine="true"  />
 
         <code.name.monkey.retromusic.views.IconImageView
             android:id="@+id/action_prev"
@@ -52,8 +47,6 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
             android:background="?roundSelector"
             android:scaleType="center"
             tools:ignore="ContentDescription" />
diff --git a/app/src/main/res/layout/fragment_name.xml b/app/src/main/res/layout/fragment_name.xml
index 78425002..b0b321d5 100644
--- a/app/src/main/res/layout/fragment_name.xml
+++ b/app/src/main/res/layout/fragment_name.xml
@@ -30,7 +30,7 @@
             android:text="@string/summary_user_info"
             android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginBottom="-16dp"
@@ -51,7 +51,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
-                    <android.support.v7.widget.AppCompatImageView
+                    <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/image"
                         android:layout_width="match_parent"
                         android:layout_height="128dp"
@@ -93,7 +93,7 @@
                     android:orientation="vertical"
                     android:padding="16dp">
 
-                    <android.support.design.widget.TextInputEditText
+                    <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/name"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -106,7 +106,7 @@
 
                 </LinearLayout>
             </LinearLayout>
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
     <ImageButton
diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml
index b00b295b..6a210784 100644
--- a/app/src/main/res/layout/fragment_plain_player.xml
+++ b/app/src/main/res/layout/fragment_plain_player.xml
@@ -30,7 +30,7 @@
             android:paddingEnd="16dp"
             android:paddingStart="16dp">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/title"
                 fontPath="@string/circular_std_black"
                 android:layout_width="match_parent"
@@ -47,7 +47,7 @@
                 tools:ignore="MissingPrefix"
                 tools:text="Title" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -88,7 +88,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:layout_height="48dp"
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 0c3f86bc..e62605dc 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -59,7 +59,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:layout_height="48dp"
diff --git a/app/src/main/res/layout/fragment_player_album_cover.xml b/app/src/main/res/layout/fragment_player_album_cover.xml
index 406d7600..e3bd1543 100644
--- a/app/src/main/res/layout/fragment_player_album_cover.xml
+++ b/app/src/main/res/layout/fragment_player_album_cover.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/player_album_cover_viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml
index 131766a8..2caacdaf 100755
--- a/app/src/main/res/layout/fragment_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_player_playback_controls.xml
@@ -63,7 +63,7 @@
         android:orientation="vertical"
         android:padding="8dp">
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
             android:textColor="?android:attr/textColorPrimary"
             tools:text="Title" />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_playlist.xml b/app/src/main/res/layout/fragment_playlist.xml
index 2225b4af..77e275d1 100644
--- a/app/src/main/res/layout/fragment_playlist.xml
+++ b/app/src/main/res/layout/fragment_playlist.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -35,7 +35,7 @@
                 tools:ignore="MissingPrefix" />
 
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/genre_recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -43,4 +43,4 @@
 
         </LinearLayout>
     </LinearLayout>
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_queue_player.xml b/app/src/main/res/layout/fragment_queue_player.xml
index 48b309b6..752a7faf 100644
--- a/app/src/main/res/layout/fragment_queue_player.xml
+++ b/app/src/main/res/layout/fragment_queue_player.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/player_toolbar"
             style="@style/Toolbar48"
             android:navigationIcon="@drawable/ic_close_white_24dp"
@@ -59,7 +59,7 @@
             android:textColor="?android:attr/textColorPrimary"
             tools:ignore="MissingPrefix" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -67,4 +67,4 @@
             android:background="@color/md_red_200"
             android:nestedScrollingEnabled="false" />
     </LinearLayout>
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_queue_player_playback_controls.xml b/app/src/main/res/layout/fragment_queue_player_playback_controls.xml
index fafb9892..912f01c4 100644
--- a/app/src/main/res/layout/fragment_queue_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_queue_player_playback_controls.xml
@@ -41,7 +41,7 @@
             tools:text="22.00" />
     </LinearLayout>
 
-    <android.support.v7.widget.AppCompatSeekBar
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/player_progress_slider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
         android:orientation="vertical"
         android:padding="8dp">
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -77,7 +77,7 @@
             android:textColor="?android:attr/textColorPrimary"
             tools:text="Title" />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml
index d2c6b3d6..6c67f84b 100644
--- a/app/src/main/res/layout/fragment_simple_player.xml
+++ b/app/src/main/res/layout/fragment_simple_player.xml
@@ -58,7 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="0">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/player_toolbar"
                 style="@style/Toolbar48"
                 android:layout_height="48dp"
diff --git a/app/src/main/res/layout/fragment_volume.xml b/app/src/main/res/layout/fragment_volume.xml
index 49d1f77a..8f160c01 100755
--- a/app/src/main/res/layout/fragment_volume.xml
+++ b/app/src/main/res/layout/fragment_volume.xml
@@ -16,7 +16,7 @@
         android:padding="16dp"
         app:srcCompat="@drawable/ic_volume_down_white_24dp" />
 
-    <android.support.v7.widget.AppCompatSeekBar
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/volume_seekbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/home_section_content.xml b/app/src/main/res/layout/home_section_content.xml
index e82fc753..cbdbd069 100644
--- a/app/src/main/res/layout/home_section_content.xml
+++ b/app/src/main/res/layout/home_section_content.xml
@@ -23,7 +23,7 @@
             android:textColor="?android:attr/textColorPrimary"
             tools:ignore="MissingPrefix" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
             android:textColor="?android:attr/textColorPrimary"
             tools:ignore="MissingPrefix" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/top_artist"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -127,29 +127,4 @@
             android:layout_margin="12dp"
             android:background="?attr/dividerColor" />
     </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/genre_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-            fontPath="@string/circular_std_black"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:text="@string/genres"
-            android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="?android:attr/textColorPrimary"
-            tools:ignore="MissingPrefix" />
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/genres"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:nestedScrollingEnabled="false" />
-    </LinearLayout>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/home_section_recycler_view.xml b/app/src/main/res/layout/home_section_recycler_view.xml
deleted file mode 100644
index 7a6100f9..00000000
--- a/app/src/main/res/layout/home_section_recycler_view.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical">

    <TextView
        android:id="@+id/title"
        fontPath="@string/circular_std_black"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:padding="12dp"
        android:text="@string/recent_artists"
        android:textAppearance="@style/TextAppearance.AppCompat.Title"
        android:textColor="?android:attr/textColorPrimary"
        tools:ignore="MissingPrefix"
        tools:text="@string/rate_app"
        tools:textColor="@color/md_black_1000" />

    <android.support.v7.widget.RecyclerView
        android:id="@+id/recycler_view"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:nestedScrollingEnabled="false" />

    <View
        android:layout_width="match_parent"
        android:layout_height="1dp"
        android:layout_margin="12dp"
        android:background="?attr/dividerColor" />
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/home_shortcuts.xml b/app/src/main/res/layout/home_shortcuts.xml
index 348e9271..8d8be8b4 100644
--- a/app/src/main/res/layout/home_shortcuts.xml
+++ b/app/src/main/res/layout/home_shortcuts.xml
@@ -5,7 +5,7 @@
   android:layout_height="wrap_content"
   android:orientation="vertical">
 
-  <android.support.v7.widget.AppCompatTextView xmlns:tools="http://schemas.android.com/tools"
+  <androidx.appcompat.widget.AppCompatTextView xmlns:tools="http://schemas.android.com/tools"
     fontPath="@string/circular_std_black"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
       android:layout_weight="1"
       android:orientation="vertical">
 
-      <android.support.v7.widget.AppCompatImageView
+      <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -40,7 +40,7 @@
         app:srcCompat="@drawable/ic_shuffle_white_24dp"
         app:tint="@color/md_white_1000"/>
 
-      <android.support.v7.widget.AppCompatTextView
+      <androidx.appcompat.widget.AppCompatTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
@@ -58,7 +58,7 @@
       android:layout_weight="1"
       android:orientation="vertical">
 
-      <android.support.v7.widget.AppCompatImageView
+      <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -68,7 +68,7 @@
         app:srcCompat="@drawable/ic_timer_white_24dp"
         app:tint="@color/md_white_1000"/>
 
-      <android.support.v7.widget.AppCompatTextView
+      <androidx.appcompat.widget.AppCompatTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
@@ -85,7 +85,7 @@
       android:layout_weight="1"
       android:orientation="vertical">
 
-      <android.support.v7.widget.AppCompatImageView
+      <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -95,7 +95,7 @@
         app:srcCompat="@drawable/ic_settings_white_24dp"
         app:tint="@color/md_white_1000"/>
 
-      <android.support.v7.widget.AppCompatTextView
+      <androidx.appcompat.widget.AppCompatTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
@@ -113,7 +113,7 @@
       android:layout_weight="1"
       android:orientation="vertical">
 
-      <android.support.v7.widget.AppCompatImageView
+      <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -123,7 +123,7 @@
         app:srcCompat="@drawable/ic_folder_white_24dp"
         app:tint="@color/md_white_1000"/>
 
-      <android.support.v7.widget.AppCompatTextView
+      <androidx.appcompat.widget.AppCompatTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
diff --git a/app/src/main/res/layout/item_artist.xml b/app/src/main/res/layout/item_artist.xml
index cfecdd93..f321021b 100644
--- a/app/src/main/res/layout/item_artist.xml
+++ b/app/src/main/res/layout/item_artist.xml
@@ -20,7 +20,7 @@
       tools:src="@drawable/hemanth_s"/>
   </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-  <android.support.v7.widget.AppCompatTextView
+  <androidx.appcompat.widget.AppCompatTextView
     android:id="@+id/title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml
index 8dd49a97..ac685fb0 100644
--- a/app/src/main/res/layout/item_card.xml
+++ b/app/src/main/res/layout/item_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -57,4 +57,4 @@
 
         </LinearLayout>
     </LinearLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/item_card_color.xml b/app/src/main/res/layout/item_card_color.xml
index 2b4ad136..3b27becc 100644
--- a/app/src/main/res/layout/item_card_color.xml
+++ b/app/src/main/res/layout/item_card_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
@@ -57,4 +57,4 @@
         android:textSize="12sp"/>
     </LinearLayout>
   </LinearLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/item_collage.xml b/app/src/main/res/layout/item_collage.xml
index b9d0f2a0..ccc565c2 100644
--- a/app/src/main/res/layout/item_collage.xml
+++ b/app/src/main/res/layout/item_collage.xml
@@ -19,7 +19,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     app:cardCornerRadius="8dp"
@@ -30,7 +30,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:scaleType="centerCrop" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </code.name.monkey.retromusic.views.WidthFitSquareLayout>
         </FrameLayout>
 
@@ -45,7 +45,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     app:cardCornerRadius="8dp"
@@ -56,14 +56,14 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:scaleType="centerCrop" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
             <code.name.monkey.retromusic.views.WidthFitSquareLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     app:cardCornerRadius="8dp"
@@ -74,7 +74,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:scaleType="centerCrop" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </code.name.monkey.retromusic.views.WidthFitSquareLayout>
         </LinearLayout>
 
@@ -88,7 +88,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     app:cardCornerRadius="8dp"
@@ -99,7 +99,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:scaleType="centerCrop" />
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </code.name.monkey.retromusic.views.WidthFitSquareLayout>
         </FrameLayout>
     </LinearLayout>
@@ -114,7 +114,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:cardCornerRadius="8dp"
@@ -125,7 +125,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop" />
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
         <code.name.monkey.retromusic.views.WidthFitSquareLayout
@@ -133,7 +133,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:cardCornerRadius="8dp"
@@ -144,7 +144,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop" />
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
         <code.name.monkey.retromusic.views.WidthFitSquareLayout
@@ -152,7 +152,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:cardCornerRadius="8dp"
@@ -163,7 +163,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop" />
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
         <Space
@@ -175,7 +175,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:cardCornerRadius="8dp"
@@ -186,7 +186,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop" />
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
         <code.name.monkey.retromusic.views.WidthFitSquareLayout
@@ -194,7 +194,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:cardCornerRadius="6dp"
@@ -205,7 +205,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop" />
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_donation_option.xml b/app/src/main/res/layout/item_donation_option.xml
index 4630f4cd..95805a0b 100644
--- a/app/src/main/res/layout/item_donation_option.xml
+++ b/app/src/main/res/layout/item_donation_option.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:cardCornerRadius="8dp"
@@ -58,5 +58,5 @@
                 android:textColor="?android:textColorSecondary"
                 tools:text="description" />
         </LinearLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index 79bf8491..af128c49 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -18,7 +18,7 @@
       android:layout_width="match_parent"
       android:layout_height="match_parent">
 
-      <android.support.v7.widget.CardView
+      <androidx.cardview.widget.CardView
         android:id="@+id/image_container_card"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -32,7 +32,7 @@
           android:layout_height="match_parent"
           android:scaleType="centerCrop"
           tools:ignore="ContentDescription"/>
-      </android.support.v7.widget.CardView>
+      </androidx.cardview.widget.CardView>
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/item_image.xml b/app/src/main/res/layout/item_image.xml
index 8a714511..c83bb402 100644
--- a/app/src/main/res/layout/item_image.xml
+++ b/app/src/main/res/layout/item_image.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/image_container_card"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -18,12 +18,12 @@
             app:cardCornerRadius="8dp"
             app:cardPreventCornerOverlap="true">
 
-            <android.support.v7.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/image"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop" />
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index d7fd1d5b..487a9df7 100755
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -33,7 +33,7 @@
             android:paddingEnd="0dp"
             android:paddingLeft="16dp">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:id="@+id/image_text_container"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
                 app:cardCornerRadius="6dp"
                 app:cardElevation="0dp">
 
-                <android.support.v7.widget.AppCompatImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/image"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
@@ -49,7 +49,7 @@
                     android:gravity="center_vertical"
                     android:scaleType="centerCrop" />
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/image_text"
                     android:layout_width="36dp"
                     android:layout_height="match_parent"
@@ -59,7 +59,7 @@
                     android:minHeight="40dp"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                     android:visibility="gone" />
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </FrameLayout>
 
         <LinearLayout
@@ -74,7 +74,7 @@
             android:paddingEnd="16dp"
             android:paddingStart="16dp">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/title"
                 style="@style/TextAppearance.AppCompat.Subhead"
                 android:layout_width="wrap_content"
@@ -84,7 +84,7 @@
                 android:maxLines="1"
                 android:textColor="?android:attr/textColorPrimary" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/text"
                 style="@style/TextAppearance.AppCompat.Body1"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml
index 3412d2ba..9ba736ec 100755
--- a/app/src/main/res/layout/item_song.xml
+++ b/app/src/main/res/layout/item_song.xml
@@ -16,7 +16,7 @@
         android:paddingEnd="0dp"
         android:paddingLeft="16dp">
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/image_text"
             android:layout_width="36dp"
             android:layout_height="match_parent"
@@ -48,7 +48,7 @@
             android:paddingEnd="0dp"
             android:paddingStart="6dp">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
                 android:textColor="?android:attr/textColorPrimary"
                 tools:text="Song title" />
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml
index e6a0c370..c326d82f 100644
--- a/app/src/main/res/layout/pager_item.xml
+++ b/app/src/main/res/layout/pager_item.xml
@@ -7,20 +7,20 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/image_container"
         android:layout_width="match_parent"
         android:layout_height="182dp"
         app:cardCornerRadius="12dp"
         app:cardUseCompatPadding="true">
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop" />
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/play_songs"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -30,9 +30,9 @@
             android:backgroundTint="@color/eighty_percent_black_overlay"
             android:padding="8dp"
             app:srcCompat="@drawable/ic_play_arrow_white_24dp" />
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -45,7 +45,7 @@
         tools:ignore="MissingPrefix"
         tools:text="My top tracks" />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/title"
         fontPath="@string/circular_std_black"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/preference_dialog_library_categories.xml b/app/src/main/res/layout/preference_dialog_library_categories.xml
index b2bbafc7..a407c6f8 100644
--- a/app/src/main/res/layout/preference_dialog_library_categories.xml
+++ b/app/src/main/res/layout/preference_dialog_library_categories.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
index f5b74b24..89c4ba88 100644
--- a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
+++ b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
@@ -23,7 +23,7 @@
         android:focusable="false"
         android:gravity="center_vertical" />
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/preference_dialog_now_playing_screen.xml b/app/src/main/res/layout/preference_dialog_now_playing_screen.xml
index 8e7ad765..b1eb42d2 100644
--- a/app/src/main/res/layout/preference_dialog_now_playing_screen.xml
+++ b/app/src/main/res/layout/preference_dialog_now_playing_screen.xml
@@ -4,7 +4,7 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/now_playing_screen_view_pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/recycler_view_sec.xml b/app/src/main/res/layout/recycler_view_sec.xml
index a246244e..8120b05a 100644
--- a/app/src/main/res/layout/recycler_view_sec.xml
+++ b/app/src/main/res/layout/recycler_view_sec.xml
@@ -18,7 +18,7 @@
         android:textColor="?android:attr/textColorPrimary"
         tools:ignore="MissingPrefix" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/shadow_statusbar_toolbar.xml b/app/src/main/res/layout/shadow_statusbar_toolbar.xml
index 1e9842cb..afca46be 100755
--- a/app/src/main/res/layout/shadow_statusbar_toolbar.xml
+++ b/app/src/main/res/layout/shadow_statusbar_toolbar.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <View
+        <code.name.monkey.retromusic.views.StatusBarView
             android:layout_width="match_parent"
             android:layout_height="@dimen/status_bar_padding" />
 
diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml
index 36bea509..06fc3c5e 100644
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@@ -1,56 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:sothree="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/sliding_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_weight="1"
+    android:gravity="bottom"
+    sothree:umanoOverlay="false"
+    sothree:umanoPanelHeight="0dp"
+    sothree:umanoScrollableView="@+id/recycler_view"
+    sothree:umanoShadowHeight="0dp">
 
-    <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/sliding_layout"
+    <FrameLayout
+        android:id="@+id/content_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="bottom"
-        sothree:umanoOverlay="false"
-        sothree:umanoPanelHeight="0dp"
-        sothree:umanoScrollableView="@+id/recycler_view"
-        sothree:umanoShadowHeight="0dp">
+        android:layout_height="match_parent" />
+
+
+    <FrameLayout
+        android:id="@+id/sliding_panel"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
 
         <FrameLayout
-            android:id="@+id/content_container"
+            android:id="@+id/player_fragment_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-
-        <FrameLayout
-            android:id="@+id/sliding_panel"
+        <fragment
+            android:id="@+id/mini_player_fragment"
+            android:name="code.name.monkey.retromusic.ui.fragments.MiniPlayerFragment"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="48dp"
+            tools:layout="@layout/fragment_mini_player" />
 
-
-            <FrameLayout
-                android:id="@+id/player_fragment_container"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <fragment
-                android:id="@+id/mini_player_fragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.MiniPlayerFragment"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                tools:layout="@layout/fragment_mini_player" />
-        </FrameLayout>
-    </com.sothree.slidinguppanel.SlidingUpPanelLayout>
-
-
-    <fragment
-        android:id="@+id/castMiniController"
-        class="com.google.android.gms.cast.framework.media.widget.MiniControllerFragment"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        tools:visibility="visible" />
-
-</LinearLayout>
\ No newline at end of file
+        <fragment
+            android:id="@+id/castMiniController"
+            app:castShowImageThumbnail="false"
+            class="com.google.android.gms.cast.framework.media.widget.MiniControllerFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:visibility="visible" />
+    </FrameLayout>
+</com.sothree.slidinguppanel.SlidingUpPanelLayout>
diff --git a/app/src/main/res/layout/status_bar.xml b/app/src/main/res/layout/status_bar.xml
index 4e828d7b..e29b5c77 100755
--- a/app/src/main/res/layout/status_bar.xml
+++ b/app/src/main/res/layout/status_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<View xmlns:android="http://schemas.android.com/apk/res/android"
+<code.name.monkey.retromusic.views.StatusBarView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/status_bar"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/menu/bottom_navigation_main.xml b/app/src/main/res/menu/bottom_navigation_main.xml
index 28c76228..b642de4a 100644
--- a/app/src/main/res/menu/bottom_navigation_main.xml
+++ b/app/src/main/res/menu/bottom_navigation_main.xml
@@ -23,7 +23,7 @@
     <item
         android:id="@+id/action_genre"
         android:enabled="true"
-        android:icon="@drawable/ic_access_time_white_24dp"
+        android:icon="@drawable/ic_guitar_acoustic_white_24dp"
         android:title="@string/genre" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_expanded_controller.xml b/app/src/main/res/menu/menu_expanded_controller.xml
index 06d66b29..b38fb6c1 100644
--- a/app/src/main/res/menu/menu_expanded_controller.xml
+++ b/app/src/main/res/menu/menu_expanded_controller.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/media_route_menu_item"
         android:title="Cast"
-        app:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
+        app:actionProviderClass="androidx.mediarouter.app.MediaRouteActionProvider"
         app:showAsAction="always" />
 
 </menu>
diff --git a/app/src/main/res/menu/menu_main_options.xml b/app/src/main/res/menu/menu_main_options.xml
new file mode 100644
index 00000000..904eca91
--- /dev/null
+++ b/app/src/main/res/menu/menu_main_options.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_home"
+        android:icon="@drawable/ic_home_white_24dp"
+        android:title="@string/home"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/action_library"
+        android:icon="@drawable/ic_library_music_white_24dp"
+        android:title="@string/library"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/action_folders"
+        android:icon="@drawable/ic_folder_white_24dp"
+        android:title="@string/folders"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/action_settings"
+        android:icon="@drawable/ic_settings_white_24dp"
+        android:title="@string/action_settings"
+        app:showAsAction="always" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml
index 36115c24..0277f89e 100644
--- a/app/src/main/res/menu/menu_search.xml
+++ b/app/src/main/res/menu/menu_search.xml
@@ -5,6 +5,6 @@
         android:id="@+id/search"
         android:icon="@drawable/ic_search_white_24dp"
         android:title="@string/action_search"
-        app:actionViewClass="android.support.v7.widget.SearchView"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="ifRoom|collapseActionView" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
new file mode 100644
index 00000000..22c54579
--- /dev/null
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation 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/nav_graph"
+    app:startDestination="@id/bannerHomeFragment">
+    <fragment
+        android:id="@+id/bannerHomeFragment"
+        android:name="code.name.monkey.retromusic.ui.fragments.mainactivity.home.BannerHomeFragment"
+        android:label="fragment_banner_home"
+        tools:layout="@layout/fragment_banner_home">
+        <action
+            android:id="@+id/action_bannerHomeFragment2_to_libraryFragment"
+            app:destination="@id/libraryFragment" />
+        <action
+            android:id="@+id/action_bannerHomeFragment2_to_foldersFragment"
+            app:destination="@id/foldersFragment" />
+        <action
+            android:id="@+id/action_bannerHomeFragment_to_settingsActivity"
+            app:destination="@id/settingsActivity" />
+    </fragment>
+    <fragment
+        android:id="@+id/foldersFragment"
+        android:name="code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFragment"
+        android:label="fragment_folder"
+        tools:layout="@layout/fragment_folder" />
+    <fragment
+        android:id="@+id/libraryFragment"
+        android:name="code.name.monkey.retromusic.ui.fragments.mainactivity.LibraryFragment"
+        android:label="fragment_library"
+        tools:layout="@layout/fragment_library">
+        <action
+            android:id="@+id/action_libraryFragment_to_songsFragment"
+            app:destination="@id/songsFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/songsFragment"
+        android:name="code.name.monkey.retromusic.ui.fragments.mainactivity.SongsFragment"
+        android:label="SongsFragment" />
+    <activity
+        android:id="@+id/settingsActivity"
+        android:name="code.name.monkey.retromusic.ui.activities.SettingsActivity"
+        android:label="activity_settings"
+        tools:layout="@layout/fragment_main_settings" />
+</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
new file mode 100644
index 00000000..a54c60a1
--- /dev/null
+++ b/app/src/main/res/values-land/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="horizontal_margin">52dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
index a0a6d8b4..5a23938e 100644
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="header_image_height">420dp</dimen>
+    <dimen name="horizontal_margin">128dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e27406e7..c8cea012 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,7 +1,5 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">68dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="status_bar_padding">0dp</dimen>
     <dimen name="toolbar_elevation">4dp</dimen>
     <dimen name="default_item_margin">16dp</dimen>
@@ -57,7 +55,7 @@
     <dimen name="list_item_image_icon_padding">8dp</dimen>
 
     <dimen name="mini_player_height">48dp</dimen>
-    <dimen name="mini_player_height_expanded">104dp</dimen>
+    <dimen name="mini_player_height_expanded">68dp</dimen>
 
 
     <!--
@@ -92,5 +90,6 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
     <dimen name="column_width">80dp</dimen>
     <dimen name="icon_notification_dimen">32dp</dimen>
     <dimen name="overlap_toolbar_height">-12dp</dimen>
+    <dimen name="horizontal_margin">0dp</dimen>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b0a090b..e387a161 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -419,6 +419,7 @@
     <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</string>
     <string name="pref_summary_toggle_status_bar">Hide only status bar</string>
     <string name="pref_summary_toggle_volume">If enough space is available, show volume controls in the now playing screen</string>
+    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
     <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
     <string name="pref_title_album_grid_style">Album grid</string>
     <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
@@ -461,6 +462,7 @@
     <string name="pref_title_toggle_toggle_shuffle">Shuffle mode</string>
     <string name="pref_title_toggle_volume">Volume controls</string>
     <string name="pref_title_user_info">User info</string>
+    <string name="pref_title_extra_controls">Extra controls</string>
 
     <string name="primary_color">Primary color</string>
     <string name="primary_color_desc">The primary theme color, defaults to blue grey, for now works with dark colors</string>
@@ -688,4 +690,8 @@
     <string name="now_playing_themes">9+ now playing themes</string>
     <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
     <string name="window_corner_edges">Rounded corners</string>
+    <string name="pref_title_album_cover_style">Album cover theme</string>
+    <string name="circular">Circular</string>
+    <string name="carousal">Carousal</string>
+    <string name="now_playing_summary">Customzie now playing screen</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ec403f73..1a5adc4c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -147,9 +147,5 @@
         <item name="titleEnabled">false</item>
     </style>
 
-    <style name="HideTabTitleTextAppearance">
-        <item name="android:visibility">gone</item>
-        <item name="android:textSize">0sp</item>
-    </style>
 
 </resources>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 59283478..ffaed9a4 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -19,7 +19,7 @@
         <item name="bottomSheetDialogTheme">@style/Theme.Design.BottomSheetDialog</item>
     </style>
 
-    <style name="Theme.RetroMusic.Base.Light" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
 
@@ -47,10 +47,13 @@
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
         <item name="bottomSheetDialogTheme">@style/Theme.Design.Light.BottomSheetDialog</item>
+
+        <item name="mediaRouteTheme">@style/BlackMediaRouterTheme</item>
     </style>
 
-    <style name="Theme.RetroMusic.Base" parent="Theme.AppCompat.NoActionBar">
+    <style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
 
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
@@ -81,6 +84,8 @@
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
         <item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme</item>
+
+        <item name="mediaRouteTheme">@style/WhiteMediaRouterTheme</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Color" parent="@style/Theme.RetroMusic.Base">
@@ -158,4 +163,21 @@
         <item name="android:navigationBarColor">?cardBackgroundColor</item>
     </style>
 
+
+    <!--Cast Button-->
+    <style name="BlackMediaRouterTheme" parent="Theme.MediaRouter">
+        <item name="mediaRouteButtonStyle">@style/BlackMediaRouteButtonStyle</item>
+    </style>
+
+    <style name="BlackMediaRouteButtonStyle" parent="Widget.MediaRouter.Light.MediaRouteButton">
+        <item name="mediaRouteButtonTint">@color/md_grey_700</item>
+    </style>
+
+    <style name="WhiteMediaRouterTheme" parent="Theme.MediaRouter">
+        <item name="mediaRouteButtonStyle">@style/WhiteMediaRouteButtonStyle</item>
+    </style>
+
+    <style name="WhiteMediaRouteButtonStyle" parent="Widget.MediaRouter.Light.MediaRouteButton">
+        <item name="mediaRouteButtonTint">@color/md_white_1000</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/automotive_app_desc.xml b/app/src/main/res/xml/automotive_app_desc.xml
deleted file mode 100644
index 0a6a3c9f..00000000
--- a/app/src/main/res/xml/automotive_app_desc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<automotiveApp>
-    <uses name="media"/>
-</automotiveApp>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
index 0d48761a..09bf345e 100755
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -1,61 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory android:title="Advanced">
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
             android:key="toggle_headset"
             android:summary="@string/pref_summary_toggle_headset"
-            android:title="@string/pref_title_toggle_toggle_headset" />
+            android:title="@string/pref_title_toggle_toggle_headset"
+            app:iconSpaceReserved="false" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
             android:key="toggle_shuffle"
             android:summary="@string/pref_summary_toggle_shuffle"
-            android:title="@string/pref_title_toggle_toggle_shuffle" />
+            android:title="@string/pref_title_toggle_toggle_shuffle"
+            app:iconSpaceReserved="false" />
 
-        <android.support.v7.preference.SeekBarPreference
-            android:defaultValue="12"
-            android:key="new_blur_amount"
-            android:max="25"
-            android:summary="@string/pref_blur_amount_summary"
-            android:title="@string/pref_blur_amount_title" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
             android:key="keep_screen_on"
             android:summary="@string/pref_keep_screen_on_summary"
-            android:title="@string/pref_keep_screen_on_title" />
+            android:title="@string/pref_keep_screen_on_title"
+            app:iconSpaceReserved="false" />
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
-            android:defaultValue="0"
-            android:entries="@array/pref_grid_style_list_titles"
-            android:entryValues="@array/pref_grid_style_list_values"
-            android:key="album_grid_style"
-            android:negativeButtonText="@null"
-            android:positiveButtonText="@null"
-            android:title="@string/pref_title_album_grid_style" />
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
-            android:defaultValue="0"
-            android:entries="@array/pref_grid_style_list_titles"
-            android:entryValues="@array/pref_grid_style_list_values"
-            android:key="artist_grid_style"
-            android:negativeButtonText="@null"
-            android:positiveButtonText="@null"
-            android:title="@string/pref_title_artist_grid_style" />
-
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+        <!--<code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
+            app:iconSpaceReserved="false"
             android:key="toggle_home_banner"
             android:summary="Toggle banner image"
-            android:title="Banner" />
+            android:title="Banner" />-->
+
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="false"
-            android:key="toggle_add_controls"
-            android:summary="Extra controls"
-            android:title="Add extra controls for mini player" />
 
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_audio.xml b/app/src/main/res/xml/pref_audio.xml
index cf7ead59..549d354f 100755
--- a/app/src/main/res/xml/pref_audio.xml
+++ b/app/src/main/res/xml/pref_audio.xml
@@ -1,26 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="true"
         android:key="audio_ducking"
+        app:iconSpaceReserved="false"
         android:summary="@string/pref_summary_audio_ducking"
         android:title="@string/pref_title_audio_ducking" />
+
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="false"
         android:key="gapless_playback"
+        app:iconSpaceReserved="false"
         android:summary="@string/pref_summary_gapless_playback"
         android:title="@string/pref_title_gapless_playback" />
+
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
         android:defaultValue="system"
+        app:iconSpaceReserved="false"
         android:entries="@array/pref_equalizer_types_titles"
         android:entryValues="@array/pref_equalizer_types_values"
         android:key="choose_equalizer"
         android:negativeButtonText="@null"
         android:positiveButtonText="@null"
         android:title="@string/pref_title_choose_equalizer" />
+
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreference
         android:key="equalizer"
+        app:iconSpaceReserved="false"
         android:title="@string/equalizer" />
 
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_blacklist.xml b/app/src/main/res/xml/pref_blacklist.xml
index cdb4a4fa..4138dfd5 100644
--- a/app/src/main/res/xml/pref_blacklist.xml
+++ b/app/src/main/res/xml/pref_blacklist.xml
@@ -1,12 +1,14 @@
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory android:title="Blacklist">
 
         <code.name.monkey.retromusic.preferences.BlacklistPreference
             android:key="blacklist"
             android:summary="The content of blacklisted folders is hidden from your library."
-            android:title="Blacklist"/>
+            android:title="Blacklist"
+            app:iconSpaceReserved="false" />
 
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index 65d39bf7..2d3d57f6 100755
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory android:title="@string/pref_header_general">
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
             android:defaultValue="light"
@@ -8,7 +9,8 @@
             android:key="general_theme"
             android:negativeButtonText="@null"
             android:positiveButtonText="@null"
-            android:title="@string/pref_title_general_theme" />
+            android:title="@string/pref_title_general_theme"
+            app:iconSpaceReserved="false" />
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory android:title="@string/colors">
 
@@ -16,32 +18,43 @@
             android:key="primary_color"
             android:persistent="false"
             android:summary="@string/primary_color_desc"
-            android:title="@string/primary_color" />
+            android:title="@string/primary_color"
+            app:iconSpaceReserved="false" />
+
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEColorPreference
             android:key="accent_color"
             android:persistent="false"
             android:summary="@string/accent_color_desc"
-            android:title="@string/accent_color" />
+            android:title="@string/accent_color"
+            app:iconSpaceReserved="false" />
+
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
             android:key="should_color_navigation_bar"
             android:persistent="false"
             android:summary="@string/pref_summary_colored_navigation_bar"
-            android:title="@string/pref_title_navigation_bar" />
+            android:title="@string/pref_title_navigation_bar"
+            app:iconSpaceReserved="false" />
+
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
             android:key="adaptive_color_app"
             android:summary="@string/pref_summary_colored_app"
-            android:title="@string/pref_title_colored_app" />
+            android:title="@string/pref_title_colored_app"
+            app:iconSpaceReserved="false" />
+
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
             android:key="should_color_app_shortcuts"
             android:summary="@string/pref_summary_colored_app_shortcuts"
-            android:title="@string/pref_title_app_shortcuts" />
+            android:title="@string/pref_title_app_shortcuts"
+            app:iconSpaceReserved="false" />
+
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
             android:key="dominant_color"
             android:summary="@string/pref_summary_dominant_color"
-            android:title="@string/pref_title_toggle_dominant_color" />
+            android:title="@string/pref_title_toggle_dominant_color"
+            app:iconSpaceReserved="false" />
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_images.xml b/app/src/main/res/xml/pref_images.xml
index 74927fac..2e888a2c 100755
--- a/app/src/main/res/xml/pref_images.xml
+++ b/app/src/main/res/xml/pref_images.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="true"
+        app:iconSpaceReserved="false"
         android:key="ignore_media_store_artwork"
         android:summary="@string/pref_summary_ignore_media_store_artwork"
         android:title="@string/pref_title_ignore_media_store_artwork" />
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
         android:defaultValue="only_wifi"
+        app:iconSpaceReserved="false"
         android:entries="@array/pref_auto_download_images_titles"
         android:entryValues="@array/pref_auto_download_images_values"
         android:key="auto_download_images_policy"
         android:title="@string/pref_title_auto_download_artist_images" />
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_lockscreen.xml b/app/src/main/res/xml/pref_lockscreen.xml
index df0342d2..af17bee6 100755
--- a/app/src/main/res/xml/pref_lockscreen.xml
+++ b/app/src/main/res/xml/pref_lockscreen.xml
@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory android:title="@string/pref_header_lockscreen">
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="true"
+            app:iconSpaceReserved="false"
             android:key="album_art_on_lockscreen"
             android:summary="@string/pref_summary_album_art_on_lockscreen"
             android:title="@string/pref_title_album_art_on_lockscreen" />
+
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
             android:dependency="album_art_on_lockscreen"
             android:key="blurred_album_art"
+            app:iconSpaceReserved="false"
             android:summary="@string/pref_summary_blurred_album_art"
             android:title="@string/pref_title_blurred_album_art" />
+
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
+            app:iconSpaceReserved="false"
             android:key="lock_screen"
             android:summary="@string/pref_summary_lock_screen"
             android:title="@string/pref_title_lock_screen" />
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_notification.xml b/app/src/main/res/xml/pref_notification.xml
index e0154635..64e24946 100755
--- a/app/src/main/res/xml/pref_notification.xml
+++ b/app/src/main/res/xml/pref_notification.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="true"
+        app:iconSpaceReserved="false"
         android:key="colored_notification"
         android:summary="@string/pref_summary_colored_notification"
         android:title="@string/pref_title_colored_notification" />
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="false"
+        app:iconSpaceReserved="false"
         android:key="classic_notification"
         android:summary="@string/pref_summary_classic_notification"
         android:title="@string/pref_title_classic_notification" />
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_now_playing_screen.xml b/app/src/main/res/xml/pref_now_playing_screen.xml
index 747d743a..32500e6f 100644
--- a/app/src/main/res/xml/pref_now_playing_screen.xml
+++ b/app/src/main/res/xml/pref_now_playing_screen.xml
@@ -1,19 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <code.name.monkey.retromusic.preferences.NowPlayingScreenPreference
         android:key="now_playing_screen_id"
-        android:title="@string/pref_title_now_playing_screen_appearance" />
+        android:title="@string/pref_title_now_playing_screen_appearance"
+        app:iconSpaceReserved="false" />
+
+    <code.name.monkey.retromusic.preferences.AlbumCoverStylePreference
+        android:key="album_cover_style_id"
+        android:title="@string/pref_title_album_cover_style"
+        app:iconSpaceReserved="false" />
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="false"
         android:key="carousel_effect"
         android:summary="@string/pref_summary_carousel_effect"
-        android:title="@string/pref_title_toggle_carousel_effect" />
+        android:title="@string/pref_title_toggle_carousel_effect"
+        app:iconSpaceReserved="false" />
+
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESeekBarPreference
+        android:defaultValue="12"
+        android:key="new_blur_amount"
+        android:max="25"
+        android:summary="@string/pref_blur_amount_summary"
+        android:title="@string/pref_blur_amount_title"
+        app:iconSpaceReserved="false" />
+
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="false"
-        android:key="circular_album_art"
-        android:summary="@string/pref_summary_circular_album_effect"
-        android:title="@string/pref_title_toggle_circular_album_effect" />
+        android:key="toggle_add_controls"
+        android:summary="@string/pref_summary_extra_controls"
+        android:title="@string/pref_title_extra_controls"
+        app:iconSpaceReserved="false" />
 
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+        android:defaultValue="false"
+        android:key="toggle_volume"
+        android:summary="@string/pref_summary_toggle_volume"
+        android:title="@string/pref_title_toggle_volume"
+        app:iconSpaceReserved="false" />
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_others.xml b/app/src/main/res/xml/pref_others.xml
index b0009c97..9f93c8f9 100644
--- a/app/src/main/res/xml/pref_others.xml
+++ b/app/src/main/res/xml/pref_others.xml
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreference
         android:key="changelog"
+        app:iconSpaceReserved="false"
         android:summary="@string/changelog_summary"
         android:title="@string/changelog" />
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreference
         android:key="app_version"
         android:summary="0.0.0"
+        app:iconSpaceReserved="false"
         android:title="@string/version" />
+
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreference
         android:key="open_source"
+        app:iconSpaceReserved="false"
         android:summary="@string/pref_summary_open_source_licences"
         android:title="@string/pref_title_open_source_licences" />
+
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreference
         android:key="about"
+        app:iconSpaceReserved="false"
         android:summary="@string/pref_summary_about"
         android:title="@string/action_about" />
 
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_playlists.xml b/app/src/main/res/xml/pref_playlists.xml
index d6700bea..cfa977ea 100644
--- a/app/src/main/res/xml/pref_playlists.xml
+++ b/app/src/main/res/xml/pref_playlists.xml
@@ -1,4 +1,5 @@
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory android:title="@string/pref_header_playlists">
 
@@ -7,10 +8,11 @@
             android:entries="@array/pref_playlists_last_added_interval_titles"
             android:entryValues="@array/pref_playlists_last_added_interval_values"
             android:key="last_added_interval"
+            app:iconSpaceReserved="false"
             android:negativeButtonText="@null"
             android:positiveButtonText="@null"
             android:title="@string/pref_title_last_added_interval" />
 
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
-</android.support.v7.preference.PreferenceScreen>
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_ui.xml b/app/src/main/res/xml/pref_ui.xml
index f87d1da8..0f43bee4 100644
--- a/app/src/main/res/xml/pref_ui.xml
+++ b/app/src/main/res/xml/pref_ui.xml
@@ -1,20 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
+        android:defaultValue="0"
+        android:entries="@array/pref_grid_style_list_titles"
+        android:entryValues="@array/pref_grid_style_list_values"
+        android:key="album_grid_style"
+        android:negativeButtonText="@null"
+        android:positiveButtonText="@null"
+        android:title="@string/pref_title_album_grid_style"
+        app:iconSpaceReserved="false" />
+
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
+        android:defaultValue="0"
+        android:entries="@array/pref_grid_style_list_titles"
+        android:entryValues="@array/pref_grid_style_list_values"
+        android:key="artist_grid_style"
+        android:negativeButtonText="@null"
+        android:positiveButtonText="@null"
+        android:title="@string/pref_title_artist_grid_style"
+        app:iconSpaceReserved="false" />
+
 
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-        android:defaultValue="false"
-        android:key="toggle_volume"
-        android:summary="@string/pref_summary_toggle_volume"
-        android:title="@string/pref_title_toggle_volume" />
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="true"
         android:key="toggle_tab_titles"
         android:summary="@string/pref_summary_tab_titles"
-        android:title="@string/pref_title_toggle_tab_titles" />
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-        android:defaultValue="false"
-        android:key="toggle_genre"
-        android:summary="@string/pref_summary_toggle_genre"
-        android:title="@string/pref_title_toggle_genre" />
+        android:title="@string/pref_title_toggle_tab_titles"
+        app:iconSpaceReserved="false" />
 
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_window.xml b/app/src/main/res/xml/pref_window.xml
index 14b0bfc4..7f743ade 100644
--- a/app/src/main/res/xml/pref_window.xml
+++ b/app/src/main/res/xml/pref_window.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-  <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory android:title="@string/window">
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-      android:defaultValue="false"
-      android:key="corner_window"
-      android:summary="@string/pref_summary_round_corners"
-      android:title="@string/pref_title_round_corners"/>
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-      android:defaultValue="false"
-      android:key="toggle_full_screen"
-      android:summary="@string/pref_summary_toggle_full_screen"
-      android:title="@string/pref_title_toggle_full_screen"/>
-  </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory android:title="@string/window">
+        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+            android:defaultValue="false"
+            android:key="corner_window"
+            android:summary="@string/pref_summary_round_corners"
+            android:title="@string/pref_title_round_corners"
+            app:iconSpaceReserved="false" />
+
+        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+            android:defaultValue="false"
+            android:key="toggle_full_screen"
+            android:summary="@string/pref_summary_toggle_full_screen"
+            android:title="@string/pref_title_toggle_full_screen"
+            app:iconSpaceReserved="false" />
+    </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/appthemehelper/appthemehelper.iml b/appthemehelper/appthemehelper.iml
index ef43777f..0f0d2e48 100644
--- a/appthemehelper/appthemehelper.iml
+++ b/appthemehelper/appthemehelper.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":appthemehelper" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" version="4">
+<module external.linked.project.id=":appthemehelper" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -8,11 +8,11 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="SELECTED_BUILD_VARIANT" value="release" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseSources" />
         <afterSyncTasks>
-          <task>generateDebugSources</task>
+          <task>generateReleaseSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -24,46 +24,32 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/releaseUnitTest/compileReleaseUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/release" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/release/generateReleaseRFile/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/release/compileReleaseAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/release" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/release/compileReleaseRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/release" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/release" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/release" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -88,6 +74,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/consumer_proguard_file" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
@@ -109,42 +96,42 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:print:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:design:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0-rc01@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:transition:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.transition:transition:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.preference:preference:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0-rc01@aar" level="project" />
     <orderEntry type="library" name="Gradle: me.zhanghai.android.materialprogressbar:library:1.4.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0-rc01@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:preference-v7:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:28.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0-rc01@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0-rc01@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.android.support:cursoradapter:28.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.0.0-rc01@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0-rc01@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.afollestad.material-dialogs:commons:0.9.6.0@aar" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/appthemehelper/build.gradle b/appthemehelper/build.gradle
index b5057060..8d3a7186 100644
--- a/appthemehelper/build.gradle
+++ b/appthemehelper/build.gradle
@@ -8,7 +8,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -24,10 +24,10 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0-rc01'
-    implementation 'com.android.support:design:28.0.0-rc01'
-    implementation 'com.android.support:preference-v7:28.0.0-rc01'
-    implementation 'com.android.support:cardview-v7:28.0.0-rc01'
+    implementation 'androidx.appcompat:appcompat:1.0.0-rc01'
+    implementation 'com.google.android.material:material:1.0.0-rc01'
+    implementation 'androidx.preference:preference:1.0.0-rc01'
+    implementation 'androidx.cardview:cardview:1.0.0-rc01'
     // Used for the list preference classes
     implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
     implementation 'com.afollestad.material-dialogs:commons:0.9.6.0'
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.java
index 7bb82774..f6f7957b 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.java
@@ -7,10 +7,10 @@ import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.appthemehelper.util.TintHelper;
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATHActivity.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATHActivity.java
index 6f0d2c1a..5849f131 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATHActivity.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATHActivity.java
@@ -2,8 +2,8 @@ package code.name.monkey.appthemehelper;
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.StyleRes;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * @author Aidan Follestad (afollestad), Karim Abou Zeid (kabouzeid)
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.java
index f776fb6b..822b9696 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.java
@@ -4,14 +4,14 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Color;
-import android.support.annotation.AttrRes;
-import android.support.annotation.CheckResult;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.StyleRes;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.AttrRes;
+import androidx.annotation.CheckResult;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import androidx.core.content.ContextCompat;
 
 import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ColorUtil;
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStoreInterface.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStoreInterface.java
index 9301be7d..09e06926 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStoreInterface.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStoreInterface.java
@@ -1,9 +1,9 @@
 package code.name.monkey.appthemehelper;
 
-import android.support.annotation.AttrRes;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.StyleRes;
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.StyleRes;
 
 /**
  * @author Aidan Follestad (afollestad), Karim Abou Zeid (kabouzeid)
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/ATHActionBarActivity.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/ATHActionBarActivity.java
index df126559..6b207554 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/ATHActionBarActivity.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/ATHActionBarActivity.java
@@ -1,6 +1,6 @@
 package code.name.monkey.appthemehelper.common;
 
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
 
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/ATHToolbarActivity.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/ATHToolbarActivity.java
index b216bc4a..c29b1c3a 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/ATHToolbarActivity.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/ATHToolbarActivity.java
@@ -1,8 +1,8 @@
 package code.name.monkey.appthemehelper.common;
 
 import android.graphics.drawable.ColorDrawable;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 
 import code.name.monkey.appthemehelper.ATHActivity;
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATECheckBoxPreference.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATECheckBoxPreference.java
index da5eb869..66d76d00 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATECheckBoxPreference.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATECheckBoxPreference.java
@@ -5,18 +5,18 @@ import android.content.Context;
 import android.os.Build;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 
-import java.lang.reflect.Field;
-
 import code.name.monkey.appthemehelper.ATH;
 import code.name.monkey.appthemehelper.R;
 import code.name.monkey.appthemehelper.ThemeStore;
 
+import java.lang.reflect.Field;
+
 /**
  * @author Aidan Follestad (afollestad)
  */
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.java
index 3ccbb8c7..0dd15a05 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.java
@@ -53,7 +53,7 @@ public class ATEColorPreference extends Preference {
 
     private void invalidateColor() {
         if (mView != null) {
-            BorderCircleView circle = mView.findViewById(R.id.circle);
+            BorderCircleView circle = (BorderCircleView) mView.findViewById(R.id.circle);
             if (this.color != 0) {
                 circle.setVisibility(View.VISIBLE);
                 circle.setBackgroundColor(color);
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEDialogPreference.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEDialogPreference.java
index 3e283627..13302ee4 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEDialogPreference.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEDialogPreference.java
@@ -7,6 +7,7 @@ import com.afollestad.materialdialogs.prefs.MaterialDialogPreference;
 
 import code.name.monkey.appthemehelper.R;
 
+
 /**
  * @author Aidan Follestad (afollestad)
  */
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATESwitchPreference.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATESwitchPreference.java
index b2609ec8..e3ba86ee 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATESwitchPreference.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATESwitchPreference.java
@@ -4,17 +4,29 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
 import android.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import android.preference.SwitchPreference;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.SwitchCompat;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Switch;
+
+import code.name.monkey.appthemehelper.ATH;
+import code.name.monkey.appthemehelper.R;
+import code.name.monkey.appthemehelper.ThemeStore;
+import code.name.monkey.appthemehelper.common.views.ATESwitch;
 
 import java.lang.reflect.Field;
 
-import code.name.monkey.appthemehelper.R;
-
 /**
  * @author Aidan Follestad (afollestad)
  */
-public class ATESwitchPreference extends ATEPreference {
+public class ATESwitchPreference extends SwitchPreference {
+
+    static final boolean COMPAT_MODE = Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP;
+
+    private ATESwitch mSwitch;
 
     public ATESwitchPreference(Context context) {
         super(context);
@@ -39,20 +51,64 @@ public class ATESwitchPreference extends ATEPreference {
 
     private void init(Context context, AttributeSet attrs) {
         setLayoutResource(R.layout.ate_preference_custom);
+        if (COMPAT_MODE) {
+            setWidgetLayoutResource(R.layout.ate_preference_switch);
+        } else {
+            try {
+                Field canRecycleLayoutField = Preference.class.getDeclaredField("mCanRecycleLayout");
+                canRecycleLayoutField.setAccessible(true);
+                canRecycleLayoutField.setBoolean(this, true);
+            } catch (Exception ignored) {
+            }
 
-        try {
-            Field canRecycleLayoutField = Preference.class.getDeclaredField("mCanRecycleLayout");
-            canRecycleLayoutField.setAccessible(true);
-            canRecycleLayoutField.setBoolean(this, true);
-        } catch (Exception ignored) {
-        }
-
-        try {
-            Field hasSpecifiedLayout = Preference.class.getDeclaredField("mHasSpecifiedLayout");
-            hasSpecifiedLayout.setAccessible(true);
-            hasSpecifiedLayout.setBoolean(this, true);
-        } catch (Exception ignored) {
+            try {
+                Field hasSpecifiedLayout = Preference.class.getDeclaredField("mHasSpecifiedLayout");
+                hasSpecifiedLayout.setAccessible(true);
+                hasSpecifiedLayout.setBoolean(this, true);
+            } catch (Exception ignored) {
+            }
         }
     }
 
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        if (COMPAT_MODE) {
+            mSwitch = (ATESwitch) view.findViewById(R.id.switchWidget);
+            mSwitch.setChecked(isChecked());
+        } else {
+            View parentSwitch = findSwitchView(view);
+            if (parentSwitch != null) {
+                ATH.setTint(parentSwitch, ThemeStore.accentColor(view.getContext()));
+            }
+        }
+    }
+
+    @Nullable
+    private View findSwitchView(View view) {
+        if (view instanceof ViewGroup) {
+            for (int i = 0; i < ((ViewGroup) view).getChildCount(); i++) {
+                View child = ((ViewGroup) view).getChildAt(i);
+                if (child instanceof Switch || child instanceof SwitchCompat) {
+                    return child;
+                } else if (child instanceof ViewGroup) {
+                    View potentialSwitch = findSwitchView(child);
+                    if (potentialSwitch != null) return potentialSwitch;
+                }
+            }
+        } else if (view instanceof Switch || view instanceof SwitchCompat) {
+            return view;
+        }
+        return null;
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        super.setChecked(checked);
+        if (COMPAT_MODE) {
+            if (mSwitch != null) {
+                mSwitch.setChecked(checked);
+            }
+        }
+    }
 }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/BorderCircleView.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/BorderCircleView.java
index 7db4b1ec..db64819e 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/BorderCircleView.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/BorderCircleView.java
@@ -7,7 +7,7 @@ import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATECheckBoxPreference.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATECheckBoxPreference.java
index 3318d46e..e77699fd 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATECheckBoxPreference.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATECheckBoxPreference.java
@@ -3,11 +3,12 @@ package code.name.monkey.appthemehelper.common.prefs.supportv7;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.support.v7.preference.CheckBoxPreference;
+import androidx.preference.CheckBoxPreference;
 import android.util.AttributeSet;
 
 import code.name.monkey.appthemehelper.R;
 
+
 /**
  * @author Aidan Follestad (afollestad)
  */
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEColorPreference.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEColorPreference.java
index 757bd121..95e49ca5 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEColorPreference.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEColorPreference.java
@@ -1,8 +1,8 @@
 package code.name.monkey.appthemehelper.common.prefs.supportv7;
 
 import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEDialogPreference.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEDialogPreference.java
index e87802a5..9aa8445e 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEDialogPreference.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEDialogPreference.java
@@ -1,11 +1,12 @@
 package code.name.monkey.appthemehelper.common.prefs.supportv7;
 
 import android.content.Context;
-import android.support.v7.preference.DialogPreference;
+import androidx.preference.DialogPreference;
 import android.util.AttributeSet;
 
 import code.name.monkey.appthemehelper.R;
 
+
 /**
  * @author Aidan Follestad (afollestad)
  */
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEEditTextPreference.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEEditTextPreference.java
index be73af7b..c67231fe 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEEditTextPreference.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEEditTextPreference.java
@@ -1,11 +1,12 @@
 package code.name.monkey.appthemehelper.common.prefs.supportv7;
 
 import android.content.Context;
-import android.support.v7.preference.EditTextPreference;
+import androidx.preference.EditTextPreference;
 import android.util.AttributeSet;
 
 import code.name.monkey.appthemehelper.R;
 
+
 /**
  * @author Aidan Follestad (afollestad)
  */
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEListPreference.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEListPreference.java
index 6f6d9726..6fe4cfa2 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEListPreference.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEListPreference.java
@@ -1,7 +1,7 @@
 package code.name.monkey.appthemehelper.common.prefs.supportv7;
 
 import android.content.Context;
-import android.support.v7.preference.ListPreference;
+import androidx.preference.ListPreference;
 import android.util.AttributeSet;
 
 import code.name.monkey.appthemehelper.R;
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreference.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreference.java
index 89f33895..7c8b2393 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreference.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreference.java
@@ -3,7 +3,7 @@ package code.name.monkey.appthemehelper.common.prefs.supportv7;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 import android.util.AttributeSet;
 
 import code.name.monkey.appthemehelper.R;
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.java
index e617ba21..0e18c4ac 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.java
@@ -3,8 +3,8 @@ package code.name.monkey.appthemehelper.common.prefs.supportv7;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.java
index 8f89b2fa..81e0bb7e 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.java
@@ -1,25 +1,27 @@
 package code.name.monkey.appthemehelper.common.prefs.supportv7;
 
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
 
 import code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs.ATEEditTextPreferenceDialogFragmentCompat;
 import code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs.ATEListPreferenceDialogFragmentCompat;
 import code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs.ATEPreferenceDialogFragment;
 
-
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
 public abstract class ATEPreferenceFragmentCompat extends PreferenceFragmentCompat {
     @Override
     public void onDisplayPreferenceDialog(Preference preference) {
-        if (this.getCallbackFragment() instanceof PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback) {
-            ((PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback) this.getCallbackFragment()).onPreferenceDisplayDialog(this, preference);
+        if (this.getCallbackFragment() instanceof OnPreferenceDisplayDialogCallback) {
+            ((OnPreferenceDisplayDialogCallback) this.getCallbackFragment()).onPreferenceDisplayDialog(this, preference);
             return;
         }
 
-        if (this.getActivity() instanceof PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback) {
-            ((PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback) this.getActivity()).onPreferenceDisplayDialog(this, preference);
+        if (this.getActivity() instanceof OnPreferenceDisplayDialogCallback) {
+            ((OnPreferenceDisplayDialogCallback) this.getActivity()).onPreferenceDisplayDialog(this, preference);
             return;
         }
 
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.java
new file mode 100644
index 00000000..15266eb2
--- /dev/null
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.java
@@ -0,0 +1,29 @@
+package code.name.monkey.appthemehelper.common.prefs.supportv7;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.preference.SeekBarPreference;
+
+public class ATESeekBarPreference extends SeekBarPreference {
+    public ATESeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public ATESeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public ATESeekBarPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ATESeekBarPreference(Context context) {
+        super(context);
+        init(context);
+    }
+
+    private void init(Context context) {
+
+    }
+}
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESwitchPreference.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESwitchPreference.java
index 3dec60dc..c49637fb 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESwitchPreference.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESwitchPreference.java
@@ -3,7 +3,7 @@ package code.name.monkey.appthemehelper.common.prefs.supportv7;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.support.v7.preference.CheckBoxPreference;
+import androidx.preference.CheckBoxPreference;
 import android.util.AttributeSet;
 
 import code.name.monkey.appthemehelper.R;
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEEditTextPreferenceDialogFragmentCompat.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEEditTextPreferenceDialogFragmentCompat.java
index 8135abbf..a0c754f3 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEEditTextPreferenceDialogFragmentCompat.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEEditTextPreferenceDialogFragmentCompat.java
@@ -1,12 +1,15 @@
 package code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEEditTextPreference;
 
-
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
 public class ATEEditTextPreferenceDialogFragmentCompat extends ATEPreferenceDialogFragment implements MaterialDialog.InputCallback {
 
     private CharSequence input;
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEListPreferenceDialogFragmentCompat.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEListPreferenceDialogFragmentCompat.java
index b9a81b28..e0991c36 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEListPreferenceDialogFragmentCompat.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEListPreferenceDialogFragmentCompat.java
@@ -1,14 +1,16 @@
 package code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs;
 
 import android.os.Bundle;
-import android.support.v7.preference.ListPreference;
+import androidx.preference.ListPreference;
 import android.view.View;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference;
 
-
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
 public class ATEListPreferenceDialogFragmentCompat extends ATEPreferenceDialogFragment implements MaterialDialog.ListCallbackSingleChoice {
     private int mClickedDialogEntryIndex;
 
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEPreferenceDialogFragment.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEPreferenceDialogFragment.java
index 7bba0ac9..86e96c80 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEPreferenceDialogFragment.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEPreferenceDialogFragment.java
@@ -3,17 +3,19 @@ package code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.preference.DialogPreference;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.DialogPreference;
 import android.view.Window;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 
-
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
 public class ATEPreferenceDialogFragment extends DialogFragment implements MaterialDialog.SingleButtonCallback {
     private DialogAction mWhichButtonClicked;
 
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATECheckBox.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATECheckBox.java
index 53713393..c249d8e0 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATECheckBox.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATECheckBox.java
@@ -1,12 +1,13 @@
 package code.name.monkey.appthemehelper.common.views;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatCheckBox;
+import androidx.appcompat.widget.AppCompatCheckBox;
 import android.util.AttributeSet;
 
 import code.name.monkey.appthemehelper.ATH;
 import code.name.monkey.appthemehelper.ThemeStore;
 
+
 /**
  * @author Aidan Follestad (afollestad)
  */
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEEditText.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEEditText.java
index 5c9c41ba..1fc03f97 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEEditText.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEEditText.java
@@ -1,18 +1,17 @@
 package code.name.monkey.appthemehelper.common.views;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
+import androidx.appcompat.widget.AppCompatEditText;
 import android.util.AttributeSet;
-import android.widget.EditText;
 
 import code.name.monkey.appthemehelper.ATH;
 import code.name.monkey.appthemehelper.ThemeStore;
 
+
 /**
  * @author Aidan Follestad (afollestad)
  */
-public class ATEEditText extends EditText {
+public class ATEEditText extends AppCompatEditText {
 
     public ATEEditText(Context context) {
         super(context);
@@ -29,12 +28,6 @@ public class ATEEditText extends EditText {
         init(context, attrs);
     }
 
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public ATEEditText(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init(context, attrs);
-    }
-
     private void init(Context context, AttributeSet attrs) {
         ATH.setTint(this, ThemeStore.accentColor(context));
         setTextColor(ThemeStore.textColorPrimary(context));
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEPrimaryTextView.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEPrimaryTextView.java
index 6d49cbd6..8d030ea2 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEPrimaryTextView.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEPrimaryTextView.java
@@ -1,14 +1,16 @@
 package code.name.monkey.appthemehelper.common.views;
 
 import android.content.Context;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.util.AttributeSet;
 
 import code.name.monkey.appthemehelper.ThemeStore;
 
+
 /**
  * @author Aidan Follestad (afollestad)
  */
-public class ATEPrimaryTextView extends android.support.v7.widget.AppCompatTextView {
+public class ATEPrimaryTextView extends AppCompatTextView {
 
     public ATEPrimaryTextView(Context context) {
         super(context);
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEProgressBar.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEProgressBar.java
index d8587d3a..274852dc 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEProgressBar.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEProgressBar.java
@@ -9,6 +9,7 @@ import android.widget.ProgressBar;
 import code.name.monkey.appthemehelper.ATH;
 import code.name.monkey.appthemehelper.ThemeStore;
 
+
 /**
  * @author Aidan Follestad (afollestad)
  */
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESecondaryTextView.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESecondaryTextView.java
index 2f8bdc78..0ebbd962 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESecondaryTextView.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESecondaryTextView.java
@@ -1,17 +1,15 @@
 package code.name.monkey.appthemehelper.common.views;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.util.AttributeSet;
-import android.widget.TextView;
 
 import code.name.monkey.appthemehelper.ThemeStore;
 
 /**
  * @author Aidan Follestad (afollestad)
  */
-public class ATESecondaryTextView extends android.support.v7.widget.AppCompatTextView {
+public class ATESecondaryTextView extends AppCompatTextView {
 
     public ATESecondaryTextView(Context context) {
         super(context);
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESeekBar.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESeekBar.java
index 52dce7a1..50975724 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESeekBar.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESeekBar.java
@@ -1,15 +1,19 @@
 package code.name.monkey.appthemehelper.common.views;
 
+import android.annotation.TargetApi;
 import android.content.Context;
+import android.os.Build;
 import android.util.AttributeSet;
+import android.widget.SeekBar;
 
 import code.name.monkey.appthemehelper.ATH;
 import code.name.monkey.appthemehelper.ThemeStore;
 
+
 /**
  * @author Aidan Follestad (afollestad)
  */
-public class ATESeekBar extends android.support.v7.widget.AppCompatSeekBar {
+public class ATESeekBar extends SeekBar {
 
     public ATESeekBar(Context context) {
         super(context);
@@ -26,6 +30,12 @@ public class ATESeekBar extends android.support.v7.widget.AppCompatSeekBar {
         init(context, attrs);
     }
 
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public ATESeekBar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context, attrs);
+    }
+
     private void init(Context context, AttributeSet attrs) {
         ATH.setTint(this, ThemeStore.accentColor(context));
     }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEStockSwitch.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEStockSwitch.java
index dffffc78..432c9b3b 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEStockSwitch.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEStockSwitch.java
@@ -8,6 +8,7 @@ import android.widget.Switch;
 import code.name.monkey.appthemehelper.ATH;
 import code.name.monkey.appthemehelper.ThemeStore;
 
+
 /**
  * @author Aidan Follestad (afollestad)
  */
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.java
index a2fc840b..e9ddb90a 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.java
@@ -1,13 +1,14 @@
 package code.name.monkey.appthemehelper.common.views;
 
 import android.content.Context;
-import android.support.v7.widget.SwitchCompat;
+import androidx.appcompat.widget.SwitchCompat;
 import android.util.AttributeSet;
 import android.view.View;
 
 import code.name.monkey.appthemehelper.ATH;
 import code.name.monkey.appthemehelper.ThemeStore;
 
+
 /**
  * @author Aidan Follestad (afollestad)
  */
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ATHUtil.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ATHUtil.java
index 85979fbf..d8b07342 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ATHUtil.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ATHUtil.java
@@ -2,10 +2,8 @@ package code.name.monkey.appthemehelper.util;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-
-import code.name.monkey.appthemehelper.util.ColorUtil;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
 
 /**
  * @author Aidan Follestad (afollestad)
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ColorUtil.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ColorUtil.java
index 58c0dc0c..a0677309 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ColorUtil.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ColorUtil.java
@@ -1,8 +1,8 @@
 package code.name.monkey.appthemehelper.util;
 
 import android.graphics.Color;
-import android.support.annotation.ColorInt;
-import android.support.annotation.FloatRange;
+import androidx.annotation.ColorInt;
+import androidx.annotation.FloatRange;
 
 
 public final class ColorUtil {
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/DrawableUtil.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/DrawableUtil.java
index 2242866b..611f4266 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/DrawableUtil.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/DrawableUtil.java
@@ -3,7 +3,7 @@ package code.name.monkey.appthemehelper.util;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 
 
 public final class DrawableUtil {
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/EdgeGlowUtil.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/EdgeGlowUtil.java
index 7387d7d6..8fe1a9fe 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/EdgeGlowUtil.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/EdgeGlowUtil.java
@@ -4,13 +4,13 @@ import android.annotation.TargetApi;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.EdgeEffectCompat;
-import android.support.v4.widget.NestedScrollView;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+import androidx.core.widget.EdgeEffectCompat;
+import androidx.core.widget.NestedScrollView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.widget.AbsListView;
 import android.widget.EdgeEffect;
 import android.widget.ScrollView;
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.java
index a0192115..d9a1dd38 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.java
@@ -2,8 +2,8 @@ package code.name.monkey.appthemehelper.util;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.ColorInt;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.core.content.ContextCompat;
 
 import code.name.monkey.appthemehelper.R;
 
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.java
index 20e53fe3..495cfb2d 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.java
@@ -1,10 +1,10 @@
 package code.name.monkey.appthemehelper.util;
 
 import android.content.res.ColorStateList;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomNavigationView;
-import android.support.design.widget.NavigationView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.android.material.navigation.NavigationView;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/StatusBarUtil.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/StatusBarUtil.java
index a06f5df0..c1fec377 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/StatusBarUtil.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/StatusBarUtil.java
@@ -5,11 +5,11 @@ import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.widget.DrawerLayout;
+import androidx.annotation.ColorInt;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TabLayoutUtil.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TabLayoutUtil.java
index ae791601..905c7fa1 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TabLayoutUtil.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TabLayoutUtil.java
@@ -1,9 +1,9 @@
 package code.name.monkey.appthemehelper.util;
 
 import android.content.res.ColorStateList;
-import android.support.annotation.ColorInt;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
+import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
 
 
 public final class TabLayoutUtil {
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TextInputLayoutUtil.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TextInputLayoutUtil.java
index 0f9c6b47..792914b5 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TextInputLayoutUtil.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TextInputLayoutUtil.java
@@ -1,9 +1,9 @@
 package code.name.monkey.appthemehelper.util;
 
 import android.content.res.ColorStateList;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.design.widget.TextInputLayout;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import com.google.android.material.textfield.TextInputLayout;
 
 import java.lang.reflect.Field;
 
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java
index bb1961a8..089a8654 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java
@@ -7,15 +7,15 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.RippleDrawable;
 import android.os.Build;
-import android.support.annotation.CheckResult;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.widget.AppCompatEditText;
-import android.support.v7.widget.SwitchCompat;
+import androidx.annotation.CheckResult;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.appcompat.widget.AppCompatEditText;
+import androidx.appcompat.widget.SwitchCompat;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java
index f9c198ad..06f172e4 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java
@@ -6,24 +6,24 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.CheckResult;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.WindowDecorActionBar;
-import android.support.v7.view.menu.ActionMenuItemView;
-import android.support.v7.view.menu.BaseMenuPresenter;
-import android.support.v7.view.menu.ListMenuItemView;
-import android.support.v7.view.menu.MenuBuilder;
-import android.support.v7.view.menu.MenuPopupHelper;
-import android.support.v7.view.menu.MenuPresenter;
-import android.support.v7.view.menu.ShowableListMenu;
-import android.support.v7.widget.ActionMenuView;
-import android.support.v7.widget.AppCompatImageView;
-import android.support.v7.widget.Toolbar;
-import android.support.v7.widget.ToolbarWidgetWrapper;
+import androidx.annotation.CheckResult;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.WindowDecorActionBar;
+import androidx.appcompat.view.menu.ActionMenuItemView;
+import androidx.appcompat.view.menu.BaseMenuPresenter;
+import androidx.appcompat.view.menu.ListMenuItemView;
+import androidx.appcompat.view.menu.MenuBuilder;
+import androidx.appcompat.view.menu.MenuPopupHelper;
+import androidx.appcompat.view.menu.MenuPresenter;
+import androidx.appcompat.view.menu.ShowableListMenu;
+import androidx.appcompat.widget.ActionMenuView;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.appcompat.widget.ToolbarWidgetWrapper;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -384,7 +384,7 @@ public final class ToolbarContentTintHelper {
           // Search view theming
           if (item.getActionView() != null && (
               item.getActionView() instanceof android.widget.SearchView || item
-                  .getActionView() instanceof android.support.v7.widget.SearchView)) {
+                  .getActionView() instanceof androidx.appcompat.widget.SearchView)) {
             SearchViewTintUtil.setSearchViewContentColor(item.getActionView(), color);
           }
         }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TypefaceHelper.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TypefaceHelper.java
index 1fe4de93..e9bccef4 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TypefaceHelper.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TypefaceHelper.java
@@ -6,7 +6,7 @@ package code.name.monkey.appthemehelper.util;
 
 import android.content.Context;
 import android.graphics.Typeface;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 
 /*
     Each call to Typeface.createFromAsset will load a new instance of the typeface into memory,
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ViewUtil.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ViewUtil.java
index a497e204..73842dfc 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ViewUtil.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ViewUtil.java
@@ -4,9 +4,9 @@ import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewTreeObserver;
 
diff --git a/build.gradle b/build.gradle
index 95e0d530..a7ecaa50 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-alpha06'
+        classpath 'com.android.tools.build:gradle:3.3.0-alpha07'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index a09a676b..3632cbe6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,9 @@
 # Project-wide Gradle settings.
-
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
-
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048M
@@ -17,3 +14,5 @@ org.gradle.parallel=true
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 jvmArgs='-Xmx2048m'
+android.useAndroidX=true
+android.enableJetifier=true