diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 411c07777..000000000
--- a/.gitattributes
+++ /dev/null
@@ -1,4 +0,0 @@
-* text=auto eol=lf
-
-*.bat text eol=crlf
-*.jar binary
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index e450294c1..ac72f0bef 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -7,28 +7,28 @@ on:
     branches: [ dev ]
 
 jobs:
-  check:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-      - uses: gradle/gradle-build-action@v2
-      - name: Lint Android
-        run: ./gradlew lint
-
   build:
+
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'zulu'
-      - uses: gradle/gradle-build-action@v2
-      - name: Build
-        run: ./gradlew app:assemble
+    - uses: actions/checkout@v2
+    - name: set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Generate temporary keystore
+      run: keytool -genkey -v -storetype pkcs12 -keystore store.p12 -storepass android -alias android -keyalg RSA -keysize 2048 -validity 10000 -dname CN=CI
+    - name: Write retro.properties
+      run: |
+        cat >retro.properties <<EOF
+        storeFile=$PWD/store.p12
+        keyAlias=android
+        storePassword=android
+        keyPassword=android
+        EOF
+    - name: Build with Gradle
+      run: ./gradlew build
diff --git a/README.md b/README.md
index ca4bd8b1b..0dc8ecd19 100644
--- a/README.md
+++ b/README.md
@@ -8,21 +8,24 @@ Material Design music player for Android music lovers
      alt="Get it on F-Droid"
      height="80">](https://f-droid.org/en/packages/io.github.muntashirakon.Music/)
 
+[<img src="https://camo.githubusercontent.com/70bffd8873ab81e1bb0bccc44e488c3a989e3bd5/68747470733a2f2f692e6962622e636f2f71306d6463345a2f6765742d69742d6f6e2d6769746875622e706e67"
+     alt="Get it on GitHub"
+     height="80">](https://github.com/MuntashirAkon/Metro/releases)
+
 ## Differences between Metro and [RetroMusicPlayer](https://github.com/h4h13/RetroMusicPlayer)
 - Google Play libraries removed (fully libre)
 - Pro features available for free
-- Fully offline (INTERNET permission removed)
 - Bug fixes
 - Minor differences in UI
 
 ## 📱 Screenshots
 ### App Themes
-| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg" width="200"/> | <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg" width="200"/> | <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg" width="200"/> |
+| <img src="screenshots/home_light.jpg" width="200"/> | <img src="screenshots/home_dark.jpg" width="200"/> | <img src="screenshots/home_black.jpg" width="200"/> |
 |:---:|:---:|:---:|
 |Clearly white| Kinda dark | Just black|
 
 ### Player screen
-| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg" width="200"/>| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg" width="200"/>| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg" width="200"/>| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg" width="200"/>| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/8.jpg" width="200"/>|
+| <img src="screenshots/home_light.jpg" width="200"/>| <img src="screenshots/songs.jpg" width="200"/>| <img src="screenshots/albums.jpg" width="200"/>| <img src="screenshots/artists.jpg" width="200"/>| <img src="screenshots/settings.jpg" width="200"/>|
 |:---:|:---:|:---:|:---:|:---:|
 | Home | Songs | Albums | Artists | Settings |
 
@@ -37,7 +40,7 @@ Material Design music player for Android music lovers
 | Synced Replace Cover light | Synced Replace Cover dark | Synced Replace Cover black |
 
 ### 10+ Now playing themes
-| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg" width="200"/>	|<img src="screenshots/fit.jpg" width="200"/>|   <img src="screenshots/flat.jpg" width="200"/>  	|    <img src="screenshots/color.jpg" width="200"/> 	|     <img src="screenshots/material.jpg" width="200"/>	|
+| <img src="screenshots/normal.jpg" width="200"/>	|<img src="screenshots/fit.jpg" width="200"/>|   <img src="screenshots/flat.jpg" width="200"/>  	|    <img src="screenshots/color.jpg" width="200"/> 	|     <img src="screenshots/material.jpg" width="200"/>	|
 |:-----:	|:-----:	|:-----:	|:-----:	|:-----:	|
 | Normal 	| Fit 	| Flat 	| Color 	| Material 	|
 
diff --git a/app/build.gradle b/app/build.gradle
index cb394ecda..3c41f1b48 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,30 +1,29 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 apply plugin: 'kotlin-parcelize'
-apply plugin: 'com.google.devtools.ksp'
 
 android {
-    compileSdk 33
-    namespace "code.name.monkey.retromusic"
+    compileSdk 32
+    buildToolsVersion = '30.0.3'
 
     defaultConfig {
         minSdk 21
-        targetSdk 33
+        targetSdk 32
 
         vectorDrawables.useSupportLibrary = true
 
         applicationId 'io.github.muntashirakon.Music'
-        versionCode 10603
-        versionName '6.1.0'
+        versionCode 10580
+        versionName '5.8.5'
 
         multiDexEnabled true
     }
     buildTypes {
         release {
-            shrinkResources true
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
             applicationIdSuffix '.debug'
@@ -32,7 +31,7 @@ android {
         }
     }
 
-    buildFeatures {
+    buildFeatures{
         viewBinding true
     }
     packagingOptions {
@@ -41,8 +40,8 @@ android {
         }
     }
     lint {
-        abortOnError true
-        warning 'ImpliedQuantity', 'Instantiatable', 'MissingQuantity', 'MissingTranslation'
+        abortOnError false
+        disable 'MissingTranslation', 'InvalidPackage'
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -51,11 +50,8 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
-    dependenciesInfo {
-        includeInApk = false
-        includeInBundle = false
-    }
-    configurations.configureEach {
+
+    configurations.all {
         resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
     }
 }
@@ -64,37 +60,35 @@ android {
 dependencies {
     implementation project(':appthemehelper')
     implementation "androidx.gridlayout:gridlayout:1.0.0"
-
+    implementation "androidx.cardview:cardview:1.0.0"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'androidx.annotation:annotation:1.6.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0'
+    implementation 'androidx.annotation:annotation:1.3.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation "androidx.preference:preference-ktx:$preference_version"
-    implementation "androidx.core:core-ktx:$core_version"
+    implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.palette:palette-ktx:1.0.0'
 
-    implementation 'androidx.mediarouter:mediarouter:1.3.1'
+    implementation "androidx.media:media:1.6.0"
 
     implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
 
-    def room_version = '2.5.1'
+    def room_version = '2.4.2'
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
-    ksp "androidx.room:room-compiler:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
 
+    def lifecycle_version = "2.5.0-rc01"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
 
-    implementation "androidx.core:core-splashscreen:1.0.0"
+    implementation "androidx.core:core-splashscreen:1.0.0-beta02"
 
     implementation "com.google.android.material:material:$mdc_version"
-
-    def retrofit_version = '2.9.0'
-    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
-    implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
+    implementation 'com.google.code.gson:gson:2.9.0'
 
     def material_dialog_version = "3.3.0"
     implementation "com.afollestad.material-dialogs:core:$material_dialog_version"
@@ -103,15 +97,19 @@ dependencies {
 
     implementation 'com.afollestad:material-cab:2.0.1'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    def koin_version = '3.4.0'
+    def kotlin_coroutines_version = '1.6.1'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
+
+    def koin_version = '3.2.0'
     implementation "io.insert-koin:koin-core:$koin_version"
     implementation "io.insert-koin:koin-android:$koin_version"
 
-    def glide_version = '4.15.1'
+    def glide_version = '4.13.2'
     implementation "com.github.bumptech.glide:glide:$glide_version"
-    ksp "com.github.bumptech.glide:ksp:$glide_version"
+    kapt "com.github.bumptech.glide:compiler:$glide_version"
 
     implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'
 
@@ -126,7 +124,8 @@ dependencies {
     implementation 'com.r0adkll:slidableactivity:2.1.0'
     implementation 'com.heinrichreimersoftware:material-intro:2.0.0'
     implementation 'com.github.dhaval2404:imagepicker:2.1'
-    implementation 'me.zhanghai.android.fastscroll:library:1.2.0'
-    implementation 'cat.ereza:customactivityoncrash:2.4.0'
-    implementation 'me.tankery.lib:circularSeekBar:1.4.2'
+    implementation 'me.zhanghai.android.fastscroll:library:1.1.8'
+    implementation 'cat.ereza:customactivityoncrash:2.3.0'
+    implementation 'me.tankery.lib:circularSeekBar:1.3.2'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 }
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index c9f1d0067..dac35b027 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -66,6 +66,6 @@
 -keep class * extends androidx.fragment.app.Fragment{}
 -keepnames class * extends android.os.Parcelable
 -keepnames class * extends java.io.Serializable
--keep class code.name.monkey.retromusic.network.model.** { *; }
--keep class code.name.monkey.retromusic.model.** { *; }
+-keep class io.github.muntashirakon.music.network.model.** { *; }
+-keep class io.github.muntashirakon.music.model.** { *; }
 -keep class com.google.android.material.bottomsheet.** { *; }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 14fbaaab7..ee4c85ccf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="code.name.monkey.retromusic"
+    package="io.github.muntashirakon.music"
     android:installLocation="auto">
 
     <uses-permission
@@ -11,47 +11,36 @@
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="29" />
+        android:maxSdkVersion="28" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission
         android:name="android.permission.WRITE_SETTINGS"
         tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-    <uses-permission
-        android:name="android.permission.BLUETOOTH_CONNECT"
-        android:usesPermissionFlags="neverForLocation"
-        tools:targetApi="s" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
     <application
         android:name=".App"
         android:allowBackup="@bool/allowBackup"
-        android:appCategory="audio"
         android:configChanges="locale|layoutDirection"
-        android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:localeConfig="@xml/locales_config"
-        android:requestLegacyExternalStorage="true"
         android:restoreAnyVersion="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.RetroMusic.FollowSystem"
         android:usesCleartextTraffic="true"
-        tools:ignore="UnusedAttribute">
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning"
+        tools:targetApi="q">
         <activity
             android:name=".activities.MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
-            android:theme="@style/Theme.RetroMusic.SplashScreen">
+            android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MUSIC_PLAYER" />
@@ -62,6 +51,7 @@
             </intent-filter>
             <intent-filter>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
@@ -121,6 +111,7 @@
                 <data android:mimeType="vnd.android.cursor.dir/audio" />
             </intent-filter>
         </activity>
+        <activity android:name=".activities.SettingsActivity" />
         <activity android:name=".activities.tageditor.AlbumTagEditorActivity" />
         <activity android:name=".activities.tageditor.SongTagEditorActivity" />
         <activity android:name=".activities.LicenseActivity" />
@@ -128,11 +119,8 @@
         <activity android:name=".activities.ShareInstagramStory" />
         <activity android:name=".activities.DriveModeActivity" />
         <activity android:name=".activities.PermissionActivity" />
-        <activity
-            android:name=".activities.LockScreenActivity"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:showOnLockScreen="true" />
+        <activity android:name=".activities.LockScreenActivity" />
+        <activity android:name=".activities.saf.SAFRequestActivity" />
         <activity
             android:name=".fragments.backup.RestoreActivity"
             android:excludeFromRecents="false"
@@ -187,6 +175,16 @@
             </intent-filter>
         </activity>
 
+        <provider
+            android:name=".misc.GenericFileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}"
@@ -198,7 +196,7 @@
         </provider>
 
         <receiver
-            android:name=".service.MediaButtonIntentReceiver"
+            android:name="androidx.media.session.MediaButtonReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
@@ -302,12 +300,16 @@
 
         <service
             android:name=".service.MusicService"
+            android:enabled="true"
             android:exported="true"
             android:foregroundServiceType="mediaPlayback"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.media.browse.MediaBrowserService" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
         </service>
 
         <meta-data
@@ -328,16 +330,6 @@
         <meta-data
             android:name="com.google.android.gms.car.notification.SmallIcon"
             android:resource="@drawable/ic_notification" />
-
-        <!-- For auto-storage of locale on Android 12 and lower -->
-        <service
-            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
-            android:enabled="false"
-            android:exported="false">
-            <meta-data
-                android:name="autoStoreLocales"
-                android:value="true" />
-        </service>
     </application>
 
     <!--
diff --git a/app/src/main/assets/images/daksh.png b/app/src/main/assets/images/daksh.png
deleted file mode 100644
index 737f9066c..000000000
Binary files a/app/src/main/assets/images/daksh.png and /dev/null differ
diff --git a/app/src/main/assets/images/haythem.jpg b/app/src/main/assets/images/haythem.jpg
deleted file mode 100644
index c74527f1d..000000000
Binary files a/app/src/main/assets/images/haythem.jpg and /dev/null differ
diff --git a/app/src/main/assets/images/hemanth.jpg b/app/src/main/assets/images/hemanth.jpg
deleted file mode 100644
index b8f5e7805..000000000
Binary files a/app/src/main/assets/images/hemanth.jpg and /dev/null differ
diff --git a/app/src/main/assets/images/lenny.jpg b/app/src/main/assets/images/lenny.jpg
deleted file mode 100644
index 7f8025f08..000000000
Binary files a/app/src/main/assets/images/lenny.jpg and /dev/null differ
diff --git a/app/src/main/assets/images/milind.png b/app/src/main/assets/images/milind.png
deleted file mode 100644
index bbf9b8278..000000000
Binary files a/app/src/main/assets/images/milind.png and /dev/null differ
diff --git a/app/src/main/assets/images/pratham.jpg b/app/src/main/assets/images/pratham.jpg
deleted file mode 100644
index 7f05ad9d5..000000000
Binary files a/app/src/main/assets/images/pratham.jpg and /dev/null differ
diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html
index b6b1c411a..97037384e 100644
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@@ -62,81 +62,6 @@
 </head>
 
 <body>
-
-<div>
-    <h5>March 30, 2023</h5>
-    <h2>v6.1.0</h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>App now targets Android 13, support for Granular media permissions, Photo picker, Per-app language preferences & Predictive back gesture</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed playlist reordering crash</li>
-        <li>Other minor bugs fixes and improvements</li>
-    </ul>
-</div>
-<div>
-    <h5>March 13, 2023</h5>
-    <h2>v6.0.4</h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Minor redesign in Playlist details screen</li>
-        <li>Updated translations</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed file popup menu actions in Folders tab</li>
-        <li>Fixed playlist image loading</li>
-        <li>Fixed blurry album art in Android 13</li>
-        <li>Minor bug fixes and improvements</li>
-    </ul>
-</div>
-<div>
-    <h5>July 10, 2022</h5>
-    <h2>v6.0.3<span class="tag"><i>Beta</i></span></h2>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Migrated icons to Material symbols</li>
-    </ul>
-</div>
-<div>
-    <h5>June 21, 2022</h5>
-    <h2>v6.0.2<span class="tag"><i>Beta</i></span></h2>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Minor bug fixes and improvements</li>
-    </ul>
-</div>
-<div>
-    <h5>June 13, 2022</h5>
-    <h2>v6.0.1<span class="tag"><i>Beta</i></span></h2>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed ChromeCast crash</li>
-        <li>Fixed Slider crashes</li>
-        <li>Fixed storage related crashes on Android 10</li>
-        <li>Fixed CrossFade not working Fade Audio is not working</li>
-    </ul>
-</div>
-<div>
-    <h5>June 7, 2022</h5>
-    <h2>v6.0.0<span class="tag"><i>Beta</i></span></h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Better Cast</li>
-        <li>Mini player in settings screen</li>
-        <li>Changed Seekbar with Sliders</li>
-        <li>Added NavigationRailView for Landscape</li>
-        <li>Show remaining time in Sleep timer dialog</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed Top/Recent Artists/Albums not updating (Wrong sort order)</li>
-        <li>Fixed all Blacklist related crashes</li>
-        <li>Fix restart button not working in crash activity</li>
-    </ul>
-</div>
 <div>
     <h5>May 25, 2022</h5>
     <h2>v5.8.5</h2>
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/TagWriter.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/TagWriter.kt
deleted file mode 100644
index b9d5f28dd..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/TagWriter.kt
+++ /dev/null
@@ -1,204 +0,0 @@
-package code.name.monkey.retromusic.activities.tageditor
-
-import android.app.Activity
-import android.content.Context
-import android.graphics.Bitmap
-import android.media.MediaScannerConnection
-import android.os.Build
-import android.util.Log
-import androidx.annotation.RequiresApi
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.misc.UpdateToastMediaScannerCompletionListener
-import code.name.monkey.retromusic.model.AudioTagInfo
-import code.name.monkey.retromusic.util.MusicUtil.createAlbumArtFile
-import code.name.monkey.retromusic.util.MusicUtil.deleteAlbumArt
-import code.name.monkey.retromusic.util.MusicUtil.insertAlbumArt
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import org.jaudiotagger.audio.AudioFileIO
-import org.jaudiotagger.audio.exceptions.CannotReadException
-import org.jaudiotagger.audio.exceptions.CannotWriteException
-import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException
-import org.jaudiotagger.audio.exceptions.ReadOnlyFileException
-import org.jaudiotagger.tag.FieldDataInvalidException
-import org.jaudiotagger.tag.TagException
-import org.jaudiotagger.tag.images.AndroidArtwork
-import org.jaudiotagger.tag.images.Artwork
-import java.io.File
-import java.io.IOException
-
-class TagWriter {
-
-    companion object {
-
-        suspend fun scan(context: Context, toBeScanned: List<String?>?) {
-            if (toBeScanned.isNullOrEmpty()) {
-                Log.i("scan", "scan: Empty")
-                context.showToast("Scan file from folder")
-                return
-            }
-            MediaScannerConnection.scanFile(
-                context,
-                toBeScanned.toTypedArray(),
-                null,
-                withContext(Dispatchers.Main) {
-                    if (context is Activity) UpdateToastMediaScannerCompletionListener(
-                        context, toBeScanned
-                    ) else null
-                }
-            )
-        }
-
-        suspend fun writeTagsToFiles(context: Context, info: AudioTagInfo) {
-            withContext(Dispatchers.IO) {
-                var artwork: Artwork? = null
-                var albumArtFile: File? = null
-                if (info.artworkInfo?.artwork != null) {
-                    try {
-                        albumArtFile = createAlbumArtFile(context).canonicalFile
-                        info.artworkInfo.artwork.compress(
-                            Bitmap.CompressFormat.JPEG,
-                            100,
-                            albumArtFile.outputStream()
-                        )
-                        artwork = AndroidArtwork.createArtworkFromFile(albumArtFile)
-                    } catch (e: IOException) {
-                        e.printStackTrace()
-                    }
-                }
-                var wroteArtwork = false
-                var deletedArtwork = false
-                for (filePath in info.filePaths!!) {
-                    try {
-                        val audioFile = AudioFileIO.read(File(filePath))
-                        val tag = audioFile.tagOrCreateAndSetDefault
-                        if (info.fieldKeyValueMap != null) {
-                            for ((key, value) in info.fieldKeyValueMap) {
-                                try {
-                                    tag.setField(key, value)
-                                } catch (e: FieldDataInvalidException) {
-                                    withContext(Dispatchers.Main) {
-                                        context.showToast(R.string.could_not_write_tags_to_file)
-                                    }
-                                    return@withContext listOf<File>()
-                                } catch (e: Exception) {
-                                    e.printStackTrace()
-                                }
-                            }
-                        }
-                        if (info.artworkInfo != null) {
-                            if (info.artworkInfo.artwork == null) {
-                                tag.deleteArtworkField()
-                                deletedArtwork = true
-                            } else if (artwork != null) {
-                                tag.deleteArtworkField()
-                                tag.setField(artwork)
-                                wroteArtwork = true
-                            }
-                        }
-                        audioFile.commit()
-                    } catch (e: CannotReadException) {
-                        e.printStackTrace()
-                    } catch (e: IOException) {
-                        e.printStackTrace()
-                    } catch (e: CannotWriteException) {
-                        e.printStackTrace()
-                    } catch (e: TagException) {
-                        e.printStackTrace()
-                    } catch (e: ReadOnlyFileException) {
-                        e.printStackTrace()
-                    } catch (e: InvalidAudioFrameException) {
-                        e.printStackTrace()
-                    }
-                }
-                if (wroteArtwork) {
-                    insertAlbumArt(context, info.artworkInfo!!.albumId, albumArtFile!!.path)
-                } else if (deletedArtwork) {
-                    deleteAlbumArt(context, info.artworkInfo!!.albumId)
-                }
-                scan(context, info.filePaths)
-            }
-        }
-
-        @RequiresApi(Build.VERSION_CODES.R)
-        suspend fun writeTagsToFilesR(context: Context, info: AudioTagInfo): List<File> =
-            withContext(Dispatchers.IO) {
-                val cacheFiles = mutableListOf<File>()
-                var artwork: Artwork? = null
-                var albumArtFile: File? = null
-                if (info.artworkInfo?.artwork != null) {
-                    try {
-                        albumArtFile = createAlbumArtFile(context).canonicalFile
-                        info.artworkInfo.artwork.compress(
-                            Bitmap.CompressFormat.JPEG,
-                            100,
-                            albumArtFile.outputStream()
-                        )
-                        artwork = AndroidArtwork.createArtworkFromFile(albumArtFile)
-                    } catch (e: IOException) {
-                        e.printStackTrace()
-                    }
-                }
-                var wroteArtwork = false
-                var deletedArtwork = false
-                for (filePath in info.filePaths!!) {
-                    try {
-                        val originFile = File(filePath)
-                        val cacheFile = File(context.cacheDir, originFile.name)
-                        cacheFiles.add(cacheFile)
-                        originFile.inputStream().use { input ->
-                            cacheFile.outputStream().use { output ->
-                                input.copyTo(output)
-                            }
-                        }
-                        val audioFile = AudioFileIO.read(cacheFile)
-                        val tag = audioFile.tagOrCreateAndSetDefault
-                        if (info.fieldKeyValueMap != null) {
-                            for ((key, value) in info.fieldKeyValueMap) {
-                                try {
-                                    tag.setField(key, value)
-                                } catch (e: FieldDataInvalidException) {
-                                    withContext(Dispatchers.Main) {
-                                        context.showToast(R.string.could_not_write_tags_to_file)
-                                    }
-                                    return@withContext listOf<File>()
-                                } catch (e: Exception) {
-                                    e.printStackTrace()
-                                }
-                            }
-                        }
-                        if (info.artworkInfo != null) {
-                            if (info.artworkInfo.artwork == null) {
-                                tag.deleteArtworkField()
-                                deletedArtwork = true
-                            } else if (artwork != null) {
-                                tag.deleteArtworkField()
-                                tag.setField(artwork)
-                                wroteArtwork = true
-                            }
-                        }
-                        audioFile.commit()
-                    } catch (e: CannotReadException) {
-                        e.printStackTrace()
-                    } catch (e: IOException) {
-                        e.printStackTrace()
-                    } catch (e: CannotWriteException) {
-                        e.printStackTrace()
-                    } catch (e: TagException) {
-                        e.printStackTrace()
-                    } catch (e: ReadOnlyFileException) {
-                        e.printStackTrace()
-                    } catch (e: InvalidAudioFrameException) {
-                        e.printStackTrace()
-                    }
-                }
-                if (wroteArtwork) {
-                    insertAlbumArt(context, info.artworkInfo!!.albumId, albumArtFile!!.path)
-                } else if (deletedArtwork) {
-                    deleteAlbumArt(context, info.artworkInfo!!.albumId)
-                }
-                cacheFiles
-            }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt
deleted file mode 100644
index bb7b8491c..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-package code.name.monkey.retromusic.adapter.base
-
-import android.graphics.Color
-import android.view.ActionMode
-import android.view.Menu
-import android.view.MenuItem
-import androidx.activity.OnBackPressedCallback
-import androidx.annotation.MenuRes
-import androidx.fragment.app.FragmentActivity
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.NumberRollViewBinding
-import code.name.monkey.retromusic.views.NumberRollView
-
-abstract class AbsMultiSelectAdapter<V : RecyclerView.ViewHolder?, I>(
-    open val activity: FragmentActivity, @MenuRes menuRes: Int,
-) : RecyclerView.Adapter<V>(), ActionMode.Callback {
-    var actionMode: ActionMode? = null
-    private val checked: MutableList<I>
-    private var menuRes: Int
-
-    override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-        val inflater = mode?.menuInflater
-        inflater?.inflate(menuRes, menu)
-        return true
-    }
-
-    override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-        return false
-    }
-
-    override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
-        if (item?.itemId == R.id.action_multi_select_adapter_check_all) {
-            checkAll()
-        } else {
-            onMultipleItemAction(item!!, ArrayList(checked))
-            actionMode?.finish()
-            clearChecked()
-        }
-        return true
-    }
-
-    override fun onDestroyActionMode(mode: ActionMode?) {
-        clearChecked()
-        activity.window.statusBarColor = when {
-            VersionUtils.hasMarshmallow() -> Color.TRANSPARENT
-            else -> Color.BLACK
-        }
-        actionMode = null
-        onBackPressedCallback.remove()
-    }
-
-    private fun checkAll() {
-        if (actionMode != null) {
-            checked.clear()
-            for (i in 0 until itemCount) {
-                val identifier = getIdentifier(i)
-                if (identifier != null) {
-                    checked.add(identifier)
-                }
-            }
-            notifyDataSetChanged()
-            updateCab()
-        }
-    }
-
-    protected abstract fun getIdentifier(position: Int): I?
-
-    protected abstract fun getName(model: I): String?
-
-    protected fun isChecked(identifier: I): Boolean {
-        return checked.contains(identifier)
-    }
-
-    protected val isInQuickSelectMode: Boolean
-        get() = actionMode != null
-
-    protected abstract fun onMultipleItemAction(menuItem: MenuItem, selection: List<I>)
-    protected fun setMultiSelectMenuRes(@MenuRes menuRes: Int) {
-        this.menuRes = menuRes
-    }
-
-    protected fun toggleChecked(position: Int): Boolean {
-        val identifier = getIdentifier(position) ?: return false
-        if (!checked.remove(identifier)) {
-            checked.add(identifier)
-        }
-        notifyItemChanged(position)
-        updateCab()
-        return true
-    }
-
-    private fun clearChecked() {
-        checked.clear()
-        notifyDataSetChanged()
-    }
-
-    private fun updateCab() {
-        if (actionMode == null) {
-            actionMode = activity.startActionMode(this)?.apply {
-                customView = NumberRollViewBinding.inflate(activity.layoutInflater).root
-            }
-            activity.onBackPressedDispatcher.addCallback(onBackPressedCallback)
-        }
-        val size = checked.size
-        when {
-            size <= 0 -> {
-                actionMode?.finish()
-            }
-            else -> {
-                actionMode?.customView?.findViewById<NumberRollView>(R.id.selection_mode_number)
-                    ?.setNumber(size, true)
-            }
-        }
-    }
-
-    init {
-        checked = ArrayList()
-        this.menuRes = menuRes
-    }
-
-    private val onBackPressedCallback = object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-            if (actionMode != null) {
-                actionMode?.finish()
-                remove()
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/RoomMigrations.kt b/app/src/main/java/code/name/monkey/retromusic/db/RoomMigrations.kt
deleted file mode 100644
index b8b383c31..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/RoomMigrations.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package code.name.monkey.retromusic.db
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-val MIGRATION_23_24 = object : Migration(23, 24) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE LyricsEntity")
-        database.execSQL("DROP TABLE BlackListStoreEntity")
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/SongExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/SongExtensions.kt
deleted file mode 100644
index f28f05624..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/SongExtensions.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package code.name.monkey.retromusic.extensions
-
-import android.support.v4.media.MediaDescriptionCompat
-import android.support.v4.media.session.MediaSessionCompat.QueueItem
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-
-val Song.uri get() = MusicUtil.getSongFileUri(songId = id)
-
-val Song.albumArtUri get() = MusicUtil.getMediaStoreAlbumCoverUri(albumId)
-
-fun ArrayList<Song>.toMediaSessionQueue(): List<QueueItem> {
-    return map { song ->
-        val mediaDescription = MediaDescriptionCompat.Builder()
-            .setMediaId(song.id.toString())
-            .setTitle(song.title)
-            .setSubtitle(song.artistName)
-            .setIconUri(song.albumArtUri)
-            .build()
-        QueueItem(mediaDescription, song.hashCode().toLong())
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/MusicSeekSkipTouchListener.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/MusicSeekSkipTouchListener.kt
deleted file mode 100644
index 946b34e21..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/MusicSeekSkipTouchListener.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-package code.name.monkey.retromusic.fragments
-
-import android.annotation.SuppressLint
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewConfiguration
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.lifecycleScope
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import kotlinx.coroutines.*
-import kotlin.math.abs
-
-/**
- * @param activity, Activity
- * @param next, if the button is next, if false then it's considered previous
- */
-class MusicSeekSkipTouchListener(val activity: FragmentActivity, val next: Boolean) :
-    View.OnTouchListener {
-
-    private var job: Job? = null
-    private var counter = 0
-    private var wasSeeking = false
-
-    private var startX = 0f
-    private var startY = 0f
-
-    private val scaledTouchSlop = ViewConfiguration.get(activity).scaledTouchSlop
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
-        when (event?.actionMasked) {
-            MotionEvent.ACTION_DOWN -> {
-                startX = event.x
-                startY = event.y
-                job = activity.lifecycleScope.launch(Dispatchers.Default) {
-                    counter = 0
-                    while (isActive) {
-                        delay(500)
-                        wasSeeking = true
-                        var seekingDuration = MusicPlayerRemote.songProgressMillis
-                        if (next) {
-                            seekingDuration += 5000 * (counter.floorDiv(2) + 1)
-                        } else {
-                            seekingDuration -= 5000 * (counter.floorDiv(2) + 1)
-                        }
-                        withContext(Dispatchers.Main) {
-                            MusicPlayerRemote.seekTo(seekingDuration)
-                        }
-                        counter += 1
-                    }
-                }
-            }
-            MotionEvent.ACTION_UP -> {
-                job?.cancel()
-                val endX = event.x
-                val endY = event.y
-                if (!wasSeeking && isAClick(startX, endX, startY, endY)) {
-                    if (next) {
-                        MusicPlayerRemote.playNextSong()
-                    } else {
-                        MusicPlayerRemote.back()
-                    }
-                }
-
-                wasSeeking = false
-            }
-            MotionEvent.ACTION_CANCEL -> {
-                job?.cancel()
-            }
-        }
-        return false
-    }
-
-    private fun isAClick(startX: Float, endX: Float, startY: Float, endY: Float): Boolean {
-        val differenceX = abs(startX - endX)
-        val differenceY = abs(startY - endY)
-        return !(differenceX > scaledTouchSlop || differenceY > scaledTouchSlop)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt
deleted file mode 100644
index cfc758307..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.settings
-
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.Fragment
-import androidx.navigation.NavController
-import androidx.navigation.NavDestination
-import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager
-import code.name.monkey.retromusic.databinding.FragmentSettingsBinding
-import code.name.monkey.retromusic.extensions.findNavController
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.color.ColorCallback
-
-class SettingsFragment : Fragment(R.layout.fragment_settings), ColorCallback {
-    private var _binding: FragmentSettingsBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        _binding = FragmentSettingsBinding.bind(view)
-        setupToolbar()
-    }
-
-    private fun setupToolbar() {
-        val navController: NavController = findNavController(R.id.contentFrame)
-        with (binding.appBarLayout.toolbar) {
-            setNavigationIcon(R.drawable.ic_arrow_back)
-            isTitleCentered = false
-            setNavigationOnClickListener {
-                requireActivity().onBackPressedDispatcher.onBackPressed()
-            }
-        }
-
-        navController.addOnDestinationChangedListener { _, _, _ ->
-            binding.appBarLayout.title =
-                navController.currentDestination?.let { getStringFromDestination(it) }.toString()
-        }
-    }
-
-    private fun getStringFromDestination(currentDestination: NavDestination): String {
-        val idRes = when (currentDestination.id) {
-            R.id.mainSettingsFragment -> R.string.action_settings
-            R.id.audioSettings -> R.string.pref_header_audio
-            R.id.imageSettingFragment -> R.string.pref_header_images
-            R.id.notificationSettingsFragment -> R.string.notification
-            R.id.nowPlayingSettingsFragment -> R.string.now_playing
-            R.id.otherSettingsFragment -> R.string.others
-            R.id.personalizeSettingsFragment -> R.string.personalize
-            R.id.themeSettingsFragment -> R.string.general_settings_title
-            R.id.aboutActivity -> R.string.action_about
-            R.id.backup_fragment -> R.string.backup_restore_title
-            else -> R.id.action_settings
-        }
-        return getString(idRes)
-    }
-
-    override fun invoke(dialog: MaterialDialog, color: Int) {
-        ThemeStore.editTheme(requireContext()).accentColor(color).commit()
-        if (VersionUtils.hasNougatMR())
-            DynamicShortcutManager(requireContext()).updateDynamicShortcuts()
-        activity?.recreate()
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    companion object {
-        val TAG: String = SettingsFragment::class.java.simpleName
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreview.kt b/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreview.kt
deleted file mode 100644
index 7af7e0dae..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreview.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package code.name.monkey.retromusic.glide.playlistPreview
-
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.toSongs
-import code.name.monkey.retromusic.model.Song
-
-class PlaylistPreview(val playlistWithSongs: PlaylistWithSongs) {
-
-    val playlistEntity: PlaylistEntity get() = playlistWithSongs.playlistEntity
-    val songs: List<Song> get() = playlistWithSongs.songs.toSongs()
-
-    override fun equals(other: Any?): Boolean {
-        println("Glide equals $this $other")
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as PlaylistPreview
-        if (other.playlistEntity.playListId != playlistEntity.playListId) return false
-        if (other.songs.size != songs.size) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = playlistEntity.playListId.hashCode()
-        result = 31 * result + playlistWithSongs.songs.size
-        println("Glide $result")
-        return result
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IHomeClickListener.kt b/app/src/main/java/code/name/monkey/retromusic/interfaces/IHomeClickListener.kt
deleted file mode 100644
index db224ee96..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IHomeClickListener.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package code.name.monkey.retromusic.interfaces
-
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Genre
-
-interface IHomeClickListener {
-    fun onAlbumClick(album: Album)
-
-    fun onArtistClick(artist: Artist)
-
-    fun onGenreClick(genre: Genre)
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java
deleted file mode 100644
index 25ec996e8..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java
+++ /dev/null
@@ -1,649 +0,0 @@
-/*
- * Copyright (C) 2017 wangchenyan
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package code.name.monkey.retromusic.lyrics;
-
-import android.animation.ValueAnimator;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.os.Looper;
-import android.text.Layout;
-import android.text.StaticLayout;
-import android.text.TextPaint;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.util.AttributeSet;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.animation.LinearInterpolator;
-import android.widget.Scroller;
-
-import androidx.core.content.ContextCompat;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import code.name.monkey.retromusic.BuildConfig;
-import code.name.monkey.retromusic.R;
-
-/**
- * 歌词 Created by wcy on 2015/11/9.
- */
-@SuppressLint("StaticFieldLeak")
-public class LrcView extends View {
-    private static final long ADJUST_DURATION = 100;
-    private static final long TIMELINE_KEEP_TIME = 4 * DateUtils.SECOND_IN_MILLIS;
-
-    private final List<LrcEntry> mLrcEntryList = new ArrayList<>();
-    private final TextPaint mLrcPaint = new TextPaint();
-    private final TextPaint mTimePaint = new TextPaint();
-    private Paint.FontMetrics mTimeFontMetrics;
-    private Drawable mPlayDrawable;
-    private float mDividerHeight;
-    private long mAnimationDuration;
-    private int mNormalTextColor;
-    private float mNormalTextSize;
-    private int mCurrentTextColor;
-    private float mCurrentTextSize;
-    private int mTimelineTextColor;
-    private int mTimelineColor;
-    private int mTimeTextColor;
-    private int mDrawableWidth;
-    private int mTimeTextWidth;
-    private String mDefaultLabel;
-    private float mLrcPadding;
-    private OnPlayClickListener mOnPlayClickListener;
-    private ValueAnimator mAnimator;
-    private GestureDetector mGestureDetector;
-    private Scroller mScroller;
-    private float mOffset;
-    private int mCurrentLine;
-    private Object mFlag;
-    private boolean isShowTimeline;
-    private boolean isTouching;
-    private boolean isFling;
-    private int mTextGravity; // 歌词显示位置，靠左/居中/靠右
-    private final Runnable hideTimelineRunnable =
-            new Runnable() {
-                @Override
-                public void run() {
-                    if (hasLrc() && isShowTimeline) {
-                        isShowTimeline = false;
-                        smoothScrollTo(mCurrentLine);
-                    }
-                }
-            };
-
-    private final GestureDetector.SimpleOnGestureListener mSimpleOnGestureListener =
-            new GestureDetector.SimpleOnGestureListener() {
-                @Override
-                public boolean onDown(MotionEvent e) {
-                    if (hasLrc() && mOnPlayClickListener != null) {
-                        mScroller.forceFinished(true);
-                        removeCallbacks(hideTimelineRunnable);
-                        isTouching = true;
-                        isShowTimeline = true;
-                        invalidate();
-                        return true;
-                    }
-                    return super.onDown(e);
-                }
-
-                @Override
-                public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-                    if (hasLrc()) {
-                        mOffset -= distanceY;
-                        mOffset = Math.min(mOffset, getOffset(0));
-                        mOffset = Math.max(mOffset, getOffset(mLrcEntryList.size() - 1));
-                        invalidate();
-                        getParent().requestDisallowInterceptTouchEvent(true);
-                        return true;
-                    }
-                    return super.onScroll(e1, e2, distanceX, distanceY);
-                }
-
-                @Override
-                public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-                    if (hasLrc()) {
-                        mScroller.fling(
-                                0,
-                                (int) mOffset,
-                                0,
-                                (int) velocityY,
-                                0,
-                                0,
-                                (int) getOffset(mLrcEntryList.size() - 1),
-                                (int) getOffset(0));
-                        isFling = true;
-                        return true;
-                    }
-                    return super.onFling(e1, e2, velocityX, velocityY);
-                }
-
-                @Override
-                public boolean onSingleTapConfirmed(MotionEvent e) {
-                    if (hasLrc()
-                            && isShowTimeline
-                            && mPlayDrawable.getBounds().contains((int) e.getX(), (int) e.getY())) {
-                        int centerLine = getCenterLine();
-                        long centerLineTime = mLrcEntryList.get(centerLine).getTime();
-                        // onPlayClick 消费了才更新 UI
-                        if (mOnPlayClickListener != null && mOnPlayClickListener.onPlayClick(centerLineTime)) {
-                            isShowTimeline = false;
-                            removeCallbacks(hideTimelineRunnable);
-                            mCurrentLine = centerLine;
-                            invalidate();
-                            return true;
-                        }
-                    }
-                    return super.onSingleTapConfirmed(e);
-                }
-            };
-
-    public LrcView(Context context) {
-        this(context, null);
-    }
-
-    public LrcView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public LrcView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init(attrs);
-    }
-
-    private void init(AttributeSet attrs) {
-        TypedArray ta = getContext().obtainStyledAttributes(attrs, R.styleable.LrcView);
-        mCurrentTextSize =
-                ta.getDimension(
-                        R.styleable.LrcView_lrcTextSize, getResources().getDimension(R.dimen.lrc_text_size));
-        mNormalTextSize =
-                ta.getDimension(
-                        R.styleable.LrcView_lrcNormalTextSize,
-                        getResources().getDimension(R.dimen.lrc_text_size));
-        if (mNormalTextSize == 0) {
-            mNormalTextSize = mCurrentTextSize;
-        }
-
-        mDividerHeight =
-                ta.getDimension(
-                        R.styleable.LrcView_lrcDividerHeight,
-                        getResources().getDimension(R.dimen.lrc_divider_height));
-        int defDuration = getResources().getInteger(R.integer.lrc_animation_duration);
-        mAnimationDuration = ta.getInt(R.styleable.LrcView_lrcAnimationDuration, defDuration);
-        mAnimationDuration = (mAnimationDuration < 0) ? defDuration : mAnimationDuration;
-        mNormalTextColor =
-                ta.getColor(
-                        R.styleable.LrcView_lrcNormalTextColor,
-                        getResources().getColor(R.color.lrc_normal_text_color));
-        mCurrentTextColor =
-                ta.getColor(
-                        R.styleable.LrcView_lrcCurrentTextColor,
-                        getResources().getColor(R.color.lrc_current_text_color));
-        mTimelineTextColor =
-                ta.getColor(
-                        R.styleable.LrcView_lrcTimelineTextColor,
-                        getResources().getColor(R.color.lrc_timeline_text_color));
-        mDefaultLabel = ta.getString(R.styleable.LrcView_lrcLabel);
-        mDefaultLabel =
-                TextUtils.isEmpty(mDefaultLabel) ? getContext().getString(R.string.empty) : mDefaultLabel;
-        mLrcPadding = ta.getDimension(R.styleable.LrcView_lrcPadding, 0);
-        mTimelineColor =
-                ta.getColor(
-                        R.styleable.LrcView_lrcTimelineColor,
-                        getResources().getColor(R.color.lrc_timeline_color));
-        float timelineHeight =
-                ta.getDimension(
-                        R.styleable.LrcView_lrcTimelineHeight,
-                        getResources().getDimension(R.dimen.lrc_timeline_height));
-        mPlayDrawable = ta.getDrawable(R.styleable.LrcView_lrcPlayDrawable);
-        mPlayDrawable =
-                (mPlayDrawable == null)
-                        ? ContextCompat.getDrawable(getContext(), R.drawable.ic_play_arrow)
-                        : mPlayDrawable;
-        mTimeTextColor =
-                ta.getColor(
-                        R.styleable.LrcView_lrcTimeTextColor,
-                        getResources().getColor(R.color.lrc_time_text_color));
-        float timeTextSize =
-                ta.getDimension(
-                        R.styleable.LrcView_lrcTimeTextSize,
-                        getResources().getDimension(R.dimen.lrc_time_text_size));
-        mTextGravity = ta.getInteger(R.styleable.LrcView_lrcTextGravity, LrcEntry.GRAVITY_CENTER);
-
-        ta.recycle();
-
-        mDrawableWidth = (int) getResources().getDimension(R.dimen.lrc_drawable_width);
-        mTimeTextWidth = (int) getResources().getDimension(R.dimen.lrc_time_width);
-
-        mLrcPaint.setAntiAlias(true);
-        mLrcPaint.setTextSize(mCurrentTextSize);
-        mLrcPaint.setTextAlign(Paint.Align.LEFT);
-        mTimePaint.setAntiAlias(true);
-        mTimePaint.setTextSize(timeTextSize);
-        mTimePaint.setTextAlign(Paint.Align.CENTER);
-        //noinspection SuspiciousNameCombination
-        mTimePaint.setStrokeWidth(timelineHeight);
-        mTimePaint.setStrokeCap(Paint.Cap.ROUND);
-        mTimeFontMetrics = mTimePaint.getFontMetrics();
-
-        mGestureDetector = new GestureDetector(getContext(), mSimpleOnGestureListener);
-        mGestureDetector.setIsLongpressEnabled(false);
-        mScroller = new Scroller(getContext());
-    }
-
-    public void setCurrentColor(int currentColor) {
-        mCurrentTextColor = currentColor;
-        postInvalidate();
-    }
-
-    public void setTimelineTextColor(int timelineTextColor) {
-        mTimelineTextColor = timelineTextColor;
-        postInvalidate();
-    }
-
-    public void setTimelineColor(int timelineColor) {
-        mTimelineColor = timelineColor;
-        postInvalidate();
-    }
-
-
-    public void setTimeTextColor(int timeTextColor) {
-        mTimeTextColor = timeTextColor;
-        postInvalidate();
-    }
-
-
-    public void setDraggable(boolean draggable, OnPlayClickListener onPlayClickListener) {
-        if (draggable) {
-            if (onPlayClickListener == null) {
-                throw new IllegalArgumentException(
-                        "if draggable == true, onPlayClickListener must not be null");
-            }
-            mOnPlayClickListener = onPlayClickListener;
-        } else {
-            mOnPlayClickListener = null;
-        }
-    }
-
-    public void setLabel(String label) {
-        runOnUi(
-                () -> {
-                    mDefaultLabel = label;
-                    invalidate();
-                });
-    }
-
-    public void loadLrc(File lrcFile) {
-        loadLrc(lrcFile, null);
-    }
-
-    public void loadLrc(File mainLrcFile, File secondLrcFile) {
-        runOnUi(() -> {
-            reset();
-
-            StringBuilder sb = new StringBuilder("file://");
-            sb.append(mainLrcFile.getPath());
-            if (secondLrcFile != null) {
-                sb.append("#").append(secondLrcFile.getPath());
-            }
-            String flag = sb.toString();
-            setFlag(flag);
-            new AsyncTask<File, Integer, List<LrcEntry>>() {
-                @Override
-                protected List<LrcEntry> doInBackground(File... params) {
-                    return LrcUtils.parseLrc(params);
-                }
-
-                @Override
-                protected void onPostExecute(List<LrcEntry> lrcEntries) {
-                    if (getFlag() == flag) {
-                        onLrcLoaded(lrcEntries);
-                        setFlag(null);
-                    }
-                }
-            }.execute(mainLrcFile, secondLrcFile);
-        });
-    }
-
-    public void loadLrc(String lrcText) {
-        loadLrc(lrcText, null);
-    }
-
-    public void loadLrc(String mainLrcText, String secondLrcText) {
-        runOnUi(
-                () -> {
-                    reset();
-
-                    StringBuilder sb = new StringBuilder("file://");
-                    sb.append(mainLrcText);
-                    if (secondLrcText != null) {
-                        sb.append("#").append(secondLrcText);
-                    }
-                    String flag = sb.toString();
-                    setFlag(flag);
-                    new AsyncTask<String, Integer, List<LrcEntry>>() {
-                        @Override
-                        protected List<LrcEntry> doInBackground(String... params) {
-                            return LrcUtils.parseLrc(params);
-                        }
-
-                        @Override
-                        protected void onPostExecute(List<LrcEntry> lrcEntries) {
-                            if (getFlag() == flag) {
-                                onLrcLoaded(lrcEntries);
-                                setFlag(null);
-                            }
-                        }
-                    }.execute(mainLrcText, secondLrcText);
-                });
-    }
-
-    public boolean hasLrc() {
-        return !mLrcEntryList.isEmpty();
-    }
-
-    public void updateTime(long time) {
-        runOnUi(
-                () -> {
-                    if (!hasLrc()) {
-                        return;
-                    }
-
-                    int line = findShowLine(time);
-                    if (line != mCurrentLine) {
-                        mCurrentLine = line;
-                        if (!isShowTimeline) {
-                            smoothScrollTo(line);
-                        } else {
-                            invalidate();
-                        }
-                    }
-                });
-    }
-
-    @Deprecated
-    public void onDrag(long time) {
-        updateTime(time);
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        super.onLayout(changed, left, top, right, bottom);
-        if (changed) {
-            initPlayDrawable();
-            initEntryList();
-            if (hasLrc()) {
-                smoothScrollTo(mCurrentLine, 0L);
-            }
-        }
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        int centerY = getHeight() / 2;
-
-        if (!hasLrc()) {
-            mLrcPaint.setColor(mCurrentTextColor);
-            @SuppressLint("DrawAllocation")
-            StaticLayout staticLayout =
-                    new StaticLayout(
-                            mDefaultLabel,
-                            mLrcPaint,
-                            (int) getLrcWidth(),
-                            Layout.Alignment.ALIGN_CENTER,
-                            1f,
-                            0f,
-                            false);
-            drawText(canvas, staticLayout, centerY);
-            return;
-        }
-
-        int centerLine = getCenterLine();
-
-        if (isShowTimeline) {
-            mPlayDrawable.draw(canvas);
-
-            mTimePaint.setColor(mTimelineColor);
-            canvas.drawLine(mTimeTextWidth, centerY, getWidth() - mTimeTextWidth, centerY, mTimePaint);
-
-            mTimePaint.setColor(mTimeTextColor);
-            String timeText = LrcUtils.formatTime(mLrcEntryList.get(centerLine).getTime());
-            float timeX = getWidth() - mTimeTextWidth / 2F;
-            float timeY = centerY - (mTimeFontMetrics.descent + mTimeFontMetrics.ascent) / 2;
-            canvas.drawText(timeText, timeX, timeY, mTimePaint);
-        }
-
-        canvas.translate(0, mOffset);
-
-        float y = 0;
-        for (int i = 0; i < mLrcEntryList.size(); i++) {
-            if (i > 0) {
-                y +=
-                        ((mLrcEntryList.get(i - 1).getHeight() + mLrcEntryList.get(i).getHeight()) >> 1)
-                                + mDividerHeight;
-            }
-            if (BuildConfig.DEBUG) {
-                // mLrcPaint.setTypeface(ResourcesCompat.getFont(getContext(), R.font.sans));
-            }
-            if (i == mCurrentLine) {
-                mLrcPaint.setTextSize(mCurrentTextSize);
-                mLrcPaint.setColor(mCurrentTextColor);
-            } else if (isShowTimeline && i == centerLine) {
-                mLrcPaint.setColor(mTimelineTextColor);
-            } else {
-                mLrcPaint.setTextSize(mNormalTextSize);
-                mLrcPaint.setColor(mNormalTextColor);
-            }
-            drawText(canvas, mLrcEntryList.get(i).getStaticLayout(), y);
-        }
-    }
-
-    private void drawText(Canvas canvas, StaticLayout staticLayout, float y) {
-        canvas.save();
-        canvas.translate(mLrcPadding, y - (staticLayout.getHeight() >> 1));
-        staticLayout.draw(canvas);
-        canvas.restore();
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        if (event.getAction() == MotionEvent.ACTION_UP
-                || event.getAction() == MotionEvent.ACTION_CANCEL) {
-            isTouching = false;
-            if (hasLrc() && !isFling) {
-                adjustCenter();
-                postDelayed(hideTimelineRunnable, TIMELINE_KEEP_TIME);
-            }
-        }
-        return mGestureDetector.onTouchEvent(event);
-    }
-
-    @Override
-    public void computeScroll() {
-        if (mScroller.computeScrollOffset()) {
-            mOffset = mScroller.getCurrY();
-            invalidate();
-        }
-
-        if (isFling && mScroller.isFinished()) {
-            isFling = false;
-            if (hasLrc() && !isTouching) {
-                adjustCenter();
-                postDelayed(hideTimelineRunnable, TIMELINE_KEEP_TIME);
-            }
-        }
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        removeCallbacks(hideTimelineRunnable);
-        super.onDetachedFromWindow();
-    }
-
-    private void onLrcLoaded(List<LrcEntry> entryList) {
-        if (entryList != null && !entryList.isEmpty()) {
-            mLrcEntryList.addAll(entryList);
-        }
-
-        Collections.sort(mLrcEntryList);
-
-        initEntryList();
-        invalidate();
-    }
-
-    private void initPlayDrawable() {
-        int l = (mTimeTextWidth - mDrawableWidth) / 2;
-        int t = getHeight() / 2 - mDrawableWidth / 2;
-        int r = l + mDrawableWidth;
-        int b = t + mDrawableWidth;
-        mPlayDrawable.setBounds(l, t, r, b);
-    }
-
-    private void initEntryList() {
-        if (!hasLrc() || getWidth() == 0) {
-            return;
-        }
-
-        for (LrcEntry lrcEntry : mLrcEntryList) {
-            lrcEntry.init(mLrcPaint, (int) getLrcWidth(), mTextGravity);
-        }
-
-        mOffset = getHeight() / 2F;
-    }
-
-    private void reset() {
-        endAnimation();
-        mScroller.forceFinished(true);
-        isShowTimeline = false;
-        isTouching = false;
-        isFling = false;
-        removeCallbacks(hideTimelineRunnable);
-        mLrcEntryList.clear();
-        mOffset = 0;
-        mCurrentLine = 0;
-        //invalidate();
-    }
-
-    private void adjustCenter() {
-        smoothScrollTo(getCenterLine(), ADJUST_DURATION);
-    }
-
-    private void smoothScrollTo(int line) {
-        smoothScrollTo(line, mAnimationDuration);
-    }
-
-    private void smoothScrollTo(int line, long duration) {
-        float offset = getOffset(line);
-        endAnimation();
-
-        mAnimator = ValueAnimator.ofFloat(mOffset, offset);
-        mAnimator.setDuration(duration);
-        mAnimator.setInterpolator(new LinearInterpolator());
-        mAnimator.addUpdateListener(
-                animation -> {
-                    mOffset = (float) animation.getAnimatedValue();
-                    invalidate();
-                });
-        mAnimator.start();
-    }
-
-    private void endAnimation() {
-        if (mAnimator != null && mAnimator.isRunning()) {
-            mAnimator.end();
-        }
-    }
-
-    private int findShowLine(long time) {
-        int left = 0;
-        int right = mLrcEntryList.size();
-        while (left <= right) {
-            int middle = (left + right) / 2;
-            long middleTime = mLrcEntryList.get(middle).getTime();
-
-            if (time < middleTime) {
-                right = middle - 1;
-            } else {
-                if (middle + 1 >= mLrcEntryList.size() || time < mLrcEntryList.get(middle + 1).getTime()) {
-                    return middle;
-                }
-
-                left = middle + 1;
-            }
-        }
-
-        return 0;
-    }
-
-    private int getCenterLine() {
-        int centerLine = 0;
-        float minDistance = Float.MAX_VALUE;
-        for (int i = 0; i < mLrcEntryList.size(); i++) {
-            if (Math.abs(mOffset - getOffset(i)) < minDistance) {
-                minDistance = Math.abs(mOffset - getOffset(i));
-                centerLine = i;
-            }
-        }
-        return centerLine;
-    }
-
-    private float getOffset(int line) {
-        if (mLrcEntryList.get(line).getOffset() == Float.MIN_VALUE) {
-            float offset = getHeight() / 2F;
-            for (int i = 1; i <= line; i++) {
-                offset -=
-                        ((mLrcEntryList.get(i - 1).getHeight() + mLrcEntryList.get(i).getHeight()) >> 1)
-                                + mDividerHeight;
-            }
-            mLrcEntryList.get(line).setOffset(offset);
-        }
-
-        return mLrcEntryList.get(line).getOffset();
-    }
-
-    private float getLrcWidth() {
-        return getWidth() - mLrcPadding * 2;
-    }
-
-    private void runOnUi(Runnable r) {
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            r.run();
-        } else {
-            post(r);
-        }
-    }
-
-    private Object getFlag() {
-        return mFlag;
-    }
-
-    private void setFlag(Object flag) {
-        this.mFlag = flag;
-    }
-
-    public interface OnPlayClickListener {
-        boolean onPlayClick(long time);
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/AudioFader.kt b/app/src/main/java/code/name/monkey/retromusic/service/AudioFader.kt
deleted file mode 100644
index 69ec73746..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/AudioFader.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package code.name.monkey.retromusic.service
-
-import android.animation.Animator
-import android.animation.ValueAnimator
-import android.content.Context
-import android.media.MediaPlayer
-import android.provider.Settings
-import androidx.core.animation.doOnEnd
-import code.name.monkey.retromusic.service.playback.Playback
-import code.name.monkey.retromusic.util.PreferenceUtil
-
-class AudioFader {
-    companion object {
-        fun createFadeAnimator(
-            context: Context,
-            fadeInMp: MediaPlayer,
-            fadeOutMp: MediaPlayer,
-            endAction: (animator: Animator) -> Unit, /* Code to run when Animator Ends*/
-        ): Animator? {
-            // Get Global animator scale
-            val animScale = Settings.Global.getFloat(context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f)
-
-            // Set duration according to the global animation scale, so cross-fade actually lasts for the duration set by the user
-            val duration = (PreferenceUtil.crossFadeDuration * 1000 ) / animScale
-            if (duration == 0F) {
-                return null
-            }
-            return ValueAnimator.ofFloat(0f, 1f).apply {
-                this.duration = duration.toLong()
-                addUpdateListener { animation: ValueAnimator ->
-                    fadeInMp.setVolume(
-                        animation.animatedValue as Float, animation.animatedValue as Float
-                    )
-                    fadeOutMp.setVolume(1 - animation.animatedValue as Float,
-                        1 - animation.animatedValue as Float)
-                }
-                doOnEnd {
-                    endAction(it)
-                }
-            }
-        }
-
-        fun startFadeAnimator(
-            playback: Playback,
-            fadeIn: Boolean, /* fadeIn -> true  fadeOut -> false*/
-            callback: Runnable? = null, /* Code to run when Animator Ends*/
-        ) {
-            val duration = PreferenceUtil.audioFadeDuration.toLong()
-            if (duration == 0L) {
-                callback?.run()
-                return
-            }
-            val startValue = if (fadeIn) 0f else 1.0f
-            val endValue = if (fadeIn) 1.0f else 0f
-            val animator = ValueAnimator.ofFloat(startValue, endValue)
-            animator.duration = duration
-            animator.addUpdateListener { animation: ValueAnimator ->
-                playback.setVolume(animation.animatedValue as Float)
-            }
-            animator.doOnEnd {
-                callback?.run()
-            }
-            animator.start()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/LocalPlayback.kt b/app/src/main/java/code/name/monkey/retromusic/service/LocalPlayback.kt
deleted file mode 100644
index 429867051..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/LocalPlayback.kt
+++ /dev/null
@@ -1,189 +0,0 @@
-package code.name.monkey.retromusic.service
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.media.AudioAttributes
-import android.media.AudioManager
-import android.media.MediaPlayer
-import android.media.PlaybackParams
-import androidx.annotation.CallSuper
-import androidx.core.content.getSystemService
-import androidx.core.net.toUri
-import androidx.media.AudioAttributesCompat
-import androidx.media.AudioFocusRequestCompat
-import androidx.media.AudioManagerCompat
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.service.playback.Playback
-import code.name.monkey.retromusic.util.PreferenceUtil.isAudioFocusEnabled
-import code.name.monkey.retromusic.util.PreferenceUtil.playbackPitch
-import code.name.monkey.retromusic.util.PreferenceUtil.playbackSpeed
-
-abstract class LocalPlayback(val context: Context) : Playback, MediaPlayer.OnErrorListener,
-    MediaPlayer.OnCompletionListener {
-
-    private val becomingNoisyReceiverIntentFilter =
-        IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY)
-
-    private val audioManager: AudioManager? = context.getSystemService()
-
-    private var becomingNoisyReceiverRegistered = false
-    private val becomingNoisyReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            if (intent.action != null
-                && intent.action == AudioManager.ACTION_AUDIO_BECOMING_NOISY
-            ) {
-                val serviceIntent = Intent(context, MusicService::class.java)
-                serviceIntent.action = MusicService.ACTION_PAUSE
-                context.startService(serviceIntent)
-            }
-        }
-    }
-
-    private var isPausedByTransientLossOfFocus = false
-
-    private val audioFocusListener = AudioManager.OnAudioFocusChangeListener { focusChange ->
-        when (focusChange) {
-            AudioManager.AUDIOFOCUS_GAIN -> {
-                if (!isPlaying && isPausedByTransientLossOfFocus) {
-                    start()
-                    callbacks?.onPlayStateChanged()
-                    isPausedByTransientLossOfFocus = false
-                }
-                setVolume(Volume.NORMAL)
-            }
-            AudioManager.AUDIOFOCUS_LOSS -> {
-                // Lost focus for an unbounded amount of time: stop playback and release media playback
-                if (!isAudioFocusEnabled) {
-                    pause()
-                    callbacks?.onPlayStateChanged()
-                }
-            }
-            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
-                // Lost focus for a short time, but we have to stop
-                // playback. We don't release the media playback because playback
-                // is likely to resume
-                val wasPlaying = isPlaying
-                pause()
-                callbacks?.onPlayStateChanged()
-                isPausedByTransientLossOfFocus = wasPlaying
-            }
-            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> {
-                // Lost focus for a short time, but it's ok to keep playing
-                // at an attenuated level
-                setVolume(Volume.DUCK)
-            }
-        }
-    }
-
-    private val audioFocusRequest: AudioFocusRequestCompat =
-        AudioFocusRequestCompat.Builder(AudioManagerCompat.AUDIOFOCUS_GAIN)
-            .setOnAudioFocusChangeListener(audioFocusListener)
-            .setAudioAttributes(
-                AudioAttributesCompat.Builder()
-                    .setContentType(AudioAttributesCompat.CONTENT_TYPE_MUSIC).build()
-            ).build()
-
-    @CallSuper
-    override fun start(): Boolean {
-        if (!requestFocus()) {
-            context.showToast(R.string.audio_focus_denied)
-        }
-        registerBecomingNoisyReceiver()
-        return true
-    }
-
-    @CallSuper
-    override fun stop() {
-        abandonFocus()
-        unregisterBecomingNoisyReceiver()
-    }
-
-    @CallSuper
-    override fun pause(): Boolean {
-        unregisterBecomingNoisyReceiver()
-        return true
-    }
-
-    /**
-     * @param player The [MediaPlayer] to use
-     * @param path The path of the file, or the http/rtsp URL of the stream you want to play
-     * @return True if the <code>player</code> has been prepared and is ready to play, false otherwise
-     */
-    fun setDataSourceImpl(
-        player: MediaPlayer,
-        path: String,
-        completion: (success: Boolean) -> Unit,
-    ) {
-        player.reset()
-        try {
-            if (path.startsWith("content://")) {
-                player.setDataSource(context, path.toUri())
-            } else {
-                player.setDataSource(path)
-            }
-            player.setAudioAttributes(
-                AudioAttributes.Builder()
-                    .setUsage(AudioAttributes.USAGE_MEDIA)
-                    .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
-                    .build()
-            )
-            if (VersionUtils.hasMarshmallow())
-                player.playbackParams =
-                    PlaybackParams().setSpeed(playbackSpeed).setPitch(playbackPitch)
-
-            player.setOnPreparedListener {
-                player.setOnPreparedListener(null)
-                completion(true)
-            }
-            player.prepareAsync()
-        } catch (e: Exception) {
-            completion(false)
-            e.printStackTrace()
-        }
-        player.setOnCompletionListener(this)
-        player.setOnErrorListener(this)
-    }
-
-    private fun unregisterBecomingNoisyReceiver() {
-        if (becomingNoisyReceiverRegistered) {
-            context.unregisterReceiver(becomingNoisyReceiver)
-            becomingNoisyReceiverRegistered = false
-        }
-    }
-
-    private fun registerBecomingNoisyReceiver() {
-        if (!becomingNoisyReceiverRegistered) {
-            context.registerReceiver(
-                becomingNoisyReceiver,
-                becomingNoisyReceiverIntentFilter
-            )
-            becomingNoisyReceiverRegistered = true
-        }
-    }
-
-    private fun requestFocus(): Boolean {
-        return AudioManagerCompat.requestAudioFocus(
-            audioManager!!,
-            audioFocusRequest
-        ) == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
-    }
-
-    private fun abandonFocus() {
-        AudioManagerCompat.abandonAudioFocusRequest(audioManager!!, audioFocusRequest)
-    }
-
-    object Volume {
-        /**
-         * The volume we set the media player to when we lose audio focus, but are
-         * allowed to reduce the volume instead of stopping playback.
-         */
-        const val DUCK = 0.2f
-
-        /** The volume we set the media player when we have audio focus.  */
-        const val NORMAL = 1.0f
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MediaButtonIntentReceiver.kt b/app/src/main/java/code/name/monkey/retromusic/service/MediaButtonIntentReceiver.kt
deleted file mode 100644
index 72f9550ff..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/MediaButtonIntentReceiver.kt
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-
-package code.name.monkey.retromusic.service
-
-import android.content.Context
-import android.content.Intent
-import android.os.Handler
-import android.os.Looper
-import android.os.Message
-import android.os.PowerManager
-import android.os.PowerManager.WakeLock
-import android.util.Log
-import android.view.KeyEvent
-import androidx.core.content.ContextCompat
-import androidx.core.content.getSystemService
-import androidx.core.os.BundleCompat
-import androidx.media.session.MediaButtonReceiver
-import code.name.monkey.retromusic.BuildConfig
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_PAUSE
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_PLAY
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_STOP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-
-
-/**
- * Used to control headset playback.
- * Single press: pause/resume
- * Double press: actionNext track
- * Triple press: previous track
- */
-class MediaButtonIntentReceiver : MediaButtonReceiver() {
-
-    override fun onReceive(context: Context, intent: Intent) {
-        if (DEBUG) Log.v(TAG, "Received intent: $intent")
-        if (handleIntent(context, intent) && isOrderedBroadcast) {
-            abortBroadcast()
-        }
-    }
-
-    companion object {
-        val TAG: String = MediaButtonIntentReceiver::class.java.simpleName
-        private val DEBUG = BuildConfig.DEBUG
-        private const val MSG_HEADSET_DOUBLE_CLICK_TIMEOUT = 2
-
-        private const val DOUBLE_CLICK = 400
-
-        private var wakeLock: WakeLock? = null
-        private var mClickCounter = 0
-        private var mLastClickTime: Long = 0
-
-        private val mHandler = object : Handler(Looper.getMainLooper()) {
-
-            override fun handleMessage(msg: Message) {
-                when (msg.what) {
-                    MSG_HEADSET_DOUBLE_CLICK_TIMEOUT -> {
-                        val clickCount = msg.arg1
-
-                        if (DEBUG) Log.v(TAG, "Handling headset click, count = $clickCount")
-                        val command = when (clickCount) {
-                            1 -> ACTION_TOGGLE_PAUSE
-                            2 -> ACTION_SKIP
-                            3 -> ACTION_REWIND
-                            else -> null
-                        }
-
-                        if (command != null) {
-                            val context = msg.obj as Context
-                            startService(context, command)
-                        }
-                    }
-                }
-                releaseWakeLockIfHandlerIdle()
-            }
-        }
-
-        fun handleIntent(context: Context, intent: Intent): Boolean {
-            println("Intent Action: ${intent.action}")
-            val intentAction = intent.action
-            if (Intent.ACTION_MEDIA_BUTTON == intentAction) {
-                val event = intent.extras?.let { BundleCompat.getParcelable(it, Intent.EXTRA_KEY_EVENT, KeyEvent::class.java) }
-                    ?: return false
-
-                val keycode = event.keyCode
-                val action = event.action
-                val eventTime = if (event.eventTime != 0L)
-                    event.eventTime
-                else
-                    System.currentTimeMillis()
-
-                var command: String? = null
-                when (keycode) {
-                    KeyEvent.KEYCODE_MEDIA_STOP -> command = ACTION_STOP
-                    KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE -> command =
-                        ACTION_TOGGLE_PAUSE
-
-                    KeyEvent.KEYCODE_MEDIA_NEXT -> command = ACTION_SKIP
-                    KeyEvent.KEYCODE_MEDIA_PREVIOUS -> command = ACTION_REWIND
-                    KeyEvent.KEYCODE_MEDIA_PAUSE -> command = ACTION_PAUSE
-                    KeyEvent.KEYCODE_MEDIA_PLAY -> command = ACTION_PLAY
-                }
-                if (command != null) {
-                    if (action == KeyEvent.ACTION_DOWN) {
-                        if (event.repeatCount == 0) {
-                            // Only consider the first event in a sequence, not the repeat events,
-                            // so that we don't trigger in cases where the first event went to
-                            // a different app (e.g. when the user ends a phone call by
-                            // long pressing the headset button)
-
-                            // The service may or may not be running, but we need to send it
-                            // a command.
-                            if (keycode == KeyEvent.KEYCODE_HEADSETHOOK || keycode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) {
-                                if (eventTime - mLastClickTime >= DOUBLE_CLICK) {
-                                    mClickCounter = 0
-                                }
-
-                                mClickCounter++
-                                if (DEBUG) Log.v(TAG, "Got headset click, count = $mClickCounter")
-                                mHandler.removeMessages(MSG_HEADSET_DOUBLE_CLICK_TIMEOUT)
-
-                                val msg = mHandler.obtainMessage(
-                                    MSG_HEADSET_DOUBLE_CLICK_TIMEOUT, mClickCounter, 0, context
-                                )
-
-                                val delay = (if (mClickCounter < 3) DOUBLE_CLICK else 0).toLong()
-                                if (mClickCounter >= 3) {
-                                    mClickCounter = 0
-                                }
-                                mLastClickTime = eventTime
-                                acquireWakeLockAndSendMessage(context, msg, delay)
-                            } else {
-                                startService(context, command)
-                            }
-                            return true
-                        }
-                    }
-                }
-            }
-            return false
-        }
-
-        private fun startService(context: Context, command: String?) {
-            val intent = Intent(context, MusicService::class.java)
-            intent.action = command
-            try {
-                context.startService(intent)
-            } catch (e: Exception) {
-                ContextCompat.startForegroundService(context, intent)
-            }
-        }
-
-        private fun acquireWakeLockAndSendMessage(context: Context, msg: Message, delay: Long) {
-            if (wakeLock == null) {
-                val appContext = context.applicationContext
-                val pm = appContext.getSystemService<PowerManager>()
-                wakeLock = pm?.newWakeLock(
-                    PowerManager.PARTIAL_WAKE_LOCK,
-                    "RetroMusicApp:Wakelock headset button"
-                )
-                wakeLock!!.setReferenceCounted(false)
-            }
-            if (DEBUG) Log.v(TAG, "Acquiring wake lock and sending " + msg.what)
-            // Make sure we don't indefinitely hold the wake lock under any circumstances
-            wakeLock!!.acquire(10000)
-
-            mHandler.sendMessageDelayed(msg, delay)
-        }
-
-        private fun releaseWakeLockIfHandlerIdle() {
-            if (mHandler.hasMessages(MSG_HEADSET_DOUBLE_CLICK_TIMEOUT)) {
-                if (DEBUG) Log.v(TAG, "Handler still has messages pending, not releasing wake lock")
-                return
-            }
-
-            if (wakeLock != null) {
-                if (DEBUG) Log.v(TAG, "Releasing wake lock")
-                wakeLock!!.release()
-                wakeLock = null
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.kt b/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.kt
deleted file mode 100644
index a29122a68..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.kt
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.service
-
-import android.content.Context
-import android.media.MediaPlayer
-import android.os.PowerManager
-import android.util.Log
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.extensions.uri
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.playback.Playback.PlaybackCallbacks
-import code.name.monkey.retromusic.util.PreferenceUtil.isGapLessPlayback
-import code.name.monkey.retromusic.util.logE
-
-/**
- * @author Andrew Neal, Karim Abou Zeid (kabouzeid)
- */
-class MultiPlayer(context: Context) : LocalPlayback(context) {
-    private var mCurrentMediaPlayer = MediaPlayer()
-    private var mNextMediaPlayer: MediaPlayer? = null
-    override var callbacks: PlaybackCallbacks? = null
-
-    /**
-     * @return True if the player is ready to go, false otherwise
-     */
-    override var isInitialized = false
-        private set
-
-    init {
-        mCurrentMediaPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
-    }
-
-    /**
-     * @param song The song object you want to play
-     * @return True if the `player` has been prepared and is ready to play, false otherwise
-     */
-    override fun setDataSource(
-        song: Song,
-        force: Boolean,
-        completion: (success: Boolean) -> Unit,
-    ) {
-        isInitialized = false
-        setDataSourceImpl(mCurrentMediaPlayer, song.uri.toString()) { success ->
-            isInitialized = success
-            if (isInitialized) {
-                setNextDataSource(null)
-            }
-            completion(isInitialized)
-        }
-    }
-
-    /**
-     * Set the MediaPlayer to start when this MediaPlayer finishes playback.
-     *
-     * @param path The path of the file, or the http/rtsp URL of the stream you want to play
-     */
-    override fun setNextDataSource(path: String?) {
-        try {
-            mCurrentMediaPlayer.setNextMediaPlayer(null)
-        } catch (e: IllegalArgumentException) {
-            Log.i(TAG, "Next media player is current one, continuing")
-        } catch (e: IllegalStateException) {
-            Log.e(TAG, "Media player not initialized!")
-            return
-        }
-        if (mNextMediaPlayer != null) {
-            mNextMediaPlayer?.release()
-            mNextMediaPlayer = null
-        }
-        if (path == null) {
-            return
-        }
-        if (isGapLessPlayback) {
-            mNextMediaPlayer = MediaPlayer()
-            mNextMediaPlayer?.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
-            mNextMediaPlayer?.audioSessionId = audioSessionId
-            setDataSourceImpl(mNextMediaPlayer!!, path) { success ->
-                if (success) {
-                    try {
-                        mCurrentMediaPlayer.setNextMediaPlayer(mNextMediaPlayer)
-                    } catch (e: IllegalArgumentException) {
-                        Log.e(TAG, "setNextDataSource: setNextMediaPlayer()", e)
-                        if (mNextMediaPlayer != null) {
-                            mNextMediaPlayer?.release()
-                            mNextMediaPlayer = null
-                        }
-                    } catch (e: IllegalStateException) {
-                        Log.e(TAG, "setNextDataSource: setNextMediaPlayer()", e)
-                        if (mNextMediaPlayer != null) {
-                            mNextMediaPlayer?.release()
-                            mNextMediaPlayer = null
-                        }
-                    }
-                } else {
-                    if (mNextMediaPlayer != null) {
-                        mNextMediaPlayer?.release()
-                        mNextMediaPlayer = null
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Starts or resumes playback.
-     */
-    override fun start(): Boolean {
-        super.start()
-        return try {
-            mCurrentMediaPlayer.start()
-            true
-        } catch (e: IllegalStateException) {
-            false
-        }
-    }
-
-    /**
-     * Resets the MediaPlayer to its uninitialized state.
-     */
-    override fun stop() {
-        super.stop()
-        mCurrentMediaPlayer.reset()
-        isInitialized = false
-    }
-
-    /**
-     * Releases resources associated with this MediaPlayer object.
-     */
-    override fun release() {
-        stop()
-        mCurrentMediaPlayer.release()
-        mNextMediaPlayer?.release()
-    }
-
-    /**
-     * Pauses playback. Call start() to resume.
-     */
-    override fun pause(): Boolean {
-        super.pause()
-        return try {
-            mCurrentMediaPlayer.pause()
-            true
-        } catch (e: IllegalStateException) {
-            false
-        }
-    }
-
-    /**
-     * Checks whether the MultiPlayer is playing.
-     */
-    override val isPlaying: Boolean
-        get() = isInitialized && mCurrentMediaPlayer.isPlaying
-
-    /**
-     * Gets the duration of the file.
-     *
-     * @return The duration in milliseconds
-     */
-    override fun duration(): Int {
-        return if (!this.isInitialized) {
-            -1
-        } else try {
-            mCurrentMediaPlayer.duration
-        } catch (e: IllegalStateException) {
-            -1
-        }
-    }
-
-    /**
-     * Gets the current playback position.
-     *
-     * @return The current position in milliseconds
-     */
-    override fun position(): Int {
-        return if (!this.isInitialized) {
-            -1
-        } else try {
-            mCurrentMediaPlayer.currentPosition
-        } catch (e: IllegalStateException) {
-            -1
-        }
-    }
-
-    /**
-     * Gets the current playback position.
-     *
-     * @param whereto The offset in milliseconds from the start to seek to
-     * @return The offset in milliseconds from the start to seek to
-     */
-    override fun seek(whereto: Int, force: Boolean): Int {
-        return try {
-            mCurrentMediaPlayer.seekTo(whereto)
-            whereto
-        } catch (e: IllegalStateException) {
-            -1
-        }
-    }
-
-    override fun setVolume(vol: Float): Boolean {
-        return try {
-            mCurrentMediaPlayer.setVolume(vol, vol)
-            true
-        } catch (e: IllegalStateException) {
-            false
-        }
-    }
-
-    /**
-     * Sets the audio session ID.
-     *
-     * @param sessionId The audio session ID
-     */
-    override fun setAudioSessionId(sessionId: Int): Boolean {
-        return try {
-            mCurrentMediaPlayer.audioSessionId = sessionId
-            true
-        } catch (e: IllegalArgumentException) {
-            false
-        } catch (e: IllegalStateException) {
-            false
-        }
-    }
-
-    /**
-     * Returns the audio session ID.
-     *
-     * @return The current audio session ID.
-     */
-    override val audioSessionId: Int
-        get() = mCurrentMediaPlayer.audioSessionId
-
-    override fun onError(mp: MediaPlayer, what: Int, extra: Int): Boolean {
-        isInitialized = false
-        mCurrentMediaPlayer.release()
-        mCurrentMediaPlayer = MediaPlayer()
-        mCurrentMediaPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
-        context.showToast(R.string.unplayable_file)
-        logE(what.toString() + extra)
-        return false
-    }
-
-    override fun onCompletion(mp: MediaPlayer) {
-        if (mp == mCurrentMediaPlayer && mNextMediaPlayer != null) {
-            isInitialized = false
-            mCurrentMediaPlayer.release()
-            mCurrentMediaPlayer = mNextMediaPlayer!!
-            isInitialized = true
-            mNextMediaPlayer = null
-            callbacks?.onTrackWentToNext()
-        } else {
-            callbacks?.onTrackEnded()
-        }
-    }
-
-    override fun setCrossFadeDuration(duration: Int) {}
-
-    override fun setPlaybackSpeedPitch(speed: Float, pitch: Float) {
-        mCurrentMediaPlayer.setPlaybackSpeedPitch(speed, pitch)
-        mNextMediaPlayer?.setPlaybackSpeedPitch(speed, pitch)
-    }
-
-    companion object {
-        val TAG: String = MultiPlayer::class.java.simpleName
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/PersistentStorage.kt b/app/src/main/java/code/name/monkey/retromusic/service/PersistentStorage.kt
deleted file mode 100644
index 1d8d2351b..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/PersistentStorage.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package code.name.monkey.retromusic.service
-
-import android.content.Context
-import android.support.v4.media.MediaBrowserCompat
-import android.support.v4.media.MediaDescriptionCompat
-import androidx.core.content.edit
-import androidx.core.net.toUri
-import code.name.monkey.retromusic.extensions.albumArtUri
-import code.name.monkey.retromusic.model.Song
-
-class PersistentStorage(context: Context) {
-
-    private val prefs = context.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
-
-    fun saveSong(song: Song) {
-        prefs.edit {
-            putLong("song_id", song.id)
-            putString("song_title", song.title)
-            putString("song_artist", song.artistName)
-            putString("song_cover", song.albumArtUri.toString())
-        }
-    }
-
-    fun recentSong(): MediaBrowserCompat.MediaItem {
-        return MediaBrowserCompat.MediaItem(
-            MediaDescriptionCompat.Builder()
-                .setMediaId(prefs.getLong("song_id", 0L).toString())
-                .setTitle(prefs.getString("song_title", ""))
-                .setSubtitle(prefs.getString("song_artist", ""))
-                .setIconUri(prefs.getString("song_cover", "")?.toUri())
-                .build(), MediaBrowserCompat.MediaItem.FLAG_PLAYABLE
-        )
-    }
-
-    companion object {
-        const val PREFERENCES_NAME = "retro_recent"
-
-        @Volatile
-        private var instance: PersistentStorage? = null
-
-        fun getInstance(context: Context) =
-            instance ?: synchronized(this) {
-                instance ?: PersistentStorage(context).also { instance = it }
-            }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt b/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt
deleted file mode 100644
index 59137fa64..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt
+++ /dev/null
@@ -1,181 +0,0 @@
-package code.name.monkey.retromusic.service
-
-import android.content.Context
-import android.content.Intent
-import android.media.audiofx.AudioEffect
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.playback.Playback
-import code.name.monkey.retromusic.util.PreferenceUtil
-
-
-class PlaybackManager(val context: Context) {
-
-    var playback: Playback? = null
-    private var playbackLocation = PlaybackLocation.LOCAL
-
-    val isLocalPlayback get() = playbackLocation == PlaybackLocation.LOCAL
-
-    val audioSessionId: Int
-        get() = if (playback != null) {
-            playback!!.audioSessionId
-        } else 0
-
-    val songDurationMillis: Int
-        get() = if (playback != null) {
-            playback!!.duration()
-        } else -1
-
-    val songProgressMillis: Int
-        get() = if (playback != null) {
-            playback!!.position()
-        } else -1
-
-    val isPlaying: Boolean
-        get() = playback != null && playback!!.isPlaying
-
-    init {
-        playback = createLocalPlayback()
-    }
-
-    fun setCallbacks(callbacks: Playback.PlaybackCallbacks) {
-        playback?.callbacks = callbacks
-    }
-
-    fun play(onNotInitialized: () -> Unit) {
-        if (playback != null && !playback!!.isPlaying) {
-            if (!playback!!.isInitialized) {
-                onNotInitialized()
-            } else {
-                openAudioEffectSession()
-                if (playbackLocation == PlaybackLocation.LOCAL) {
-                    if (playback is CrossFadePlayer) {
-                        if (!(playback as CrossFadePlayer).isCrossFading) {
-                            AudioFader.startFadeAnimator(playback!!, true)
-                        }
-                    } else {
-                        AudioFader.startFadeAnimator(playback!!, true)
-                    }
-                }
-                playback?.start()
-            }
-        }
-    }
-
-    fun pause(force: Boolean, onPause: () -> Unit) {
-        if (playback != null && playback!!.isPlaying) {
-            if (force) {
-                playback?.pause()
-                closeAudioEffectSession()
-                onPause()
-            } else {
-                AudioFader.startFadeAnimator(playback!!, false) {
-                    //Code to run when Animator Ends
-                    playback?.pause()
-                    closeAudioEffectSession()
-                    onPause()
-                }
-            }
-        }
-    }
-
-    fun seek(millis: Int, force: Boolean): Int = playback!!.seek(millis, force)
-
-    fun setDataSource(
-        song: Song,
-        force: Boolean,
-        completion: (success: Boolean) -> Unit,
-    ) {
-        playback?.setDataSource(song, force, completion)
-    }
-
-    fun setNextDataSource(trackUri: String?) {
-        playback?.setNextDataSource(trackUri)
-    }
-
-    fun setCrossFadeDuration(duration: Int) {
-        playback?.setCrossFadeDuration(duration)
-    }
-
-    /**
-     * @param crossFadeDuration CrossFade duration
-     * @return Whether switched playback
-     */
-    fun maybeSwitchToCrossFade(crossFadeDuration: Int): Boolean {
-        /* Switch to MultiPlayer if CrossFade duration is 0 and
-                Playback is not an instance of MultiPlayer */
-        if (playback !is MultiPlayer && crossFadeDuration == 0) {
-            if (playback != null) {
-                playback?.release()
-            }
-            playback = null
-            playback = MultiPlayer(context)
-            return true
-        } else if (playback !is CrossFadePlayer && crossFadeDuration > 0) {
-            if (playback != null) {
-                playback?.release()
-            }
-            playback = null
-            playback = CrossFadePlayer(context)
-            return true
-        }
-        return false
-    }
-
-    fun release() {
-        playback?.release()
-        playback = null
-        closeAudioEffectSession()
-    }
-
-    private fun openAudioEffectSession() {
-        val intent = Intent(AudioEffect.ACTION_OPEN_AUDIO_EFFECT_CONTROL_SESSION)
-        intent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, audioSessionId)
-        intent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, context.packageName)
-        intent.putExtra(AudioEffect.EXTRA_CONTENT_TYPE, AudioEffect.CONTENT_TYPE_MUSIC)
-        context.sendBroadcast(intent)
-    }
-
-    private fun closeAudioEffectSession() {
-        val audioEffectsIntent = Intent(AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION)
-        if (playback != null) {
-            audioEffectsIntent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION,
-                playback!!.audioSessionId)
-        }
-        audioEffectsIntent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, context.packageName)
-        context.sendBroadcast(audioEffectsIntent)
-    }
-
-    fun switchToLocalPlayback(onChange: (wasPlaying: Boolean, progress: Int) -> Unit) {
-        playbackLocation = PlaybackLocation.LOCAL
-        switchToPlayback(createLocalPlayback(), onChange)
-    }
-
-    private fun switchToPlayback(
-        playback: Playback,
-        onChange: (wasPlaying: Boolean, progress: Int) -> Unit,
-    ) {
-        val oldPlayback = this.playback
-        val wasPlaying: Boolean = oldPlayback?.isPlaying == true
-        val progress: Int = oldPlayback?.position() ?: 0
-        this.playback = playback
-        oldPlayback?.stop()
-        onChange(wasPlaying, progress)
-    }
-
-    private fun createLocalPlayback(): Playback {
-        // Set MultiPlayer when crossfade duration is 0 i.e. off
-        return if (PreferenceUtil.crossFadeDuration == 0) {
-            MultiPlayer(context)
-        } else {
-            CrossFadePlayer(context)
-        }
-    }
-
-    fun setPlaybackSpeedPitch(playbackSpeed: Float, playbackPitch: Float) {
-        playback?.setPlaybackSpeedPitch(playbackSpeed, playbackPitch)
-    }
-}
-
-enum class PlaybackLocation {
-    LOCAL,
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/LogUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/LogUtil.kt
deleted file mode 100644
index e0def5424..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/LogUtil.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package code.name.monkey.retromusic.util
-
-import android.util.Log
-import code.name.monkey.retromusic.BuildConfig
-
-fun Any.logD(message: Any?) {
-    logD(message.toString())
-}
-
-fun Any.logD(message: String) {
-    if (BuildConfig.DEBUG) {
-        Log.d(name, message)
-    }
-}
-
-fun Any.logE(message: String) {
-    Log.e(name, message)
-}
-
-fun Any.logE(e: Exception) {
-    Log.e(name, e.message ?: "Error")
-}
-
-private val Any.name: String get() = this::class.java.simpleName
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/NumberRollView.kt b/app/src/main/java/code/name/monkey/retromusic/views/NumberRollView.kt
deleted file mode 100644
index ea2d9cbd1..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/NumberRollView.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-package code.name.monkey.retromusic.views
-
-import android.animation.Animator
-import android.animation.ObjectAnimator
-import android.content.Context
-import android.content.res.ColorStateList
-import android.util.AttributeSet
-import android.util.Property
-import android.view.animation.LinearInterpolator
-import android.widget.FrameLayout
-import android.widget.TextView
-import androidx.annotation.VisibleForTesting
-import code.name.monkey.retromusic.R
-import java.text.NumberFormat
-
-/**
- * View that shows an integer number. It provides a smooth roll animation on changing the
- * number.
- */
-class NumberRollView(context: Context?, attrs: AttributeSet?) :
-    FrameLayout(context!!, attrs) {
-    private var mUpNumber: TextView? = null
-    private var mDownNumber: TextView? = null
-    private var mNumber = 0f
-    private var mLastRollAnimator: Animator? = null
-    private var mStringId = R.string.x_selected
-    private var mStringIdForZero = 0
-    override fun onFinishInflate() {
-        super.onFinishInflate()
-        mUpNumber = findViewById(R.id.up)
-        mDownNumber = findViewById(R.id.down)
-        assert(mUpNumber != null)
-        assert(mDownNumber != null)
-        setNumberRoll(mNumber)
-    }
-
-    /**
-     * Sets a number to display.
-     * @param animate Whether it should smoothly animate to the number.
-     */
-    fun setNumber(number: Int, animate: Boolean) {
-        if (mLastRollAnimator != null) mLastRollAnimator!!.cancel()
-        if (animate) {
-            val rollAnimator: Animator =
-                ObjectAnimator.ofFloat(this, NUMBER_PROPERTY, number.toFloat())
-            rollAnimator.interpolator = LinearInterpolator()
-            rollAnimator.start()
-            mLastRollAnimator = rollAnimator
-        } else {
-            setNumberRoll(number.toFloat())
-        }
-    }
-
-    /**
-     * @param stringId The id of the string to use for the description. The string must be a plural
-     * that has one placeholder for a quantity.
-     */
-    fun setString(stringId: Int) {
-        mStringId = stringId
-    }
-
-    /**
-     * @param stringIdForZero The id of the string to use for the description when the number is
-     * zero.
-     */
-    fun setStringForZero(stringIdForZero: Int) {
-        mStringIdForZero = stringIdForZero
-    }
-
-    /**
-     * Gets the current number roll position.
-     */
-    private fun getNumberRoll(): Float {
-        return mNumber
-    }
-
-    /**
-     * Sets the number roll position.
-     */
-    private fun setNumberRoll(number: Float) {
-        mNumber = number
-        val downNumber = number.toInt()
-        val upNumber = downNumber + 1
-        val numberFormatter = NumberFormat.getIntegerInstance()
-        var newString = if (mStringId != 0) {
-            if (upNumber == 0 && mStringIdForZero != 0) resources.getString(mStringIdForZero) else resources.getString(
-                mStringId,
-                upNumber
-            )
-        } else {
-            numberFormatter.format(upNumber.toLong())
-        }
-        if (newString != mUpNumber!!.text.toString()) {
-            mUpNumber!!.text = newString
-        }
-        newString = if (mStringId != 0) {
-            if (downNumber == 0 && mStringIdForZero != 0) resources.getString(mStringIdForZero) else resources.getString(
-                mStringId,
-                downNumber
-            )
-        } else {
-            numberFormatter.format(downNumber.toLong())
-        }
-        if (newString != mDownNumber!!.text.toString()) {
-            mDownNumber!!.text = newString
-        }
-        val offset = number % 1.0f
-        mUpNumber!!.translationY = mUpNumber!!.height * (offset - 1.0f)
-        mDownNumber!!.translationY = mDownNumber!!.height * offset
-        mUpNumber!!.alpha = offset
-        mDownNumber!!.alpha = 1.0f - offset
-    }
-
-    /** Ends any in-progress animations.  */
-    @VisibleForTesting
-    fun endAnimationsForTesting() {
-        if (mLastRollAnimator != null) mLastRollAnimator!!.end()
-    }
-
-    /**
-     * Update the text color with [ColorStateList] for both [TextView].
-     * @param resId The new text [ColorStateList] to use.
-     */
-    fun setTextColorStateList(colorStateList: ColorStateList?) {
-        mUpNumber!!.setTextColor(colorStateList)
-        mDownNumber!!.setTextColor(colorStateList)
-    }
-
-    companion object {
-        /**
-         * A Property wrapper around the `number` functionality handled by the
-         * [NumberRollView.setNumberRoll] and [NumberRollView.getNumberRoll]
-         * methods.
-         */
-        val NUMBER_PROPERTY: Property<NumberRollView, Float> =
-            object : Property<NumberRollView, Float>(
-                Float::class.java, ""
-            ) {
-                override fun set(view: NumberRollView, value: Float) {
-                    view.setNumberRoll(value)
-                }
-
-                override fun get(view: NumberRollView): Float {
-                    return view.getNumberRoll()
-                }
-            }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/TintedBottomNavigationView.kt b/app/src/main/java/code/name/monkey/retromusic/views/TintedBottomNavigationView.kt
deleted file mode 100644
index 116f3d0a3..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/TintedBottomNavigationView.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.util.AttributeSet
-import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.retromusic.extensions.addAlpha
-import code.name.monkey.retromusic.extensions.setItemColors
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import dev.chrisbanes.insetter.applyInsetter
-
-class TintedBottomNavigationView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-) : BottomNavigationView(context, attrs, defStyleAttr) {
-
-    init {
-        if (!isInEditMode) {
-            // If we are in Immersive mode we have to just set empty OnApplyWindowInsetsListener as
-            // bottom, start, and end padding is always applied (with the help of OnApplyWindowInsetsListener) to
-            // BottomNavigationView to dodge the system navigation bar (so we basically clear that listener).
-            if (PreferenceUtil.isFullScreenMode) {
-                setOnApplyWindowInsetsListener { _, insets ->
-                    insets
-                }
-            } else {
-                applyInsetter {
-                    type(navigationBars = true) {
-                        padding(vertical = true)
-                        margin(horizontal = true)
-                    }
-                }
-            }
-
-            labelVisibilityMode = PreferenceUtil.tabTitleMode
-
-            if (!PreferenceUtil.materialYou) {
-                val iconColor = ATHUtil.resolveColor(context, android.R.attr.colorControlNormal)
-                val accentColor = ThemeStore.accentColor(context)
-                setItemColors(iconColor, accentColor)
-                itemRippleColor = ColorStateList.valueOf(accentColor.addAlpha(0.08F))
-                itemActiveIndicatorColor = ColorStateList.valueOf(accentColor.addAlpha(0.12F))
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/TintedNavigationRailView.kt b/app/src/main/java/code/name/monkey/retromusic/views/TintedNavigationRailView.kt
deleted file mode 100644
index 828e6fc2b..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/TintedNavigationRailView.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.util.AttributeSet
-import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.addAlpha
-import code.name.monkey.retromusic.extensions.setItemColors
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.google.android.material.navigationrail.NavigationRailView
-
-class TintedNavigationRailView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-) : NavigationRailView(context, attrs, defStyleAttr) {
-
-    init {
-        if (!isInEditMode) {
-            labelVisibilityMode = PreferenceUtil.tabTitleMode
-
-            if (!PreferenceUtil.materialYou) {
-                val iconColor = ATHUtil.resolveColor(context, android.R.attr.colorControlNormal)
-                val accentColor = context.accentColor()
-                setItemColors(iconColor, accentColor)
-                itemRippleColor = ColorStateList.valueOf(accentColor.addAlpha(0.08F))
-                itemActiveIndicatorColor = ColorStateList.valueOf(accentColor.addAlpha(0.12F))
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsConstraintLayout.kt b/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsConstraintLayout.kt
deleted file mode 100644
index 772145485..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsConstraintLayout.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package code.name.monkey.retromusic.views.insets
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.constraintlayout.widget.ConstraintLayout
-import code.name.monkey.retromusic.util.PreferenceUtil
-import dev.chrisbanes.insetter.applyInsetter
-
-class InsetsConstraintLayout @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr) {
-    init {
-        if (!isInEditMode && !PreferenceUtil.isFullScreenMode)
-            applyInsetter {
-                type(navigationBars = true) {
-                    padding(vertical = true)
-                }
-            }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsRecyclerView.kt b/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsRecyclerView.kt
deleted file mode 100644
index 200c2a999..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsRecyclerView.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package code.name.monkey.retromusic.views.insets
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.util.PreferenceUtil
-import dev.chrisbanes.insetter.applyInsetter
-
-class InsetsRecyclerView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-) : RecyclerView(context, attrs, defStyleAttr) {
-    init {
-        if (!isInEditMode && !PreferenceUtil.isFullScreenMode)
-            applyInsetter {
-                type(navigationBars = true) {
-                    padding(vertical = true)
-                }
-            }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/App.kt b/app/src/main/java/io/github/muntashirakon/music/App.kt
similarity index 69%
rename from app/src/main/java/code/name/monkey/retromusic/App.kt
rename to app/src/main/java/io/github/muntashirakon/music/App.kt
index 93dfe4d96..5ab7d88f4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/App.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/App.kt
@@ -10,19 +10,16 @@
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
-package code.name.monkey.retromusic
+package io.github.muntashirakon.music
 
 import android.app.Application
-import androidx.preference.PreferenceManager
 import cat.ereza.customactivityoncrash.config.CaocConfig
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.activities.ErrorActivity
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager
-import code.name.monkey.retromusic.helper.WallpaperAccentManager
+import io.github.muntashirakon.music.activities.ErrorActivity
+import io.github.muntashirakon.music.appshortcuts.DynamicShortcutManager
+import io.github.muntashirakon.music.helper.WallpaperAccentManager
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 
@@ -41,7 +38,7 @@ class App : Application() {
         // default theme
         if (!ThemeStore.isConfigured(this, 3)) {
             ThemeStore.editTheme(this)
-                .accentColorRes(code.name.monkey.appthemehelper.R.color.md_deep_purple_A200)
+                .accentColorRes(R.color.md_deep_purple_A200)
                 .coloredNavigationBar(true)
                 .commit()
         }
@@ -51,12 +48,7 @@ class App : Application() {
             DynamicShortcutManager(this).initDynamicShortcuts()
 
         // setting Error activity
-        CaocConfig.Builder.create().errorActivity(ErrorActivity::class.java)
-            .restartActivity(MainActivity::class.java).apply()
-
-        // Set Default values for now playing preferences
-        // This will reduce startup time for now playing settings fragment as Preference listener of AbsSlidingMusicPanelActivity won't be called
-        PreferenceManager.setDefaultValues(this, R.xml.pref_now_playing_screen, false)
+        CaocConfig.Builder.create().errorActivity(ErrorActivity::class.java).apply()
     }
 
     override fun onTerminate() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/Constants.kt b/app/src/main/java/io/github/muntashirakon/music/Constants.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/Constants.kt
rename to app/src/main/java/io/github/muntashirakon/music/Constants.kt
index 31032f62b..c77c00737 100644
--- a/app/src/main/java/code/name/monkey/retromusic/Constants.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/Constants.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic
+package io.github.muntashirakon.music
 
 import android.provider.BaseColumns
 import android.provider.MediaStore
@@ -79,7 +79,12 @@ const val CIRCULAR_ALBUM_ART = "circular_album_art"
 const val USER_NAME = "user_name"
 const val TOGGLE_FULL_SCREEN = "toggle_full_screen"
 const val TOGGLE_VOLUME = "toggle_volume"
+const val ROUND_CORNERS = "corner_window"
+const val TOGGLE_GENRE = "toggle_genre"
+const val PROFILE_IMAGE_PATH = "profile_image_path"
+const val BANNER_IMAGE_PATH = "banner_image_path"
 const val ADAPTIVE_COLOR_APP = "adaptive_color_app"
+const val TOGGLE_SEPARATE_LINE = "toggle_separate_line"
 const val HOME_ARTIST_GRID_STYLE = "home_artist_grid_style"
 const val HOME_ALBUM_GRID_STYLE = "home_album_grid_style"
 const val TOGGLE_ADD_CONTROLS = "toggle_add_controls"
@@ -87,7 +92,6 @@ const val ALBUM_COVER_STYLE = "album_cover_style_id"
 const val ALBUM_COVER_TRANSFORM = "album_cover_transform"
 const val TAB_TEXT_MODE = "tab_text_mode"
 const val LANGUAGE_NAME = "language_name"
-const val LOCALE_AUTO_STORE_ENABLED = "locale_auto_store_enabled"
 const val SLEEP_TIMER_FINISH_SONG = "sleep_timer_finish_song"
 const val ALBUM_GRID_STYLE = "album_grid_style_home"
 const val ARTIST_GRID_STYLE = "artist_grid_style_home"
@@ -95,6 +99,7 @@ const val SAF_SDCARD_URI = "saf_sdcard_uri"
 const val SONG_SORT_ORDER = "song_sort_order"
 const val SONG_GRID_SIZE = "song_grid_size"
 const val GENRE_SORT_ORDER = "genre_sort_order"
+const val LAST_PAGE = "last_start_page"
 const val BLUETOOTH_PLAYBACK = "bluetooth_playback"
 const val INITIALIZED_BLACKLIST = "initialized_blacklist"
 const val ARTIST_SORT_ORDER = "artist_sort_order"
@@ -111,6 +116,7 @@ const val ARTIST_GRID_SIZE_LAND = "artist_grid_size_land"
 const val PLAYLIST_GRID_SIZE = "playlist_grid_size"
 const val PLAYLIST_GRID_SIZE_LAND = "playlist_grid_size_land"
 const val COLORED_APP_SHORTCUTS = "colored_app_shortcuts"
+const val AUDIO_DUCKING = "audio_ducking"
 const val LAST_ADDED_CUTOFF = "last_added_interval"
 const val LAST_SLEEP_TIMER_VALUE = "last_sleep_timer_value"
 const val NEXT_SLEEP_TIMER_ELAPSED_REALTIME = "next_sleep_timer_elapsed_real_time"
@@ -126,6 +132,7 @@ const val ARTIST_DETAIL_SONG_SORT_ORDER = "artist_detail_song_sort_order"
 const val LYRICS_OPTIONS = "lyrics_tab_position"
 const val CHOOSE_EQUALIZER = "choose_equalizer"
 const val EQUALIZER = "equalizer"
+const val TOGGLE_SHUFFLE = "toggle_shuffle"
 const val SONG_GRID_STYLE = "song_grid_style"
 const val PAUSE_ON_ZERO_VOLUME = "pause_on_zero_volume"
 const val FILTER_SONG = "filter_song"
diff --git a/app/src/main/java/code/name/monkey/retromusic/HomeSection.kt b/app/src/main/java/io/github/muntashirakon/music/HomeSection.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/HomeSection.kt
rename to app/src/main/java/io/github/muntashirakon/music/HomeSection.kt
index 4f1273a03..6a05113eb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/HomeSection.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/HomeSection.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic
+package io.github.muntashirakon.music
 
 import androidx.annotation.IntDef
 
diff --git a/app/src/main/java/io/github/muntashirakon/music/LanguageContextWrapper.kt b/app/src/main/java/io/github/muntashirakon/music/LanguageContextWrapper.kt
new file mode 100644
index 000000000..736d36b56
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/LanguageContextWrapper.kt
@@ -0,0 +1,25 @@
+package io.github.muntashirakon.music
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.os.LocaleList
+import code.name.monkey.appthemehelper.util.VersionUtils.hasNougatMR
+import java.util.*
+
+class LanguageContextWrapper(base: Context?) : ContextWrapper(base) {
+    companion object {
+        fun wrap(context: Context?, newLocale: Locale?): LanguageContextWrapper {
+            if (context == null) return LanguageContextWrapper(context)
+            val configuration = context.resources.configuration
+            if (hasNougatMR()) {
+                configuration.setLocale(newLocale)
+                val localeList = LocaleList(newLocale)
+                LocaleList.setDefault(localeList)
+                configuration.setLocales(localeList)
+            } else {
+                configuration.setLocale(newLocale)
+            }
+            return LanguageContextWrapper(context.createConfigurationContext(configuration))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/MainModule.kt b/app/src/main/java/io/github/muntashirakon/music/MainModule.kt
similarity index 59%
rename from app/src/main/java/code/name/monkey/retromusic/MainModule.kt
rename to app/src/main/java/io/github/muntashirakon/music/MainModule.kt
index d88f8a760..f3607c0c5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/MainModule.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/MainModule.kt
@@ -1,16 +1,24 @@
-package code.name.monkey.retromusic
+package io.github.muntashirakon.music
 
 import androidx.room.Room
-import code.name.monkey.retromusic.auto.AutoMusicProvider
-import code.name.monkey.retromusic.db.MIGRATION_23_24
-import code.name.monkey.retromusic.db.RetroDatabase
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.albums.AlbumDetailsViewModel
-import code.name.monkey.retromusic.fragments.artists.ArtistDetailsViewModel
-import code.name.monkey.retromusic.fragments.genres.GenreDetailsViewModel
-import code.name.monkey.retromusic.fragments.playlists.PlaylistDetailsViewModel
-import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.repository.*
+import androidx.room.RoomDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
+import io.github.muntashirakon.music.auto.AutoMusicProvider
+import io.github.muntashirakon.music.db.BlackListStoreDao
+import io.github.muntashirakon.music.db.BlackListStoreEntity
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.db.RetroDatabase
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.fragments.albums.AlbumDetailsViewModel
+import io.github.muntashirakon.music.fragments.artists.ArtistDetailsViewModel
+import io.github.muntashirakon.music.fragments.genres.GenreDetailsViewModel
+import io.github.muntashirakon.music.fragments.playlists.PlaylistDetailsViewModel
+import io.github.muntashirakon.music.model.Genre
+import io.github.muntashirakon.music.repository.*
+import io.github.muntashirakon.music.util.FilePathUtil
+import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.bind
@@ -20,14 +28,32 @@ private val roomModule = module {
 
     single {
         Room.databaseBuilder(androidContext(), RetroDatabase::class.java, "playlist.db")
-            .addMigrations(MIGRATION_23_24)
+            .allowMainThreadQueries()
+            .addCallback(object : RoomDatabase.Callback() {
+                override fun onOpen(db: SupportSQLiteDatabase) {
+                    super.onOpen(db)
+                    GlobalScope.launch(IO) {
+                        FilePathUtil.blacklistFilePaths().map {
+                            get<BlackListStoreDao>().insertBlacklistPath(BlackListStoreEntity(it))
+                        }
+                    }
+                }
+            })
+            .fallbackToDestructiveMigration()
             .build()
     }
+    factory {
+        get<RetroDatabase>().lyricsDao()
+    }
 
     factory {
         get<RetroDatabase>().playlistDao()
     }
 
+    factory {
+        get<RetroDatabase>().blackListStore()
+    }
+
     factory {
         get<RetroDatabase>().playCountDao()
     }
@@ -37,7 +63,7 @@ private val roomModule = module {
     }
 
     single {
-        RealRoomRepository(get(), get(), get())
+        RealRoomRepository(get(), get(), get(), get(), get())
     } bind RoomRepository::class
 }
 private val autoModule = module {
@@ -138,10 +164,10 @@ private val viewModules = module {
         )
     }
 
-    viewModel { (playlistId: Long) ->
+    viewModel { (playlist: PlaylistWithSongs) ->
         PlaylistDetailsViewModel(
             get(),
-            playlistId
+            playlist
         )
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/DriveModeActivity.kt
similarity index 76%
rename from app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/DriveModeActivity.kt
index af3890d22..47a10eaa6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/DriveModeActivity.kt
@@ -12,32 +12,35 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.activities
+package io.github.muntashirakon.music.activities
 
+import android.animation.ObjectAnimator
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.PorterDuff
 import android.os.Bundle
+import android.view.animation.LinearInterpolator
+import android.widget.SeekBar
 import androidx.lifecycle.lifecycleScope
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.databinding.ActivityDriveModeBinding
-import code.name.monkey.retromusic.db.toSongEntity
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.glide.BlurTransformation
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper.Callback
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.MusicUtil
-import com.bumptech.glide.Glide
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.base.AbsMusicServiceActivity
+import io.github.muntashirakon.music.databinding.ActivityDriveModeBinding
+import io.github.muntashirakon.music.db.toSongEntity
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.drawAboveSystemBars
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.glide.BlurTransformation
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper.Callback
+import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
+import io.github.muntashirakon.music.misc.SimpleOnSeekbarChangeListener
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.repository.RealRepository
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.util.MusicUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -65,7 +68,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
         progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
         lastPlaybackControlsColor = accentColor()
         binding.close.setOnClickListener {
-            onBackPressedDispatcher.onBackPressed()
+            onBackPressed()
         }
         binding.repeatButton.drawAboveSystemBars()
     }
@@ -110,15 +113,17 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
     }
 
     private fun setUpProgressSlider() {
-        binding.progressSlider.addOnChangeListener { _: Slider, progress: Float, fromUser: Boolean ->
-            if (fromUser) {
-                MusicPlayerRemote.seekTo(progress.toInt())
-                onUpdateProgressViews(
-                    MusicPlayerRemote.songProgressMillis,
-                    MusicPlayerRemote.songDurationMillis
-                )
+        binding.progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(
+                        MusicPlayerRemote.songProgressMillis,
+                        MusicPlayerRemote.songDurationMillis
+                    )
+                }
             }
-        }
+        })
     }
 
     override fun onPause() {
@@ -186,7 +191,6 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
                 lastPlaybackControlsColor,
                 PorterDuff.Mode.SRC_IN
             )
-
             else -> binding.shuffleButton.setColorFilter(
                 lastDisabledPlaybackControlsColor,
                 PorterDuff.Mode.SRC_IN
@@ -203,7 +207,6 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
                     PorterDuff.Mode.SRC_IN
                 )
             }
-
             MusicService.REPEAT_MODE_ALL -> {
                 binding.repeatButton.setImageResource(R.drawable.ic_repeat)
                 binding.repeatButton.setColorFilter(
@@ -211,7 +214,6 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
                     PorterDuff.Mode.SRC_IN
                 )
             }
-
             MusicService.REPEAT_MODE_THIS -> {
                 binding.repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 binding.repeatButton.setColorFilter(
@@ -239,7 +241,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
         binding.songTitle.text = song.title
         binding.songText.text = song.artistName
 
-        Glide.with(this)
+        GlideApp.with(this)
             .load(RetroGlideExtension.getSongModel(song))
             .songCoverOptions(song)
             .transform(BlurTransformation.Builder(this).build())
@@ -247,10 +249,12 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
     }
 
     override fun onUpdateProgressViews(progress: Int, total: Int) {
-        binding.progressSlider.run {
-            valueTo = total.toFloat()
-            value = progress.toFloat().coerceIn(valueFrom, valueTo)
-        }
+        binding.progressSlider.max = total
+
+        val animator = ObjectAnimator.ofInt(binding.progressSlider, "progress", progress)
+        animator.duration = AbsPlayerControlsFragment.SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
 
         binding.songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
         binding.songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/ErrorActivity.kt
similarity index 60%
rename from app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/ErrorActivity.kt
index 6823b80f8..77d074659 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/ErrorActivity.kt
@@ -1,34 +1,34 @@
-package code.name.monkey.retromusic.activities
+package io.github.muntashirakon.music.activities
 
 import android.os.Bundle
 import android.widget.Button
 import android.widget.ImageView
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.util.FileUtils.createFile
-import code.name.monkey.retromusic.util.Share.shareFile
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.util.FileUtils.createFile
+import io.github.muntashirakon.music.util.Share.shareFile
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
 
 class ErrorActivity : AppCompatActivity() {
     private val dayFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
-    private val reportPrefix = "bug_report-"
+    private val ReportPrefix = "bug_report-"
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(cat.ereza.customactivityoncrash.R.layout.customactivityoncrash_default_error_activity)
+        setContentView(R.layout.customactivityoncrash_default_error_activity)
 
         val restartButton =
-            findViewById<Button>(cat.ereza.customactivityoncrash.R.id.customactivityoncrash_error_activity_restart_button)
+            findViewById<Button>(R.id.customactivityoncrash_error_activity_restart_button)
 
         val config = CustomActivityOnCrash.getConfigFromIntent(intent)
         if (config == null) {
             finish()
             return
         }
-        restartButton.setText(cat.ereza.customactivityoncrash.R.string.customactivityoncrash_error_activity_restart_app)
+        restartButton.setText(R.string.customactivityoncrash_error_activity_restart_app)
         restartButton.setOnClickListener {
             CustomActivityOnCrash.restartApplication(
                 this@ErrorActivity,
@@ -36,11 +36,11 @@ class ErrorActivity : AppCompatActivity() {
             )
         }
         val moreInfoButton =
-            findViewById<Button>(cat.ereza.customactivityoncrash.R.id.customactivityoncrash_error_activity_more_info_button)
+            findViewById<Button>(R.id.customactivityoncrash_error_activity_more_info_button)
 
         moreInfoButton.setOnClickListener { //We retrieve all the error data and show it
-            MaterialAlertDialogBuilder(this@ErrorActivity)
-                .setTitle(cat.ereza.customactivityoncrash.R.string.customactivityoncrash_error_activity_error_details_title)
+            AlertDialog.Builder(this@ErrorActivity)
+                .setTitle(R.string.customactivityoncrash_error_activity_error_details_title)
                 .setMessage(
                     CustomActivityOnCrash.getAllErrorDetailsFromIntent(
                         this@ErrorActivity,
@@ -48,7 +48,7 @@ class ErrorActivity : AppCompatActivity() {
                     )
                 )
                 .setPositiveButton(
-                    cat.ereza.customactivityoncrash.R.string.customactivityoncrash_error_activity_error_details_close,
+                    R.string.customactivityoncrash_error_activity_error_details_close,
                     null
                 )
                 .setNeutralButton(
@@ -58,19 +58,19 @@ class ErrorActivity : AppCompatActivity() {
                     val bugReport = createFile(
                         context = this,
                         "Bug Report",
-                        "$reportPrefix${dayFormat.format(Date())}",
+                        "$ReportPrefix${dayFormat.format(Date())}",
                         CustomActivityOnCrash.getAllErrorDetailsFromIntent(
                             this@ErrorActivity,
                             intent
                         ), ".txt"
                     )
-                    shareFile(this, bugReport, "text/*")
+                    shareFile(this, bugReport)
                 }
                 .show()
         }
         val errorActivityDrawableId = config.errorDrawable
         val errorImageView =
-            findViewById<ImageView>(cat.ereza.customactivityoncrash.R.id.customactivityoncrash_error_activity_image)
+            findViewById<ImageView>(R.id.customactivityoncrash_error_activity_image)
         if (errorActivityDrawableId != null) {
             errorImageView.setImageResource(
                 errorActivityDrawableId
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/LicenseActivity.kt
similarity index 89%
rename from app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/LicenseActivity.kt
index e41352dae..23fb10759 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/LicenseActivity.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.activities
+package io.github.muntashirakon.music.activities
 
 import android.graphics.Color
 import android.os.Bundle
@@ -19,11 +19,11 @@ import android.view.MenuItem
 import code.name.monkey.appthemehelper.util.ATHUtil.isWindowBackgroundDark
 import code.name.monkey.appthemehelper.util.ColorUtil.lightenColor
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.activities.base.AbsThemeActivity
-import code.name.monkey.retromusic.databinding.ActivityLicenseBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.surfaceColor
+import io.github.muntashirakon.music.activities.base.AbsThemeActivity
+import io.github.muntashirakon.music.databinding.ActivityLicenseBinding
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.drawAboveSystemBars
+import io.github.muntashirakon.music.extensions.surfaceColor
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
@@ -77,7 +77,7 @@ class LicenseActivity : AbsThemeActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == android.R.id.home) {
-            onBackPressedDispatcher.onBackPressed()
+            onBackPressed()
             return true
         }
         return super.onOptionsItemSelected(item)
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/LockScreenActivity.kt
similarity index 73%
rename from app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/LockScreenActivity.kt
index 3ac219871..aff5fe29a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/LockScreenActivity.kt
@@ -12,27 +12,25 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.activities
+package io.github.muntashirakon.music.activities
 
 import android.app.KeyguardManager
 import android.os.Bundle
 import android.view.WindowManager
 import androidx.core.content.getSystemService
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.databinding.ActivityLockScreenBinding
-import code.name.monkey.retromusic.extensions.hideStatusBar
-import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.base.AbsMusicServiceActivity
+import io.github.muntashirakon.music.databinding.ActivityLockScreenBinding
+import io.github.muntashirakon.music.extensions.hideStatusBar
+import io.github.muntashirakon.music.extensions.setTaskDescriptionColorAuto
+import io.github.muntashirakon.music.extensions.whichFragment
+import io.github.muntashirakon.music.fragments.player.lockscreen.LockScreenControlsFragment
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import com.r0adkll.slidr.Slidr
 import com.r0adkll.slidr.model.SlidrConfig
 import com.r0adkll.slidr.model.SlidrListener
@@ -86,11 +84,12 @@ class LockScreenActivity : AbsMusicServiceActivity() {
     private fun lockScreenInit() {
         if (VersionUtils.hasOreoMR1()) {
             setShowWhenLocked(true)
-            //setTurnScreenOn(true)
+            val keyguardManager = getSystemService<KeyguardManager>()
+            keyguardManager?.requestDismissKeyguard(this, null)
         } else {
-            window.addFlags(
-                WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
-                //          or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+            this.window.addFlags(
+                WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or
+                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
             )
         }
     }
@@ -107,7 +106,7 @@ class LockScreenActivity : AbsMusicServiceActivity() {
 
     private fun updateSongs() {
         val song = MusicPlayerRemote.currentSong
-        Glide.with(this)
+        GlideApp.with(this)
             .asBitmapPalette()
             .songCoverOptions(song)
             .load(RetroGlideExtension.getSongModel(song))
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/MainActivity.kt
similarity index 73%
rename from app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/MainActivity.kt
index e9cb29abe..d854b2e9d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/MainActivity.kt
@@ -12,37 +12,43 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.activities
+package io.github.muntashirakon.music.activities
 
 import android.content.Intent
+import android.content.SharedPreferences
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.contains
 import androidx.navigation.ui.setupWithNavController
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SearchQueryHelper.getSongs
-import code.name.monkey.retromusic.interfaces.IScrollHelper
-import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.PlaylistSongsLoader
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.logE
+import io.github.muntashirakon.music.*
+import io.github.muntashirakon.music.activities.base.AbsSlidingMusicPanelActivity
+import io.github.muntashirakon.music.databinding.SlidingMusicPanelLayoutBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.SearchQueryHelper.getSongs
+import io.github.muntashirakon.music.interfaces.IScrollHelper
+import io.github.muntashirakon.music.model.CategoryInfo
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.repository.PlaylistSongsLoader
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.util.PreferenceUtil
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.get
 
-class MainActivity : AbsSlidingMusicPanelActivity() {
+class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeListener {
     companion object {
         const val TAG = "MainActivity"
         const val EXPAND_PANEL = "expand_panel"
     }
 
+    override fun createContentView(): SlidingMusicPanelLayoutBinding {
+        return wrapSlidingMusicPanel()
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setTaskDescriptionColorAuto()
@@ -50,7 +56,9 @@ class MainActivity : AbsSlidingMusicPanelActivity() {
         updateTabs()
 
         setupNavigationController()
-
+        if (!hasPermissions()) {
+            findNavController(R.id.fragment_container).navigate(R.id.permissionFragment)
+        }
         WhatsNewFragment.showChangeLog(this)
     }
 
@@ -76,9 +84,9 @@ class MainActivity : AbsSlidingMusicPanelActivity() {
             )
         }
         navController.graph = navGraph
-        navigationView.setupWithNavController(navController)
+        bottomNavigationView.setupWithNavController(navController)
         // Scroll Fragment to top
-        navigationView.setOnItemReselectedListener {
+        bottomNavigationView.setOnItemReselectedListener {
             currentFragment(R.id.fragment_container).apply {
                 if (this is IScrollHelper) {
                     scrollToTop()
@@ -110,9 +118,7 @@ class MainActivity : AbsSlidingMusicPanelActivity() {
     }
 
     private fun saveTab(id: Int) {
-        if (PreferenceUtil.libraryCategory.firstOrNull { it.category.id == id }?.visible == true) {
-            PreferenceUtil.lastTab = id
-        }
+        PreferenceUtil.lastTab = id
     }
 
     override fun onSupportNavigateUp(): Boolean =
@@ -129,6 +135,22 @@ class MainActivity : AbsSlidingMusicPanelActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        PreferenceUtil.registerOnSharedPreferenceChangedListener(this)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        PreferenceUtil.unregisterOnSharedPreferenceChangedListener(this)
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+        if (key == GENERAL_THEME || key == MATERIAL_YOU || key == WALLPAPER_ACCENT || key == BLACK_THEME || key == ADAPTIVE_COLOR_APP || key == USER_NAME || key == TOGGLE_FULL_SCREEN || key == TOGGLE_VOLUME || key == ROUND_CORNERS || key == CAROUSEL_EFFECT || key == NOW_PLAYING_SCREEN_ID || key == TOGGLE_GENRE || key == BANNER_IMAGE_PATH || key == PROFILE_IMAGE_PATH || key == CIRCULAR_ALBUM_ART || key == KEEP_SCREEN_ON || key == TOGGLE_SEPARATE_LINE || key == TOGGLE_HOME_BANNER || key == TOGGLE_ADD_CONTROLS || key == ALBUM_COVER_STYLE || key == HOME_ARTIST_GRID_STYLE || key == ALBUM_COVER_TRANSFORM || key == DESATURATED_COLOR || key == EXTRA_SONG_INFO || key == TAB_TEXT_MODE || key == LANGUAGE_NAME || key == LIBRARY_CATEGORIES || key == CUSTOM_FONT || key == APPBAR_MODE || key == CIRCLE_PLAY_BUTTON || key == SWIPE_DOWN_DISMISS) {
+            postRecreate()
+        }
+    }
+
     override fun onServiceConnected() {
         super.onServiceConnected()
         intent ?: return
@@ -196,7 +218,7 @@ class MainActivity : AbsSlidingMusicPanelActivity() {
     private fun parseLongFromIntent(
         intent: Intent,
         longKey: String,
-        stringKey: String,
+        stringKey: String
     ): Long {
         var id = intent.getLongExtra(longKey, -1)
         if (id < 0) {
@@ -205,7 +227,7 @@ class MainActivity : AbsSlidingMusicPanelActivity() {
                 try {
                     id = idString.toLong()
                 } catch (e: NumberFormatException) {
-                    logE(e)
+                    println(e.message)
                 }
             }
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/PermissionActivity.kt
similarity index 79%
rename from app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/PermissionActivity.kt
index 5cb64cf93..3eeaf3c1d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/PermissionActivity.kt
@@ -12,8 +12,9 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.activities
+package io.github.muntashirakon.music.activities
 
+import android.Manifest
 import android.Manifest.permission.BLUETOOTH_CONNECT
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -21,17 +22,16 @@ import android.content.res.ColorStateList
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
-import androidx.activity.OnBackPressedCallback
 import androidx.annotation.RequiresApi
 import androidx.core.app.ActivityCompat
 import androidx.core.net.toUri
 import androidx.core.text.parseAsHtml
 import androidx.core.view.isVisible
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.databinding.ActivityPermissionBinding
-import code.name.monkey.retromusic.extensions.*
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.base.AbsMusicServiceActivity
+import io.github.muntashirakon.music.databinding.ActivityPermissionBinding
+import io.github.muntashirakon.music.extensions.*
 
 class PermissionActivity : AbsMusicServiceActivity() {
     private lateinit var binding: ActivityPermissionBinding
@@ -61,14 +61,10 @@ class PermissionActivity : AbsMusicServiceActivity() {
         if (VersionUtils.hasS()) {
             binding.bluetoothPermission.show()
             binding.bluetoothPermission.setButtonClick {
-                ActivityCompat.requestPermissions(
-                    this,
+                ActivityCompat.requestPermissions(this,
                     arrayOf(BLUETOOTH_CONNECT),
-                    BLUETOOTH_PERMISSION_REQUEST
-                )
+                    PERMISSION_REQUEST)
             }
-        } else {
-            binding.audioPermission.setNumber("2")
         }
 
         binding.finish.accentBackgroundColor()
@@ -83,20 +79,12 @@ class PermissionActivity : AbsMusicServiceActivity() {
                 finish()
             }
         }
-        onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                finishAffinity()
-                remove()
-            }
-        })
     }
 
     private fun setupTitle() {
         val appName =
-            getString(
-                R.string.message_welcome,
-                "<b>Metro</b>"
-            )
+            getString(R.string.message_welcome,
+                "<b>Metro</b>")
                 .parseAsHtml()
         binding.appNameText.text = appName
     }
@@ -126,19 +114,23 @@ class PermissionActivity : AbsMusicServiceActivity() {
     }
 
     private fun hasStoragePermission(): Boolean {
-        return hasPermissions()
+        return ActivityCompat.checkSelfPermission(this,
+            Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
     }
 
     @RequiresApi(Build.VERSION_CODES.S)
     private fun hasBluetoothPermission(): Boolean {
-        return ActivityCompat.checkSelfPermission(
-            this,
-            BLUETOOTH_CONNECT
-        ) == PackageManager.PERMISSION_GRANTED
+        return ActivityCompat.checkSelfPermission(this,
+            BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED
     }
 
     @RequiresApi(Build.VERSION_CODES.M)
     private fun hasAudioPermission(): Boolean {
         return Settings.System.canWrite(this)
     }
+
+    override fun onBackPressed() {
+        super.onBackPressed()
+        finishAffinity()
+    }
 }
diff --git a/app/src/main/java/io/github/muntashirakon/music/activities/SettingsActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/SettingsActivity.kt
new file mode 100644
index 000000000..788ccd6e8
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/SettingsActivity.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2020 Hemanth Savarla.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ */
+package io.github.muntashirakon.music.activities
+
+import android.Manifest.permission.BLUETOOTH_CONNECT
+import android.content.Intent
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.navigation.NavController
+import androidx.navigation.NavDestination
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.VersionUtils
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.base.AbsBaseActivity
+import io.github.muntashirakon.music.appshortcuts.DynamicShortcutManager
+import io.github.muntashirakon.music.databinding.ActivitySettingsBinding
+import io.github.muntashirakon.music.extensions.*
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.color.ColorCallback
+
+class SettingsActivity : AbsBaseActivity(), ColorCallback, OnThemeChangedListener {
+    private lateinit var binding: ActivitySettingsBinding
+    override fun onCreate(savedInstanceState: Bundle?) {
+        val mSavedInstanceState = extra<Bundle>(TAG).value ?: savedInstanceState
+        super.onCreate(mSavedInstanceState)
+        binding = ActivitySettingsBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        setupToolbar()
+        setPermissionDeniedMessage(getString(R.string.permission_bluetooth_denied))
+    }
+
+    override fun onResume() {
+        super.onResume()
+        setNavigationBarColorPreOreo(surfaceColor())
+    }
+
+    private fun setupToolbar() {
+        applyToolbar(binding.toolbar)
+        val navController: NavController = findNavController(R.id.contentFrame)
+        navController.addOnDestinationChangedListener { _, _, _ ->
+            binding.collapsingToolbarLayout.title =
+                navController.currentDestination?.let { getStringFromDestination(it) }
+        }
+    }
+
+    private fun getStringFromDestination(currentDestination: NavDestination): String {
+        val idRes = when (currentDestination.id) {
+            R.id.mainSettingsFragment -> R.string.action_settings
+            R.id.audioSettings -> R.string.pref_header_audio
+            R.id.imageSettingFragment -> R.string.pref_header_images
+            R.id.notificationSettingsFragment -> R.string.notification
+            R.id.nowPlayingSettingsFragment -> R.string.now_playing
+            R.id.otherSettingsFragment -> R.string.others
+            R.id.personalizeSettingsFragment -> R.string.personalize
+            R.id.themeSettingsFragment -> R.string.general_settings_title
+            R.id.aboutActivity -> R.string.action_about
+            R.id.backup_fragment -> R.string.backup_restore_title
+            else -> R.id.action_settings
+        }
+        return getString(idRes)
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        return findNavController(R.id.contentFrame).navigateUp() || super.onSupportNavigateUp()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    override fun getPermissionsToRequest(): Array<String> {
+        return if (VersionUtils.hasS()) {
+            arrayOf(BLUETOOTH_CONNECT)
+        } else {
+            arrayOf()
+        }
+    }
+
+    override fun invoke(dialog: MaterialDialog, color: Int) {
+        ThemeStore.editTheme(this).accentColor(color).commit()
+        if (VersionUtils.hasNougatMR())
+            DynamicShortcutManager(this).updateDynamicShortcuts()
+        restart()
+    }
+
+    override fun onThemeValuesChanged() {
+        restart()
+    }
+
+    private fun restart() {
+        val savedInstanceState = Bundle().apply {
+            onSaveInstanceState(this)
+        }
+        finish()
+        val intent = Intent(this, this::class.java).putExtra(TAG, savedInstanceState)
+        startActivity(intent)
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+    }
+
+    companion object {
+        val TAG: String = SettingsActivity::class.java.simpleName
+    }
+}
+
+interface OnThemeChangedListener {
+    fun onThemeValuesChanged()
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt b/app/src/main/java/io/github/muntashirakon/music/activities/ShareInstagramStory.kt
similarity index 66%
rename from app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/ShareInstagramStory.kt
index 546c9d794..95d67cc3d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/ShareInstagramStory.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.activities
+package io.github.muntashirakon.music.activities
 
 import android.content.res.ColorStateList
 import android.graphics.Bitmap
@@ -22,28 +22,26 @@ import android.os.Bundle
 import android.provider.MediaStore.Images.Media
 import android.view.MenuItem
 import androidx.core.net.toUri
-import androidx.core.os.BundleCompat
 import androidx.core.view.drawToBitmap
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.retromusic.activities.base.AbsThemeActivity
-import code.name.monkey.retromusic.databinding.ActivityShareInstagramBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.setStatusBarColor
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.Share
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.activities.base.AbsBaseActivity
+import io.github.muntashirakon.music.databinding.ActivityShareInstagramBinding
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.setLightStatusBar
+import io.github.muntashirakon.music.extensions.setStatusBarColor
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.Share
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 /**
  * Created by hemanths on 2020-02-02.
  */
 
-class ShareInstagramStory : AbsThemeActivity() {
+class ShareInstagramStory : AbsBaseActivity() {
 
     private lateinit var binding: ActivityShareInstagramBinding
 
@@ -53,7 +51,7 @@ class ShareInstagramStory : AbsThemeActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == android.R.id.home) {
-            onBackPressedDispatcher.onBackPressed()
+            onBackPressed()
             return true
         }
         return super.onOptionsItemSelected(item)
@@ -68,15 +66,16 @@ class ShareInstagramStory : AbsThemeActivity() {
         binding.toolbar.setBackgroundColor(Color.TRANSPARENT)
         setSupportActionBar(binding.toolbar)
 
-        val song = intent.extras?.let { BundleCompat.getParcelable(it, EXTRA_SONG, Song::class.java) }
+        val song = intent.extras?.getParcelable<Song>(EXTRA_SONG)
         song?.let { songFinal ->
-            Glide.with(this)
+            GlideApp.with(this)
                 .asBitmapPalette()
                 .songCoverOptions(songFinal)
                 .load(RetroGlideExtension.getSongModel(songFinal))
                 .into(object : RetroMusicColoredTarget(binding.image) {
                     override fun onColorReady(colors: MediaNotificationProcessor) {
-                        setColors(colors.backgroundColor)
+                        val isColorLight = ColorUtil.isColorLight(colors.backgroundColor)
+                        setColors(isColorLight, colors.backgroundColor)
                     }
                 })
 
@@ -104,7 +103,22 @@ class ShareInstagramStory : AbsThemeActivity() {
             ColorStateList.valueOf(accentColor())
     }
 
-    private fun setColors(color: Int) {
+    private fun setColors(colorLight: Boolean, color: Int) {
+        setLightStatusBar(colorLight)
+        binding.toolbar.setTitleTextColor(
+            MaterialValueHelper.getPrimaryTextColor(
+                this@ShareInstagramStory,
+                colorLight
+            )
+        )
+        binding.toolbar.navigationIcon?.setTintList(
+            ColorStateList.valueOf(
+                MaterialValueHelper.getPrimaryTextColor(
+                    this@ShareInstagramStory,
+                    colorLight
+                )
+            )
+        )
         binding.mainContent.background =
             GradientDrawable(
                 GradientDrawable.Orientation.TOP_BOTTOM,
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt b/app/src/main/java/io/github/muntashirakon/music/activities/WhatsNewFragment.kt
similarity index 82%
rename from app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/WhatsNewFragment.kt
index 48b39ed35..f7ef6ad38 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/WhatsNewFragment.kt
@@ -1,16 +1,12 @@
-package code.name.monkey.retromusic.activities
+package io.github.muntashirakon.music.activities
 
 import android.content.Context
-import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.webkit.WebResourceRequest
-import android.webkit.WebView
-import android.webkit.WebViewClient
 import androidx.core.content.pm.PackageInfoCompat
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.FragmentActivity
@@ -18,12 +14,12 @@ import code.name.monkey.appthemehelper.util.ATHUtil.isWindowBackgroundDark
 import code.name.monkey.appthemehelper.util.ColorUtil.isColorLight
 import code.name.monkey.appthemehelper.util.ColorUtil.lightenColor
 import code.name.monkey.appthemehelper.util.MaterialValueHelper.getPrimaryTextColor
-import code.name.monkey.retromusic.BuildConfig
-import code.name.monkey.retromusic.Constants
-import code.name.monkey.retromusic.databinding.FragmentWhatsNewBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.openUrl
-import code.name.monkey.retromusic.util.PreferenceUtil.lastVersion
+import io.github.muntashirakon.music.BuildConfig
+import io.github.muntashirakon.music.Constants
+import io.github.muntashirakon.music.databinding.FragmentWhatsNewBinding
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.openUrl
+import io.github.muntashirakon.music.util.PreferenceUtil.lastVersion
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import java.nio.charset.StandardCharsets
 import java.util.*
@@ -45,7 +41,7 @@ class WhatsNewFragment : BottomSheetDialogFragment() {
         super.onViewCreated(view, savedInstanceState)
         try {
             val buf = StringBuilder()
-            val stream = requireContext().assets.open("retro-changelog.html")
+            val stream= requireContext().assets.open("retro-changelog.html")
             stream.reader(StandardCharsets.UTF_8).buffered().use { br ->
                 var str: String?
                 while (br.readLine().also { str = it } != null) {
@@ -80,17 +76,6 @@ class WhatsNewFragment : BottomSheetDialogFragment() {
                     )
                 )
             binding.webView.loadData(changeLog, "text/html", "UTF-8")
-            binding.webView.webViewClient = object : WebViewClient() {
-                override fun shouldOverrideUrlLoading(
-                    view: WebView?,
-                    request: WebResourceRequest?
-                ): Boolean {
-                    val url = request?.url ?: return false
-                    //you can do checks here e.g. url.host equals to target one
-                    startActivity(Intent(Intent.ACTION_VIEW, url))
-                    return true
-                }
-            }
         } catch (e: Throwable) {
             binding.webView.loadData(
                 "<h1>Unable to load</h1><p>" + e.localizedMessage + "</p>", "text/html", "UTF-8"
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsBaseActivity.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/base/AbsBaseActivity.kt
index 1e0c110d5..cd5cf2d94 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsBaseActivity.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.activities.base
+package io.github.muntashirakon.music.activities.base
 
 import android.Manifest
 import android.content.Intent
@@ -30,10 +30,8 @@ import android.widget.EditText
 import androidx.core.app.ActivityCompat
 import androidx.core.content.getSystemService
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.rootView
-import code.name.monkey.retromusic.util.logD
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.accentColor
 import com.google.android.material.snackbar.Snackbar
 
 abstract class AbsBaseActivity : AbsThemeActivity() {
@@ -54,7 +52,7 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
     }
 
     private val snackBarContainer: View
-        get() = rootView
+        get() = window.decorView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -77,7 +75,7 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
 
     protected open fun onHasPermissionsChanged(hasPermissions: Boolean) {
         // implemented by sub classes
-        logD(hasPermissions)
+        println(hasPermissions)
     }
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
@@ -116,19 +114,33 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
             for (grantResult in grantResults) {
                 if (grantResult != PackageManager.PERMISSION_GRANTED) {
                     if (ActivityCompat.shouldShowRequestPermissionRationale(
-                            this@AbsBaseActivity, Manifest.permission.READ_EXTERNAL_STORAGE,
-                        ) || ActivityCompat.shouldShowRequestPermissionRationale(
-                            this@AbsBaseActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                            this@AbsBaseActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE
                         )
                     ) {
                         // User has deny from permission dialog
                         Snackbar.make(
                             snackBarContainer,
                             permissionDeniedMessage!!,
-                            Snackbar.LENGTH_SHORT
+                            Snackbar.LENGTH_INDEFINITE
                         )
                             .setAction(R.string.action_grant) { requestPermissions() }
                             .setActionTextColor(accentColor()).show()
+                    } else if (ActivityCompat.shouldShowRequestPermissionRationale(
+                            this@AbsBaseActivity, Manifest.permission.BLUETOOTH_CONNECT
+                        )
+                    ) {
+                        // User has deny from permission dialog
+                        Snackbar.make(
+                            snackBarContainer,
+                            R.string.permission_bluetooth_denied,
+                            Snackbar.LENGTH_INDEFINITE
+                        )
+                            .setAction(R.string.action_grant) {
+                                ActivityCompat.requestPermissions(this,
+                                    arrayOf(Manifest.permission.BLUETOOTH_CONNECT),
+                                    PERMISSION_REQUEST)
+                            }
+                            .setActionTextColor(accentColor()).show()
                     } else {
                         // User has deny permission and checked never show permission dialog so you can redirect to Application settings page
                         Snackbar.make(
@@ -153,34 +165,11 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
             }
             hadPermissions = true
             onHasPermissionsChanged(true)
-        } else if (requestCode == BLUETOOTH_PERMISSION_REQUEST) {
-            for (grantResult in grantResults) {
-                if (grantResult != PackageManager.PERMISSION_GRANTED) {
-                    if (ActivityCompat.shouldShowRequestPermissionRationale(
-                            this@AbsBaseActivity, Manifest.permission.BLUETOOTH_CONNECT
-                        )
-                    ) {
-                        // User has deny from permission dialog
-                        Snackbar.make(
-                            snackBarContainer,
-                            R.string.permission_bluetooth_denied,
-                            Snackbar.LENGTH_SHORT
-                        )
-                            .setAction(R.string.action_grant) {
-                                ActivityCompat.requestPermissions(this,
-                                    arrayOf(Manifest.permission.BLUETOOTH_CONNECT),
-                                    BLUETOOTH_PERMISSION_REQUEST)
-                            }
-                            .setActionTextColor(accentColor()).show()
-                    }
-                }
-            }
         }
     }
 
     companion object {
         const val PERMISSION_REQUEST = 100
-        const val BLUETOOTH_PERMISSION_REQUEST = 101
     }
 
     // this lets keyboard close when clicked in background
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsMusicServiceActivity.kt
similarity index 75%
rename from app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/base/AbsMusicServiceActivity.kt
index f9f05c919..65195c2f0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsMusicServiceActivity.kt
@@ -12,29 +12,27 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.activities.base
+package io.github.muntashirakon.music.activities.base
 
 import android.Manifest
 import android.content.*
 import android.os.Bundle
 import android.os.IBinder
-import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.toPlayCount
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.service.MusicService.Companion.FAVORITE_STATE_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.MEDIA_STORE_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.META_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.PLAY_STATE_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.QUEUE_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.REPEAT_MODE_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.SHUFFLE_MODE_CHANGED
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.logD
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.toPlayCount
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.interfaces.IMusicServiceEventListener
+import io.github.muntashirakon.music.repository.RealRepository
+import io.github.muntashirakon.music.service.MusicService.Companion.FAVORITE_STATE_CHANGED
+import io.github.muntashirakon.music.service.MusicService.Companion.MEDIA_STORE_CHANGED
+import io.github.muntashirakon.music.service.MusicService.Companion.META_CHANGED
+import io.github.muntashirakon.music.service.MusicService.Companion.PLAY_STATE_CHANGED
+import io.github.muntashirakon.music.service.MusicService.Companion.QUEUE_CHANGED
+import io.github.muntashirakon.music.service.MusicService.Companion.REPEAT_MODE_CHANGED
+import io.github.muntashirakon.music.service.MusicService.Companion.SHUFFLE_MODE_CHANGED
+import io.github.muntashirakon.music.util.PreferenceUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
@@ -97,7 +95,8 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), IMusicServiceEventLi
             filter.addAction(MEDIA_STORE_CHANGED)
             filter.addAction(FAVORITE_STATE_CHANGED)
 
-            ContextCompat.registerReceiver(this, musicStateReceiver, filter, ContextCompat.RECEIVER_NOT_EXPORTED)
+            registerReceiver(musicStateReceiver, filter)
+
             receiverRegistered = true
         }
 
@@ -122,14 +121,23 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), IMusicServiceEventLi
             listener.onPlayingMetaChanged()
         }
         lifecycleScope.launch(Dispatchers.IO) {
-            if (!PreferenceUtil.pauseHistory) {
-                repository.upsertSongInHistory(MusicPlayerRemote.currentSong)
+            val entity = repository.songPresentInHistory(MusicPlayerRemote.currentSong)
+            if (entity != null) {
+                repository.updateHistorySong(MusicPlayerRemote.currentSong)
+            } else {
+                // Check whether pause history option is ON or OFF
+                if (!PreferenceUtil.pauseHistory) {
+                    repository.addSongToHistory(MusicPlayerRemote.currentSong)
+                }
+            }
+            val songs = repository.checkSongExistInPlayCount(MusicPlayerRemote.currentSong.id)
+            if (songs.isNotEmpty()) {
+                repository.updateSongInPlayCount(songs.first().apply {
+                    playCount += 1
+                })
+            } else {
+                repository.insertSongInPlayCount(MusicPlayerRemote.currentSong.toPlayCount())
             }
-            val song = repository.findSongExistInPlayCount(MusicPlayerRemote.currentSong.id)
-                ?.apply { playCount += 1 }
-                ?: MusicPlayerRemote.currentSong.toPlayCount()
-
-            repository.upsertSongInPlayCount(song)
         }
     }
 
@@ -177,18 +185,12 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), IMusicServiceEventLi
             true
         ) // just in case we need to know this at some point
         sendBroadcast(intent)
-        logD("sendBroadcast $hasPermissions")
+        println("sendBroadcast $hasPermissions")
     }
 
     override fun getPermissionsToRequest(): Array<String> {
-        return mutableListOf<String>().apply {
-            if (VersionUtils.hasT()) {
-                add(Manifest.permission.READ_MEDIA_AUDIO)
-                add(Manifest.permission.POST_NOTIFICATIONS)
-            } else {
-                add(Manifest.permission.READ_EXTERNAL_STORAGE)
-            }
-            if (!VersionUtils.hasR()) {
+        return mutableListOf(Manifest.permission.READ_EXTERNAL_STORAGE).apply {
+            if (!VersionUtils.hasQ()) {
                 add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
             }
         }.toTypedArray()
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsSlidingMusicPanelActivity.kt
similarity index 53%
rename from app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/base/AbsSlidingMusicPanelActivity.kt
index 2a81ca9b4..d29fff7da 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -12,12 +12,10 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.activities.base
+package io.github.muntashirakon.music.activities.base
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
-import android.content.Intent
-import android.content.SharedPreferences
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
@@ -26,74 +24,48 @@ import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import android.view.animation.PathInterpolator
 import android.widget.FrameLayout
-import androidx.activity.OnBackPressedCallback
 import androidx.core.animation.doOnEnd
 import androidx.core.view.*
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.ADAPTIVE_COLOR_APP
-import code.name.monkey.retromusic.ALBUM_COVER_STYLE
-import code.name.monkey.retromusic.ALBUM_COVER_TRANSFORM
-import code.name.monkey.retromusic.CAROUSEL_EFFECT
-import code.name.monkey.retromusic.CIRCLE_PLAY_BUTTON
-import code.name.monkey.retromusic.EXTRA_SONG_INFO
-import code.name.monkey.retromusic.KEEP_SCREEN_ON
-import code.name.monkey.retromusic.LIBRARY_CATEGORIES
-import code.name.monkey.retromusic.NOW_PLAYING_SCREEN_ID
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.SCREEN_ON_LYRICS
-import code.name.monkey.retromusic.SWIPE_ANYWHERE_NOW_PLAYING
-import code.name.monkey.retromusic.SWIPE_DOWN_DISMISS
-import code.name.monkey.retromusic.TAB_TEXT_MODE
-import code.name.monkey.retromusic.TOGGLE_ADD_CONTROLS
-import code.name.monkey.retromusic.TOGGLE_FULL_SCREEN
-import code.name.monkey.retromusic.TOGGLE_VOLUME
-import code.name.monkey.retromusic.activities.PermissionActivity
-import code.name.monkey.retromusic.databinding.SlidingMusicPanelLayoutBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.NowPlayingScreen
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.other.MiniPlayerFragment
-import code.name.monkey.retromusic.fragments.player.adaptive.AdaptiveFragment
-import code.name.monkey.retromusic.fragments.player.blur.BlurPlayerFragment
-import code.name.monkey.retromusic.fragments.player.card.CardFragment
-import code.name.monkey.retromusic.fragments.player.cardblur.CardBlurFragment
-import code.name.monkey.retromusic.fragments.player.circle.CirclePlayerFragment
-import code.name.monkey.retromusic.fragments.player.classic.ClassicPlayerFragment
-import code.name.monkey.retromusic.fragments.player.color.ColorFragment
-import code.name.monkey.retromusic.fragments.player.fit.FitFragment
-import code.name.monkey.retromusic.fragments.player.flat.FlatPlayerFragment
-import code.name.monkey.retromusic.fragments.player.full.FullPlayerFragment
-import code.name.monkey.retromusic.fragments.player.gradient.GradientPlayerFragment
-import code.name.monkey.retromusic.fragments.player.material.MaterialFragment
-import code.name.monkey.retromusic.fragments.player.md3.MD3PlayerFragment
-import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
-import code.name.monkey.retromusic.fragments.player.peek.PeekPlayerFragment
-import code.name.monkey.retromusic.fragments.player.plain.PlainPlayerFragment
-import code.name.monkey.retromusic.fragments.player.simple.SimplePlayerFragment
-import code.name.monkey.retromusic.fragments.player.tiny.TinyPlayerFragment
-import code.name.monkey.retromusic.fragments.queue.PlayingQueueFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ViewUtil
-import code.name.monkey.retromusic.util.logD
-import com.google.android.material.bottomnavigation.BottomNavigationView
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.SlidingMusicPanelLayoutBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.fragments.NowPlayingScreen
+import io.github.muntashirakon.music.fragments.NowPlayingScreen.*
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.other.MiniPlayerFragment
+import io.github.muntashirakon.music.fragments.player.adaptive.AdaptiveFragment
+import io.github.muntashirakon.music.fragments.player.blur.BlurPlayerFragment
+import io.github.muntashirakon.music.fragments.player.card.CardFragment
+import io.github.muntashirakon.music.fragments.player.cardblur.CardBlurFragment
+import io.github.muntashirakon.music.fragments.player.circle.CirclePlayerFragment
+import io.github.muntashirakon.music.fragments.player.classic.ClassicPlayerFragment
+import io.github.muntashirakon.music.fragments.player.color.ColorFragment
+import io.github.muntashirakon.music.fragments.player.fit.FitFragment
+import io.github.muntashirakon.music.fragments.player.flat.FlatPlayerFragment
+import io.github.muntashirakon.music.fragments.player.full.FullPlayerFragment
+import io.github.muntashirakon.music.fragments.player.gradient.GradientPlayerFragment
+import io.github.muntashirakon.music.fragments.player.material.MaterialFragment
+import io.github.muntashirakon.music.fragments.player.md3.MD3PlayerFragment
+import io.github.muntashirakon.music.fragments.player.normal.PlayerFragment
+import io.github.muntashirakon.music.fragments.player.peek.PeekPlayerFragment
+import io.github.muntashirakon.music.fragments.player.plain.PlainPlayerFragment
+import io.github.muntashirakon.music.fragments.player.simple.SimplePlayerFragment
+import io.github.muntashirakon.music.fragments.player.tiny.TinyPlayerFragment
+import io.github.muntashirakon.music.fragments.queue.PlayingQueueFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.CategoryInfo
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.ViewUtil
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_DRAGGING
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_SETTLING
-import com.google.android.material.bottomsheet.BottomSheetBehavior.from
+import com.google.android.material.bottomsheet.BottomSheetBehavior.*
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 
-abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
-    SharedPreferences.OnSharedPreferenceChangeListener {
+abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
     companion object {
         val TAG: String = AbsSlidingMusicPanelActivity::class.java.simpleName
     }
@@ -102,13 +74,13 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
     private var windowInsets: WindowInsetsCompat? = null
     protected val libraryViewModel by viewModel<LibraryViewModel>()
     private lateinit var bottomSheetBehavior: BottomSheetBehavior<FrameLayout>
-    private lateinit var playerFragment: AbsPlayerFragment
+    private var playerFragment: AbsPlayerFragment? = null
     private var miniPlayerFragment: MiniPlayerFragment? = null
     private var nowPlayingScreen: NowPlayingScreen? = null
     private var taskColor: Int = 0
     private var paletteColor: Int = Color.WHITE
     private var navigationBarColor = 0
-
+    protected abstract fun createContentView(): SlidingMusicPanelLayoutBinding
     private val panelState: Int
         get() = bottomSheetBehavior.state
     private lateinit var binding: SlidingMusicPanelLayoutBinding
@@ -117,63 +89,46 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
     private var navigationBarColorAnimator: ValueAnimator? = null
     private val argbEvaluator: ArgbEvaluator = ArgbEvaluator()
 
-    private val onBackPressedCallback = object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-            println("Handle back press ${bottomSheetBehavior.state}")
-            if (!handleBackPress()) {
-                remove()
-                onBackPressedDispatcher.onBackPressed()
-            }
+    private val bottomSheetCallbackList = object : BottomSheetCallback() {
+
+        override fun onSlide(bottomSheet: View, slideOffset: Float) {
+            setMiniPlayerAlphaProgress(slideOffset)
+            navigationBarColorAnimator?.cancel()
+            setNavigationBarColorPreOreo(
+                argbEvaluator.evaluate(
+                    slideOffset,
+                    surfaceColor(),
+                    navigationBarColor
+                ) as Int
+            )
         }
-    }
 
-    private val bottomSheetCallbackList by lazy {
-        object : BottomSheetCallback() {
-
-            override fun onSlide(bottomSheet: View, slideOffset: Float) {
-                setMiniPlayerAlphaProgress(slideOffset)
-                navigationBarColorAnimator?.cancel()
-                setNavigationBarColorPreOreo(
-                    argbEvaluator.evaluate(
-                        slideOffset,
-                        surfaceColor(),
-                        navigationBarColor
-                    ) as Int
-                )
-            }
-
-            override fun onStateChanged(bottomSheet: View, newState: Int) {
-                onBackPressedCallback.isEnabled = newState == STATE_EXPANDED
-                when (newState) {
-                    STATE_EXPANDED -> {
-                        onPanelExpanded()
-                        if (PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) {
-                            keepScreenOn(true)
-                        }
+        override fun onStateChanged(bottomSheet: View, newState: Int) {
+            when (newState) {
+                STATE_EXPANDED -> {
+                    onPanelExpanded()
+                    if (PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) {
+                        keepScreenOn(true)
                     }
-
-                    STATE_COLLAPSED -> {
-                        onPanelCollapsed()
-                        if ((PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) || !PreferenceUtil.isScreenOnEnabled) {
-                            keepScreenOn(false)
-                        }
+                }
+                STATE_COLLAPSED -> {
+                    onPanelCollapsed()
+                    if ((PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) || !PreferenceUtil.isScreenOnEnabled) {
+                        keepScreenOn(false)
                     }
-
-                    STATE_SETTLING, STATE_DRAGGING -> {
-                        if (fromNotification) {
-                            binding.navigationView.bringToFront()
-                            fromNotification = false
-                        }
-                    }
-
-                    STATE_HIDDEN -> {
-                        MusicPlayerRemote.clearQueue()
-                    }
-
-                    else -> {
-                        logD("Do a flip")
+                }
+                STATE_SETTLING, STATE_DRAGGING -> {
+                    if (fromNotification) {
+                        binding.bottomNavigationView.bringToFront()
+                        fromNotification = false
                     }
                 }
+                STATE_HIDDEN -> {
+                    MusicPlayerRemote.clearQueue()
+                }
+                else -> {
+                    println("Do a flip")
+                }
             }
         }
     }
@@ -182,14 +137,12 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (!hasPermissions()) {
-            startActivity(Intent(this, PermissionActivity::class.java))
-            finish()
-        }
-        binding = SlidingMusicPanelLayoutBinding.inflate(layoutInflater)
+        binding = createContentView()
         setContentView(binding.root)
-        binding.root.setOnApplyWindowInsetsListener { _, insets ->
-            windowInsets = WindowInsetsCompat.toWindowInsetsCompat(insets)
+        ViewCompat.setOnApplyWindowInsetsListener(
+            binding.root
+        ) { _, insets ->
+            windowInsets = insets
             insets
         }
         chooseFragmentForTheme()
@@ -198,25 +151,21 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
         updateColor()
         if (!PreferenceUtil.materialYou) {
             binding.slidingPanel.backgroundTintList = ColorStateList.valueOf(darkAccentColor())
-            navigationView.backgroundTintList = ColorStateList.valueOf(darkAccentColor())
+            bottomNavigationView.backgroundTintList = ColorStateList.valueOf(darkAccentColor())
         }
 
         navigationBarColor = surfaceColor()
-
-        onBackPressedDispatcher.addCallback(onBackPressedCallback)
     }
 
     private fun setupBottomSheet() {
         bottomSheetBehavior = from(binding.slidingPanel)
         bottomSheetBehavior.addBottomSheetCallback(bottomSheetCallbackList)
         bottomSheetBehavior.isHideable = PreferenceUtil.swipeDownToDismiss
-        bottomSheetBehavior.significantVelocityThreshold = 300
         setMiniPlayerAlphaProgress(0F)
     }
 
     override fun onResume() {
         super.onResume()
-        PreferenceUtil.registerOnSharedPreferenceChangedListener(this)
         if (nowPlayingScreen != PreferenceUtil.nowPlayingScreen) {
             postRecreate()
         }
@@ -228,69 +177,10 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
     override fun onDestroy() {
         super.onDestroy()
         bottomSheetBehavior.removeBottomSheetCallback(bottomSheetCallbackList)
-        PreferenceUtil.unregisterOnSharedPreferenceChangedListener(this)
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        when (key) {
-            SWIPE_DOWN_DISMISS -> {
-                bottomSheetBehavior.isHideable = PreferenceUtil.swipeDownToDismiss
-            }
-
-            TOGGLE_ADD_CONTROLS -> {
-                miniPlayerFragment?.setUpButtons()
-            }
-
-            NOW_PLAYING_SCREEN_ID -> {
-                chooseFragmentForTheme()
-                binding.slidingPanel.updateLayoutParams<ViewGroup.LayoutParams> {
-                    height = if (nowPlayingScreen != Peek) {
-                        ViewGroup.LayoutParams.MATCH_PARENT
-                    } else {
-                        ViewGroup.LayoutParams.WRAP_CONTENT
-                    }
-                    onServiceConnected()
-                }
-            }
-
-            ALBUM_COVER_TRANSFORM, CAROUSEL_EFFECT,
-            ALBUM_COVER_STYLE, TOGGLE_VOLUME, EXTRA_SONG_INFO, CIRCLE_PLAY_BUTTON,
-            -> {
-                chooseFragmentForTheme()
-                onServiceConnected()
-            }
-
-            SWIPE_ANYWHERE_NOW_PLAYING -> {
-                playerFragment.addSwipeDetector()
-            }
-
-            ADAPTIVE_COLOR_APP -> {
-                if (PreferenceUtil.nowPlayingScreen in listOf(Normal, Material, Flat)) {
-                    chooseFragmentForTheme()
-                    onServiceConnected()
-                }
-            }
-
-            LIBRARY_CATEGORIES -> {
-                updateTabs()
-            }
-
-            TAB_TEXT_MODE -> {
-                navigationView.labelVisibilityMode = PreferenceUtil.tabTitleMode
-            }
-
-            TOGGLE_FULL_SCREEN -> {
-                recreate()
-            }
-
-            SCREEN_ON_LYRICS -> {
-                keepScreenOn(bottomSheetBehavior.state == STATE_EXPANDED && PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics || PreferenceUtil.isScreenOnEnabled)
-            }
-
-            KEEP_SCREEN_ON -> {
-                maybeSetScreenOn()
-            }
-        }
+    protected fun wrapSlidingMusicPanel(): SlidingMusicPanelLayoutBinding {
+        return SlidingMusicPanelLayoutBinding.inflate(layoutInflater)
     }
 
     fun collapsePanel() {
@@ -306,10 +196,8 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
         val alpha = 1 - progress
         miniPlayerFragment?.view?.alpha = 1 - (progress / 0.2F)
         miniPlayerFragment?.view?.isGone = alpha == 0f
-        if (!isLandscape) {
-            binding.navigationView.translationY = progress * 500
-            binding.navigationView.alpha = alpha
-        }
+        binding.bottomNavigationView.translationY = progress * 500
+        binding.bottomNavigationView.alpha = alpha
         binding.playerFragmentContainer.alpha = (progress - 0.2F) / 0.2F
     }
 
@@ -336,13 +224,13 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
         setLightStatusBarAuto()
         setLightNavigationBarAuto()
         setTaskDescriptionColor(taskColor)
-        //playerFragment?.onHide()
+        playerFragment?.onHide()
     }
 
     open fun onPanelExpanded() {
         setMiniPlayerAlphaProgress(1F)
         onPaletteColorChanged()
-        //playerFragment?.onShow()
+        playerFragment?.onShow()
     }
 
     private fun setupSlidingUpPanel() {
@@ -366,15 +254,21 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
         })
     }
 
-    val navigationView get() = binding.navigationView
+    val bottomNavigationView get() = binding.bottomNavigationView
 
     val slidingPanel get() = binding.slidingPanel
 
-    val isBottomNavVisible get() = navigationView.isVisible && navigationView is BottomNavigationView
-
     override fun onServiceConnected() {
         super.onServiceConnected()
-        hideBottomSheet(false)
+        if (MusicPlayerRemote.playingQueue.isNotEmpty()) {
+            binding.slidingPanel.viewTreeObserver.addOnGlobalLayoutListener(object :
+                ViewTreeObserver.OnGlobalLayoutListener {
+                override fun onGlobalLayout() {
+                    binding.slidingPanel.viewTreeObserver.removeOnGlobalLayoutListener(this)
+                    hideBottomSheet(false)
+                }
+            })
+        } // don't call hideBottomSheet(true) here as it causes a bug with the SlidingUpPanelLayout
     }
 
     override fun onQueueChanged() {
@@ -386,7 +280,12 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
         }
     }
 
+    override fun onBackPressed() {
+        if (!handleBackPress()) super.onBackPressed()
+    }
+
     private fun handleBackPress(): Boolean {
+        if (bottomSheetBehavior.peekHeight != 0 && playerFragment!!.onBackPressed()) return true
         if (panelState == STATE_EXPANDED) {
             collapsePanel()
             return true
@@ -433,20 +332,18 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
     }
 
     fun updateTabs() {
-        binding.navigationView.menu.clear()
+        binding.bottomNavigationView.menu.clear()
         val currentTabs: List<CategoryInfo> = PreferenceUtil.libraryCategory
         for (tab in currentTabs) {
             if (tab.visible) {
                 val menu = tab.category
-                binding.navigationView.menu.add(0, menu.id, 0, menu.stringRes)
+                binding.bottomNavigationView.menu.add(0, menu.id, 0, menu.stringRes)
                     .setIcon(menu.icon)
             }
         }
-        if (binding.navigationView.menu.size() == 1) {
+        if (binding.bottomNavigationView.menu.size() == 1) {
             isInOneTabMode = true
-            binding.navigationView.isVisible = false
-        } else {
-            isInOneTabMode = false
+            binding.bottomNavigationView.hide()
         }
     }
 
@@ -462,7 +359,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
         animate: Boolean = false,
         hideBottomSheet: Boolean = MusicPlayerRemote.playingQueue.isEmpty(),
     ) {
-        if (!ViewCompat.isLaidOut(navigationView)) {
+        if (!ViewCompat.isLaidOut(bottomNavigationView)) {
             return
         }
         if (isInOneTabMode) {
@@ -473,38 +370,38 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
             )
             return
         }
-        if (visible xor navigationView.isVisible) {
-            val mAnimate = animate && bottomSheetBehavior.state == STATE_COLLAPSED
-            if (mAnimate) {
-                if (visible) {
-                    binding.navigationView.bringToFront()
-                    binding.navigationView.show()
-                } else {
-                    binding.navigationView.hide()
-                }
+        val mAnimate = animate && bottomSheetBehavior.state == STATE_COLLAPSED
+        if (mAnimate) {
+            if (visible) {
+                binding.bottomNavigationView.bringToFront()
+                binding.bottomNavigationView.show()
             } else {
-                binding.navigationView.isVisible = visible
-                if (visible && bottomSheetBehavior.state != STATE_EXPANDED) {
-                    binding.navigationView.bringToFront()
-                }
+                binding.bottomNavigationView.hide()
+            }
+        } else {
+            binding.bottomNavigationView.isVisible = false
+            if (visible && bottomSheetBehavior.state != STATE_EXPANDED) {
+                binding.bottomNavigationView.bringToFront()
             }
         }
         hideBottomSheet(
             hide = hideBottomSheet,
             animate = animate,
-            isBottomNavVisible = visible && navigationView is BottomNavigationView
+            isBottomNavVisible = visible
         )
     }
 
     fun hideBottomSheet(
         hide: Boolean,
         animate: Boolean = false,
-        isBottomNavVisible: Boolean = navigationView.isVisible && navigationView is BottomNavigationView,
+        isBottomNavVisible: Boolean = bottomNavigationView.isVisible,
     ) {
-        val heightOfBar = windowInsets.getBottomInsets() + dip(R.dimen.mini_player_height)
+        val heightOfBar =
+            windowInsets.safeGetBottomInsets() +
+                    if (MusicPlayerRemote.isCasting) dip(R.dimen.cast_mini_player_height) else dip(R.dimen.mini_player_height)
         val heightOfBarWithTabs = heightOfBar + dip(R.dimen.bottom_nav_height)
         if (hide) {
-            bottomSheetBehavior.peekHeight = -windowInsets.getBottomInsets()
+            bottomSheetBehavior.peekHeight = -windowInsets.safeGetBottomInsets()
             bottomSheetBehavior.state = STATE_COLLAPSED
             libraryViewModel.setFabMargin(
                 this,
@@ -513,20 +410,17 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
         } else {
             if (MusicPlayerRemote.playingQueue.isNotEmpty()) {
                 binding.slidingPanel.elevation = 0F
-                binding.navigationView.elevation = 5F
+                binding.bottomNavigationView.elevation = 5F
                 if (isBottomNavVisible) {
-                    logD("List")
+                    println("List")
                     if (animate) {
                         bottomSheetBehavior.peekHeightAnimate(heightOfBarWithTabs)
                     } else {
                         bottomSheetBehavior.peekHeight = heightOfBarWithTabs
                     }
-                    libraryViewModel.setFabMargin(
-                        this,
-                        dip(R.dimen.bottom_nav_mini_player_height)
-                    )
+                    libraryViewModel.setFabMargin(this, dip(R.dimen.mini_player_height_expanded))
                 } else {
-                    logD("Details")
+                    println("Details")
                     if (animate) {
                         bottomSheetBehavior.peekHeightAnimate(heightOfBar).doOnEnd {
                             binding.slidingPanel.bringToFront()
@@ -549,7 +443,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
     private fun chooseFragmentForTheme() {
         nowPlayingScreen = PreferenceUtil.nowPlayingScreen
 
-        val fragment: AbsPlayerFragment = when (nowPlayingScreen) {
+        val fragment: Fragment = when (nowPlayingScreen) {
             Blur -> BlurPlayerFragment()
             Adaptive -> AdaptiveFragment()
             Normal -> PlayerFragment()
@@ -569,12 +463,12 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
             Classic -> ClassicPlayerFragment()
             MD3 -> MD3PlayerFragment()
             else -> PlayerFragment()
-        } // must extend AbsPlayerFragment
+        } // must implement AbsPlayerFragment
         supportFragmentManager.commit {
             replace(R.id.playerFragmentContainer, fragment)
         }
         supportFragmentManager.executePendingTransactions()
-        playerFragment = whichFragment(R.id.playerFragmentContainer)
+        playerFragment = whichFragment<AbsPlayerFragment>(R.id.playerFragmentContainer)
         miniPlayerFragment = whichFragment<MiniPlayerFragment>(R.id.miniPlayerFragment)
         miniPlayerFragment?.view?.setOnClickListener { expandPanel() }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsThemeActivity.kt
similarity index 63%
rename from app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/base/AbsThemeActivity.kt
index 32b025f01..db4c680a9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsThemeActivity.kt
@@ -12,35 +12,38 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.activities.base
+package io.github.muntashirakon.music.activities.base
 
 import android.content.Context
+import android.content.res.Resources
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.view.KeyEvent
-import androidx.appcompat.app.AppCompatDelegate
+import android.view.View
 import androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode
-import androidx.core.os.LocaleListCompat
+import androidx.core.os.ConfigurationCompat
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.theme.getNightMode
-import code.name.monkey.retromusic.util.theme.getThemeResValue
+import io.github.muntashirakon.music.LanguageContextWrapper
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.theme.getNightMode
+import io.github.muntashirakon.music.util.theme.getThemeResValue
+import java.util.*
 
 abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 
     private val handler = Handler(Looper.getMainLooper())
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        updateLocale()
         updateTheme()
         hideStatusBar()
         super.onCreate(savedInstanceState)
         setEdgeToEdgeOrImmersive()
-        maybeSetScreenOn()
+        registerSystemUiVisibility()
+        toggleScreenOn()
         setLightNavigationBarAuto()
         setLightStatusBarAuto(surfaceColor())
         if (VersionUtils.hasQ()) {
@@ -57,13 +60,8 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         if (PreferenceUtil.isCustomFont) {
             setTheme(R.style.FontThemeOverlay)
         }
-    }
-
-    private fun updateLocale() {
-        val localeCode = PreferenceUtil.languageCode
-        if (PreferenceUtil.isLocaleAutoStorageEnabled) {
-            AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(localeCode))
-            PreferenceUtil.isLocaleAutoStorageEnabled = true
+        if (PreferenceUtil.circlePlayButton) {
+            setTheme(R.style.CircleFABOverlay)
         }
     }
 
@@ -78,6 +76,20 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         }
     }
 
+    private fun registerSystemUiVisibility() {
+        val decorView = window.decorView
+        decorView.setOnSystemUiVisibilityChangeListener { visibility ->
+            if (visibility and View.SYSTEM_UI_FLAG_FULLSCREEN == 0) {
+                setImmersiveFullscreen()
+            }
+        }
+    }
+
+    private fun unregisterSystemUiVisibility() {
+        val decorView = window.decorView
+        decorView.setOnSystemUiVisibilityChangeListener(null)
+    }
+
     override fun run() {
         setImmersiveFullscreen()
     }
@@ -89,6 +101,7 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 
     public override fun onDestroy() {
         super.onDestroy()
+        unregisterSystemUiVisibility()
         exitFullscreen()
     }
 
@@ -101,6 +114,13 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
     }
 
     override fun attachBaseContext(newBase: Context?) {
-        super.attachBaseContext(newBase)
+        val code = PreferenceUtil.languageCode
+        val locale = if (code == "auto") {
+            // Get the device default locale
+            ConfigurationCompat.getLocales(Resources.getSystem().configuration)[0]
+        } else {
+            Locale.forLanguageTag(code)
+        }
+        super.attachBaseContext(LanguageContextWrapper.wrap(newBase, locale))
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/bugreport/BugReportActivity.kt
similarity index 81%
rename from app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/bugreport/BugReportActivity.kt
index e99881953..5eb938e77 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/bugreport/BugReportActivity.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.activities.bugreport
+package io.github.muntashirakon.music.activities.bugreport
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -23,13 +23,13 @@ import androidx.core.content.getSystemService
 import androidx.core.net.toUri
 import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsThemeActivity
-import code.name.monkey.retromusic.activities.bugreport.model.DeviceInfo
-import code.name.monkey.retromusic.databinding.ActivityBugReportBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
-import code.name.monkey.retromusic.extensions.showToast
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.base.AbsThemeActivity
+import io.github.muntashirakon.music.activities.bugreport.model.DeviceInfo
+import io.github.muntashirakon.music.databinding.ActivityBugReportBinding
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.setTaskDescriptionColorAuto
+import io.github.muntashirakon.music.extensions.showToast
 
 open class BugReportActivity : AbsThemeActivity() {
 
@@ -64,6 +64,7 @@ open class BugReportActivity : AbsThemeActivity() {
 
     private fun reportIssue() {
         copyDeviceInfoToClipBoard()
+
         val i = Intent(Intent.ACTION_VIEW)
         i.data = ISSUE_TRACKER_LINK.toUri()
         i.flags = Intent.FLAG_ACTIVITY_NEW_TASK
@@ -79,11 +80,17 @@ open class BugReportActivity : AbsThemeActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == android.R.id.home) {
-            onBackPressedDispatcher.onBackPressed()
+            onBackPressed()
         }
         return super.onOptionsItemSelected(item)
     }
 
+    private fun tryToFinishActivity() {
+        if (!isFinishing) {
+            finish()
+        }
+    }
+
     companion object {
         private const val ISSUE_TRACKER_LINK =
             "https://github.com/MuntashirAkon/Metro/issues/new"
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.kt b/app/src/main/java/io/github/muntashirakon/music/activities/bugreport/model/DeviceInfo.kt
similarity index 91%
rename from app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/bugreport/model/DeviceInfo.kt
index 19aff73a2..5990029ba 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/bugreport/model/DeviceInfo.kt
@@ -1,15 +1,15 @@
-package code.name.monkey.retromusic.activities.bugreport.model
+package io.github.muntashirakon.music.activities.bugreport.model
 
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
 import androidx.annotation.IntRange
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.pm.PackageInfoCompat
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.PreferenceUtil.isAdaptiveColor
-import code.name.monkey.retromusic.util.PreferenceUtil.nowPlayingScreen
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.PreferenceUtil.isAdaptiveColor
+import io.github.muntashirakon.music.util.PreferenceUtil.languageCode
+import io.github.muntashirakon.music.util.PreferenceUtil.nowPlayingScreen
 import java.util.*
 
 class DeviceInfo(context: Context) {
@@ -106,6 +106,6 @@ class DeviceInfo(context: Context) {
         baseTheme = PreferenceUtil.baseTheme
         nowPlayingTheme = context.getString(nowPlayingScreen.titleRes)
         isAdaptive = isAdaptiveColor
-        selectedLang = AppCompatDelegate.getApplicationLocales().toLanguageTags()
+        selectedLang = languageCode
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFGuideActivity.java b/app/src/main/java/io/github/muntashirakon/music/activities/saf/SAFGuideActivity.java
similarity index 79%
rename from app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFGuideActivity.java
rename to app/src/main/java/io/github/muntashirakon/music/activities/saf/SAFGuideActivity.java
index efd56210e..224fdcd34 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFGuideActivity.java
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/saf/SAFGuideActivity.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.activities.saf;
+package io.github.muntashirakon.music.activities.saf;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -22,7 +22,7 @@ import androidx.annotation.Nullable;
 import com.heinrichreimersoftware.materialintro.app.IntroActivity;
 import com.heinrichreimersoftware.materialintro.slide.SimpleSlide;
 
-import code.name.monkey.retromusic.R;
+import io.github.muntashirakon.music.R;
 
 /** Created by hemanths on 2019-07-31. */
 public class SAFGuideActivity extends IntroActivity {
@@ -50,8 +50,8 @@ public class SAFGuideActivity extends IntroActivity {
                     ? R.string.saf_guide_slide1_description_before_o
                     : R.string.saf_guide_slide1_description)
             .image(R.drawable.saf_guide_1)
-            .background(code.name.monkey.appthemehelper.R.color.md_deep_purple_300)
-            .backgroundDark(code.name.monkey.appthemehelper.R.color.md_deep_purple_400)
+            .background(R.color.md_deep_purple_300)
+            .backgroundDark(R.color.md_deep_purple_400)
             .layout(R.layout.fragment_simple_slide_large_image)
             .build());
     addSlide(
@@ -59,8 +59,8 @@ public class SAFGuideActivity extends IntroActivity {
             .title(R.string.saf_guide_slide2_title)
             .description(R.string.saf_guide_slide2_description)
             .image(R.drawable.saf_guide_2)
-            .background(code.name.monkey.appthemehelper.R.color.md_deep_purple_500)
-            .backgroundDark(code.name.monkey.appthemehelper.R.color.md_deep_purple_600)
+            .background(R.color.md_deep_purple_500)
+            .backgroundDark(R.color.md_deep_purple_600)
             .layout(R.layout.fragment_simple_slide_large_image)
             .build());
     addSlide(
@@ -68,8 +68,8 @@ public class SAFGuideActivity extends IntroActivity {
             .title(R.string.saf_guide_slide3_title)
             .description(R.string.saf_guide_slide3_description)
             .image(R.drawable.saf_guide_3)
-            .background(code.name.monkey.appthemehelper.R.color.md_deep_purple_700)
-            .backgroundDark(code.name.monkey.appthemehelper.R.color.md_deep_purple_800)
+            .background(R.color.md_deep_purple_700)
+            .backgroundDark(R.color.md_deep_purple_800)
             .layout(R.layout.fragment_simple_slide_large_image)
             .build());
   }
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFRequestActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/saf/SAFRequestActivity.kt
similarity index 82%
rename from app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFRequestActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/saf/SAFRequestActivity.kt
index 1b389b9d2..4cf3fa7a6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFRequestActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/saf/SAFRequestActivity.kt
@@ -11,19 +11,19 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.activities.saf
+package io.github.muntashirakon.music.activities.saf
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import code.name.monkey.retromusic.activities.saf.SAFGuideActivity.REQUEST_CODE_SAF_GUIDE
-import code.name.monkey.retromusic.util.SAFUtil
+import io.github.muntashirakon.music.activities.saf.SAFGuideActivity.REQUEST_CODE_SAF_GUIDE
+import io.github.muntashirakon.music.util.SAFUtil
 
 /** Created by buliasz on 2021-02-07.  */
 class SAFRequestActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val intent = Intent(this, code.name.monkey.retromusic.activities.saf.SAFGuideActivity::class.java)
+        val intent = Intent(this, SAFGuideActivity::class.java)
         startActivityForResult(intent, REQUEST_CODE_SAF_GUIDE)
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/AbsTagEditorActivity.kt
similarity index 79%
rename from app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/tageditor/AbsTagEditorActivity.kt
index 3a9ca4e4b..9bfeed854 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/AbsTagEditorActivity.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.activities.tageditor
+package io.github.muntashirakon.music.activities.tageditor
 
 import android.app.Activity
 import android.app.SearchManager
@@ -29,23 +29,25 @@ import android.view.animation.OvershootInterpolator
 import android.widget.ImageView
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.IntentSenderRequest
-import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsBaseActivity
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.hideSoftKeyboard
-import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
-import code.name.monkey.retromusic.model.ArtworkInfo
-import code.name.monkey.retromusic.model.AudioTagInfo
-import code.name.monkey.retromusic.repository.Repository
-import code.name.monkey.retromusic.util.logD
-import code.name.monkey.retromusic.util.logE
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.R.drawable
+import io.github.muntashirakon.music.activities.base.AbsBaseActivity
+import io.github.muntashirakon.music.activities.saf.SAFGuideActivity
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.hideSoftKeyboard
+import io.github.muntashirakon.music.extensions.setTaskDescriptionColorAuto
+import io.github.muntashirakon.music.model.ArtworkInfo
+import io.github.muntashirakon.music.model.AudioTagInfo
+import io.github.muntashirakon.music.repository.Repository
+import io.github.muntashirakon.music.util.SAFUtil
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.GlobalScope
@@ -55,6 +57,7 @@ import org.jaudiotagger.audio.AudioFileIO
 import org.jaudiotagger.tag.FieldKey
 import org.koin.android.ext.android.inject
 import java.io.File
+import java.util.*
 
 abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
     abstract val editorImage: ImageView
@@ -98,8 +101,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM_ARTIST)
-            } catch (e: Exception) {
-                logE(e)
+            } catch (ignored: Exception) {
                 null
             }
         }
@@ -108,8 +110,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.TITLE)
-            } catch (e: Exception) {
-                logE(e)
+            } catch (ignored: Exception) {
                 null
             }
         }
@@ -117,8 +118,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.COMPOSER)
-            } catch (e: Exception) {
-                logE(e)
+            } catch (ignored: Exception) {
                 null
             }
         }
@@ -127,8 +127,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM)
-            } catch (e: Exception) {
-                logE(e)
+            } catch (ignored: Exception) {
                 null
             }
         }
@@ -137,8 +136,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ARTIST)
-            } catch (e: Exception) {
-                logE(e)
+            } catch (ignored: Exception) {
                 null
             }
         }
@@ -147,8 +145,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM_ARTIST)
-            } catch (e: Exception) {
-                logE(e)
+            } catch (ignored: Exception) {
                 null
             }
         }
@@ -157,8 +154,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.GENRE)
-            } catch (e: Exception) {
-                logE(e)
+            } catch (ignored: Exception) {
                 null
             }
         }
@@ -167,8 +163,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.YEAR)
-            } catch (e: Exception) {
-                logE(e)
+            } catch (ignored: Exception) {
                 null
             }
         }
@@ -177,8 +172,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.TRACK)
-            } catch (e: Exception) {
-                logE(e)
+            } catch (ignored: Exception) {
                 null
             }
         }
@@ -187,8 +181,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.DISC_NO)
-            } catch (e: Exception) {
-                logE(e)
+            } catch (ignored: Exception) {
                 null
             }
         }
@@ -197,8 +190,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.LYRICS)
-            } catch (e: Exception) {
-                logE(e)
+            } catch (ignored: Exception) {
                 null
             }
         }
@@ -216,17 +208,11 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
                     )
                 }
                 return null
-            } catch (e: Exception) {
-                logE(e)
+            } catch (ignored: Exception) {
                 return null
             }
         }
 
-    private val pickArtworkImage =
-        registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
-            loadImageFromFile(uri)
-        }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         _binding = bindingInflater.invoke(layoutInflater)
@@ -237,7 +223,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         getIntentExtras()
 
         songPaths = getSongPaths()
-        logD(songPaths?.size)
+        println(songPaths?.size)
         if (songPaths!!.isEmpty()) {
             finish()
         }
@@ -267,7 +253,14 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
     }
 
     private fun startImagePicker() {
-        pickArtworkImage.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
+        val intent = Intent(Intent.ACTION_GET_CONTENT)
+        intent.type = "image/*"
+        startActivityForResult(
+            Intent.createChooser(
+                intent,
+                getString(R.string.pick_from_local_storage)
+            ), REQUEST_CODE_SELECT_IMAGE
+        )
     }
 
     protected abstract fun loadCurrentImage()
@@ -283,6 +276,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
             scaleY = 0f
             isEnabled = false
             setOnClickListener { save() }
+            TintHelper.setTintAuto(this, ThemeStore.accentColor(this@AbsTagEditorActivity), true)
         }
     }
 
@@ -315,7 +309,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             android.R.id.home -> {
-                onBackPressedDispatcher.onBackPressed()
+                super.onBackPressed()
                 return true
             }
         }
@@ -340,7 +334,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
 
     protected fun setImageBitmap(bitmap: Bitmap?, bgColor: Int) {
         if (bitmap == null) {
-            editorImage.setImageResource(R.drawable.default_audio_art)
+            editorImage.setImageResource(drawable.default_audio_art)
         } else {
             editorImage.setImageBitmap(bitmap)
         }
@@ -358,7 +352,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         hideSoftKeyboard()
 
         hideFab()
-        logD(fieldKeyValueMap)
+        println(fieldKeyValueMap)
         GlobalScope.launch {
             if (VersionUtils.hasR()) {
                 cacheFiles = TagWriter.writeTagsToFilesR(
@@ -368,12 +362,9 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
                         artworkInfo
                     )
                 )
+                val pendingIntent = MediaStore.createWriteRequest(contentResolver, getSongUris())
 
-                if (cacheFiles.isNotEmpty()) {
-                    val pendingIntent =
-                        MediaStore.createWriteRequest(contentResolver, getSongUris())
-                    launcher.launch(IntentSenderRequest.Builder(pendingIntent).build())
-                }
+                launcher.launch(IntentSenderRequest.Builder(pendingIntent).build())
             } else {
                 TagWriter.writeTagsToFiles(
                     this@AbsTagEditorActivity, AudioTagInfo(
@@ -411,14 +402,36 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         }
     }
 
-    private lateinit var audioFile: AudioFile
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
+        super.onActivityResult(requestCode, resultCode, intent)
+        when (requestCode) {
+            REQUEST_CODE_SELECT_IMAGE -> if (resultCode == Activity.RESULT_OK) {
+                intent?.data?.let {
+                    loadImageFromFile(it)
+                }
+            }
+            SAFGuideActivity.REQUEST_CODE_SAF_GUIDE -> {
+                SAFUtil.openTreePicker(this)
+            }
+            SAFUtil.REQUEST_SAF_PICK_TREE -> {
+                if (resultCode == Activity.RESULT_OK) {
+                    SAFUtil.saveTreeUri(this, intent)
+                    writeTags(savedSongPaths)
+                }
+            }
+            SAFUtil.REQUEST_SAF_PICK_FILE -> {
+                if (resultCode == Activity.RESULT_OK) {
+                    writeTags(Collections.singletonList(currentSongPath + SAFUtil.SEPARATOR + intent!!.dataString))
+                }
+            }
+        }
+    }
+
 
     private fun getAudioFile(path: String): AudioFile {
         return try {
-            if (!this::audioFile.isInitialized) {
-                audioFile = AudioFileIO.read(File(path))
-            }
-            audioFile
+            AudioFileIO.read(File(path))
         } catch (e: Exception) {
             Log.e(TAG, "Could not read audio file $path", e)
             AudioFile()
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/AlbumTagEditorActivity.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/tageditor/AlbumTagEditorActivity.kt
index 2c9013657..d6650c5f3 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/AlbumTagEditorActivity.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.activities.tageditor
+package io.github.muntashirakon.music.activities.tageditor
 
 import android.app.Activity
 import android.content.res.ColorStateList
@@ -28,19 +28,17 @@ import android.widget.ImageView
 import android.widget.Toast
 import androidx.core.widget.doAfterTextChanged
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ActivityAlbumTagEditorBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.model.ArtworkInfo
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.ImageUtil
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.RetroColorUtil.generatePalette
-import code.name.monkey.retromusic.util.RetroColorUtil.getColor
-import code.name.monkey.retromusic.util.logD
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.ActivityAlbumTagEditorBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.model.ArtworkInfo
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.ImageUtil
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.RetroColorUtil.generatePalette
+import io.github.muntashirakon.music.util.RetroColorUtil.getColor
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.target.ImageViewTarget
 import com.bumptech.glide.request.transition.Transition
@@ -100,7 +98,7 @@ class AlbumTagEditorActivity : AbsTagEditorActivity<ActivityAlbumTagEditorBindin
         binding.albumArtistText.setText(albumArtistName)
         binding.genreTitle.setText(genreName)
         binding.yearTitle.setText(songYear)
-        logD(albumTitle + albumArtistName)
+        println(albumTitle + albumArtistName)
     }
 
     override fun loadCurrentImage() {
@@ -133,9 +131,7 @@ class AlbumTagEditorActivity : AbsTagEditorActivity<ActivityAlbumTagEditorBindin
     }
 
     override fun loadImageFromFile(selectedFile: Uri?) {
-        Glide.with(this@AlbumTagEditorActivity)
-            .asBitmapPalette()
-            .load(selectedFile)
+        GlideApp.with(this@AlbumTagEditorActivity).asBitmapPalette().load(selectedFile)
             .diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)
             .into(object : ImageViewTarget<BitmapPaletteWrapper>(binding.editorImage) {
                 override fun onResourceReady(
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt b/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/SongTagEditorActivity.kt
similarity index 89%
rename from app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/activities/tageditor/SongTagEditorActivity.kt
index 93dd8a44f..5be7c0599 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/SongTagEditorActivity.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.activities.tageditor
+package io.github.muntashirakon.music.activities.tageditor
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -28,18 +28,16 @@ import android.widget.ImageView
 import android.widget.Toast
 import androidx.core.widget.doAfterTextChanged
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ActivitySongTagEditorBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.model.ArtworkInfo
-import code.name.monkey.retromusic.repository.SongRepository
-import code.name.monkey.retromusic.util.ImageUtil
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.RetroColorUtil
-import code.name.monkey.retromusic.util.logD
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.ActivitySongTagEditorBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.model.ArtworkInfo
+import io.github.muntashirakon.music.repository.SongRepository
+import io.github.muntashirakon.music.util.ImageUtil
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.RetroColorUtil
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.target.ImageViewTarget
 import com.bumptech.glide.request.transition.Transition
@@ -104,7 +102,7 @@ class SongTagEditorActivity : AbsTagEditorActivity<ActivitySongTagEditorBinding>
         binding.discNumberText.setText(discNumber)
         binding.lyricsText.setText(lyrics)
         binding.songComposerText.setText(composer)
-        logD(songTitle + songYear)
+        println(songTitle + songYear)
     }
 
     override fun loadCurrentImage() {
@@ -172,11 +170,8 @@ class SongTagEditorActivity : AbsTagEditorActivity<ActivitySongTagEditorBinding>
     override fun getSongUris(): List<Uri> = listOf(MusicUtil.getSongFileUri(id))
 
     override fun loadImageFromFile(selectedFile: Uri?) {
-        Glide.with(this@SongTagEditorActivity)
-            .asBitmapPalette()
-            .load(selectedFile)
-            .diskCacheStrategy(DiskCacheStrategy.NONE)
-            .skipMemoryCache(true)
+        GlideApp.with(this@SongTagEditorActivity).asBitmapPalette().load(selectedFile)
+            .diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)
             .into(object : ImageViewTarget<BitmapPaletteWrapper>(binding.editorImage) {
                 override fun onResourceReady(
                     resource: BitmapPaletteWrapper,
diff --git a/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/TagWriter.kt b/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/TagWriter.kt
new file mode 100644
index 000000000..a9cbfb298
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/TagWriter.kt
@@ -0,0 +1,201 @@
+package io.github.muntashirakon.music.activities.tageditor
+
+import android.app.Activity
+import android.content.Context
+import android.graphics.Bitmap
+import android.media.MediaScannerConnection
+import android.os.Build
+import android.util.Log
+import androidx.annotation.RequiresApi
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.misc.UpdateToastMediaScannerCompletionListener
+import io.github.muntashirakon.music.model.AudioTagInfo
+import io.github.muntashirakon.music.util.MusicUtil.createAlbumArtFile
+import io.github.muntashirakon.music.util.MusicUtil.deleteAlbumArt
+import io.github.muntashirakon.music.util.MusicUtil.insertAlbumArt
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.jaudiotagger.audio.AudioFileIO
+import org.jaudiotagger.audio.exceptions.CannotReadException
+import org.jaudiotagger.audio.exceptions.CannotWriteException
+import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException
+import org.jaudiotagger.audio.exceptions.ReadOnlyFileException
+import org.jaudiotagger.tag.TagException
+import org.jaudiotagger.tag.images.AndroidArtwork
+import org.jaudiotagger.tag.images.Artwork
+import java.io.File
+import java.io.IOException
+
+class TagWriter {
+
+    companion object {
+
+        suspend fun scan(context: Context, toBeScanned: List<String?>?) {
+            if (toBeScanned == null || toBeScanned.isEmpty()) {
+                Log.i("scan", "scan: Empty")
+                context.showToast( "Scan file from folder")
+                return
+            }
+            MediaScannerConnection.scanFile(
+                context,
+                toBeScanned.toTypedArray(),
+                null,
+                withContext(Dispatchers.Main) {
+                    if (context is Activity) UpdateToastMediaScannerCompletionListener(
+                        context, toBeScanned
+                    ) else null
+                }
+            )
+        }
+
+        suspend fun writeTagsToFiles(context: Context, info: AudioTagInfo) {
+            withContext(Dispatchers.IO) {
+                runCatching {
+                    var artwork: Artwork? = null
+                    var albumArtFile: File? = null
+                    if (info.artworkInfo?.artwork != null) {
+                        try {
+                            albumArtFile = createAlbumArtFile(context).canonicalFile
+                            info.artworkInfo.artwork.compress(
+                                Bitmap.CompressFormat.JPEG,
+                                100,
+                                albumArtFile.outputStream()
+                            )
+                            artwork = AndroidArtwork.createArtworkFromFile(albumArtFile)
+                        } catch (e: IOException) {
+                            e.printStackTrace()
+                        }
+                    }
+                    var wroteArtwork = false
+                    var deletedArtwork = false
+                    for (filePath in info.filePaths!!) {
+                        try {
+                            val audioFile = AudioFileIO.read(File(filePath))
+                            val tag = audioFile.tagOrCreateAndSetDefault
+                            if (info.fieldKeyValueMap != null) {
+                                for ((key, value) in info.fieldKeyValueMap) {
+                                    try {
+                                        tag.setField(key, value)
+                                    } catch (e: Exception) {
+                                        e.printStackTrace()
+                                    }
+                                }
+                            }
+                            if (info.artworkInfo != null) {
+                                if (info.artworkInfo.artwork == null) {
+                                    tag.deleteArtworkField()
+                                    deletedArtwork = true
+                                } else if (artwork != null) {
+                                    tag.deleteArtworkField()
+                                    tag.setField(artwork)
+                                    wroteArtwork = true
+                                }
+                            }
+                            audioFile.commit()
+                        } catch (e: CannotReadException) {
+                            e.printStackTrace()
+                        } catch (e: IOException) {
+                            e.printStackTrace()
+                        } catch (e: CannotWriteException) {
+                            e.printStackTrace()
+                        } catch (e: TagException) {
+                            e.printStackTrace()
+                        } catch (e: ReadOnlyFileException) {
+                            e.printStackTrace()
+                        } catch (e: InvalidAudioFrameException) {
+                            e.printStackTrace()
+                        }
+                    }
+                    if (wroteArtwork) {
+                        insertAlbumArt(context, info.artworkInfo!!.albumId, albumArtFile!!.path)
+                    } else if (deletedArtwork) {
+                        deleteAlbumArt(context, info.artworkInfo!!.albumId)
+                    }
+                    scan(context, info.filePaths)
+                }.onFailure {
+                    it.printStackTrace()
+                }
+            }
+        }
+
+
+        @RequiresApi(Build.VERSION_CODES.R)
+        suspend fun writeTagsToFilesR(context: Context, info: AudioTagInfo): List<File> =
+            withContext(Dispatchers.IO) {
+                val cacheFiles = mutableListOf<File>()
+                runCatching {
+                    var artwork: Artwork? = null
+                    var albumArtFile: File? = null
+                    if (info.artworkInfo?.artwork != null) {
+                        try {
+                            albumArtFile = createAlbumArtFile(context).canonicalFile
+                            info.artworkInfo.artwork.compress(
+                                Bitmap.CompressFormat.JPEG,
+                                100,
+                                albumArtFile.outputStream()
+                            )
+                            artwork = AndroidArtwork.createArtworkFromFile(albumArtFile)
+                        } catch (e: IOException) {
+                            e.printStackTrace()
+                        }
+                    }
+                    var wroteArtwork = false
+                    var deletedArtwork = false
+                    for (filePath in info.filePaths!!) {
+                        try {
+                            val originFile = File(filePath)
+                            val cacheFile = File(context.cacheDir, originFile.name)
+                            cacheFiles.add(cacheFile)
+                            originFile.inputStream().use { input ->
+                                cacheFile.outputStream().use { output ->
+                                    input.copyTo(output)
+                                }
+                            }
+                            val audioFile = AudioFileIO.read(cacheFile)
+                            val tag = audioFile.tagOrCreateAndSetDefault
+                            if (info.fieldKeyValueMap != null) {
+                                for ((key, value) in info.fieldKeyValueMap) {
+                                    try {
+                                        tag.setField(key, value)
+                                    } catch (e: Exception) {
+                                        e.printStackTrace()
+                                    }
+                                }
+                            }
+                            if (info.artworkInfo != null) {
+                                if (info.artworkInfo.artwork == null) {
+                                    tag.deleteArtworkField()
+                                    deletedArtwork = true
+                                } else if (artwork != null) {
+                                    tag.deleteArtworkField()
+                                    tag.setField(artwork)
+                                    wroteArtwork = true
+                                }
+                            }
+                            audioFile.commit()
+                        } catch (e: CannotReadException) {
+                            e.printStackTrace()
+                        } catch (e: IOException) {
+                            e.printStackTrace()
+                        } catch (e: CannotWriteException) {
+                            e.printStackTrace()
+                        } catch (e: TagException) {
+                            e.printStackTrace()
+                        } catch (e: ReadOnlyFileException) {
+                            e.printStackTrace()
+                        } catch (e: InvalidAudioFrameException) {
+                            e.printStackTrace()
+                        }
+                    }
+                    if (wroteArtwork) {
+                        insertAlbumArt(context, info.artworkInfo!!.albumId, albumArtFile!!.path)
+                    } else if (deletedArtwork) {
+                        deleteAlbumArt(context, info.artworkInfo!!.albumId)
+                    }
+                }.onFailure {
+                    it.printStackTrace()
+                }
+                cacheFiles
+            }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/CategoryInfoAdapter.kt
similarity index 86%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/CategoryInfoAdapter.kt
index dd5cda1d3..451cd48a7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/CategoryInfoAdapter.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.adapter
+package io.github.muntashirakon.music.adapter
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
@@ -22,15 +22,15 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore.Companion.accentColor
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.PreferenceDialogLibraryCategoriesListitemBinding
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.SwipeAndDragHelper
-import code.name.monkey.retromusic.util.SwipeAndDragHelper.ActionCompletionContract
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.PreferenceDialogLibraryCategoriesListitemBinding
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.model.CategoryInfo
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.SwipeAndDragHelper
+import io.github.muntashirakon.music.util.SwipeAndDragHelper.ActionCompletionContract
 
-class CategoryInfoAdapter : RecyclerView.Adapter<code.name.monkey.retromusic.adapter.CategoryInfoAdapter.ViewHolder>(),
+class CategoryInfoAdapter : RecyclerView.Adapter<CategoryInfoAdapter.ViewHolder>(),
     ActionCompletionContract {
     var categoryInfos: MutableList<CategoryInfo> =
         PreferenceUtil.libraryCategory.toMutableList()
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/GenreAdapter.kt
similarity index 82%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/GenreAdapter.kt
index b139a0af8..69bf69de7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/GenreAdapter.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter
+package io.github.muntashirakon.music.adapter
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -21,17 +21,15 @@ import android.view.ViewGroup
 import android.view.ViewOutlineProvider
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ItemGenreBinding
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.interfaces.IGenreClickListener
-import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.ItemGenreBinding
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
+import io.github.muntashirakon.music.interfaces.IGenreClickListener
+import io.github.muntashirakon.music.model.Genre
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import java.util.*
 
 /**
@@ -70,10 +68,10 @@ class GenreAdapter(
 
     private fun loadGenreImage(genre: Genre, holder: GenreAdapter.ViewHolder) {
         val genreSong = MusicUtil.songByGenre(genre.id)
-        Glide.with(activity)
+        GlideApp.with(activity)
             .asBitmapPalette()
-            .songCoverOptions(genreSong)
             .load(RetroGlideExtension.getSongModel(genreSong))
+            .songCoverOptions(genreSong)
             .into(object : RetroMusicColoredTarget(holder.binding.image) {
                 override fun onColorReady(colors: MediaNotificationProcessor) {
                     setColors(holder, colors)
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/HomeAdapter.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/HomeAdapter.kt
index e3f809b5f..c5ca929e2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/HomeAdapter.kt
@@ -12,12 +12,13 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter
+package io.github.muntashirakon.music.adapter
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.os.bundleOf
@@ -27,21 +28,21 @@ import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.adapter.album.AlbumAdapter
-import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
-import code.name.monkey.retromusic.adapter.song.SongAdapter
-import code.name.monkey.retromusic.fragments.home.HomeFragment
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.interfaces.IArtistClickListener
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Home
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.*
+import io.github.muntashirakon.music.adapter.album.AlbumAdapter
+import io.github.muntashirakon.music.adapter.artist.ArtistAdapter
+import io.github.muntashirakon.music.adapter.song.SongAdapter
+import io.github.muntashirakon.music.fragments.home.HomeFragment
+import io.github.muntashirakon.music.interfaces.IAlbumClickListener
+import io.github.muntashirakon.music.interfaces.IArtistClickListener
+import io.github.muntashirakon.music.interfaces.IGenreClickListener
+import io.github.muntashirakon.music.model.*
+import io.github.muntashirakon.music.util.PreferenceUtil
 
-class HomeAdapter(private val activity: AppCompatActivity) :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>(), IArtistClickListener, IAlbumClickListener {
+class HomeAdapter(
+    private val activity: AppCompatActivity
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>(), IArtistClickListener, IAlbumClickListener,
+    IGenreClickListener {
 
     private var list = listOf<Home>()
 
@@ -133,7 +134,6 @@ class HomeAdapter(private val activity: AppCompatActivity) :
         notifyDataSetChanged()
     }
 
-    @Suppress("UNCHECKED_CAST")
     private inner class AlbumViewHolder(view: View) : AbsHomeViewItem(view) {
         fun bindView(home: Home) {
             title.setText(home.titleRes)
@@ -144,7 +144,6 @@ class HomeAdapter(private val activity: AppCompatActivity) :
         }
     }
 
-    @Suppress("UNCHECKED_CAST")
     private inner class ArtistViewHolder(view: View) : AbsHomeViewItem(view) {
         fun bindView(home: Home) {
             title.setText(home.titleRes)
@@ -155,7 +154,6 @@ class HomeAdapter(private val activity: AppCompatActivity) :
         }
     }
 
-    @Suppress("UNCHECKED_CAST")
     private inner class PlaylistViewHolder(view: View) : AbsHomeViewItem(view) {
         fun bindView(home: Home) {
             title.setText(home.titleRes)
@@ -163,7 +161,7 @@ class HomeAdapter(private val activity: AppCompatActivity) :
                 val songAdapter = SongAdapter(
                     activity,
                     home.arrayList as MutableList<Song>,
-                    R.layout.item_favourite_card
+                    R.layout.item_favourite_card, null
                 )
                 layoutManager = linearLayoutManager()
                 adapter = songAdapter
@@ -174,14 +172,15 @@ class HomeAdapter(private val activity: AppCompatActivity) :
     open class AbsHomeViewItem(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val recyclerView: RecyclerView = itemView.findViewById(R.id.recyclerView)
         val title: AppCompatTextView = itemView.findViewById(R.id.title)
+        val arrow: ImageView = itemView.findViewById(R.id.arrow)
         val clickableArea: ViewGroup = itemView.findViewById(R.id.clickable_area)
     }
 
     private fun artistsAdapter(artists: List<Artist>) =
-        ArtistAdapter(activity, artists, PreferenceUtil.homeArtistGridStyle, this)
+        ArtistAdapter(activity, artists, PreferenceUtil.homeArtistGridStyle, null, this)
 
     private fun albumAdapter(albums: List<Album>) =
-        AlbumAdapter(activity, albums, PreferenceUtil.homeAlbumGridStyle, this)
+        AlbumAdapter(activity, albums, PreferenceUtil.homeAlbumGridStyle, null, this)
 
     private fun gridLayoutManager() =
         GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
@@ -210,4 +209,16 @@ class HomeAdapter(private val activity: AppCompatActivity) :
             )
         )
     }
-}
+
+    override fun onClickGenre(genre: Genre, view: View) {
+        activity.findNavController(R.id.fragment_container).navigate(
+            R.id.genreDetailsFragment,
+            bundleOf(EXTRA_GENRE to genre),
+            null,
+            FragmentNavigatorExtras(
+                view to "genre"
+            )
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/SearchAdapter.kt
similarity index 77%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/SearchAdapter.kt
index 22a60bd95..594f311a8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/SearchAdapter.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter
+package io.github.muntashirakon.music.adapter
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -26,21 +26,18 @@ import androidx.fragment.app.FragmentActivity
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.menu.SongMenuHelper
-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.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.*
+import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.menu.SongMenuHelper
+import io.github.muntashirakon.music.model.Album
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.model.Genre
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
 import java.util.*
 
 class SearchAdapter(
@@ -63,28 +60,26 @@ class SearchAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return when (viewType) {
-            HEADER -> ViewHolder(
-                LayoutInflater.from(activity).inflate(
-                    R.layout.sub_header,
-                    parent,
-                    false
-                ), viewType
-            )
-
-            ALBUM, ARTIST, ALBUM_ARTIST -> ViewHolder(
+        return if (viewType == HEADER) ViewHolder(
+            LayoutInflater.from(activity).inflate(
+                R.layout.sub_header,
+                parent,
+                false
+            ), viewType
+        )
+        else if (viewType == ALBUM || viewType == ARTIST || viewType== ALBUM_ARTIST)
+            ViewHolder(
                 LayoutInflater.from(activity).inflate(
                     R.layout.item_list_big,
                     parent,
                     false
                 ), viewType
             )
-
-            else -> ViewHolder(
+        else
+            ViewHolder(
                 LayoutInflater.from(activity).inflate(R.layout.item_list, parent, false),
                 viewType
             )
-        }
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -94,30 +89,24 @@ class SearchAdapter(
                 val album = dataSet[position] as Album
                 holder.title?.text = album.title
                 holder.text?.text = album.artistName
-                Glide.with(activity).asDrawable().albumCoverOptions(album.safeGetFirstSong())
-                    .load(RetroGlideExtension.getSongModel(album.safeGetFirstSong()))
+                GlideApp.with(activity).asDrawable().albumCoverOptions(album.safeGetFirstSong()).load(RetroGlideExtension.getSongModel(album.safeGetFirstSong()))
                     .into(holder.image!!)
             }
-
             ARTIST -> {
                 holder.imageTextContainer?.isVisible = true
                 val artist = dataSet[position] as Artist
                 holder.title?.text = artist.name
                 holder.text?.text = MusicUtil.getArtistInfoString(activity, artist)
-                Glide.with(activity).asDrawable().artistImageOptions(artist).load(
-                    RetroGlideExtension.getArtistModel(artist)
-                ).into(holder.image!!)
+                GlideApp.with(activity).asDrawable().artistImageOptions(artist).load(
+                    RetroGlideExtension.getArtistModel(artist)).into(holder.image!!)
             }
-
             SONG -> {
                 holder.imageTextContainer?.isVisible = true
                 val song = dataSet[position] as Song
                 holder.title?.text = song.title
                 holder.text?.text = song.albumName
-                Glide.with(activity).asDrawable().songCoverOptions(song)
-                    .load(RetroGlideExtension.getSongModel(song)).into(holder.image!!)
+                GlideApp.with(activity).asDrawable().songCoverOptions(song).load(RetroGlideExtension.getSongModel(song)).into(holder.image!!)
             }
-
             GENRE -> {
                 val genre = dataSet[position] as Genre
                 holder.title?.text = genre.name
@@ -130,23 +119,19 @@ class SearchAdapter(
                     )
                 )
             }
-
             PLAYLIST -> {
                 val playlist = dataSet[position] as PlaylistWithSongs
                 holder.title?.text = playlist.playlistEntity.playlistName
                 //holder.text?.text = MusicUtil.playlistInfoString(activity, playlist.songs)
             }
-
             ALBUM_ARTIST -> {
                 holder.imageTextContainer?.isVisible = true
                 val artist = dataSet[position] as Artist
                 holder.title?.text = artist.name
                 holder.text?.text = MusicUtil.getArtistInfoString(activity, artist)
-                Glide.with(activity).asDrawable().artistImageOptions(artist).load(
-                    RetroGlideExtension.getArtistModel(artist)
-                ).into(holder.image!!)
+                GlideApp.with(activity).asDrawable().artistImageOptions(artist).load(
+                    RetroGlideExtension.getArtistModel(artist)).into(holder.image!!)
             }
-
             else -> {
                 holder.title?.text = dataSet[position].toString()
                 holder.title?.setTextColor(ThemeStore.accentColor(activity))
@@ -192,35 +177,30 @@ class SearchAdapter(
                         bundleOf(EXTRA_ALBUM_ID to (item as Album).id)
                     )
                 }
-
                 ARTIST -> {
                     activity.findNavController(R.id.fragment_container).navigate(
                         R.id.artistDetailsFragment,
                         bundleOf(EXTRA_ARTIST_ID to (item as Artist).id)
                     )
                 }
-
-                ALBUM_ARTIST -> {
+                ALBUM_ARTIST ->{
                     activity.findNavController(R.id.fragment_container).navigate(
                         R.id.albumArtistDetailsFragment,
                         bundleOf(EXTRA_ARTIST_NAME to (item as Artist).name)
                     )
                 }
-
                 GENRE -> {
                     activity.findNavController(R.id.fragment_container).navigate(
                         R.id.genreDetailsFragment,
                         bundleOf(EXTRA_GENRE to (item as Genre))
                     )
                 }
-
                 PLAYLIST -> {
                     activity.findNavController(R.id.fragment_container).navigate(
                         R.id.playlistDetailsFragment,
-                        bundleOf(EXTRA_PLAYLIST_ID to (item as PlaylistWithSongs).playlistEntity.playListId)
+                        bundleOf(EXTRA_PLAYLIST to (item as PlaylistWithSongs))
                     )
                 }
-
                 SONG -> {
                     MusicPlayerRemote.playNext(item as Song)
                     MusicPlayerRemote.playNextSong()
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/SongFileAdapter.kt
similarity index 85%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/SongFileAdapter.kt
index 4005c6e6c..d07c7d72e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/SongFileAdapter.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter
+package io.github.muntashirakon.music.adapter
 
 import android.graphics.PorterDuff
 import android.view.LayoutInflater
@@ -22,14 +22,16 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.audiocover.AudioFileCover
-import code.name.monkey.retromusic.interfaces.ICallbacks
-import code.name.monkey.retromusic.util.MusicUtil
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter
+import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
+import io.github.muntashirakon.music.extensions.getTintedDrawable
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.audiocover.AudioFileCover
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.interfaces.ICallbacks
+import io.github.muntashirakon.music.util.MusicUtil
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.signature.MediaStoreSignature
 import me.zhanghai.android.fastscroll.PopupTextProvider
@@ -42,9 +44,10 @@ class SongFileAdapter(
     override val activity: AppCompatActivity,
     private var dataSet: List<File>,
     private val itemLayoutRes: Int,
-    private val iCallbacks: ICallbacks?
+    private val iCallbacks: ICallbacks?,
+    iCabHolder: ICabHolder?,
 ) : AbsMultiSelectAdapter<SongFileAdapter.ViewHolder, File>(
-    activity, R.menu.menu_media_selection
+    activity, iCabHolder, R.menu.menu_media_selection
 ), PopupTextProvider {
 
     init {
@@ -94,7 +97,7 @@ class SongFileAdapter(
     }
 
     private fun loadFileImage(file: File, holder: ViewHolder) {
-        val iconColor = ATHUtil.resolveColor(activity, androidx.appcompat.R.attr.colorControlNormal)
+        val iconColor = ATHUtil.resolveColor(activity, R.attr.colorControlNormal)
         if (file.isDirectory) {
             holder.image?.let {
                 it.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN)
@@ -103,12 +106,12 @@ class SongFileAdapter(
             holder.imageTextContainer?.setCardBackgroundColor(
                 ATHUtil.resolveColor(
                     activity,
-                    com.google.android.material.R.attr.colorSurface
+                    R.attr.colorSurface
                 )
             )
         } else {
-            val error = activity.getTintedDrawable(R.drawable.ic_audio_file, iconColor)
-            Glide.with(activity)
+            val error = activity.getTintedDrawable(R.drawable.ic_file_music, iconColor)
+            GlideApp.with(activity)
                 .load(AudioFileCover(file.path))
                 .diskCacheStrategy(DiskCacheStrategy.NONE)
                 .error(error)
@@ -144,7 +147,7 @@ class SongFileAdapter(
         return MusicUtil.getSectionName(dataSet[position].name)
     }
 
-    inner class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
 
         init {
             if (menu != null && iCallbacks != null) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/StorageAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/StorageAdapter.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/StorageAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/StorageAdapter.kt
index 98c2c632f..ca1189399 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/StorageAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/StorageAdapter.kt
@@ -1,11 +1,11 @@
-package code.name.monkey.retromusic.adapter
+package io.github.muntashirakon.music.adapter
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.R
+import io.github.muntashirakon.music.R
 import java.io.File
 
 class StorageAdapter(
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/album/AlbumAdapter.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/album/AlbumAdapter.kt
index 160af7e47..172b2214a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/album/AlbumAdapter.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter.album
+package io.github.muntashirakon.music.adapter.album
 
 import android.content.res.ColorStateList
 import android.view.LayoutInflater
@@ -21,31 +21,32 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.helper.SortOrder
-import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter
+import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
+import io.github.muntashirakon.music.helper.SortOrder
+import io.github.muntashirakon.music.helper.menu.SongsMenuHelper
+import io.github.muntashirakon.music.interfaces.IAlbumClickListener
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.model.Album
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import me.zhanghai.android.fastscroll.PopupTextProvider
 
 open class AlbumAdapter(
     override val activity: FragmentActivity,
     var dataSet: List<Album>,
     var itemLayoutRes: Int,
+    iCabHolder: ICabHolder?,
     val listener: IAlbumClickListener?
 ) : AbsMultiSelectAdapter<AlbumAdapter.ViewHolder, Album>(
     activity,
+    iCabHolder,
     R.menu.menu_media_selection
 ), PopupTextProvider {
 
@@ -112,9 +113,7 @@ open class AlbumAdapter(
             return
         }
         val song = album.safeGetFirstSong()
-        Glide.with(activity)
-            .asBitmapPalette()
-            .albumCoverOptions(song)
+        GlideApp.with(activity).asBitmapPalette().albumCoverOptions(song)
             //.checkIgnoreMediaStore()
             .load(RetroGlideExtension.getSongModel(song))
             .into(object : RetroMusicColoredTarget(holder.image!!) {
@@ -164,7 +163,6 @@ open class AlbumAdapter(
         when (PreferenceUtil.albumSortOrder) {
             SortOrder.AlbumSortOrder.ALBUM_A_Z, SortOrder.AlbumSortOrder.ALBUM_Z_A -> sectionName =
                 dataSet[position].title
-
             SortOrder.AlbumSortOrder.ALBUM_ARTIST -> sectionName = dataSet[position].albumArtist
             SortOrder.AlbumSortOrder.ALBUM_YEAR -> return MusicUtil.getYearString(
                 dataSet[position].year
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/album/AlbumCoverPagerAdapter.kt
similarity index 85%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/album/AlbumCoverPagerAdapter.kt
index 5a0a7d3cd..2e577e438 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/album/AlbumCoverPagerAdapter.kt
@@ -12,33 +12,30 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter.album
+package io.github.muntashirakon.music.adapter.album
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import androidx.core.os.BundleCompat
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.lifecycleScope
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.fragments.AlbumCoverStyle
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
-import code.name.monkey.retromusic.fragments.base.goToLyrics
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.misc.CustomFragmentStatePagerAdapter
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.fragments.AlbumCoverStyle
+import io.github.muntashirakon.music.fragments.NowPlayingScreen.*
+import io.github.muntashirakon.music.fragments.base.goToLyrics
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
+import io.github.muntashirakon.music.misc.CustomFragmentStatePagerAdapter
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.Dispatchers
@@ -98,7 +95,7 @@ class AlbumCoverPagerAdapter(
         override fun onCreate(savedInstanceState: Bundle?) {
             super.onCreate(savedInstanceState)
             if (arguments != null) {
-                song = BundleCompat.getParcelable(requireArguments(), SONG_ARG, Song::class.java)!!
+                song = requireArguments().getParcelable(SONG_ARG)!!
             }
         }
 
@@ -122,7 +119,7 @@ class AlbumCoverPagerAdapter(
                 withContext(Dispatchers.Main) {
                     MaterialAlertDialogBuilder(
                         requireContext(),
-                        com.google.android.material.R.style.ThemeOverlay_MaterialComponents_Dialog_Alert
+                        R.style.ThemeOverlay_MaterialComponents_Dialog_Alert
                     ).apply {
                         setTitle(song.title)
                         setMessage(if (data.isNullOrEmpty()) "No lyrics found" else data)
@@ -167,9 +164,7 @@ class AlbumCoverPagerAdapter(
         }
 
         private fun loadAlbumCover(albumCover: ImageView) {
-            Glide.with(this)
-                .asBitmapPalette()
-                .songCoverOptions(song)
+            GlideApp.with(this).asBitmapPalette().songCoverOptions(song)
                 //.checkIgnoreMediaStore()
                 .load(RetroGlideExtension.getSongModel(song))
                 .dontAnimate()
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/album/HorizontalAlbumAdapter.kt
similarity index 72%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/album/HorizontalAlbumAdapter.kt
index 7a9f7fa6e..4cc5f9f74 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/album/HorizontalAlbumAdapter.kt
@@ -12,28 +12,28 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter.album
+package io.github.muntashirakon.music.adapter.album
 
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.helper.HorizontalAdapterHelper
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
+import io.github.muntashirakon.music.helper.HorizontalAdapterHelper
+import io.github.muntashirakon.music.interfaces.IAlbumClickListener
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.model.Album
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class HorizontalAlbumAdapter(
     activity: FragmentActivity,
     dataSet: List<Album>,
+    ICabHolder: ICabHolder?,
     albumClickListener: IAlbumClickListener
 ) : AlbumAdapter(
-    activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, albumClickListener
+    activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, ICabHolder, albumClickListener
 ) {
 
     override fun createViewHolder(view: View, viewType: Int): ViewHolder {
@@ -49,9 +49,7 @@ class HorizontalAlbumAdapter(
 
     override fun loadAlbumCover(album: Album, holder: ViewHolder) {
         if (holder.image == null) return
-        Glide.with(activity)
-            .asBitmapPalette()
-            .albumCoverOptions(album.safeGetFirstSong())
+        GlideApp.with(activity).asBitmapPalette().albumCoverOptions(album.safeGetFirstSong())
             .load(RetroGlideExtension.getSongModel(album.safeGetFirstSong()))
             .into(object : RetroMusicColoredTarget(holder.image!!) {
                 override fun onColorReady(colors: MediaNotificationProcessor) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/artist/ArtistAdapter.kt
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/artist/ArtistAdapter.kt
index e1ea2ca4c..f703c4504 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/artist/ArtistAdapter.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter.artist
+package io.github.muntashirakon.music.adapter.artist
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
@@ -23,32 +23,34 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.IAlbumArtistClickListener
-import code.name.monkey.retromusic.interfaces.IArtistClickListener
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter
+import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
+import io.github.muntashirakon.music.extensions.hide
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
+import io.github.muntashirakon.music.helper.menu.SongsMenuHelper
+import io.github.muntashirakon.music.interfaces.IAlbumArtistClickListener
+import io.github.muntashirakon.music.interfaces.IArtistClickListener
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import me.zhanghai.android.fastscroll.PopupTextProvider
 
 class ArtistAdapter(
     override val activity: FragmentActivity,
     var dataSet: List<Artist>,
     var itemLayoutRes: Int,
+    val ICabHolder: ICabHolder?,
     val IArtistClickListener: IArtistClickListener,
     val IAlbumArtistClickListener: IAlbumArtistClickListener? = null
-) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(activity, R.menu.menu_media_selection),
-    PopupTextProvider {
+) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(
+    activity, ICabHolder, R.menu.menu_media_selection
+), PopupTextProvider {
 
     var albumArtistsOnly = false
 
@@ -110,10 +112,10 @@ class ArtistAdapter(
         if (holder.image == null) {
             return
         }
-        Glide.with(activity)
+        GlideApp.with(activity)
             .asBitmapPalette()
-            .artistImageOptions(artist)
             .load(RetroGlideExtension.getArtistModel(artist))
+            .artistImageOptions(artist)
             .transition(RetroGlideExtension.getDefaultTransition())
             .into(object : RetroMusicColoredTarget(holder.image!!) {
                 override fun onColorReady(colors: MediaNotificationProcessor) {
@@ -157,7 +159,7 @@ class ArtistAdapter(
         return MusicUtil.getSectionName(dataSet[position].name)
     }
 
-    inner class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
 
         init {
             menu?.isVisible = false
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/backup/BackupAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/backup/BackupAdapter.kt
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/backup/BackupAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/backup/BackupAdapter.kt
index adfcecf1b..430f04e3d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/backup/BackupAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/backup/BackupAdapter.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.adapter.backup
+package io.github.muntashirakon.music.adapter.backup
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -7,8 +7,8 @@ import android.view.ViewGroup
 import androidx.appcompat.widget.PopupMenu
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ItemListBackupBinding
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.ItemListBackupBinding
 import java.io.File
 
 
diff --git a/app/src/main/java/io/github/muntashirakon/music/adapter/base/AbsMultiSelectAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/base/AbsMultiSelectAdapter.kt
new file mode 100644
index 000000000..5fe98cd7a
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/base/AbsMultiSelectAdapter.kt
@@ -0,0 +1,125 @@
+package io.github.muntashirakon.music.adapter.base
+
+import android.annotation.SuppressLint
+import android.graphics.Color
+import android.view.Menu
+import android.view.MenuItem
+import androidx.annotation.MenuRes
+import androidx.fragment.app.FragmentActivity
+import androidx.recyclerview.widget.RecyclerView
+import code.name.monkey.appthemehelper.util.VersionUtils
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.surfaceColor
+import io.github.muntashirakon.music.interfaces.ICabCallback
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.util.RetroColorUtil
+import com.afollestad.materialcab.attached.AttachedCab
+import com.afollestad.materialcab.attached.destroy
+import com.afollestad.materialcab.attached.isActive
+
+abstract class AbsMultiSelectAdapter<V : RecyclerView.ViewHolder?, I>(
+    open val activity: FragmentActivity, private val ICabHolder: ICabHolder?, @MenuRes menuRes: Int
+) : RecyclerView.Adapter<V>(), ICabCallback {
+    private var cab: AttachedCab? = null
+    private val checked: MutableList<I>
+    private var menuRes: Int
+    override fun onCabCreated(cab: AttachedCab, menu: Menu): Boolean {
+        activity.window.statusBarColor =
+            RetroColorUtil.shiftBackgroundColor(activity.surfaceColor())
+        return true
+    }
+
+    override fun onCabFinished(cab: AttachedCab): Boolean {
+        clearChecked()
+        activity.window.statusBarColor = when {
+            VersionUtils.hasMarshmallow() -> Color.TRANSPARENT
+            else -> Color.BLACK
+        }
+        return true
+    }
+
+    override fun onCabItemClicked(item: MenuItem): Boolean {
+        if (item.itemId == R.id.action_multi_select_adapter_check_all) {
+            checkAll()
+        } else {
+            onMultipleItemAction(item, ArrayList(checked))
+            cab?.destroy()
+            clearChecked()
+        }
+        return true
+    }
+
+    private fun checkAll() {
+        if (ICabHolder != null) {
+            checked.clear()
+            for (i in 0 until itemCount) {
+                val identifier = getIdentifier(i)
+                if (identifier != null) {
+                    checked.add(identifier)
+                }
+            }
+            notifyDataSetChanged()
+            updateCab()
+        }
+    }
+
+    protected abstract fun getIdentifier(position: Int): I?
+
+    protected abstract fun getName(model: I): String?
+
+    protected fun isChecked(identifier: I): Boolean {
+        return checked.contains(identifier)
+    }
+
+    protected val isInQuickSelectMode: Boolean
+        get() = cab != null && cab!!.isActive()
+
+    protected abstract fun onMultipleItemAction(menuItem: MenuItem, selection: List<I>)
+    protected fun setMultiSelectMenuRes(@MenuRes menuRes: Int) {
+        this.menuRes = menuRes
+    }
+
+    protected fun toggleChecked(position: Int): Boolean {
+        if (ICabHolder != null) {
+            val identifier = getIdentifier(position) ?: return false
+            if (!checked.remove(identifier)) {
+                checked.add(identifier)
+            }
+            notifyItemChanged(position)
+            updateCab()
+            return true
+        }
+        return false
+    }
+
+    private fun clearChecked() {
+        checked.clear()
+        notifyDataSetChanged()
+    }
+
+    @SuppressLint("StringFormatInvalid", "StringFormatMatches")
+    private fun updateCab() {
+        if (ICabHolder != null) {
+            if (cab == null || !cab!!.isActive()) {
+                cab = ICabHolder.openCab(menuRes, this)
+            }
+            val size = checked.size
+            when {
+                size <= 0 -> {
+                    cab?.destroy()
+                }
+                size == 1 -> {
+                    cab?.title(literal = getName(checked[0]))
+                }
+                else -> {
+                    cab?.title(literal = activity.getString(R.string.x_selected, size))
+                }
+            }
+        }
+    }
+
+    init {
+        checked = ArrayList()
+        this.menuRes = menuRes
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/io/github/muntashirakon/music/adapter/base/MediaEntryViewHolder.java
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
rename to app/src/main/java/io/github/muntashirakon/music/adapter/base/MediaEntryViewHolder.java
index d68186c0f..45d21ac84 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/base/MediaEntryViewHolder.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.adapter.base;
+package io.github.muntashirakon.music.adapter.base;
 
 import android.graphics.Color;
 import android.view.View;
@@ -27,7 +27,7 @@ import androidx.appcompat.widget.AppCompatImageView;
 import com.google.android.material.card.MaterialCardView;
 import com.h6ah4i.android.widget.advrecyclerview.utils.AbstractDraggableSwipeableItemViewHolder;
 
-import code.name.monkey.retromusic.R;
+import io.github.muntashirakon.music.R;
 
 public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHolder
         implements View.OnLongClickListener, View.OnClickListener {
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/LegacyPlaylistAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/playlist/LegacyPlaylistAdapter.kt
similarity index 86%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/playlist/LegacyPlaylistAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/playlist/LegacyPlaylistAdapter.kt
index 19d681ecf..ed416f038 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/LegacyPlaylistAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/playlist/LegacyPlaylistAdapter.kt
@@ -12,15 +12,16 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter.playlist
+package io.github.muntashirakon.music.adapter.playlist
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.util.MusicUtil
+import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
+import io.github.muntashirakon.music.model.Playlist
+import io.github.muntashirakon.music.util.MusicUtil
 
 class LegacyPlaylistAdapter(
     private val activity: FragmentActivity,
@@ -35,7 +36,7 @@ class LegacyPlaylistAdapter(
         notifyDataSetChanged()
     }
 
-    class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView)
+    class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView)
 
     override fun onCreateViewHolder(
         parent: ViewGroup,
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/playlist/PlaylistAdapter.kt
similarity index 72%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/playlist/PlaylistAdapter.kt
index 6e5b0c001..b3265bc59 100755
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/playlist/PlaylistAdapter.kt
@@ -12,10 +12,9 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter.playlist
+package io.github.muntashirakon.music.adapter.playlist
 
 import android.graphics.Color
-import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -24,33 +23,34 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.core.view.isGone
 import androidx.core.view.setPadding
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.toSongs
-import code.name.monkey.retromusic.extensions.dipToPix
-import code.name.monkey.retromusic.glide.RetroGlideExtension.playlistOptions
-import code.name.monkey.retromusic.glide.playlistPreview.PlaylistPreview
-import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder
-import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
-import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.IPlaylistClickListener
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter
+import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
+import io.github.muntashirakon.music.db.PlaylistEntity
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.db.toSongs
+import io.github.muntashirakon.music.extensions.dipToPix
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.playlistPreview.PlaylistPreview
+import io.github.muntashirakon.music.helper.SortOrder.PlaylistSortOrder
+import io.github.muntashirakon.music.helper.menu.PlaylistMenuHelper
+import io.github.muntashirakon.music.helper.menu.SongsMenuHelper
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.interfaces.IPlaylistClickListener
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
 import me.zhanghai.android.fastscroll.PopupTextProvider
 
 class PlaylistAdapter(
     override val activity: FragmentActivity,
     var dataSet: List<PlaylistWithSongs>,
     private var itemLayoutRes: Int,
+    ICabHolder: ICabHolder?,
     private val listener: IPlaylistClickListener
 ) : AbsMultiSelectAdapter<PlaylistAdapter.ViewHolder, PlaylistWithSongs>(
     activity,
+    ICabHolder,
     R.menu.menu_playlists_selection
 ), PopupTextProvider {
 
@@ -72,7 +72,7 @@ class PlaylistAdapter(
         return createViewHolder(view)
     }
 
-    private fun createViewHolder(view: View): ViewHolder {
+    fun createViewHolder(view: View): ViewHolder {
         return ViewHolder(view)
     }
 
@@ -101,23 +101,17 @@ class PlaylistAdapter(
         holder.title?.text = getPlaylistTitle(playlist.playlistEntity)
         holder.text?.text = getPlaylistText(playlist)
         holder.menu?.isGone = isChecked(playlist)
-        if (itemLayoutRes == R.layout.item_list) {
-            holder.image?.setPadding(activity.dipToPix(8F).toInt())
-            holder.image?.setImageDrawable(getIconRes())
-        } else {
-            Glide.with(activity)
-                .load(PlaylistPreview(playlist))
-                .playlistOptions()
-                .into(holder.image!!)
-        }
+        GlideApp.with(activity)
+            .load(
+                if (itemLayoutRes == R.layout.item_list) {
+                    holder.image?.setPadding(activity.dipToPix(8F).toInt())
+                    R.drawable.ic_playlist_play
+                } else PlaylistPreview(playlist)
+            )
+            .playlistOptions()
+            .into(holder.image!!)
     }
 
-    private fun getIconRes(): Drawable = TintHelper.createTintedDrawable(
-        activity,
-        R.drawable.ic_playlist_play,
-        ATHUtil.resolveColor(activity, android.R.attr.colorControlNormal)
-    )
-
     override fun getItemCount(): Int {
         return dataSet.size
     }
@@ -148,7 +142,7 @@ class PlaylistAdapter(
         return songs
     }
 
-    inner class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
         init {
             menu?.setOnClickListener { view ->
                 val popupMenu = PopupMenu(activity, view)
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/song/AbsOffsetSongAdapter.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/song/AbsOffsetSongAdapter.kt
index 2d5fd724f..3bb610aee 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/song/AbsOffsetSongAdapter.kt
@@ -12,22 +12,24 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter.song
+package io.github.muntashirakon.music.adapter.song
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.model.Song
 
 abstract class AbsOffsetSongAdapter(
     activity: FragmentActivity,
     dataSet: MutableList<Song>,
-    @LayoutRes itemLayoutRes: Int
-) : SongAdapter(activity, dataSet, itemLayoutRes) {
+    @LayoutRes itemLayoutRes: Int,
+    ICabHolder: ICabHolder?
+) : SongAdapter(activity, dataSet, itemLayoutRes, ICabHolder) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SongAdapter.ViewHolder {
         if (viewType == OFFSET_ITEM) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/song/OrderablePlaylistSongAdapter.kt
similarity index 57%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/song/OrderablePlaylistSongAdapter.kt
index bf85fe28b..95b17e19a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/song/OrderablePlaylistSongAdapter.kt
@@ -12,21 +12,25 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter.song
+package io.github.muntashirakon.music.adapter.song
 
 import android.view.MenuItem
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.toSongEntity
-import code.name.monkey.retromusic.db.toSongsEntity
-import code.name.monkey.retromusic.dialogs.RemoveSongFromPlaylistDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.ViewUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.PlaylistEntity
+import io.github.muntashirakon.music.db.toSongEntity
+import io.github.muntashirakon.music.db.toSongsEntity
+import io.github.muntashirakon.music.dialogs.RemoveSongFromPlaylistDialog
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.accentOutlineColor
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.model.Song
+import com.google.android.material.button.MaterialButton
 import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
 import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
 import kotlinx.coroutines.Dispatchers
@@ -34,11 +38,12 @@ import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class OrderablePlaylistSongAdapter(
-    private val playlistId: Long,
+    private val playlist: PlaylistEntity,
     activity: FragmentActivity,
     dataSet: MutableList<Song>,
     itemLayoutRes: Int,
-) : SongAdapter(activity, dataSet, itemLayoutRes),
+    ICabHolder: ICabHolder?,
+) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, ICabHolder),
     DraggableItemAdapter<OrderablePlaylistSongAdapter.ViewHolder> {
 
     val libraryViewModel: LibraryViewModel by activity.viewModel()
@@ -51,27 +56,56 @@ class OrderablePlaylistSongAdapter(
     override fun getItemId(position: Int): Long {
         // requires static value, it means need to keep the same value
         // even if the item position has been changed.
-        return dataSet[position].id
+        return if (position != 0) {
+            dataSet[position - 1].id
+        } else {
+            -1
+        }
     }
 
     override fun createViewHolder(view: View): SongAdapter.ViewHolder {
         return ViewHolder(view)
     }
 
+    override fun getItemViewType(position: Int): Int {
+        return if (position == 0) OFFSET_ITEM else SONG
+    }
+
+    override fun onBindViewHolder(holder: SongAdapter.ViewHolder, position: Int) {
+        if (holder.itemViewType == OFFSET_ITEM) {
+            val viewHolder = holder as ViewHolder
+            viewHolder.playAction?.let {
+                it.setOnClickListener {
+                    MusicPlayerRemote.openQueue(dataSet, 0, true)
+                }
+                it.accentOutlineColor()
+            }
+            viewHolder.shuffleAction?.let {
+                it.setOnClickListener {
+                    MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
+                }
+                it.accentColor()
+            }
+        } else {
+            super.onBindViewHolder(holder, position - 1)
+        }
+    }
+
     override fun onMultipleItemAction(menuItem: MenuItem, selection: List<Song>) {
         when (menuItem.itemId) {
             R.id.action_remove_from_playlist -> RemoveSongFromPlaylistDialog.create(
                 selection.toSongsEntity(
-                    playlistId
+                    playlist
                 )
             )
                 .show(activity.supportFragmentManager, "REMOVE_FROM_PLAYLIST")
-
             else -> super.onMultipleItemAction(menuItem, selection)
         }
     }
 
-    inner class ViewHolder(itemView: View) : SongAdapter.ViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : AbsOffsetSongAdapter.ViewHolder(itemView) {
+        val playAction: MaterialButton? = itemView.findViewById(R.id.playAction)
+        val shuffleAction: MaterialButton? = itemView.findViewById(R.id.shuffleAction)
 
         override var songMenuRes: Int
             get() = R.menu.menu_item_playlist_song
@@ -82,7 +116,7 @@ class OrderablePlaylistSongAdapter(
         override fun onSongMenuItemClick(item: MenuItem): Boolean {
             when (item.itemId) {
                 R.id.action_remove_from_playlist -> {
-                    RemoveSongFromPlaylistDialog.create(song.toSongEntity(playlistId))
+                    RemoveSongFromPlaylistDialog.create(song.toSongEntity(playlist.playListId))
                         .show(activity.supportFragmentManager, "REMOVE_FROM_PLAYLIST")
                     return true
                 }
@@ -96,22 +130,26 @@ class OrderablePlaylistSongAdapter(
     }
 
     override fun onCheckCanStartDrag(holder: ViewHolder, position: Int, x: Int, y: Int): Boolean {
-        if (isInQuickSelectMode) {
+        if (dataSet.size == 0 or 1 || isInQuickSelectMode) {
             return false
         }
-        return ViewUtil.hitTest(holder.imageText!!, x, y) || ViewUtil.hitTest(
-            holder.dragView!!,
-            x,
-            y
-        )
+        val dragHandle = holder.dragView ?: return false
+
+        val handleWidth = dragHandle.width
+        val handleHeight = dragHandle.height
+        val handleLeft = dragHandle.left
+        val handleTop = dragHandle.top
+
+        return (x >= handleLeft && x < handleLeft + handleWidth &&
+                y >= handleTop && y < handleTop + handleHeight) && position != 0
     }
 
     override fun onMoveItem(fromPosition: Int, toPosition: Int) {
-        dataSet.add(toPosition, dataSet.removeAt(fromPosition))
+        dataSet.add(toPosition - 1, dataSet.removeAt(fromPosition - 1))
     }
 
-    override fun onGetItemDraggableRange(holder: ViewHolder, position: Int): ItemDraggableRange? {
-        return null
+    override fun onGetItemDraggableRange(holder: ViewHolder, position: Int): ItemDraggableRange {
+        return ItemDraggableRange(1, itemCount - 1)
     }
 
     override fun onCheckCanDrop(draggingPosition: Int, dropPosition: Int): Boolean {
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/song/PlayingQueueAdapter.kt
similarity index 86%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/song/PlayingQueueAdapter.kt
index 2d387be44..8357b65bd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/song/PlayingQueueAdapter.kt
@@ -12,23 +12,22 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter.song
+package io.github.muntashirakon.music.adapter.song
 
 import android.view.MenuItem
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicPlayerRemote.isPlaying
-import code.name.monkey.retromusic.helper.MusicPlayerRemote.playNextSong
-import code.name.monkey.retromusic.helper.MusicPlayerRemote.removeFromQueue
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.ViewUtil
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicPlayerRemote.isPlaying
+import io.github.muntashirakon.music.helper.MusicPlayerRemote.playNextSong
+import io.github.muntashirakon.music.helper.MusicPlayerRemote.removeFromQueue
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.ViewUtil
 import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
 import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
 import com.h6ah4i.android.widget.advrecyclerview.draggable.annotation.DraggableItemStateFlags
@@ -43,9 +42,10 @@ class PlayingQueueAdapter(
     activity: FragmentActivity,
     dataSet: MutableList<Song>,
     private var current: Int,
-    itemLayoutRes: Int,
-) : SongAdapter(activity, dataSet, itemLayoutRes),
-    DraggableItemAdapter<PlayingQueueAdapter.ViewHolder>,
+    itemLayoutRes: Int
+) : SongAdapter(
+    activity, dataSet, itemLayoutRes, null
+), DraggableItemAdapter<PlayingQueueAdapter.ViewHolder>,
     SwipeableItemAdapter<PlayingQueueAdapter.ViewHolder>,
     PopupTextProvider {
 
@@ -77,7 +77,7 @@ class PlayingQueueAdapter(
         if (holder.image == null) {
             return
         }
-        Glide.with(activity)
+        GlideApp.with(activity)
             .load(RetroGlideExtension.getSongModel(song))
             .songCoverOptions(song)
             .into(holder.image!!)
@@ -153,14 +153,6 @@ class PlayingQueueAdapter(
             dragView?.isVisible = true
         }
 
-        override fun onClick(v: View?) {
-            if (isInQuickSelectMode) {
-                toggleChecked(layoutPosition)
-            } else {
-                MusicPlayerRemote.playSongAt(layoutPosition)
-            }
-        }
-
         override fun onSongMenuItemClick(item: MenuItem): Boolean {
             when (item.itemId) {
                 R.id.action_remove_from_playing_queue -> {
@@ -196,7 +188,7 @@ class PlayingQueueAdapter(
         return if (result == SwipeableItemConstants.RESULT_CANCELED) {
             SwipeResultActionDefault()
         } else {
-            SwipedResultActionRemoveItem(this, position)
+            SwipedResultActionRemoveItem(this, position, activity)
         }
     }
 
@@ -217,9 +209,12 @@ class PlayingQueueAdapter(
     internal class SwipedResultActionRemoveItem(
         private val adapter: PlayingQueueAdapter,
         private val position: Int,
+        private val activity: FragmentActivity
     ) : SwipeResultActionRemoveItem() {
 
         private var songToRemove: Song? = null
+        private val isPlaying: Boolean = MusicPlayerRemote.isPlaying
+        private val songProgressMillis = 0
         override fun onPerformAction() {
             // currentlyShownSnackbar = null
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/song/ShuffleButtonSongAdapter.kt
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/song/ShuffleButtonSongAdapter.kt
index 82ba1a7f7..ea4025c06 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/song/ShuffleButtonSongAdapter.kt
@@ -12,25 +12,27 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter.song
+package io.github.muntashirakon.music.adapter.song
 
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.accentOutlineColor
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.accentOutlineColor
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RetroUtil
 import com.google.android.material.button.MaterialButton
 
 class ShuffleButtonSongAdapter(
     activity: FragmentActivity,
     dataSet: MutableList<Song>,
-    itemLayoutRes: Int
-) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes) {
+    itemLayoutRes: Int,
+    ICabHolder: ICabHolder?
+) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, ICabHolder) {
 
 
     override fun createViewHolder(view: View): SongAdapter.ViewHolder {
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/song/SimpleSongAdapter.kt
similarity index 83%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/song/SimpleSongAdapter.kt
index f1f50e627..e5ba83799 100755
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/song/SimpleSongAdapter.kt
@@ -12,19 +12,22 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter.song
+package io.github.muntashirakon.music.adapter.song
 
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
 
 class SimpleSongAdapter(
     context: FragmentActivity,
     songs: ArrayList<Song>,
-    layoutRes: Int
-) : SongAdapter(context, songs, layoutRes) {
+    layoutRes: Int,
+    ICabHolder: ICabHolder?
+) : SongAdapter(context, songs, layoutRes, ICabHolder) {
 
     override fun swapDataSet(dataSet: List<Song>) {
         this.dataSet = dataSet.toMutableList()
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/song/SongAdapter.kt
similarity index 83%
rename from app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
rename to app/src/main/java/io/github/muntashirakon/music/adapter/song/SongAdapter.kt
index 7b7b7bf99..233ca7c60 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/song/SongAdapter.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.adapter.song
+package io.github.muntashirakon.music.adapter.song
 
 import android.content.res.ColorStateList
 import android.content.res.Resources
@@ -25,24 +25,24 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.findNavController
-import code.name.monkey.retromusic.EXTRA_ALBUM_ID
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SortOrder
-import code.name.monkey.retromusic.helper.menu.SongMenuHelper
-import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.EXTRA_ALBUM_ID
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter
+import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.SortOrder
+import io.github.muntashirakon.music.helper.menu.SongMenuHelper
+import io.github.muntashirakon.music.helper.menu.SongsMenuHelper
+import io.github.muntashirakon.music.interfaces.ICabCallback
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RetroUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import me.zhanghai.android.fastscroll.PopupTextProvider
 
 /**
@@ -53,11 +53,13 @@ open class SongAdapter(
     override val activity: FragmentActivity,
     var dataSet: MutableList<Song>,
     protected var itemLayoutRes: Int,
+    ICabHolder: ICabHolder?,
     showSectionName: Boolean = true
 ) : AbsMultiSelectAdapter<SongAdapter.ViewHolder, Song>(
     activity,
+    ICabHolder,
     R.menu.menu_media_selection
-), PopupTextProvider {
+), ICabCallback, PopupTextProvider {
 
     private var showSectionName = true
 
@@ -118,9 +120,7 @@ open class SongAdapter(
         if (holder.image == null) {
             return
         }
-        Glide.with(activity)
-            .asBitmapPalette()
-            .songCoverOptions(song)
+        GlideApp.with(activity).asBitmapPalette().songCoverOptions(song)
             .load(RetroGlideExtension.getSongModel(song))
             .into(object : RetroMusicColoredTarget(holder.image!!) {
                 override fun onColorReady(colors: MediaNotificationProcessor) {
@@ -159,11 +159,6 @@ open class SongAdapter(
 
     override fun getPopupText(position: Int): String {
         val sectionName: String? = when (PreferenceUtil.songSortOrder) {
-            SortOrder.SongSortOrder.SONG_DEFAULT -> return MusicUtil.getSectionName(
-                dataSet[position].title,
-                true
-            )
-
             SortOrder.SongSortOrder.SONG_A_Z, SortOrder.SongSortOrder.SONG_Z_A -> dataSet[position].title
             SortOrder.SongSortOrder.SONG_ALBUM -> dataSet[position].albumName
             SortOrder.SongSortOrder.SONG_ARTIST -> dataSet[position].artistName
@@ -221,7 +216,6 @@ open class SongAdapter(
         }
 
         override fun onLongClick(v: View?): Boolean {
-            println("Long click")
             return toggleChecked(layoutPosition)
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutIconGenerator.kt b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/AppShortcutIconGenerator.kt
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutIconGenerator.kt
rename to app/src/main/java/io/github/muntashirakon/music/appshortcuts/AppShortcutIconGenerator.kt
index ad8f964e7..13763c3b7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutIconGenerator.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/AppShortcutIconGenerator.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appshortcuts
+package io.github.muntashirakon.music.appshortcuts
 
 import android.content.Context
 import android.graphics.drawable.Icon
@@ -22,9 +22,9 @@ import android.util.TypedValue
 import androidx.annotation.RequiresApi
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.getTintedDrawable
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 @RequiresApi(Build.VERSION_CODES.N_MR1)
 object AppShortcutIconGenerator {
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/AppShortcutLauncherActivity.kt
similarity index 68%
rename from app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/appshortcuts/AppShortcutLauncherActivity.kt
index 9f10d795b..05535a278 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/AppShortcutLauncherActivity.kt
@@ -12,26 +12,26 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appshortcuts
+package io.github.muntashirakon.music.appshortcuts
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.os.bundleOf
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.LastAddedShortcutType
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.ShuffleAllShortcutType
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.TopTracksShortcutType
-import code.name.monkey.retromusic.extensions.extraNotNull
-import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
-import code.name.monkey.retromusic.model.smartplaylist.ShuffleAllPlaylist
-import code.name.monkey.retromusic.model.smartplaylist.TopTracksPlaylist
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_PLAY_PLAYLIST
-import code.name.monkey.retromusic.service.MusicService.Companion.INTENT_EXTRA_PLAYLIST
-import code.name.monkey.retromusic.service.MusicService.Companion.INTENT_EXTRA_SHUFFLE_MODE
-import code.name.monkey.retromusic.service.MusicService.Companion.SHUFFLE_MODE_NONE
-import code.name.monkey.retromusic.service.MusicService.Companion.SHUFFLE_MODE_SHUFFLE
+import io.github.muntashirakon.music.appshortcuts.shortcuttype.LastAddedShortcutType
+import io.github.muntashirakon.music.appshortcuts.shortcuttype.ShuffleAllShortcutType
+import io.github.muntashirakon.music.appshortcuts.shortcuttype.TopTracksShortcutType
+import io.github.muntashirakon.music.extensions.extraNotNull
+import io.github.muntashirakon.music.model.Playlist
+import io.github.muntashirakon.music.model.smartplaylist.LastAddedPlaylist
+import io.github.muntashirakon.music.model.smartplaylist.ShuffleAllPlaylist
+import io.github.muntashirakon.music.model.smartplaylist.TopTracksPlaylist
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_PLAY_PLAYLIST
+import io.github.muntashirakon.music.service.MusicService.Companion.INTENT_EXTRA_PLAYLIST
+import io.github.muntashirakon.music.service.MusicService.Companion.INTENT_EXTRA_SHUFFLE_MODE
+import io.github.muntashirakon.music.service.MusicService.Companion.SHUFFLE_MODE_NONE
+import io.github.muntashirakon.music.service.MusicService.Companion.SHUFFLE_MODE_SHUFFLE
 
 class AppShortcutLauncherActivity : Activity() {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/DynamicShortcutManager.kt b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/DynamicShortcutManager.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/appshortcuts/DynamicShortcutManager.kt
rename to app/src/main/java/io/github/muntashirakon/music/appshortcuts/DynamicShortcutManager.kt
index a943ed0c8..806d3722a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/DynamicShortcutManager.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/DynamicShortcutManager.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appshortcuts
+package io.github.muntashirakon.music.appshortcuts
 
 import android.annotation.TargetApi
 import android.content.Context
@@ -22,9 +22,9 @@ import android.content.pm.ShortcutManager
 import android.graphics.drawable.Icon
 import android.os.Build
 import androidx.core.content.getSystemService
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.LastAddedShortcutType
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.ShuffleAllShortcutType
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.TopTracksShortcutType
+import io.github.muntashirakon.music.appshortcuts.shortcuttype.LastAddedShortcutType
+import io.github.muntashirakon.music.appshortcuts.shortcuttype.ShuffleAllShortcutType
+import io.github.muntashirakon.music.appshortcuts.shortcuttype.TopTracksShortcutType
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class DynamicShortcutManager(private val context: Context) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/BaseShortcutType.kt b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/shortcuttype/BaseShortcutType.kt
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/BaseShortcutType.kt
rename to app/src/main/java/io/github/muntashirakon/music/appshortcuts/shortcuttype/BaseShortcutType.kt
index 4b0c7f3a0..d48295ed1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/BaseShortcutType.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/shortcuttype/BaseShortcutType.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appshortcuts.shortcuttype
+package io.github.muntashirakon.music.appshortcuts.shortcuttype
 
 import android.annotation.TargetApi
 import android.content.Context
@@ -20,7 +20,7 @@ import android.content.Intent
 import android.content.pm.ShortcutInfo
 import android.os.Build
 import androidx.core.os.bundleOf
-import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
+import io.github.muntashirakon.music.appshortcuts.AppShortcutLauncherActivity
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 abstract class BaseShortcutType(internal var context: Context) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/LastAddedShortcutType.kt b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/shortcuttype/LastAddedShortcutType.kt
similarity index 85%
rename from app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/LastAddedShortcutType.kt
rename to app/src/main/java/io/github/muntashirakon/music/appshortcuts/shortcuttype/LastAddedShortcutType.kt
index d0976042c..d90514ec4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/LastAddedShortcutType.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/shortcuttype/LastAddedShortcutType.kt
@@ -12,15 +12,15 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appshortcuts.shortcuttype
+package io.github.muntashirakon.music.appshortcuts.shortcuttype
 
 import android.annotation.TargetApi
 import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.os.Build
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.appshortcuts.AppShortcutIconGenerator
-import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.appshortcuts.AppShortcutIconGenerator
+import io.github.muntashirakon.music.appshortcuts.AppShortcutLauncherActivity
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class LastAddedShortcutType(context: Context) : BaseShortcutType(context) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/ShuffleAllShortcutType.kt b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/shortcuttype/ShuffleAllShortcutType.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/ShuffleAllShortcutType.kt
rename to app/src/main/java/io/github/muntashirakon/music/appshortcuts/shortcuttype/ShuffleAllShortcutType.kt
index 21855cacd..9aad0b655 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/ShuffleAllShortcutType.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/shortcuttype/ShuffleAllShortcutType.kt
@@ -12,15 +12,15 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appshortcuts.shortcuttype
+package io.github.muntashirakon.music.appshortcuts.shortcuttype
 
 import android.annotation.TargetApi
 import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.os.Build
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.appshortcuts.AppShortcutIconGenerator
-import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.appshortcuts.AppShortcutIconGenerator
+import io.github.muntashirakon.music.appshortcuts.AppShortcutLauncherActivity
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class ShuffleAllShortcutType(context: Context) : BaseShortcutType(context) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/TopTracksShortcutType.kt b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/shortcuttype/TopTracksShortcutType.kt
similarity index 85%
rename from app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/TopTracksShortcutType.kt
rename to app/src/main/java/io/github/muntashirakon/music/appshortcuts/shortcuttype/TopTracksShortcutType.kt
index fc0fa9f47..d8e1a8bce 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/TopTracksShortcutType.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appshortcuts/shortcuttype/TopTracksShortcutType.kt
@@ -11,15 +11,15 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.appshortcuts.shortcuttype
+package io.github.muntashirakon.music.appshortcuts.shortcuttype
 
 import android.annotation.TargetApi
 import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.os.Build
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.appshortcuts.AppShortcutIconGenerator
-import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.appshortcuts.AppShortcutIconGenerator
+import io.github.muntashirakon.music.appshortcuts.AppShortcutLauncherActivity
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class TopTracksShortcutType(context: Context) : BaseShortcutType(context) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetBig.kt
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt
rename to app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetBig.kt
index 7d9497209..5db22e668 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetBig.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appwidgets
+package io.github.muntashirakon.music.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -25,17 +25,18 @@ import android.widget.RemoteViews
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
+import io.github.muntashirakon.music.extensions.getTintedDrawable
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RetroUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.Target
@@ -151,7 +152,7 @@ class AppWidgetBig : BaseAppWidget() {
             if (target != null) {
                 Glide.with(service).clear(target)
             }
-            target = Glide.with(appContext)
+            target = GlideApp.with(appContext)
                 .asBitmap()
                 //.checkIgnoreMediaStore()
                 .load(RetroGlideExtension.getSongModel(song))
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetCard.kt
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt
rename to app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetCard.kt
index 471d908d6..4a237e679 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetCard.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appwidgets
+package io.github.muntashirakon.music.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -25,19 +25,18 @@ import android.widget.RemoteViews
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
+import io.github.muntashirakon.music.extensions.getTintedDrawable
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import io.github.muntashirakon.music.util.PreferenceUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.Target
@@ -144,9 +143,7 @@ class AppWidgetCard : BaseAppWidget() {
             if (target != null) {
                 Glide.with(service).clear(target)
             }
-            target = Glide.with(service)
-                .asBitmapPalette()
-                .songCoverOptions(song)
+            target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song)
                 .load(RetroGlideExtension.getSongModel(song))
                 .centerCrop()
                 .into(object : CustomTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCircle.kt b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetCircle.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCircle.kt
rename to app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetCircle.kt
index cb3ae0e44..5151e1956 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCircle.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetCircle.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appwidgets
+package io.github.muntashirakon.music.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -24,20 +24,19 @@ import android.widget.RemoteViews
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.service.MusicService.Companion.TOGGLE_FAVORITE
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
+import io.github.muntashirakon.music.extensions.getTintedDrawable
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import io.github.muntashirakon.music.service.MusicService.Companion.TOGGLE_FAVORITE
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RetroUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.CustomTarget
@@ -90,7 +89,7 @@ class AppWidgetCircle : BaseAppWidget() {
             ).toBitmap()
         )
         val isFavorite = runBlocking(Dispatchers.IO) {
-            return@runBlocking MusicUtil.isFavorite(song)
+            return@runBlocking MusicUtil.repository.isSongFavorite(song.id)
         }
         val favoriteRes =
             if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border
@@ -115,9 +114,7 @@ class AppWidgetCircle : BaseAppWidget() {
             if (target != null) {
                 Glide.with(service).clear(target)
             }
-            target = Glide.with(service)
-                .asBitmapPalette()
-                .songCoverOptions(song)
+            target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song)
                 .load(RetroGlideExtension.getSongModel(song))
                 .apply(RequestOptions.circleCropTransform())
                 .into(object : CustomTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetClassic.kt
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt
rename to app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetClassic.kt
index ad04f8aae..a261da378 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetClassic.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appwidgets
+package io.github.muntashirakon.music.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -26,19 +26,18 @@ import android.widget.RemoteViews
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
+import io.github.muntashirakon.music.extensions.getTintedDrawable
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import io.github.muntashirakon.music.util.PreferenceUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.Target
@@ -120,9 +119,7 @@ class AppWidgetClassic : BaseAppWidget() {
             if (target != null) {
                 Glide.with(service).clear(target)
             }
-            target = Glide.with(service)
-                .asBitmapPalette()
-                .songCoverOptions(song)
+            target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song)
                 .load(RetroGlideExtension.getSongModel(song))
                 //.checkIgnoreMediaStore()
                 .centerCrop()
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetMD3.kt
similarity index 89%
rename from app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt
rename to app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetMD3.kt
index 618914ff3..85dca0ee1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetMD3.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appwidgets
+package io.github.muntashirakon.music.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -25,20 +25,19 @@ import android.widget.RemoteViews
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.DensityUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
+import io.github.muntashirakon.music.extensions.getTintedDrawable
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import io.github.muntashirakon.music.util.DensityUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.Target
@@ -145,9 +144,7 @@ class AppWidgetMD3 : BaseAppWidget() {
             if (target != null) {
                 Glide.with(service).clear(target)
             }
-            target = Glide.with(service)
-                .asBitmapPalette()
-                .songCoverOptions(song)
+            target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song)
                 .load(RetroGlideExtension.getSongModel(song))
                 .centerCrop()
                 .into(object : CustomTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetSmall.kt
similarity index 89%
rename from app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt
rename to app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetSmall.kt
index ee4e87e99..57c016704 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetSmall.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appwidgets
+package io.github.muntashirakon.music.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -25,19 +25,18 @@ import android.widget.RemoteViews
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
+import io.github.muntashirakon.music.extensions.getTintedDrawable
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import io.github.muntashirakon.music.util.PreferenceUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.Target
@@ -123,9 +122,7 @@ class AppWidgetSmall : BaseAppWidget() {
             if (target != null) {
                 Glide.with(service).clear(target)
             }
-            target = Glide.with(service)
-                .asBitmapPalette()
-                .songCoverOptions(song)
+            target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song)
                 //.checkIgnoreMediaStore()
                 .load(RetroGlideExtension.getSongModel(song))
                 .centerCrop()
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetText.kt
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt
rename to app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetText.kt
index b7abb6ee5..b8f34bd93 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appwidgets/AppWidgetText.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appwidgets
+package io.github.muntashirakon.music.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -23,15 +23,15 @@ import android.widget.RemoteViews
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
+import io.github.muntashirakon.music.extensions.getTintedDrawable
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 class AppWidgetText : BaseAppWidget() {
     override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
@@ -40,29 +40,29 @@ class AppWidgetText : BaseAppWidget() {
         appWidgetView.setImageViewBitmap(
             R.id.button_next,
             context.getTintedDrawable(R.drawable.ic_skip_next, ContextCompat.getColor(
-                context, code.name.monkey.appthemehelper.R.color.md_white_1000
+                context, R.color.md_white_1000
             )).toBitmap()
         )
         appWidgetView.setImageViewBitmap(
             R.id.button_prev,
             context.getTintedDrawable(R.drawable.ic_skip_previous, ContextCompat.getColor(
-                context, code.name.monkey.appthemehelper.R.color.md_white_1000
+                context, R.color.md_white_1000
             )
             ).toBitmap()
         )
         appWidgetView.setImageViewBitmap(
             R.id.button_toggle_play_pause,
             context.getTintedDrawable(R.drawable.ic_play_arrow_white_32dp, ContextCompat.getColor(
-                context, code.name.monkey.appthemehelper.R.color.md_white_1000
+                context, R.color.md_white_1000
             )
             ).toBitmap()
         )
 
         appWidgetView.setTextColor(
-            R.id.title, ContextCompat.getColor(context, code.name.monkey.appthemehelper.R.color.md_white_1000)
+            R.id.title, ContextCompat.getColor(context, R.color.md_white_1000)
         )
         appWidgetView.setTextColor(
-            R.id.text, ContextCompat.getColor(context, code.name.monkey.appthemehelper.R.color.md_white_1000)
+            R.id.text, ContextCompat.getColor(context, R.color.md_white_1000)
         )
 
         linkButtons(context, appWidgetView)
@@ -127,7 +127,7 @@ class AppWidgetText : BaseAppWidget() {
         appWidgetView.setImageViewBitmap(
             R.id.button_toggle_play_pause,
             service.getTintedDrawable(playPauseRes, ContextCompat.getColor(
-                service, code.name.monkey.appthemehelper.R.color.md_white_1000)
+                service, R.color.md_white_1000)
             ).toBitmap()
         )
         appWidgetView.setImageViewBitmap(
@@ -136,7 +136,7 @@ class AppWidgetText : BaseAppWidget() {
                 R.drawable.ic_skip_next,
                 ContextCompat.getColor(
                     service,
-                    code.name.monkey.appthemehelper.R.color.md_white_1000
+                    R.color.md_white_1000
                 )
             ).toBitmap()
         )
@@ -145,7 +145,7 @@ class AppWidgetText : BaseAppWidget() {
             service.getTintedDrawable(
                 R.drawable.ic_skip_previous,
                 ContextCompat.getColor(
-                    service, code.name.monkey.appthemehelper.R.color.md_white_1000
+                    service, R.color.md_white_1000
                 )
             ).toBitmap()
         )
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/BootReceiver.kt b/app/src/main/java/io/github/muntashirakon/music/appwidgets/BootReceiver.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/appwidgets/BootReceiver.kt
rename to app/src/main/java/io/github/muntashirakon/music/appwidgets/BootReceiver.kt
index 079e90ae6..adae340c8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/BootReceiver.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appwidgets/BootReceiver.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appwidgets
+package io.github.muntashirakon.music.appwidgets
 
 import android.appwidget.AppWidgetManager
 import android.content.BroadcastReceiver
@@ -20,7 +20,7 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import code.name.monkey.retromusic.service.MusicService
+import io.github.muntashirakon.music.service.MusicService
 
 class BootReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/base/BaseAppWidget.kt b/app/src/main/java/io/github/muntashirakon/music/appwidgets/base/BaseAppWidget.kt
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/appwidgets/base/BaseAppWidget.kt
rename to app/src/main/java/io/github/muntashirakon/music/appwidgets/base/BaseAppWidget.kt
index e460b7956..5d72e10bd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/base/BaseAppWidget.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/appwidgets/base/BaseAppWidget.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.appwidgets.base
+package io.github.muntashirakon.music.appwidgets.base
 
 import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
@@ -26,14 +26,14 @@ import android.graphics.drawable.Drawable
 import android.widget.RemoteViews
 import androidx.core.content.ContextCompat
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.APP_WIDGET_UPDATE
-import code.name.monkey.retromusic.service.MusicService.Companion.EXTRA_APP_WIDGET_NAME
-import code.name.monkey.retromusic.service.MusicService.Companion.FAVORITE_STATE_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.META_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.PLAY_STATE_CHANGED
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.service.MusicService.Companion.APP_WIDGET_UPDATE
+import io.github.muntashirakon.music.service.MusicService.Companion.EXTRA_APP_WIDGET_NAME
+import io.github.muntashirakon.music.service.MusicService.Companion.FAVORITE_STATE_CHANGED
+import io.github.muntashirakon.music.service.MusicService.Companion.META_CHANGED
+import io.github.muntashirakon.music.service.MusicService.Companion.PLAY_STATE_CHANGED
 
 abstract class BaseAppWidget : AppWidgetProvider() {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/auto/AutoMediaIDHelper.java b/app/src/main/java/io/github/muntashirakon/music/auto/AutoMediaIDHelper.java
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/auto/AutoMediaIDHelper.java
rename to app/src/main/java/io/github/muntashirakon/music/auto/AutoMediaIDHelper.java
index 3d1f4815d..40cea0d61 100644
--- a/app/src/main/java/code/name/monkey/retromusic/auto/AutoMediaIDHelper.java
+++ b/app/src/main/java/io/github/muntashirakon/music/auto/AutoMediaIDHelper.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.auto;
+package io.github.muntashirakon.music.auto;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/auto/AutoMusicProvider.kt b/app/src/main/java/io/github/muntashirakon/music/auto/AutoMusicProvider.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/auto/AutoMusicProvider.kt
rename to app/src/main/java/io/github/muntashirakon/music/auto/AutoMusicProvider.kt
index b6e267ed2..555d155c9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/auto/AutoMusicProvider.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/auto/AutoMusicProvider.kt
@@ -11,19 +11,19 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.auto
+package io.github.muntashirakon.music.auto
 
 import android.content.Context
 import android.content.res.Resources
 import android.support.v4.media.MediaBrowserCompat
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.*
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.CategoryInfo
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.repository.*
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
 import java.lang.ref.WeakReference
 
 
@@ -31,7 +31,7 @@ import java.lang.ref.WeakReference
  * Created by Beesham Sarendranauth (Beesham)
  */
 class AutoMusicProvider(
-    private val mContext: Context,
+    val mContext: Context,
     private val songsRepository: SongRepository,
     private val albumsRepository: AlbumRepository,
     private val artistsRepository: ArtistRepository,
@@ -138,7 +138,7 @@ class AutoMusicProvider(
                 topPlayedRepository.notRecentlyPlayedTracks().take(8)
             }
             else -> {
-                emptyList()
+                    emptyList()
             }
         }
         songs.forEach { song ->
diff --git a/app/src/main/java/code/name/monkey/retromusic/auto/MediaItemBuilder.kt b/app/src/main/java/io/github/muntashirakon/music/auto/MediaItemBuilder.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/auto/MediaItemBuilder.kt
rename to app/src/main/java/io/github/muntashirakon/music/auto/MediaItemBuilder.kt
index 534b0ec52..03c26bc5a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/auto/MediaItemBuilder.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/auto/MediaItemBuilder.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.auto
+package io.github.muntashirakon.music.auto
 
 import android.content.Context
 import android.net.Uri
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/BlackListStoreDao.kt b/app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreDao.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/db/BlackListStoreDao.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreDao.kt
index 0bf40b736..ac72f0e76 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/BlackListStoreDao.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreDao.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.*
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/BlackListStoreEntity.kt b/app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreEntity.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/db/BlackListStoreEntity.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreEntity.kt
index 8592442a2..4e7cf10bc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/BlackListStoreEntity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/BlackListStoreEntity.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/HistoryDao.kt b/app/src/main/java/io/github/muntashirakon/music/db/HistoryDao.kt
similarity index 76%
rename from app/src/main/java/code/name/monkey/retromusic/db/HistoryDao.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/HistoryDao.kt
index 2ceb309db..4532d3b6f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/HistoryDao.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/HistoryDao.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.lifecycle.LiveData
 import androidx.room.*
@@ -23,11 +23,16 @@ interface HistoryDao {
         private const val HISTORY_LIMIT = 100
     }
 
-    @Upsert
-    suspend fun upsertSongInHistory(historyEntity: HistoryEntity)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertSongInHistory(historyEntity: HistoryEntity)
 
     @Query("DELETE FROM HistoryEntity WHERE id= :songId")
     fun deleteSongInHistory(songId: Long)
+    @Query("SELECT * FROM HistoryEntity WHERE id = :songId LIMIT 1")
+    suspend fun isSongPresentInHistory(songId: Long): HistoryEntity?
+
+    @Update
+    suspend fun updateHistorySong(historyEntity: HistoryEntity)
 
     @Query("SELECT * FROM HistoryEntity ORDER BY time_played DESC LIMIT $HISTORY_LIMIT")
     fun historySongs(): List<HistoryEntity>
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/HistoryEntity.kt b/app/src/main/java/io/github/muntashirakon/music/db/HistoryEntity.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/db/HistoryEntity.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/HistoryEntity.kt
index 535a37964..4458577b7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/HistoryEntity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/HistoryEntity.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/LyricsDao.kt b/app/src/main/java/io/github/muntashirakon/music/db/LyricsDao.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/db/LyricsDao.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/LyricsDao.kt
index fa14b1aca..cd50b2e77 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/LyricsDao.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/LyricsDao.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.*
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/LyricsEntity.kt b/app/src/main/java/io/github/muntashirakon/music/db/LyricsEntity.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/db/LyricsEntity.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/LyricsEntity.kt
index 91d987d62..8eab4d65a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/LyricsEntity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/LyricsEntity.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/PlayCountDao.kt b/app/src/main/java/io/github/muntashirakon/music/db/PlayCountDao.kt
similarity index 65%
rename from app/src/main/java/code/name/monkey/retromusic/db/PlayCountDao.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/PlayCountDao.kt
index 087ae4faf..de621adb7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/PlayCountDao.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/PlayCountDao.kt
@@ -12,25 +12,30 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.*
 
 @Dao
 interface PlayCountDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertSongInPlayCount(playCountEntity: PlayCountEntity)
 
-    @Upsert
-    fun upsertSongInPlayCount(playCountEntity: PlayCountEntity)
+    @Update
+    fun updateSongInPlayCount(playCountEntity: PlayCountEntity)
 
     @Delete
     fun deleteSongInPlayCount(playCountEntity: PlayCountEntity)
 
-    @Query("SELECT * FROM PlayCountEntity WHERE id =:songId LIMIT 1")
-    fun findSongExistInPlayCount(songId: Long): PlayCountEntity?
+    @Query("SELECT * FROM PlayCountEntity WHERE id =:songId")
+    fun checkSongExistInPlayCount(songId: Long): List<PlayCountEntity>
 
     @Query("SELECT * FROM PlayCountEntity ORDER BY play_count DESC")
     fun playCountSongs(): List<PlayCountEntity>
 
     @Query("DELETE FROM SongEntity WHERE id =:songId")
     fun deleteSong(songId: Long)
+
+    @Query("UPDATE PlayCountEntity SET play_count = play_count + 1 WHERE id = :id")
+    fun updateQuantity(id: Long)
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/PlayCountEntity.kt b/app/src/main/java/io/github/muntashirakon/music/db/PlayCountEntity.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/db/PlayCountEntity.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/PlayCountEntity.kt
index 2fa41b227..fb552311b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/PlayCountEntity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/PlayCountEntity.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistDao.kt b/app/src/main/java/io/github/muntashirakon/music/db/PlaylistDao.kt
similarity index 83%
rename from app/src/main/java/code/name/monkey/retromusic/db/PlaylistDao.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/PlaylistDao.kt
index dea1e6b7d..0c39ef7b9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistDao.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/PlaylistDao.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.lifecycle.LiveData
 import androidx.room.*
@@ -41,10 +41,6 @@ interface PlaylistDao {
     @Query("SELECT * FROM PlaylistEntity")
     suspend fun playlistsWithSongs(): List<PlaylistWithSongs>
 
-    @Transaction
-    @Query("SELECT * FROM PlaylistEntity WHERE playlist_id= :playlistId")
-    fun getPlaylist(playlistId: Long): LiveData<PlaylistWithSongs>
-
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertSongsToPlaylist(songEntities: List<SongEntity>)
 
@@ -63,9 +59,8 @@ interface PlaylistDao {
     @Delete
     suspend fun deletePlaylistSongs(songs: List<SongEntity>)
 
-    @RewriteQueriesToDropUnusedColumns
-    @Query("SELECT * FROM SongEntity ,(SELECT playlist_id FROM PlaylistEntity WHERE playlist_name= :playlistName LIMIT 1) AS playlist WHERE playlist_creator_id= playlist.playlist_id")
-    fun favoritesSongsLiveData(playlistName: String): LiveData<List<SongEntity>>
+    @Query("SELECT * FROM SongEntity WHERE playlist_creator_id= :playlistId")
+    fun favoritesSongsLiveData(playlistId: Long): LiveData<List<SongEntity>>
 
     @Query("SELECT * FROM SongEntity WHERE playlist_creator_id= :playlistId")
     fun favoritesSongs(playlistId: Long): List<SongEntity>
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistEntity.kt b/app/src/main/java/io/github/muntashirakon/music/db/PlaylistEntity.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/db/PlaylistEntity.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/PlaylistEntity.kt
index 5493b1155..ba0cd3dda 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistEntity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/PlaylistEntity.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import android.os.Parcelable
 import androidx.room.ColumnInfo
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistWithSongs.kt b/app/src/main/java/io/github/muntashirakon/music/db/PlaylistWithSongs.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/db/PlaylistWithSongs.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/PlaylistWithSongs.kt
index da80d8228..aabb4831d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistWithSongs.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/PlaylistWithSongs.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import android.os.Parcelable
 import androidx.room.Embedded
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt b/app/src/main/java/io/github/muntashirakon/music/db/RetroDatabase.kt
similarity index 79%
rename from app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/RetroDatabase.kt
index 6401766aa..a0ddffc43 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/RetroDatabase.kt
@@ -12,18 +12,20 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
 
 @Database(
-    entities = [PlaylistEntity::class, SongEntity::class, HistoryEntity::class, PlayCountEntity::class],
-    version = 24,
+    entities = [PlaylistEntity::class, SongEntity::class, HistoryEntity::class, PlayCountEntity::class, BlackListStoreEntity::class, LyricsEntity::class],
+    version = 23,
     exportSchema = false
 )
 abstract class RetroDatabase : RoomDatabase() {
     abstract fun playlistDao(): PlaylistDao
+    abstract fun blackListStore(): BlackListStoreDao
     abstract fun playCountDao(): PlayCountDao
     abstract fun historyDao(): HistoryDao
+    abstract fun lyricsDao(): LyricsDao
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/SongEntity.kt b/app/src/main/java/io/github/muntashirakon/music/db/SongEntity.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/db/SongEntity.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/SongEntity.kt
index 206c91e27..6e9d99d6a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/SongEntity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/SongEntity.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
 import android.os.Parcelable
 import androidx.room.ColumnInfo
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/SongExtension.kt b/app/src/main/java/io/github/muntashirakon/music/db/SongExtension.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/db/SongExtension.kt
rename to app/src/main/java/io/github/muntashirakon/music/db/SongExtension.kt
index d6fe11b05..68a0500a4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/SongExtension.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/db/SongExtension.kt
@@ -12,9 +12,9 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.db
+package io.github.muntashirakon.music.db
 
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.model.Song
 
 fun List<HistoryEntity>.fromHistoryToSongs(): List<Song> {
     return map {
@@ -145,9 +145,3 @@ fun List<Song>.toSongsEntity(playlistEntity: PlaylistEntity): List<SongEntity> {
         it.toSongEntity(playlistEntity.playListId)
     }
 }
-
-fun List<Song>.toSongsEntity(playlistId: Long): List<SongEntity> {
-    return map {
-        it.toSongEntity(playlistId)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/AddToPlaylistDialog.kt
similarity index 77%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/dialogs/AddToPlaylistDialog.kt
index aa47f0fe2..7c94272c9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/AddToPlaylistDialog.kt
@@ -12,25 +12,25 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_PLAYLISTS
-import code.name.monkey.retromusic.EXTRA_SONG
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.extraNotNull
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.model.Song
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import io.github.muntashirakon.music.EXTRA_PLAYLISTS
+import io.github.muntashirakon.music.EXTRA_SONG
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.PlaylistEntity
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.extraNotNull
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.model.Song
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 class AddToPlaylistDialog : DialogFragment() {
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
+    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
 
     companion object {
         fun create(playlistEntities: List<PlaylistEntity>, song: Song): AddToPlaylistDialog {
@@ -58,8 +58,8 @@ class AddToPlaylistDialog : DialogFragment() {
             playlistNames.add(entity.playlistName)
         }
         return materialDialog(R.string.add_playlist_title)
-            .setItems(playlistNames.toTypedArray()) { dialog, which ->
-                if (which == 0) {
+            .setItems(playlistNames.toTypedArray()) { dialog, which->
+                 if (which == 0) {
                     showCreateDialog(songs)
                 } else {
                     libraryViewModel.addToPlaylist(requireContext(), playlistNames[which], songs)
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/BlacklistFolderChooserDialog.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/dialogs/BlacklistFolderChooserDialog.kt
index 5701d858b..0d1b22491 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/BlacklistFolderChooserDialog.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.Manifest
 import android.app.Dialog
@@ -8,9 +8,9 @@ import android.os.Bundle
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.DialogFragment
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.util.getExternalStorageDirectory
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.util.getExternalStorageDirectory
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.list.listItems
 import com.afollestad.materialdialogs.list.updateListItems
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/CreatePlaylistDialog.kt
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/dialogs/CreatePlaylistDialog.kt
index 7d7a01c90..1be024783 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/CreatePlaylistDialog.kt
@@ -12,29 +12,29 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_SONG
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.DialogPlaylistBinding
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.extra
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.EXTRA_SONG
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.DialogPlaylistBinding
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.extra
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.model.Song
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 class CreatePlaylistDialog : DialogFragment() {
     private var _binding: DialogPlaylistBinding? = null
     private val binding get() = _binding!!
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
+    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
 
     companion object {
         fun create(song: Song): CreatePlaylistDialog {
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/DeletePlaylistDialog.kt
similarity index 70%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/dialogs/DeletePlaylistDialog.kt
index 30675d88a..3a36b8845 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/DeletePlaylistDialog.kt
@@ -12,26 +12,26 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_PLAYLIST
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.extraNotNull
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import io.github.muntashirakon.music.EXTRA_PLAYLIST
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.PlaylistEntity
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.extraNotNull
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.fragments.ReloadType
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 class DeletePlaylistDialog : DialogFragment() {
 
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
+    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
 
     companion object {
 
@@ -55,13 +55,10 @@ class DeletePlaylistDialog : DialogFragment() {
         //noinspection ConstantConditions
         if (playlists.size > 1) {
             title = R.string.delete_playlists_title
-            message =
-                String.format(getString(R.string.delete_x_playlists), playlists.size).parseAsHtml()
+            message = String.format(getString(R.string.delete_x_playlists), playlists.size).parseAsHtml()
         } else {
             title = R.string.delete_playlist_title
-            message =
-                String.format(getString(R.string.delete_playlist_x), playlists[0].playlistName)
-                    .parseAsHtml()
+            message = String.format(getString(R.string.delete_playlist_x), playlists[0].playlistName).parseAsHtml()
         }
 
         return materialDialog(title)
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/DeleteSongsDialog.kt
similarity index 86%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/dialogs/DeleteSongsDialog.kt
index 5fd45b060..00fec214a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/DeleteSongsDialog.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Activity
 import android.app.Dialog
@@ -25,16 +25,17 @@ import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
 import androidx.fragment.app.DialogFragment
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.EXTRA_SONG
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.extraNotNull
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.SAFUtil
+import io.github.muntashirakon.music.EXTRA_SONG
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.saf.SAFGuideActivity
+import io.github.muntashirakon.music.extensions.extraNotNull
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.fragments.ReloadType
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.SAFUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -119,8 +120,8 @@ class DeleteSongsDialog : DialogFragment() {
                             deleteSongs(songs)
                         } else {
                             startActivityForResult(
-                                Intent(requireActivity(), code.name.monkey.retromusic.activities.saf.SAFGuideActivity::class.java),
-                                code.name.monkey.retromusic.activities.saf.SAFGuideActivity.REQUEST_CODE_SAF_GUIDE
+                                Intent(requireActivity(), SAFGuideActivity::class.java),
+                                SAFGuideActivity.REQUEST_CODE_SAF_GUIDE
                             )
                         }
                     }
@@ -131,7 +132,7 @@ class DeleteSongsDialog : DialogFragment() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         when (requestCode) {
-            code.name.monkey.retromusic.activities.saf.SAFGuideActivity.REQUEST_CODE_SAF_GUIDE -> {
+            SAFGuideActivity.REQUEST_CODE_SAF_GUIDE -> {
                 SAFUtil.openTreePicker(this)
             }
             SAFUtil.REQUEST_SAF_PICK_TREE,
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/ImportPlaylistDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/ImportPlaylistDialog.kt
similarity index 75%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/ImportPlaylistDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/dialogs/ImportPlaylistDialog.kt
index 87e3b6dbd..4420733f6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/ImportPlaylistDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/ImportPlaylistDialog.kt
@@ -12,19 +12,19 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 class ImportPlaylistDialog : DialogFragment() {
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
+    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return materialDialog(R.string.import_playlist)
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/PlaybackSpeedDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/PlaybackSpeedDialog.kt
similarity index 82%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/PlaybackSpeedDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/dialogs/PlaybackSpeedDialog.kt
index 6965d0831..07716b2bf 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/PlaybackSpeedDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/PlaybackSpeedDialog.kt
@@ -1,14 +1,14 @@
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.DialogPlaybackSpeedBinding
-import code.name.monkey.retromusic.extensions.accent
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.DialogPlaybackSpeedBinding
+import io.github.muntashirakon.music.extensions.accent
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.util.PreferenceUtil
 import com.google.android.material.slider.Slider
 
 class PlaybackSpeedDialog : DialogFragment() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveSongFromPlaylistDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/RemoveSongFromPlaylistDialog.kt
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveSongFromPlaylistDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/dialogs/RemoveSongFromPlaylistDialog.kt
index cd94bc480..615ca61fe 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveSongFromPlaylistDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/RemoveSongFromPlaylistDialog.kt
@@ -12,24 +12,24 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_SONG
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.SongEntity
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.extraNotNull
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import io.github.muntashirakon.music.EXTRA_SONG
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.SongEntity
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.extraNotNull
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 class RemoveSongFromPlaylistDialog : DialogFragment() {
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
+    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
 
     companion object {
         fun create(song: SongEntity): RemoveSongFromPlaylistDialog {
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/RenamePlaylistDialog.kt
similarity index 77%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/dialogs/RenamePlaylistDialog.kt
index 803315277..770f5321b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/RenamePlaylistDialog.kt
@@ -12,28 +12,28 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_PLAYLIST_ID
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.extraNotNull
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType
+import io.github.muntashirakon.music.EXTRA_PLAYLIST_ID
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.PlaylistEntity
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.extraNotNull
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.fragments.ReloadType
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 class RenamePlaylistDialog : DialogFragment() {
 
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
+    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
 
     companion object {
         fun create(playlistEntity: PlaylistEntity): RenamePlaylistDialog {
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SavePlaylistDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/SavePlaylistDialog.kt
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/SavePlaylistDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/dialogs/SavePlaylistDialog.kt
index 157a1b221..49924ae1d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SavePlaylistDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/SavePlaylistDialog.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Dialog
 import android.media.MediaScannerConnection
@@ -22,12 +22,12 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.EXTRA_PLAYLIST
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.helper.M3UWriter
-import code.name.monkey.retromusic.util.PlaylistsUtil
+import io.github.muntashirakon.music.EXTRA_PLAYLIST
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.helper.M3UWriter
+import io.github.muntashirakon.music.util.PlaylistsUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/SleepTimerDialog.kt
similarity index 50%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/dialogs/SleepTimerDialog.kt
index 32de5ba6c..4ac1b7d04 100755
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/SleepTimerDialog.kt
@@ -12,12 +12,11 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.AlarmManager
 import android.app.Dialog
 import android.app.PendingIntent
-import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
 import android.os.CountDownTimer
@@ -26,45 +25,43 @@ import android.widget.CheckBox
 import android.widget.SeekBar
 import android.widget.TextView
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import androidx.core.content.getSystemService
-import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.DialogSleepTimerBinding
-import code.name.monkey.retromusic.extensions.addAccentColor
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_PENDING_QUIT
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_QUIT
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.DialogSleepTimerBinding
+import io.github.muntashirakon.music.extensions.addAccentColor
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_PENDING_QUIT
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_QUIT
+import io.github.muntashirakon.music.util.PreferenceUtil
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.WhichButton
+import com.afollestad.materialdialogs.actions.getActionButton
 
 class SleepTimerDialog : DialogFragment() {
 
     private var seekArcProgress: Int = 0
     private lateinit var timerUpdater: TimerUpdater
-    private lateinit var dialog: AlertDialog
-
-    private var _binding: DialogSleepTimerBinding? = null
-    private val binding get() = _binding!!
-
-    private val shouldFinishLastSong: CheckBox get() = binding.shouldFinishLastSong
-    private val seekBar: SeekBar get() = binding.seekBar
-    private val timerDisplay: TextView get() = binding.timerDisplay
+    private lateinit var dialog: MaterialDialog
+    private lateinit var shouldFinishLastSong: CheckBox
+    private lateinit var timerDisplay: TextView
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         timerUpdater = TimerUpdater()
-        _binding = DialogSleepTimerBinding.inflate(layoutInflater)
+        val binding = DialogSleepTimerBinding.inflate(layoutInflater)
+        shouldFinishLastSong = binding.shouldFinishLastSong
+        timerDisplay = binding.timerDisplay
 
         val finishMusic = PreferenceUtil.isSleepTimerFinishMusic
         shouldFinishLastSong.apply {
             addAccentColor()
             isChecked = finishMusic
         }
-        seekBar.apply {
+        binding.seekBar.apply {
             addAccentColor()
             seekArcProgress = PreferenceUtil.lastSleepTimerValue
             updateTimeDisplayTime()
@@ -88,65 +85,47 @@ class SleepTimerDialog : DialogFragment() {
                 PreferenceUtil.lastSleepTimerValue = seekArcProgress
             }
         })
+        return materialDialog(R.string.action_sleep_timer)
+            .setView(binding.root)
+            .setPositiveButton(R.string.action_set) { _, _ ->
+                PreferenceUtil.isSleepTimerFinishMusic = shouldFinishLastSong.isChecked
+                val minutes = seekArcProgress
+                val pi = makeTimerPendingIntent(PendingIntent.FLAG_CANCEL_CURRENT)
+                val nextSleepTimerElapsedTime = SystemClock.elapsedRealtime() + minutes * 60 * 1000
+                PreferenceUtil.nextSleepTimerElapsedRealTime = nextSleepTimerElapsedTime.toInt()
+                val am = requireContext().getSystemService<AlarmManager>()
+                am?.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, nextSleepTimerElapsedTime, pi)
 
-        materialDialog(R.string.action_sleep_timer).apply {
-            if (PreferenceUtil.nextSleepTimerElapsedRealTime > System.currentTimeMillis()) {
-                seekBar.isVisible = false
-                shouldFinishLastSong.isVisible = false
-                timerUpdater.start()
-                setPositiveButton(android.R.string.ok, null)
-                setNegativeButton(R.string.action_cancel) { _, _ ->
-                    timerUpdater.cancel()
-                    val previous = makeTimerPendingIntent(PendingIntent.FLAG_NO_CREATE)
-                    if (previous != null) {
-                        val am = requireContext().getSystemService<AlarmManager>()
-                        am?.cancel(previous)
-                        previous.cancel()
+                Toast.makeText(
+                    requireContext(),
+                    requireContext().resources.getString(R.string.sleep_timer_set, minutes),
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+            .setNegativeButton(android.R.string.cancel) { _, _ ->
+                val previous = makeTimerPendingIntent(PendingIntent.FLAG_NO_CREATE)
+                if (previous != null) {
+                    val am = requireContext().getSystemService<AlarmManager>()
+                    am?.cancel(previous)
+                    previous.cancel()
+                    Toast.makeText(
+                        requireContext(),
+                        requireContext().resources.getString(R.string.sleep_timer_canceled),
+                        Toast.LENGTH_SHORT
+                    ).show()
+                    val musicService = MusicPlayerRemote.musicService
+                    if (musicService != null && musicService.pendingQuit) {
+                        musicService.pendingQuit = false
                         Toast.makeText(
                             requireContext(),
                             requireContext().resources.getString(R.string.sleep_timer_canceled),
                             Toast.LENGTH_SHORT
                         ).show()
-                        val musicService = MusicPlayerRemote.musicService
-                        if (musicService != null && musicService.pendingQuit) {
-                            musicService.pendingQuit = false
-                            Toast.makeText(
-                                requireContext(),
-                                requireContext().resources.getString(R.string.sleep_timer_canceled),
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
                     }
                 }
-            } else {
-                seekBar.isVisible = true
-                shouldFinishLastSong.isVisible = true
-                setPositiveButton(R.string.action_set) { _, _ ->
-                    PreferenceUtil.isSleepTimerFinishMusic = shouldFinishLastSong.isChecked
-                    val minutes = seekArcProgress
-                    val pi = makeTimerPendingIntent(PendingIntent.FLAG_CANCEL_CURRENT)
-                    val nextSleepTimerElapsedTime =
-                        SystemClock.elapsedRealtime() + minutes * 60 * 1000
-                    PreferenceUtil.nextSleepTimerElapsedRealTime = nextSleepTimerElapsedTime.toInt()
-                    val am = requireContext().getSystemService<AlarmManager>()
-                    am?.setExact(
-                        AlarmManager.ELAPSED_REALTIME_WAKEUP,
-                        nextSleepTimerElapsedTime,
-                        pi
-                    )
-
-                    Toast.makeText(
-                        requireContext(),
-                        requireContext().resources.getString(R.string.sleep_timer_set, minutes),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
             }
-            setView(binding.root)
-            dialog = create()
-
-        }
-        return dialog
+            .create()
+            .colorButtons()
     }
 
     private fun updateTimeDisplayTime() {
@@ -168,10 +147,14 @@ class SleepTimerDialog : DialogFragment() {
         } else intent.setAction(ACTION_QUIT)
     }
 
-    override fun onDismiss(dialog: DialogInterface) {
-        super.onDismiss(dialog)
-        timerUpdater.cancel()
-        _binding = null
+    private fun updateCancelButton() {
+        val musicService = MusicPlayerRemote.musicService
+        if (musicService != null && musicService.pendingQuit) {
+            dialog.getActionButton(WhichButton.NEUTRAL).text =
+                dialog.context.getString(R.string.cancel_current_timer)
+        } else {
+            dialog.getActionButton(WhichButton.NEUTRAL).text = null
+        }
     }
 
     private inner class TimerUpdater :
@@ -181,9 +164,10 @@ class SleepTimerDialog : DialogFragment() {
         ) {
 
         override fun onTick(millisUntilFinished: Long) {
-            timerDisplay.text = MusicUtil.getReadableDurationString(millisUntilFinished)
         }
 
-        override fun onFinish() {}
+        override fun onFinish() {
+            updateCancelButton()
+        }
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/SongDetailDialog.kt
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/dialogs/SongDetailDialog.kt
index 19995db30..c4cc0c88e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/SongDetailDialog.kt
@@ -12,24 +12,23 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
 import android.text.Spanned
 import android.util.Log
-import androidx.core.os.BundleCompat
 import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_SONG
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.DialogFileDetailsBinding
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
+import io.github.muntashirakon.music.EXTRA_SONG
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.DialogFileDetailsBinding
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
 import org.jaudiotagger.audio.AudioFileIO
 import java.io.File
 
@@ -39,7 +38,7 @@ class SongDetailDialog : DialogFragment() {
         val context: Context = requireContext()
         val binding = DialogFileDetailsBinding.inflate(layoutInflater)
 
-        val song = BundleCompat.getParcelable(requireArguments(), EXTRA_SONG, Song::class.java)
+        val song = requireArguments().getParcelable<Song>(EXTRA_SONG)
         with(binding) {
             fileName.text = makeTextWithTitle(context, R.string.label_file_name, "-")
             filePath.text = makeTextWithTitle(context, R.string.label_file_path, "-")
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt b/app/src/main/java/io/github/muntashirakon/music/dialogs/SongShareDialog.kt
similarity index 83%
rename from app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/dialogs/SongShareDialog.kt
index fcfad5a5d..986810f46 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/dialogs/SongShareDialog.kt
@@ -12,25 +12,24 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.dialogs
+package io.github.muntashirakon.music.dialogs
 
 import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
-import androidx.core.os.BundleCompat
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_SONG
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.ShareInstagramStory
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
+import io.github.muntashirakon.music.EXTRA_SONG
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.ShareInstagramStory
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
 
 class SongShareDialog : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val song: Song? = BundleCompat.getParcelable(requireArguments(), EXTRA_SONG, Song::class.java)
+        val song: Song? = requireArguments().getParcelable(EXTRA_SONG)
         val listening: String =
             String.format(
                 getString(R.string.currently_listening_to_x_by_x),
@@ -61,7 +60,8 @@ class SongShareDialog : DialogFragment() {
             0 -> {
                 startActivity(Intent.createChooser(song?.let {
                     MusicUtil.createShareSongFileIntent(
-                        requireContext(), it
+                        it,
+                        requireContext()
                     )
                 }, null))
             }
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/ActivityExtensions.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/ActivityExtensions.kt
index bf3d9d8cd..048f0d0a1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/ActivityExtensions.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import android.app.Activity
 import android.content.Intent
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityThemeExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/ActivityThemeExtensions.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/ActivityThemeExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/ActivityThemeExtensions.kt
index d6c5a559d..1865db546 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityThemeExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/ActivityThemeExtensions.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import android.app.ActivityManager
 import android.graphics.Color
@@ -13,10 +13,10 @@ import androidx.core.view.*
 import androidx.fragment.app.FragmentActivity
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.util.PreferenceUtil
 
-fun AppCompatActivity.maybeSetScreenOn() {
+fun AppCompatActivity.toggleScreenOn() {
     if (PreferenceUtil.isScreenOnEnabled) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     } else {
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/ColorExtensions.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/ColorExtensions.kt
index b1ae4bec8..c0bfed4d3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/ColorExtensions.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import android.app.Dialog
 import android.content.Context
@@ -36,8 +36,8 @@ import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 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.util.PreferenceUtil.materialYou
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.util.PreferenceUtil.materialYou
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -52,7 +52,7 @@ fun Int.ripAlpha(): Int {
 fun Dialog.colorControlNormal() = resolveColor(android.R.attr.colorControlNormal)
 
 fun Toolbar.backgroundTintList() {
-    val surfaceColor = ATHUtil.resolveColor(context, com.google.android.material.R.attr.colorSurface, Color.BLACK)
+    val surfaceColor = ATHUtil.resolveColor(context, R.attr.colorSurface, Color.BLACK)
     val colorStateList = ColorStateList.valueOf(surfaceColor)
     backgroundTintList = colorStateList
 }
@@ -61,13 +61,13 @@ fun Context.accentColor() = ThemeStore.accentColor(this)
 
 fun Fragment.accentColor() = ThemeStore.accentColor(requireContext())
 
-fun Context.surfaceColor() = resolveColor(com.google.android.material.R.attr.colorSurface, Color.WHITE)
+fun Context.surfaceColor() = resolveColor(R.attr.colorSurface, Color.WHITE)
 
-fun Fragment.surfaceColor() = resolveColor(com.google.android.material.R.attr.colorSurface, Color.WHITE)
+fun Fragment.surfaceColor() = resolveColor(R.attr.colorSurface, Color.WHITE)
 
-fun Context.surfaceColor(fallBackColor: Int) = resolveColor(com.google.android.material.R.attr.colorSurface, fallBackColor)
+fun Context.surfaceColor(fallBackColor: Int) = resolveColor(R.attr.colorSurface, fallBackColor)
 
-fun Fragment.surfaceColor(fallBackColor: Int) = resolveColor(com.google.android.material.R.attr.colorSurface, fallBackColor)
+fun Fragment.surfaceColor(fallBackColor: Int) = resolveColor(R.attr.colorSurface, fallBackColor)
 
 fun Context.textColorSecondary() = resolveColor(android.R.attr.textColorSecondary)
 
@@ -135,9 +135,7 @@ fun Button.accentTextColor() {
 
 fun MaterialButton.accentBackgroundColor() {
     if (materialYou) return
-    backgroundTintList = ColorStateList(
-        arrayOf(intArrayOf(android.R.attr.state_enabled), intArrayOf()),
-            intArrayOf(context.accentColor(), context.accentColor().addAlpha(0.12f)))
+    backgroundTintList = ColorStateList.valueOf(context.accentColor())
 }
 
 fun MaterialButton.accentOutlineColor() {
@@ -165,15 +163,6 @@ fun SeekBar.applyColor(@ColorInt color: Int) {
     progressBackgroundTintList = ColorStateList.valueOf(color)
 }
 
-fun Slider.applyColor(@ColorInt color: Int) {
-    ColorStateList.valueOf(color).run {
-        thumbTintList = this
-        trackActiveTintList = this
-        trackInactiveTintList = ColorStateList.valueOf(color.addAlpha(0.1f))
-        haloTintList = this
-    }
-}
-
 fun ExtendedFloatingActionButton.accentColor() {
     if (materialYou) return
     val color = ThemeStore.accentColor(context)
@@ -312,9 +301,5 @@ inline val @receiver:ColorInt Int.lighterColor
 inline val @receiver:ColorInt Int.darkerColor
     get() = ColorUtil.darkenColor(this)
 
-inline val Int.colorStateList: ColorStateList
-    get() = ColorStateList.valueOf(this)
-
-fun @receiver:ColorInt Int.addAlpha(alpha: Float): Int {
-    return ColorUtil.withAlpha(this, alpha)
-}
\ No newline at end of file
+inline val Int.colorStateList : ColorStateList
+    get() = ColorStateList.valueOf(this)
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/ContextExtensions.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/ContextExtensions.kt
index a479903d7..a09fd0c06 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/ContextExtensions.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import android.content.Context
 import android.content.res.Configuration
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/CursorExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/CursorExtensions.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/CursorExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/CursorExtensions.kt
index 531c2e0bb..ff2a210c8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/CursorExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/CursorExtensions.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import android.database.Cursor
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/DialogExtension.kt
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/DialogExtension.kt
index ffd894af4..8ae307c5e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/DialogExtension.kt
@@ -12,12 +12,12 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
-import code.name.monkey.retromusic.BuildConfig
-import code.name.monkey.retromusic.R
+import io.github.muntashirakon.music.BuildConfig
+import io.github.muntashirakon.music.R
 import com.afollestad.materialdialogs.MaterialDialog
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/DimenExtension.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/DimenExtension.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/DimenExtension.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/DimenExtension.kt
index 6e5cdeccc..e9933694c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/DimenExtension.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/DimenExtension.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import android.app.Activity
 import androidx.annotation.DimenRes
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/DrawableExtensions.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/DrawableExtensions.kt
index c23f0e979..7a7f4404b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/DrawableExtensions.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import android.content.Context
 import android.graphics.Bitmap
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/FileExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/FileExtensions.kt
similarity index 76%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/FileExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/FileExtensions.kt
index 5c4df1a37..240173b40 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/FileExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/FileExtensions.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import java.io.BufferedOutputStream
 import java.util.zip.ZipOutputStream
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/FragmentExtensions.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/FragmentExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/FragmentExtensions.kt
index b1e8f5930..245e95a64 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/FragmentExtensions.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import android.content.Context
 import android.content.res.Configuration
@@ -25,7 +25,7 @@ import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.getSystemService
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.NavHostFragment
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
 import com.google.android.material.appbar.MaterialToolbar
 
 fun Fragment.getIntRes(@IntegerRes int: Int): Int {
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentMusicExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/FragmentMusicExtensions.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/FragmentMusicExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/FragmentMusicExtensions.kt
index ac35af672..e9cc99147 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentMusicExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/FragmentMusicExtensions.kt
@@ -1,9 +1,9 @@
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import android.webkit.MimeTypeMap
 import androidx.core.net.toUri
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.RetroUtil
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.RetroUtil
 import org.jaudiotagger.audio.AudioFileIO
 import java.io.File
 import java.net.URLEncoder
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/InsetsExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/InsetsExtensions.kt
similarity index 53%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/InsetsExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/InsetsExtensions.kt
index 70c8a10f4..ebc984945 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/InsetsExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/InsetsExtensions.kt
@@ -1,10 +1,10 @@
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import androidx.core.view.WindowInsetsCompat
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RetroUtil
 
-fun WindowInsetsCompat?.getBottomInsets(): Int {
+fun WindowInsetsCompat?.safeGetBottomInsets(): Int {
     return if (PreferenceUtil.isFullScreenMode) {
         return 0
     } else {
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/IntentExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/IntentExtensions.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/IntentExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/IntentExtensions.kt
index e91e81347..6da242726 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/IntentExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/IntentExtensions.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import android.app.Activity
 import android.content.Context
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/NavigationExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/NavigationExtensions.kt
similarity index 81%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/NavigationExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/NavigationExtensions.kt
index fc1f938d5..0955e4c78 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/NavigationExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/NavigationExtensions.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AppCompatActivity
@@ -21,7 +21,6 @@ import androidx.navigation.NavController
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.findNavController
-import androidx.navigation.navOptions
 
 fun Fragment.navigate(@IdRes id: Int) = findNavController().navigate(id)
 
@@ -38,13 +37,3 @@ fun AppCompatActivity.findNavController(@IdRes id: Int): NavController {
     val fragment = supportFragmentManager.findFragmentById(id) as NavHostFragment
     return fragment.navController
 }
-
-val fadeNavOptions
-    get() = navOptions {
-        anim {
-            enter = android.R.anim.fade_in
-            exit = android.R.anim.fade_out
-            popEnter = android.R.anim.fade_in
-            popExit = android.R.anim.fade_out
-        }
-    }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/PaletteExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/PaletteExtensions.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/PaletteExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/PaletteExtensions.kt
index dae607bf4..4b583638b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/PaletteExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/PaletteExtensions.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import androidx.annotation.ColorInt
 import androidx.core.graphics.ColorUtils
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/PreferenceExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/PreferenceExtensions.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/PreferenceExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/PreferenceExtensions.kt
index 317844afd..0de0c5e33 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/PreferenceExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/PreferenceExtensions.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import android.content.SharedPreferences
 
diff --git a/app/src/main/java/io/github/muntashirakon/music/extensions/SongExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/SongExtensions.kt
new file mode 100644
index 000000000..d52762bab
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/SongExtensions.kt
@@ -0,0 +1,20 @@
+package io.github.muntashirakon.music.extensions
+
+import android.support.v4.media.MediaDescriptionCompat
+import android.support.v4.media.session.MediaSessionCompat.QueueItem
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
+
+val Song.uri get() = MusicUtil.getSongFileUri(songId = id)
+
+
+fun ArrayList<Song>.toMediaSessionQueue(): List<QueueItem> {
+    return map {
+        val mediaDescription = MediaDescriptionCompat.Builder()
+            .setMediaId(it.id.toString())
+            .setTitle(it.title)
+            .setSubtitle(it.artistName)
+            .build()
+        QueueItem(mediaDescription, it.hashCode().toLong())
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt b/app/src/main/java/io/github/muntashirakon/music/extensions/ViewExtensions.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt
rename to app/src/main/java/io/github/muntashirakon/music/extensions/ViewExtensions.kt
index 114ecf6d5..674850552 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/extensions/ViewExtensions.kt
@@ -11,12 +11,11 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.extensions
+package io.github.muntashirakon.music.extensions
 
 import android.animation.Animator
 import android.animation.ObjectAnimator
 import android.animation.ValueAnimator
-import android.content.res.ColorStateList
 import android.graphics.drawable.BitmapDrawable
 import android.view.LayoutInflater
 import android.view.View
@@ -25,7 +24,6 @@ import android.view.ViewTreeObserver
 import android.view.animation.AnimationUtils
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
-import androidx.annotation.ColorInt
 import androidx.annotation.LayoutRes
 import androidx.annotation.Px
 import androidx.core.animation.doOnEnd
@@ -34,17 +32,13 @@ import androidx.core.content.getSystemService
 import androidx.core.view.*
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RetroUtil
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.card.MaterialCardView
-import com.google.android.material.navigation.NavigationBarView
-import com.google.android.material.navigationrail.NavigationRailView
 import dev.chrisbanes.insetter.applyInsetter
 
-const val ANIM_DURATION = 300L
-
 @Suppress("UNCHECKED_CAST")
 fun <T : View> ViewGroup.inflate(@LayoutRes layout: Int): T {
     return LayoutInflater.from(context).inflate(layout, this, false) as T
@@ -68,15 +62,6 @@ fun EditText.appHandleColor(): EditText {
     return this
 }
 
-fun NavigationBarView.setItemColors(@ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
-    val csl = ColorStateList(
-        arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
-        intArrayOf(normalColor, selectedColor)
-    )
-    itemIconTintList = csl
-    itemTextColor = csl
-}
-
 /**
  * Potentially animate showing a [BottomNavigationView].
  *
@@ -86,8 +71,7 @@ fun NavigationBarView.setItemColors(@ColorInt normalColor: Int, @ColorInt select
  * Instead, take a snapshot of the view, and animate this in, only changing the visibility (and
  * thus layout) when the animation completes.
  */
-fun NavigationBarView.show() {
-    if (this is NavigationRailView) return
+fun BottomNavigationView.show() {
     if (isVisible) return
 
     val parent = parent as ViewGroup
@@ -105,10 +89,10 @@ fun NavigationBarView.show() {
     drawable.setBounds(left, parent.height, right, parent.height + height)
     parent.overlay.add(drawable)
     ValueAnimator.ofInt(parent.height, top).apply {
-        duration = ANIM_DURATION
+        duration = 300
         interpolator = AnimationUtils.loadInterpolator(
             context,
-            android.R.interpolator.accelerate_decelerate
+            android.R.interpolator.linear_out_slow_in
         )
         addUpdateListener {
             val newTop = it.animatedValue as Int
@@ -131,25 +115,19 @@ fun NavigationBarView.show() {
  * Instead, take a snapshot, instantly hide the view (so content lays out to fill), then animate
  * out the snapshot.
  */
-fun NavigationBarView.hide() {
-    if (this is NavigationRailView) return
+fun BottomNavigationView.hide() {
     if (isGone) return
 
-    if (!isLaidOut) {
-        isGone = true
-        return
-    }
-
     val drawable = BitmapDrawable(context.resources, drawToBitmap())
     val parent = parent as ViewGroup
     drawable.setBounds(left, top, right, bottom)
     parent.overlay.add(drawable)
     isGone = true
     ValueAnimator.ofInt(top, parent.height).apply {
-        duration = ANIM_DURATION
+        duration = 300L
         interpolator = AnimationUtils.loadInterpolator(
             context,
-            android.R.interpolator.accelerate_decelerate
+            android.R.interpolator.fast_out_linear_in
         )
         addUpdateListener {
             val newTop = it.animatedValue as Int
@@ -180,7 +158,7 @@ fun View.translateYAnimate(value: Float): Animator {
 fun BottomSheetBehavior<*>.peekHeightAnimate(value: Int): Animator {
     return ObjectAnimator.ofInt(this, "peekHeight", value)
         .apply {
-            duration = ANIM_DURATION
+            duration = 300
             start()
         }
 }
@@ -276,7 +254,7 @@ fun View.updateMargin(
     @Px left: Int = marginLeft,
     @Px top: Int = marginTop,
     @Px right: Int = marginRight,
-    @Px bottom: Int = marginBottom,
+    @Px bottom: Int = marginBottom
 ) {
     (layoutParams as ViewGroup.MarginLayoutParams).updateMargins(left, top, right, bottom)
 }
@@ -317,7 +295,7 @@ fun View.requestApplyInsetsWhenAttached() {
 
 data class InitialPadding(
     val left: Int, val top: Int,
-    val right: Int, val bottom: Int,
+    val right: Int, val bottom: Int
 )
 
 fun recordInitialPaddingForView(view: View) = InitialPadding(
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/AlbumCoverStyle.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/AlbumCoverStyle.kt
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/AlbumCoverStyle.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/AlbumCoverStyle.kt
index d797c50fb..7159cb297 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/AlbumCoverStyle.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/AlbumCoverStyle.kt
@@ -12,11 +12,11 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments
+package io.github.muntashirakon.music.fragments
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import code.name.monkey.retromusic.R
+import io.github.muntashirakon.music.R
 
 enum class AlbumCoverStyle(
     @StringRes val titleRes: Int,
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/GridStyle.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/GridStyle.kt
similarity index 81%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/GridStyle.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/GridStyle.kt
index 505564a1c..c5e7b74b1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/GridStyle.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/GridStyle.kt
@@ -1,7 +1,7 @@
-package code.name.monkey.retromusic.fragments
+package io.github.muntashirakon.music.fragments
 
 import androidx.annotation.LayoutRes
-import code.name.monkey.retromusic.R
+import io.github.muntashirakon.music.R
 
 enum class GridStyle constructor(
     @param:LayoutRes @field:LayoutRes val layoutResId: Int,
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/LibraryViewModel.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/LibraryViewModel.kt
index 3e6b01b88..5cc9539e0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/LibraryViewModel.kt
@@ -12,28 +12,24 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments
+package io.github.muntashirakon.music.fragments
 
 import android.animation.ValueAnimator
 import android.content.Context
+import android.widget.Toast
 import androidx.core.animation.doOnEnd
 import androidx.lifecycle.*
-import code.name.monkey.retromusic.RECENT_ALBUMS
-import code.name.monkey.retromusic.RECENT_ARTISTS
-import code.name.monkey.retromusic.TOP_ALBUMS
-import code.name.monkey.retromusic.TOP_ARTISTS
-import code.name.monkey.retromusic.db.*
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.fragments.ReloadType.*
-import code.name.monkey.retromusic.fragments.search.Filter
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
-import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.util.DensityUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.logD
+import io.github.muntashirakon.music.*
+import io.github.muntashirakon.music.db.*
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.fragments.ReloadType.*
+import io.github.muntashirakon.music.fragments.search.Filter
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.interfaces.IMusicServiceEventListener
+import io.github.muntashirakon.music.model.*
+import io.github.muntashirakon.music.repository.RealRepository
+import io.github.muntashirakon.music.util.DensityUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
@@ -145,47 +141,48 @@ class LibraryViewModel(
     }
 
     override fun onMediaStoreChanged() {
-        logD("onMediaStoreChanged")
+        println("onMediaStoreChanged")
         loadLibraryContent()
     }
 
     override fun onServiceConnected() {
-        logD("onServiceConnected")
+        println("onServiceConnected")
     }
 
     override fun onServiceDisconnected() {
-        logD("onServiceDisconnected")
+        println("onServiceDisconnected")
     }
 
     override fun onQueueChanged() {
-        logD("onQueueChanged")
+        println("onQueueChanged")
     }
 
     override fun onPlayingMetaChanged() {
-        logD("onPlayingMetaChanged")
+        println("onPlayingMetaChanged")
     }
 
     override fun onPlayStateChanged() {
-        logD("onPlayStateChanged")
+        println("onPlayStateChanged")
     }
 
     override fun onRepeatModeChanged() {
-        logD("onRepeatModeChanged")
+        println("onRepeatModeChanged")
     }
 
     override fun onShuffleModeChanged() {
-        logD("onShuffleModeChanged")
+        println("onShuffleModeChanged")
     }
 
     override fun onFavoriteStateChanged() {
-        logD("onFavoriteStateChanged")
+        println("onFavoriteStateChanged")
     }
 
     fun shuffleSongs() = viewModelScope.launch(IO) {
         val songs = repository.allSongs()
-        withContext(Main) {
-            MusicPlayerRemote.openAndShuffleQueue(songs, true)
-        }
+        MusicPlayerRemote.openAndShuffleQueue(
+            songs,
+            true
+        )
     }
 
     fun renameRoomPlaylist(playListId: Long, name: String) = viewModelScope.launch(IO) {
@@ -311,7 +308,7 @@ class LibraryViewModel(
             if (previousSongHistory.isNotEmpty()) {
                 val history = ArrayList<Song>()
                 for (song in previousSongHistory) {
-                    repository.upsertSongInHistory(song.toSong())
+                    repository.addSongToHistory(song.toSong())
                     history.add(song.toSong())
                 }
                 songHistory.postValue(history)
@@ -350,7 +347,8 @@ class LibraryViewModel(
                     context.getString(
                         R.string.added_song_count_to_playlist,
                         songs.size,
-                        playlistName))
+                        playlistName),
+                    Toast.LENGTH_SHORT)
             }
         }
     }
diff --git a/app/src/main/java/io/github/muntashirakon/music/fragments/MusicSeekSkipTouchListener.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/MusicSeekSkipTouchListener.kt
new file mode 100644
index 000000000..25020c806
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/MusicSeekSkipTouchListener.kt
@@ -0,0 +1,61 @@
+package io.github.muntashirakon.music.fragments
+
+import android.annotation.SuppressLint
+import android.view.GestureDetector
+import android.view.MotionEvent
+import android.view.View
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.lifecycleScope
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import kotlinx.coroutines.*
+
+/**
+ * @param activity, Activity
+ * @param next, if the button is next, if false then it's considered previous
+ */
+class MusicSeekSkipTouchListener(val activity: FragmentActivity, val next: Boolean) :
+    View.OnTouchListener {
+
+    var job: Job? = null
+    var counter = 0
+    var wasSeeking = false
+
+    private val gestureDetector = GestureDetector(activity, object :
+        GestureDetector.SimpleOnGestureListener() {
+        override fun onDown(e: MotionEvent?): Boolean {
+            job = activity.lifecycleScope.launch(Dispatchers.Default) {
+                counter = 0
+                while (isActive) {
+                    delay(500)
+                    wasSeeking = true
+                    var seekingDuration = MusicPlayerRemote.songProgressMillis
+                    if (next) {
+                        seekingDuration += 5000 * (counter.floorDiv(2) + 1)
+                    } else {
+                        seekingDuration -= 5000 * (counter.floorDiv(2) + 1)
+                    }
+                    MusicPlayerRemote.seekTo(seekingDuration)
+                    counter += 1
+                }
+            }
+            return super.onDown(e)
+        }
+    })
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
+        val action = event?.actionMasked
+        if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
+            job?.cancel()
+            if (!wasSeeking) {
+                if (next) {
+                    MusicPlayerRemote.playNextSong()
+                } else {
+                    MusicPlayerRemote.back()
+                }
+            }
+            wasSeeking = false
+        }
+        return gestureDetector.onTouchEvent(event)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/NowPlayingScreen.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/NowPlayingScreen.kt
index 0b2e6b1ff..331039224 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/NowPlayingScreen.kt
@@ -12,11 +12,11 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments
+package io.github.muntashirakon.music.fragments
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import code.name.monkey.retromusic.R
+import io.github.muntashirakon.music.R
 
 enum class NowPlayingScreen constructor(
     @param:StringRes @field:StringRes
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/about/AboutFragment.kt
similarity index 79%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/about/AboutFragment.kt
index 89edeb1af..95326b4c6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/about/AboutFragment.kt
@@ -12,24 +12,28 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.about
+package io.github.muntashirakon.music.fragments.about
 
 import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.View
+import androidx.core.app.ShareCompat
 import androidx.fragment.app.Fragment
-import code.name.monkey.retromusic.Constants
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentAboutBinding
-import code.name.monkey.retromusic.extensions.openUrl
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.util.NavigationUtil
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import io.github.muntashirakon.music.Constants
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentAboutBinding
+import io.github.muntashirakon.music.extensions.openUrl
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.util.NavigationUtil
 import dev.chrisbanes.insetter.applyInsetter
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 class AboutFragment : Fragment(R.layout.fragment_about), View.OnClickListener {
     private var _binding: FragmentAboutBinding? = null
     private val binding get() = _binding!!
+    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -39,7 +43,7 @@ class AboutFragment : Fragment(R.layout.fragment_about), View.OnClickListener {
 
         binding.aboutContent.root.applyInsetter {
             type(navigationBars = true) {
-                padding(vertical = true)
+                padding()
             }
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumDetailsFragment.kt
similarity index 78%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumDetailsFragment.kt
index 5b8dc638c..972caadb9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumDetailsFragment.kt
@@ -12,13 +12,14 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.albums
+package io.github.muntashirakon.music.fragments.albums
 
 import android.app.ActivityOptions
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
 import android.view.*
+import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
 import androidx.core.view.doOnPreDraw
@@ -31,35 +32,40 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity.getToolbarBackgroundColor
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.EXTRA_ALBUM_ID
-import code.name.monkey.retromusic.EXTRA_ARTIST_ID
-import code.name.monkey.retromusic.EXTRA_ARTIST_NAME
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
-import code.name.monkey.retromusic.activities.tageditor.AlbumTagEditorActivity
-import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
-import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
-import code.name.monkey.retromusic.databinding.FragmentAlbumDetailsBinding
-import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
-import code.name.monkey.retromusic.dialogs.DeleteSongsDialog
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.SingleColorTarget
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_A_Z
-import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_DURATION
-import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_TRACK_LIST
-import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_Z_A
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.util.*
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.EXTRA_ALBUM_ID
+import io.github.muntashirakon.music.EXTRA_ARTIST_ID
+import io.github.muntashirakon.music.EXTRA_ARTIST_NAME
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.tageditor.AbsTagEditorActivity
+import io.github.muntashirakon.music.activities.tageditor.AlbumTagEditorActivity
+import io.github.muntashirakon.music.adapter.album.HorizontalAlbumAdapter
+import io.github.muntashirakon.music.adapter.song.SimpleSongAdapter
+import io.github.muntashirakon.music.databinding.FragmentAlbumDetailsBinding
+import io.github.muntashirakon.music.dialogs.AddToPlaylistDialog
+import io.github.muntashirakon.music.dialogs.DeleteSongsDialog
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsMainActivityFragment
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.SingleColorTarget
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_A_Z
+import io.github.muntashirakon.music.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_DURATION
+import io.github.muntashirakon.music.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_TRACK_LIST
+import io.github.muntashirakon.music.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_Z_A
+import io.github.muntashirakon.music.interfaces.IAlbumClickListener
+import io.github.muntashirakon.music.interfaces.ICabCallback
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.model.Album
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.repository.RealRepository
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RetroColorUtil
+import com.afollestad.materialcab.attached.AttachedCab
+import com.afollestad.materialcab.attached.destroy
+import com.afollestad.materialcab.attached.isActive
+import com.afollestad.materialcab.createCab
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.transition.MaterialArcMotion
 import com.google.android.material.transition.MaterialContainerTransform
@@ -72,7 +78,7 @@ import org.koin.core.parameter.parametersOf
 import java.text.Collator
 
 class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_details),
-    IAlbumClickListener {
+    IAlbumClickListener, ICabHolder {
 
     private var _binding: FragmentAlbumDetailsBinding? = null
     private val binding get() = _binding!!
@@ -108,12 +114,12 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
         binding.toolbar.title = " "
         binding.albumCoverContainer.transitionName = arguments.extraAlbumId.toString()
         postponeEnterTransition()
-        detailsViewModel.getAlbum().observe(viewLifecycleOwner) { album ->
+        detailsViewModel.getAlbum().observe(viewLifecycleOwner) {
             view.doOnPreDraw {
                 startPostponedEnterTransition()
             }
-            albumArtistExists = !album.albumArtist.isNullOrEmpty()
-            showAlbum(album)
+            albumArtistExists = !it.albumArtist.isNullOrEmpty()
+            showAlbum(it)
             binding.artistImage.transitionName = if (albumArtistExists) {
                 album.albumArtist
             } else {
@@ -152,6 +158,12 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
             )
         }
 
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
+            if (!handleBackPress()) {
+                remove()
+                requireActivity().onBackPressed()
+            }
+        }
         binding.appBarLayout?.statusBarForeground =
             MaterialShapeDrawable.createWithElevationOverlay(requireContext())
     }
@@ -165,7 +177,8 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
         simpleSongAdapter = SimpleSongAdapter(
             requireActivity() as AppCompatActivity,
             ArrayList(),
-            R.layout.item_song
+            R.layout.item_song,
+            this
         )
         binding.fragmentAlbumContent.recyclerView.apply {
             layoutManager = LinearLayoutManager(requireContext())
@@ -224,7 +237,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
             String.format(getString(R.string.label_more_from), album.artistName)
 
         val albumAdapter =
-            HorizontalAlbumAdapter(requireActivity() as AppCompatActivity, albums, this)
+            HorizontalAlbumAdapter(requireActivity() as AppCompatActivity, albums, this, this)
         binding.fragmentAlbumContent.moreRecyclerView.layoutManager = GridLayoutManager(
             requireContext(),
             1,
@@ -238,8 +251,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
         detailsViewModel.getMoreAlbums(artist).observe(viewLifecycleOwner) {
             moreAlbums(it)
         }
-        Glide.with(requireContext())
-            //.forceDownload(PreferenceUtil.isAllowedToDownloadMetadata())
+        GlideApp.with(requireContext())
             .load(
                 RetroGlideExtension.getArtistModel(artist)
             )
@@ -250,8 +262,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
     }
 
     private fun loadAlbumCover(album: Album) {
-        Glide.with(requireContext())
-            .asBitmapPalette()
+        GlideApp.with(requireContext()).asBitmapPalette()
             .albumCoverOptions(album.safeGetFirstSong())
             //.checkIgnoreMediaStore()
             .load(RetroGlideExtension.getSongModel(album.safeGetFirstSong()))
@@ -283,7 +294,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
     override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.menu_album_detail, menu)
         val sortOrder = menu.findItem(R.id.action_sort_order)
-        setUpSortOrderMenu(sortOrder.subMenu!!)
+        setUpSortOrderMenu(sortOrder.subMenu)
         ToolbarContentTintHelper.handleOnCreateOptionsMenu(
             requireContext(),
             binding.toolbar,
@@ -305,12 +316,10 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
                 MusicPlayerRemote.playNext(songs)
                 return true
             }
-
             R.id.action_add_to_current_playing -> {
                 MusicPlayerRemote.enqueue(songs)
                 return true
             }
-
             R.id.action_add_to_playlist -> {
                 lifecycleScope.launch(Dispatchers.IO) {
                     val playlists = get<RealRepository>().fetchPlaylists()
@@ -321,12 +330,10 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
                 }
                 return true
             }
-
             R.id.action_delete_from_device -> {
                 DeleteSongsDialog.create(songs).show(childFragmentManager, "DELETE_SONGS")
                 return true
             }
-
             R.id.action_tag_editor -> {
                 val intent = Intent(requireContext(), AlbumTagEditorActivity::class.java)
                 intent.putExtra(AbsTagEditorActivity.EXTRA_ID, album.id)
@@ -340,7 +347,6 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
                 )
                 return true
             }
-
             R.id.action_sort_order_title -> sortOrder = SONG_A_Z
             R.id.action_sort_order_title_desc -> sortOrder = SONG_Z_A
             R.id.action_sort_order_track_list -> sortOrder = SONG_TRACK_LIST
@@ -359,7 +365,6 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
             SONG_Z_A -> sortOrder.findItem(R.id.action_sort_order_title_desc).isChecked = true
             SONG_TRACK_LIST ->
                 sortOrder.findItem(R.id.action_sort_order_track_list).isChecked = true
-
             SONG_DURATION ->
                 sortOrder.findItem(R.id.action_sort_order_artist_song_duration).isChecked = true
         }
@@ -373,29 +378,57 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
                     o2.trackNumber
                 )
             }
-
             SONG_A_Z -> {
                 val collator = Collator.getInstance()
                 album.songs.sortedWith { o1, o2 -> collator.compare(o1.title, o2.title) }
             }
-
             SONG_Z_A -> {
                 val collator = Collator.getInstance()
                 album.songs.sortedWith { o1, o2 -> collator.compare(o2.title, o1.title) }
             }
-
             SONG_DURATION -> album.songs.sortedWith { o1, o2 ->
                 o1.duration.compareTo(
                     o2.duration
                 )
             }
-
             else -> throw IllegalArgumentException("invalid $sortOrder")
         }
         album = album.copy(songs = songs)
         simpleSongAdapter.swapDataSet(album.songs)
     }
 
+    private fun handleBackPress(): Boolean {
+        cab?.let {
+            if (it.isActive()) {
+                it.destroy()
+                return true
+            }
+        }
+        return false
+    }
+
+    private var cab: AttachedCab? = null
+
+    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
+        cab?.let {
+            if (it.isActive()) {
+                it.destroy()
+            }
+        }
+        cab = createCab(R.id.toolbar_container) {
+            menu(menuRes)
+            closeDrawable(R.drawable.ic_close)
+            backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor()))
+            slideDown()
+            onCreate { cab, menu -> callback.onCabCreated(cab, menu) }
+            onSelection {
+                callback.onCabItemClicked(it)
+            }
+            onDestroy { callback.onCabFinished(it) }
+        }
+        return cab as AttachedCab
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsViewModel.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumDetailsViewModel.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsViewModel.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumDetailsViewModel.kt
index 261df90a6..1c371a7f8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsViewModel.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumDetailsViewModel.kt
@@ -12,13 +12,13 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.albums
+package io.github.muntashirakon.music.fragments.albums
 
 import androidx.lifecycle.*
-import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.repository.RealRepository
+import io.github.muntashirakon.music.interfaces.IMusicServiceEventListener
+import io.github.muntashirakon.music.model.Album
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.repository.RealRepository
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumsFragment.kt
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumsFragment.kt
index 1b021bdf2..646b44f02 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumsFragment.kt
@@ -12,29 +12,38 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.albums
+package io.github.muntashirakon.music.fragments.albums
 
 import android.os.Bundle
 import android.view.*
+import androidx.activity.addCallback
 import androidx.core.os.bundleOf
 import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
-import code.name.monkey.retromusic.EXTRA_ALBUM_ID
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.album.AlbumAdapter
-import code.name.monkey.retromusic.fragments.GridStyle
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewCustomGridSizeFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SortOrder.AlbumSortOrder
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
+import io.github.muntashirakon.music.EXTRA_ALBUM_ID
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.album.AlbumAdapter
+import io.github.muntashirakon.music.extensions.surfaceColor
+import io.github.muntashirakon.music.fragments.GridStyle
+import io.github.muntashirakon.music.fragments.ReloadType
+import io.github.muntashirakon.music.fragments.base.AbsRecyclerViewCustomGridSizeFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.SortOrder.AlbumSortOrder
+import io.github.muntashirakon.music.interfaces.IAlbumClickListener
+import io.github.muntashirakon.music.interfaces.ICabCallback
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RetroColorUtil
+import io.github.muntashirakon.music.util.RetroUtil
+import com.afollestad.materialcab.attached.AttachedCab
+import com.afollestad.materialcab.attached.destroy
+import com.afollestad.materialcab.attached.isActive
+import com.afollestad.materialcab.createCab
 
 class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridLayoutManager>(),
-    IAlbumClickListener {
+    IAlbumClickListener, ICabHolder {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -44,6 +53,12 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridL
             else
                 adapter?.swapDataSet(listOf())
         }
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
+            if (!handleBackPress()) {
+                remove()
+                requireActivity().onBackPressed()
+            }
+        }
     }
 
     override val titleRes: Int
@@ -76,6 +91,7 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridL
             requireActivity(),
             dataSet,
             itemLayoutRes(),
+            this,
             this
         )
     }
@@ -147,10 +163,10 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridL
         if (RetroUtil.isLandscape) {
             gridSizeItem.setTitle(R.string.action_grid_size_land)
         }
-        setUpGridSizeMenu(gridSizeItem.subMenu!!)
+        setUpGridSizeMenu(gridSizeItem.subMenu)
         val layoutItem = menu.findItem(R.id.action_layout_type)
-        setupLayoutMenu(layoutItem.subMenu!!)
-        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
+        setupLayoutMenu(layoutItem.subMenu)
+        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu)
     }
 
     private fun setUpSortOrderMenu(
@@ -329,6 +345,41 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridL
 
     override fun onPause() {
         super.onPause()
-        adapter?.actionMode?.finish()
+        if (cab.isActive()) {
+            cab.destroy()
+        }
+    }
+
+    private fun handleBackPress(): Boolean {
+        cab?.let {
+            if (it.isActive()) {
+                it.destroy()
+                return true
+            }
+        }
+        return false
+    }
+
+    private var cab: AttachedCab? = null
+
+    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
+        cab?.let {
+            println("Cab")
+            if (it.isActive()) {
+                it.destroy()
+            }
+        }
+        cab = createCab(R.id.toolbar_container) {
+            menu(menuRes)
+            closeDrawable(R.drawable.ic_close)
+            backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor()))
+            slideDown()
+            onCreate { cab, menu -> callback.onCabCreated(cab, menu) }
+            onSelection {
+                callback.onCabItemClicked(it)
+            }
+            onDestroy { callback.onCabFinished(it) }
+        }
+        return cab as AttachedCab
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/artists/AbsArtistDetailsFragment.kt
similarity index 68%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/artists/AbsArtistDetailsFragment.kt
index 7eb541485..cca577bde 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/artists/AbsArtistDetailsFragment.kt
@@ -1,12 +1,15 @@
-package code.name.monkey.retromusic.fragments.artists
+package io.github.muntashirakon.music.fragments.artists
 
+import android.app.Activity
+import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
+import android.text.Spanned
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import androidx.activity.result.PickVisualMediaRequest
+import androidx.activity.addCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.os.bundleOf
@@ -17,25 +20,29 @@ import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import code.name.monkey.retromusic.EXTRA_ALBUM_ID
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
-import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
-import code.name.monkey.retromusic.databinding.FragmentArtistDetailsBinding
-import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.SingleColorTarget
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SortOrder
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.util.*
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.EXTRA_ALBUM_ID
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.album.HorizontalAlbumAdapter
+import io.github.muntashirakon.music.adapter.song.SimpleSongAdapter
+import io.github.muntashirakon.music.databinding.FragmentArtistDetailsBinding
+import io.github.muntashirakon.music.dialogs.AddToPlaylistDialog
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsMainActivityFragment
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.SingleColorTarget
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.SortOrder
+import io.github.muntashirakon.music.interfaces.IAlbumClickListener
+import io.github.muntashirakon.music.interfaces.ICabCallback
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.repository.RealRepository
+import io.github.muntashirakon.music.util.*
+import com.afollestad.materialcab.attached.AttachedCab
+import com.afollestad.materialcab.attached.destroy
+import com.afollestad.materialcab.attached.isActive
+import com.afollestad.materialcab.createCab
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.transition.MaterialContainerTransform
 import kotlinx.coroutines.Dispatchers
@@ -45,7 +52,7 @@ import org.koin.android.ext.android.get
 import java.util.*
 
 abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_details),
-    IAlbumClickListener {
+    IAlbumClickListener, ICabHolder {
     private var _binding: FragmentArtistDetailsBinding? = null
     private val binding get() = _binding!!
 
@@ -92,19 +99,25 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
             setOnClickListener { MusicPlayerRemote.openAndShuffleQueue(artist.songs, true) }
         }
 
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
+            if (!handleBackPress()) {
+                remove()
+                requireActivity().onBackPressed()
+            }
+        }
         setupSongSortButton()
         binding.appBarLayout?.statusBarForeground =
             MaterialShapeDrawable.createWithElevationOverlay(requireContext())
     }
 
     private fun setupRecyclerView() {
-        albumAdapter = HorizontalAlbumAdapter(requireActivity(), ArrayList(), this)
+        albumAdapter = HorizontalAlbumAdapter(requireActivity(), ArrayList(), this, this)
         binding.fragmentArtistContent.albumRecyclerView.apply {
             itemAnimator = DefaultItemAnimator()
             layoutManager = GridLayoutManager(this.context, 1, GridLayoutManager.HORIZONTAL, false)
             adapter = albumAdapter
         }
-        songAdapter = SimpleSongAdapter(requireActivity(), ArrayList(), R.layout.item_song)
+        songAdapter = SimpleSongAdapter(requireActivity(), ArrayList(), R.layout.item_song, this)
         binding.fragmentArtistContent.recyclerView.apply {
             itemAnimator = DefaultItemAnimator()
             layoutManager = LinearLayoutManager(this.context)
@@ -126,10 +139,14 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
             MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(artist.songs))
         )
         val songText = resources.getQuantityString(
-            R.plurals.albumSongs, artist.songCount, artist.songCount
+            R.plurals.albumSongs,
+            artist.songCount,
+            artist.songCount
         )
         val albumText = resources.getQuantityString(
-            R.plurals.albums, artist.songCount, artist.songCount
+            R.plurals.albums,
+            artist.songCount,
+            artist.songCount
         )
         binding.fragmentArtistContent.songTitle.text = songText
         binding.fragmentArtistContent.albumTitle.text = albumText
@@ -138,8 +155,9 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
     }
 
     private fun loadArtistImage(artist: Artist) {
-        Glide.with(requireContext()).asBitmapPalette().artistImageOptions(artist)
-            .load(RetroGlideExtension.getArtistModel(artist)).dontAnimate()
+        GlideApp.with(requireContext()).asBitmapPalette().artistImageOptions(artist)
+            .load(RetroGlideExtension.getArtistModel(artist))
+            .dontAnimate()
             .into(object : SingleColorTarget(binding.image) {
                 override fun onColorReady(color: Int) {
                     setColors(color)
@@ -177,12 +195,10 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
                 MusicPlayerRemote.playNext(songs)
                 return true
             }
-
             R.id.action_add_to_current_playing -> {
                 MusicPlayerRemote.enqueue(songs)
                 return true
             }
-
             R.id.action_add_to_playlist -> {
                 lifecycleScope.launch(Dispatchers.IO) {
                     val playlists = get<RealRepository>().fetchPlaylists()
@@ -193,14 +209,13 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
                 }
                 return true
             }
-
             R.id.action_set_artist_image -> {
-                selectImageLauncher.launch(
-                    PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)
-                )
+                val intent = Intent(Intent.ACTION_GET_CONTENT)
+                intent.type = "image/*"
+                selectImageLauncher.launch(Intent.createChooser(intent,
+                    getString(R.string.pick_from_local_storage)))
                 return true
             }
-
             R.id.action_reset_artist_image -> {
                 showToast(resources.getString(R.string.updating))
                 lifecycleScope.launch {
@@ -248,19 +263,14 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
         when (savedSongSortOrder) {
             SortOrder.ArtistSongSortOrder.SONG_A_Z -> sortOrder.findItem(R.id.action_sort_order_title).isChecked =
                 true
-
             SortOrder.ArtistSongSortOrder.SONG_Z_A -> sortOrder.findItem(R.id.action_sort_order_title_desc).isChecked =
                 true
-
-            SortOrder.ArtistSongSortOrder.SONG_ALBUM -> sortOrder.findItem(R.id.action_sort_order_album).isChecked =
-                true
-
-            SortOrder.ArtistSongSortOrder.SONG_YEAR -> sortOrder.findItem(R.id.action_sort_order_year).isChecked =
-                true
-
-            SortOrder.ArtistSongSortOrder.SONG_DURATION -> sortOrder.findItem(R.id.action_sort_order_song_duration).isChecked =
-                true
-
+            SortOrder.ArtistSongSortOrder.SONG_ALBUM ->
+                sortOrder.findItem(R.id.action_sort_order_album).isChecked = true
+            SortOrder.ArtistSongSortOrder.SONG_YEAR ->
+                sortOrder.findItem(R.id.action_sort_order_year).isChecked = true
+            SortOrder.ArtistSongSortOrder.SONG_DURATION ->
+                sortOrder.findItem(R.id.action_sort_order_song_duration).isChecked = true
             else -> {
                 throw IllegalArgumentException("invalid $savedSongSortOrder")
             }
@@ -268,11 +278,14 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
     }
 
     private val selectImageLauncher =
-        registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
-            lifecycleScope.launch {
-                if (uri != null) {
-                    CustomArtistImageUtil.getInstance(requireContext())
-                        .setCustomArtistImage(artist, uri)
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                result.data?.data?.let {
+                    lifecycleScope.launch {
+                        CustomArtistImageUtil.getInstance(requireContext())
+                            .setCustomArtistImage(artist, it)
+                    }
+
                 }
             }
         }
@@ -281,6 +294,40 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
         inflater.inflate(R.menu.menu_artist_detail, menu)
     }
 
+
+    private fun handleBackPress(): Boolean {
+        cab?.let {
+            if (it.isActive()) {
+                it.destroy()
+                return true
+            }
+        }
+        return false
+    }
+
+    private var cab: AttachedCab? = null
+
+    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
+        cab?.let {
+            if (it.isActive()) {
+                it.destroy()
+            }
+        }
+        cab = createCab(R.id.toolbar_container) {
+            menu(menuRes)
+            closeDrawable(R.drawable.ic_close)
+            backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor()))
+            slideDown()
+            onCreate { cab, menu -> callback.onCabCreated(cab, menu) }
+            onSelection {
+                callback.onCabItemClicked(it)
+            }
+            onDestroy { callback.onCabFinished(it) }
+        }
+        return cab as AttachedCab
+    }
+
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AlbumArtistDetailsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/artists/AlbumArtistDetailsFragment.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/artists/AlbumArtistDetailsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/artists/AlbumArtistDetailsFragment.kt
index 3480ac15e..2cd20bbfa 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AlbumArtistDetailsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/artists/AlbumArtistDetailsFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.artists
+package io.github.muntashirakon.music.fragments.artists
 
 import androidx.navigation.fragment.navArgs
 import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistDetailsFragment.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistDetailsFragment.kt
index 6e556a24e..e187ab6b7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistDetailsFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.artists
+package io.github.muntashirakon.music.fragments.artists
 
 import androidx.navigation.fragment.navArgs
 import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsViewModel.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistDetailsViewModel.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsViewModel.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistDetailsViewModel.kt
index b89aa88df..6b57fe491 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsViewModel.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistDetailsViewModel.kt
@@ -12,12 +12,12 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.artists
+package io.github.muntashirakon.music.fragments.artists
 
 import androidx.lifecycle.*
-import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.repository.RealRepository
+import io.github.muntashirakon.music.interfaces.IMusicServiceEventListener
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.repository.RealRepository
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistsFragment.kt
similarity index 79%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistsFragment.kt
index 81d0f35f5..44ba2bd81 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistsFragment.kt
@@ -12,31 +12,40 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.artists
+package io.github.muntashirakon.music.fragments.artists
 
 import android.os.Bundle
 import android.view.*
+import androidx.activity.addCallback
 import androidx.core.os.bundleOf
 import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
-import code.name.monkey.retromusic.EXTRA_ARTIST_ID
-import code.name.monkey.retromusic.EXTRA_ARTIST_NAME
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
-import code.name.monkey.retromusic.fragments.GridStyle
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewCustomGridSizeFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SortOrder.ArtistSortOrder
-import code.name.monkey.retromusic.interfaces.IAlbumArtistClickListener
-import code.name.monkey.retromusic.interfaces.IArtistClickListener
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
+import io.github.muntashirakon.music.EXTRA_ARTIST_ID
+import io.github.muntashirakon.music.EXTRA_ARTIST_NAME
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.artist.ArtistAdapter
+import io.github.muntashirakon.music.extensions.surfaceColor
+import io.github.muntashirakon.music.fragments.GridStyle
+import io.github.muntashirakon.music.fragments.ReloadType
+import io.github.muntashirakon.music.fragments.base.AbsRecyclerViewCustomGridSizeFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.SortOrder.ArtistSortOrder
+import io.github.muntashirakon.music.interfaces.IAlbumArtistClickListener
+import io.github.muntashirakon.music.interfaces.IArtistClickListener
+import io.github.muntashirakon.music.interfaces.ICabCallback
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RetroColorUtil
+import io.github.muntashirakon.music.util.RetroUtil
+import com.afollestad.materialcab.attached.AttachedCab
+import com.afollestad.materialcab.attached.destroy
+import com.afollestad.materialcab.attached.isActive
+import com.afollestad.materialcab.createCab
 
 class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, GridLayoutManager>(),
-    IArtistClickListener, IAlbumArtistClickListener {
+    IArtistClickListener, IAlbumArtistClickListener, ICabHolder {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         libraryViewModel.getArtists().observe(viewLifecycleOwner) {
@@ -45,6 +54,12 @@ class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, Gri
             else
                 adapter?.swapDataSet(listOf())
         }
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
+            if (!handleBackPress()) {
+                remove()
+                requireActivity().onBackPressed()
+            }
+        }
     }
 
     override val titleRes: Int
@@ -82,7 +97,7 @@ class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, Gri
             dataSet,
             itemLayoutRes(),
             this,
-            this
+            this, this
         )
     }
 
@@ -158,10 +173,10 @@ class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, Gri
         if (RetroUtil.isLandscape) {
             gridSizeItem.setTitle(R.string.action_grid_size_land)
         }
-        setUpGridSizeMenu(gridSizeItem.subMenu!!)
+        setUpGridSizeMenu(gridSizeItem.subMenu)
         val layoutItem = menu.findItem(R.id.action_layout_type)
-        setupLayoutMenu(layoutItem.subMenu!!)
-        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
+        setupLayoutMenu(layoutItem.subMenu)
+        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu)
         setupAlbumArtistMenu(menu)
     }
 
@@ -328,8 +343,47 @@ class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, Gri
         return false
     }
 
+    private fun handleBackPress(): Boolean {
+        cab?.let {
+            if (it.isActive()) {
+                it.destroy()
+                return true
+            }
+        }
+        return false
+    }
+
+    private var cab: AttachedCab? = null
+
+    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
+        cab?.let {
+            if (it.isActive()) {
+                it.destroy()
+            }
+        }
+        cab = createCab(R.id.toolbar_container) {
+            menu(menuRes)
+            closeDrawable(R.drawable.ic_close)
+            backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor()))
+            slideDown()
+            onCreate { cab, menu -> callback.onCabCreated(cab, menu) }
+            onSelection {
+                callback.onCabItemClicked(it)
+            }
+            onDestroy { callback.onCabFinished(it) }
+        }
+        return cab as AttachedCab
+    }
+
     override fun onResume() {
         super.onResume()
         libraryViewModel.forceReload(ReloadType.Artists)
     }
+
+    override fun onPause() {
+        super.onPause()
+        if (cab.isActive()) {
+            cab.destroy()
+        }
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/backup/BackupFragment.kt
similarity index 85%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/backup/BackupFragment.kt
index bb4a57ecb..f0a25f4c3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/backup/BackupFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.fragments.backup
+package io.github.muntashirakon.music.fragments.backup
 
 import android.annotation.SuppressLint
 import android.content.Intent
@@ -13,16 +13,16 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.backup.BackupAdapter
-import code.name.monkey.retromusic.databinding.FragmentBackupBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.accentOutlineColor
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.helper.BackupHelper
-import code.name.monkey.retromusic.helper.sanitize
-import code.name.monkey.retromusic.util.Share
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.backup.BackupAdapter
+import io.github.muntashirakon.music.databinding.FragmentBackupBinding
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.accentOutlineColor
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.helper.BackupHelper
+import io.github.muntashirakon.music.helper.sanitize
+import io.github.muntashirakon.music.util.BackupUtil
 import com.afollestad.materialdialogs.input.input
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -128,7 +128,12 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC
                 return true
             }
             R.id.action_share -> {
-                Share.shareFile(requireContext(), file, "*/*")
+                activity?.startActivity(
+                    Intent.createChooser(
+                        BackupUtil.createShareFileIntent(file, requireContext()),
+                        null
+                    )
+                )
                 return true
             }
             R.id.action_rename -> {
@@ -154,9 +159,4 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC
         }
         return false
     }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/backup/BackupViewModel.kt
similarity index 86%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/backup/BackupViewModel.kt
index f3b67abec..a7f77f0ce 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/backup/BackupViewModel.kt
@@ -1,13 +1,13 @@
-package code.name.monkey.retromusic.fragments.backup
+package io.github.muntashirakon.music.fragments.backup
 
 import android.app.Activity
 import android.content.Intent
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.helper.BackupContent
-import code.name.monkey.retromusic.helper.BackupHelper
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.helper.BackupContent
+import io.github.muntashirakon.music.helper.BackupHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.File
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/backup/RestoreActivity.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/backup/RestoreActivity.kt
index 03cb17fb3..070b4d188 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/backup/RestoreActivity.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.fragments.backup
+package io.github.muntashirakon.music.fragments.backup
 
 import android.content.ContentResolver
 import android.net.Uri
@@ -10,14 +10,15 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
-import code.name.monkey.retromusic.databinding.ActivityRestoreBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.accentOutlineColor
-import code.name.monkey.retromusic.extensions.addAccentColor
-import code.name.monkey.retromusic.helper.BackupContent
-import code.name.monkey.retromusic.helper.BackupContent.*
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.theme.getNightMode
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.ActivityRestoreBinding
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.accentOutlineColor
+import io.github.muntashirakon.music.extensions.addAccentColor
+import io.github.muntashirakon.music.helper.BackupContent
+import io.github.muntashirakon.music.helper.BackupContent.*
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.theme.getNightMode
 import com.google.android.material.color.DynamicColors
 import com.google.android.material.color.DynamicColorsOptions
 import kotlinx.coroutines.Dispatchers
@@ -70,7 +71,7 @@ class RestoreActivity : AppCompatActivity() {
             DynamicColors.applyToActivityIfAvailable(
                 this,
                 DynamicColorsOptions.Builder()
-                    .setThemeOverlay(com.google.android.material.R.style.ThemeOverlay_Material3_DynamicColors_DayNight)
+                    .setThemeOverlay(R.style.ThemeOverlay_Material3_DynamicColors_DayNight)
                     .build()
             )
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsMainActivityFragment.kt
similarity index 76%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsMainActivityFragment.kt
index a97e96129..e7f9522b7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsMainActivityFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.base
+package io.github.muntashirakon.music.fragments.base
 
 import android.os.Bundle
 import android.view.View
@@ -20,20 +20,20 @@ import androidx.annotation.LayoutRes
 import androidx.core.view.MenuHost
 import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 abstract class AbsMainActivityFragment(@LayoutRes layout: Int) : AbsMusicServiceFragment(layout),
     MenuProvider {
-    val libraryViewModel: LibraryViewModel by activityViewModel()
+    val libraryViewModel: LibraryViewModel by sharedViewModel()
 
     val mainActivity: MainActivity
         get() = activity as MainActivity
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val menuHost: MenuHost = requireActivity() as MenuHost
+        val menuHost: MenuHost = requireActivity()
         menuHost.addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.STARTED)
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsMusicServiceFragment.kt
similarity index 89%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsMusicServiceFragment.kt
index 19dfc7b85..9526c6077 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsMusicServiceFragment.kt
@@ -12,18 +12,17 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.base
+package io.github.muntashirakon.music.fragments.base
 
 import android.content.Context
 import android.os.Bundle
 import android.view.View
-import androidx.annotation.CallSuper
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
 import androidx.navigation.navOptions
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.base.AbsMusicServiceActivity
+import io.github.muntashirakon.music.interfaces.IMusicServiceEventListener
 
 /**
  * Created by hemanths on 18/08/17.
@@ -61,13 +60,11 @@ open class AbsMusicServiceFragment(@LayoutRes layout: Int) : Fragment(layout),
         serviceActivity = null
     }
 
-    @CallSuper
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         serviceActivity?.addMusicServiceEventListener(this)
     }
 
-    @CallSuper
     override fun onDestroyView() {
         super.onDestroyView()
         serviceActivity?.removeMusicServiceEventListener(this)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsPlayerControlsFragment.kt
similarity index 66%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsPlayerControlsFragment.kt
index 52a0b124c..c130e9b6f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsPlayerControlsFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.base
+package io.github.muntashirakon.music.fragments.base
 
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
@@ -29,17 +29,17 @@ import androidx.annotation.LayoutRes
 import androidx.core.view.isVisible
 import androidx.fragment.app.commit
 import androidx.fragment.app.replace
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.MusicSeekSkipTouchListener
-import code.name.monkey.retromusic.fragments.other.VolumeFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.whichFragment
+import io.github.muntashirakon.music.fragments.MusicSeekSkipTouchListener
+import io.github.muntashirakon.music.fragments.other.VolumeFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper
+import io.github.muntashirakon.music.misc.SimpleOnSeekbarChangeListener
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 /**
  * Created by hemanths on 24/09/17.
@@ -58,11 +58,10 @@ abstract class AbsPlayerControlsFragment(@LayoutRes layout: Int) : AbsMusicServi
 
     var lastDisabledPlaybackControlsColor: Int = 0
 
-    private var isSeeking = false
+    var isSeeking = false
+        private set
 
-    open val progressSlider: Slider? = null
-
-    open val seekBar: SeekBar? = null
+    open val progressSlider: SeekBar? = null
 
     abstract val shuffleButton: ImageButton
 
@@ -79,75 +78,45 @@ abstract class AbsPlayerControlsFragment(@LayoutRes layout: Int) : AbsMusicServi
     private var progressAnimator: ObjectAnimator? = null
 
     override fun onUpdateProgressViews(progress: Int, total: Int) {
-        if (seekBar == null) {
-            progressSlider?.valueTo = total.toFloat()
+        progressSlider?.max = total
 
-            progressSlider?.value =
-                progress.toFloat().coerceIn(progressSlider?.valueFrom, progressSlider?.valueTo)
+        if (isSeeking) {
+            progressSlider?.progress = progress
         } else {
-            seekBar?.max = total
-
-            if (isSeeking) {
-                seekBar?.progress = progress
-            } else {
-                progressAnimator =
-                    ObjectAnimator.ofInt(seekBar, "progress", progress).apply {
-                        duration = SLIDER_ANIMATION_TIME
-                        interpolator = LinearInterpolator()
-                        start()
-                    }
-
+            progressAnimator = ObjectAnimator.ofInt(progressSlider, "progress", progress).apply {
+                duration = SLIDER_ANIMATION_TIME
+                interpolator = LinearInterpolator()
+                start()
             }
+
         }
         songTotalTime?.text = MusicUtil.getReadableDurationString(total.toLong())
         songCurrentProgress?.text = MusicUtil.getReadableDurationString(progress.toLong())
     }
 
     private fun setUpProgressSlider() {
-        progressSlider?.addOnChangeListener(Slider.OnChangeListener { _, value, fromUser ->
-            onProgressChange(value.toInt(), fromUser)
-        })
-        progressSlider?.addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
-            override fun onStartTrackingTouch(slider: Slider) {
-                onStartTrackingTouch()
+        progressSlider?.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    onUpdateProgressViews(
+                        progress,
+                        MusicPlayerRemote.songDurationMillis
+                    )
+                }
             }
 
-            override fun onStopTrackingTouch(slider: Slider) {
-                onStopTrackingTouch(slider.value.toInt())
+            override fun onStartTrackingTouch(seekBar: SeekBar) {
+                isSeeking = true
+                progressViewUpdateHelper.stop()
+                progressAnimator?.cancel()
+            }
+
+            override fun onStopTrackingTouch(seekBar: SeekBar) {
+                isSeeking = false
+                MusicPlayerRemote.seekTo(seekBar.progress)
+                progressViewUpdateHelper.start()
             }
         })
-
-        seekBar?.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                onProgressChange(progress, fromUser)
-            }
-
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {
-                onStartTrackingTouch()
-            }
-
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {
-                onStopTrackingTouch(seekBar?.progress ?: 0)
-            }
-        })
-    }
-
-    private fun onProgressChange(value: Int, fromUser: Boolean) {
-        if (fromUser) {
-            onUpdateProgressViews(value, MusicPlayerRemote.songDurationMillis)
-        }
-    }
-
-    private fun onStartTrackingTouch() {
-        isSeeking = true
-        progressViewUpdateHelper.stop()
-        progressAnimator?.cancel()
-    }
-
-    private fun onStopTrackingTouch(value: Int) {
-        isSeeking = false
-        MusicPlayerRemote.seekTo(value)
-        progressViewUpdateHelper.start()
     }
 
     private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
@@ -155,11 +124,6 @@ abstract class AbsPlayerControlsFragment(@LayoutRes layout: Int) : AbsMusicServi
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
-        if (PreferenceUtil.circlePlayButton) {
-            requireContext().theme.applyStyle(R.style.CircleFABOverlay, true)
-        } else {
-            requireContext().theme.applyStyle(R.style.RoundedFABOverlay, true)
-        }
     }
 
     fun View.showBounceAnimation() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsPlayerFragment.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsPlayerFragment.kt
index 6a72de41e..2aead8432 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsPlayerFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.base
+package io.github.muntashirakon.music.fragments.base
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -37,46 +37,41 @@ import androidx.navigation.findNavController
 import androidx.navigation.navOptions
 import androidx.viewpager.widget.ViewPager
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.EXTRA_ALBUM_ID
-import code.name.monkey.retromusic.EXTRA_ARTIST_ID
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
-import code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.toSongEntity
-import code.name.monkey.retromusic.dialogs.*
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.dialogs.*
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.NowPlayingScreen
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.IPaletteColorHolder
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.NavigationUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RingtoneManager
+import io.github.muntashirakon.music.EXTRA_ALBUM_ID
+import io.github.muntashirakon.music.EXTRA_ARTIST_ID
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.activities.tageditor.AbsTagEditorActivity
+import io.github.muntashirakon.music.activities.tageditor.SongTagEditorActivity
+import io.github.muntashirakon.music.db.PlaylistEntity
+import io.github.muntashirakon.music.db.toSongEntity
+import io.github.muntashirakon.music.dialogs.*
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.fragments.NowPlayingScreen
+import io.github.muntashirakon.music.fragments.ReloadType
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.interfaces.IPaletteColorHolder
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.repository.RealRepository
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.util.NavigationUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RingtoneManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.get
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import kotlin.math.abs
 
 abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragment(layout),
     Toolbar.OnMenuItemClickListener, IPaletteColorHolder, PlayerAlbumCoverFragment.Callbacks {
 
-    val libraryViewModel: LibraryViewModel by activityViewModel()
+    val libraryViewModel: LibraryViewModel by sharedViewModel()
 
     val mainActivity: MainActivity
         get() = activity as MainActivity
@@ -92,7 +87,6 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
                 PlaybackSpeedDialog.newInstance().show(childFragmentManager, "PLAYBACK_SETTINGS")
                 return true
             }
-
             R.id.action_toggle_lyrics -> {
                 PreferenceUtil.showLyrics = !PreferenceUtil.showLyrics
                 showLyricsIcon(item)
@@ -103,32 +97,26 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
                 }
                 return true
             }
-
             R.id.action_go_to_lyrics -> {
                 goToLyrics(requireActivity())
                 return true
             }
-
             R.id.action_toggle_favorite -> {
                 toggleFavorite(song)
                 return true
             }
-
             R.id.action_share -> {
                 SongShareDialog.create(song).show(childFragmentManager, "SHARE_SONG")
                 return true
             }
-
             R.id.action_go_to_drive_mode -> {
                 NavigationUtil.gotoDriveMode(requireActivity())
                 return true
             }
-
             R.id.action_delete_from_device -> {
                 DeleteSongsDialog.create(song).show(childFragmentManager, "DELETE_SONGS")
                 return true
             }
-
             R.id.action_add_to_playlist -> {
                 lifecycleScope.launch(IO) {
                     val playlists = get<RealRepository>().fetchPlaylists()
@@ -139,30 +127,25 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
                 }
                 return true
             }
-
             R.id.action_clear_playing_queue -> {
                 MusicPlayerRemote.clearQueue()
                 return true
             }
-
             R.id.action_save_playing_queue -> {
                 CreatePlaylistDialog.create(ArrayList(MusicPlayerRemote.playingQueue))
                     .show(childFragmentManager, "ADD_TO_PLAYLIST")
                 return true
             }
-
             R.id.action_tag_editor -> {
                 val intent = Intent(activity, SongTagEditorActivity::class.java)
                 intent.putExtra(AbsTagEditorActivity.EXTRA_ID, song.id)
                 startActivity(intent)
                 return true
             }
-
             R.id.action_details -> {
                 SongDetailDialog.create(song).show(childFragmentManager, "SONG_DETAIL")
                 return true
             }
-
             R.id.action_go_to_album -> {
                 //Hide Bottom Bar First, else Bottom Sheet doesn't collapse fully
                 mainActivity.setBottomNavVisibility(false)
@@ -173,37 +156,29 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
                 )
                 return true
             }
-
             R.id.action_go_to_artist -> {
                 goToArtist(requireActivity())
                 return true
             }
-
             R.id.now_playing -> {
                 requireActivity().findNavController(R.id.fragment_container).navigate(
                     R.id.playing_queue_fragment,
-                    null,
-                    navOptions { launchSingleTop = true }
+                    null
                 )
-                mainActivity.collapsePanel()
                 return true
             }
-
             R.id.action_show_lyrics -> {
                 goToLyrics(requireActivity())
                 return true
             }
-
             R.id.action_equalizer -> {
                 NavigationUtil.openEqualizer(requireActivity())
                 return true
             }
-
             R.id.action_sleep_timer -> {
                 SleepTimerDialog().show(parentFragmentManager, "SLEEP_TIMER")
                 return true
             }
-
             R.id.action_set_as_ringtone -> {
                 requireContext().run {
                     if (RingtoneManager.requiresDialog(this)) {
@@ -215,7 +190,6 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
 
                 return true
             }
-
             R.id.action_go_to_genre -> {
                 val retriever = MediaMetadataRetriever()
                 val trackUri =
@@ -253,6 +227,8 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
 
     abstract fun onHide()
 
+    abstract fun onBackPressed(): Boolean
+
     abstract fun toolbarIconColor(): Int
 
     override fun onServiceConnected() {
@@ -313,15 +289,6 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
         }
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        if (PreferenceUtil.circlePlayButton) {
-            requireContext().theme.applyStyle(R.style.CircleFABOverlay, true)
-        } else {
-            requireContext().theme.applyStyle(R.style.RoundedFABOverlay, true)
-        }
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         if (PreferenceUtil.isFullScreenMode &&
@@ -349,15 +316,7 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
                 showLyricsIcon(this)
             }
         }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        addSwipeDetector()
-    }
-
-    fun addSwipeDetector() {
-        view?.setOnTouchListener(
+        requireView().setOnTouchListener(
             if (PreferenceUtil.swipeAnywhereToChangeSong) {
                 SwipeDetector(
                     requireContext(),
@@ -374,8 +333,8 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
             context,
             object : GestureDetector.SimpleOnGestureListener() {
                 override fun onScroll(
-                    e1: MotionEvent,
-                    e2: MotionEvent,
+                    e1: MotionEvent?,
+                    e2: MotionEvent?,
                     distanceX: Float,
                     distanceY: Float,
                 ): Boolean {
@@ -385,7 +344,6 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
                             view.parent.requestDisallowInterceptTouchEvent(true)
                             true
                         }
-
                         else -> {
                             false
                         }
@@ -394,7 +352,7 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
             })
 
         @SuppressLint("ClickableViewAccessibility")
-        override fun onTouch(v: View, event: MotionEvent): Boolean {
+        override fun onTouch(v: View, event: MotionEvent?): Boolean {
             viewPager?.dispatchTouchEvent(event)
             return flingPlayBackController.onTouchEvent(event)
         }
@@ -423,7 +381,9 @@ fun goToArtist(activity: Activity) {
 
         findNavController(R.id.fragment_container).navigate(
             R.id.artistDetailsFragment,
-            bundleOf(EXTRA_ARTIST_ID to song.artistId)
+            bundleOf(EXTRA_ARTIST_ID to song.artistId),
+            null,
+            null
         )
     }
 }
@@ -442,7 +402,9 @@ fun goToAlbum(activity: Activity) {
 
         findNavController(R.id.fragment_container).navigate(
             R.id.albumDetailsFragment,
-            bundleOf(EXTRA_ALBUM_ID to song.albumId)
+            bundleOf(EXTRA_ALBUM_ID to song.albumId),
+            null,
+            null
         )
     }
 }
@@ -459,7 +421,8 @@ fun goToLyrics(activity: Activity) {
         findNavController(R.id.fragment_container).navigate(
             R.id.lyrics_fragment,
             null,
-            navOptions { launchSingleTop = true }
+            navOptions { launchSingleTop = true },
+            null
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt
index 86fd7296f..ae5a7816b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt
@@ -12,14 +12,13 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.base
+package io.github.muntashirakon.music.fragments.base
 
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.TransitionManager
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.util.RetroUtil
-import code.name.monkey.retromusic.util.logD
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.util.RetroUtil
 import com.google.android.material.transition.MaterialFade
 
 abstract class AbsRecyclerViewCustomGridSizeFragment<A : RecyclerView.Adapter<*>, LM : RecyclerView.LayoutManager> :
@@ -74,7 +73,7 @@ abstract class AbsRecyclerViewCustomGridSizeFragment<A : RecyclerView.Adapter<*>
 
     fun setAndSaveSortOrder(sortOrder: String) {
         this.sortOrder = sortOrder
-        logD(sortOrder)
+        println(sortOrder)
         saveSortOrder(sortOrder)
         setSortOrder(sortOrder)
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsRecyclerViewFragment.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsRecyclerViewFragment.kt
index 80089a097..16926e959 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsRecyclerViewFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.base
+package io.github.muntashirakon.music.fragments.base
 
 import android.os.Bundle
 import android.view.*
@@ -26,16 +26,16 @@ import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.databinding.FragmentMainRecyclerBinding
-import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog
-import code.name.monkey.retromusic.dialogs.ImportPlaylistDialog
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.dip
-import code.name.monkey.retromusic.interfaces.IScrollHelper
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ThemedFastScroller.create
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentMainRecyclerBinding
+import io.github.muntashirakon.music.dialogs.CreatePlaylistDialog
+import io.github.muntashirakon.music.dialogs.ImportPlaylistDialog
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.dip
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.interfaces.IScrollHelper
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.ThemedFastScroller.create
 import com.google.android.material.transition.MaterialFadeThrough
 import me.zhanghai.android.fastscroll.FastScroller
 import me.zhanghai.android.fastscroll.FastScrollerBuilder
@@ -61,7 +61,6 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
         mainActivity.supportActionBar?.title = null
         initLayoutManager()
         initAdapter()
-        checkForMargins()
         setUpRecyclerView()
         setupToolbar()
         binding.shuffleButton.fitsSystemWindows = PreferenceUtil.isFullScreenMode
@@ -119,6 +118,7 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
             adapter = this@AbsRecyclerViewFragment.adapter
             create(this)
         }
+        checkForPadding()
     }
 
     protected open fun createFastScroller(recyclerView: RecyclerView): FastScroller {
@@ -131,6 +131,7 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
             override fun onChanged() {
                 super.onChanged()
                 checkIsEmpty()
+                checkForPadding()
             }
         })
     }
@@ -147,12 +148,16 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
         binding.empty.isVisible = adapter!!.itemCount == 0
     }
 
-    private fun checkForMargins() {
-        if (mainActivity.isBottomNavVisible) {
-            binding.recyclerView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                bottomMargin = dip(R.dimen.bottom_nav_height)
+    private fun checkForPadding() {
+        val itemCount: Int = adapter?.itemCount ?: 0
+
+        binding.recyclerView.updatePadding(
+            bottom = if (itemCount > 0 && MusicPlayerRemote.playingQueue.isNotEmpty()) {
+                dip(R.dimen.mini_player_height_expanded)
+            } else {
+                dip(R.dimen.bottom_nav_height)
             }
-        }
+        )
     }
 
     private fun initLayoutManager() {
@@ -164,6 +169,16 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
     @NonNull
     protected abstract fun createAdapter(): A
 
+    override fun onQueueChanged() {
+        super.onQueueChanged()
+        checkForPadding()
+    }
+
+    override fun onServiceConnected() {
+        super.onServiceConnected()
+        checkForPadding()
+    }
+
     protected fun invalidateLayoutManager() {
         initLayoutManager()
         binding.recyclerView.layoutManager = layoutManager
@@ -201,7 +216,7 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
     override fun onMenuItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_settings -> findNavController().navigate(
-                R.id.settings_fragment,
+                R.id.settingsActivity,
                 null,
                 navOptions
             )
@@ -217,18 +232,8 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
         return false
     }
 
-    override fun onResume() {
-        super.onResume()
-        checkForMargins()
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }
-
-    override fun onPause() {
-        super.onPause()
-        (adapter as? AbsMultiSelectAdapter<*, *>)?.actionMode?.finish()
-    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/folder/FoldersFragment.kt
similarity index 78%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/folder/FoldersFragment.kt
index f57aa8863..1532d670a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/folder/FoldersFragment.kt
@@ -11,21 +11,21 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.fragments.folder
+package io.github.muntashirakon.music.fragments.folder
 
 import android.content.Context
 import android.media.MediaScannerConnection
 import android.os.Bundle
 import android.os.Environment
-import android.view.*
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
 import android.webkit.MimeTypeMap
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.widget.PopupMenu
-import androidx.appcompat.widget.Toolbar
-import androidx.core.os.BundleCompat
 import androidx.core.text.parseAsHtml
 import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
 import androidx.loader.app.LoaderManager
 import androidx.loader.content.Loader
@@ -35,36 +35,38 @@ import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore.Companion.accentColor
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.SongFileAdapter
-import code.name.monkey.retromusic.adapter.Storage
-import code.name.monkey.retromusic.adapter.StorageAdapter
-import code.name.monkey.retromusic.adapter.StorageClickListener
-import code.name.monkey.retromusic.databinding.FragmentFolderBinding
-import code.name.monkey.retromusic.extensions.dip
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.extensions.textColorPrimary
-import code.name.monkey.retromusic.extensions.textColorSecondary
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote.openQueue
-import code.name.monkey.retromusic.helper.menu.SongMenuHelper
-import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.ICallbacks
-import code.name.monkey.retromusic.interfaces.IMainActivityFragmentCallbacks
-import code.name.monkey.retromusic.interfaces.IScrollHelper
-import code.name.monkey.retromusic.misc.UpdateToastMediaScannerCompletionListener
-import code.name.monkey.retromusic.misc.WrappedAsyncTaskLoader
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.providers.BlacklistStore
-import code.name.monkey.retromusic.util.FileUtil
-import code.name.monkey.retromusic.util.PreferenceUtil.startDirectory
-import code.name.monkey.retromusic.util.ThemedFastScroller.create
-import code.name.monkey.retromusic.util.getExternalStorageDirectory
-import code.name.monkey.retromusic.util.getExternalStoragePublicDirectory
-import code.name.monkey.retromusic.views.BreadCrumbLayout
-import code.name.monkey.retromusic.views.BreadCrumbLayout.Crumb
-import code.name.monkey.retromusic.views.BreadCrumbLayout.SelectionCallback
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.SongFileAdapter
+import io.github.muntashirakon.music.adapter.Storage
+import io.github.muntashirakon.music.adapter.StorageAdapter
+import io.github.muntashirakon.music.adapter.StorageClickListener
+import io.github.muntashirakon.music.databinding.FragmentFolderBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsMainActivityFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote.openQueue
+import io.github.muntashirakon.music.helper.MusicPlayerRemote.playingQueue
+import io.github.muntashirakon.music.helper.menu.SongsMenuHelper
+import io.github.muntashirakon.music.interfaces.ICabCallback
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.interfaces.ICallbacks
+import io.github.muntashirakon.music.interfaces.IMainActivityFragmentCallbacks
+import io.github.muntashirakon.music.misc.UpdateToastMediaScannerCompletionListener
+import io.github.muntashirakon.music.misc.WrappedAsyncTaskLoader
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.providers.BlacklistStore
+import io.github.muntashirakon.music.util.FileUtil
+import io.github.muntashirakon.music.util.PreferenceUtil.startDirectory
+import io.github.muntashirakon.music.util.RetroColorUtil
+import io.github.muntashirakon.music.util.ThemedFastScroller.create
+import io.github.muntashirakon.music.util.getExternalStorageDirectory
+import io.github.muntashirakon.music.util.getExternalStoragePublicDirectory
+import io.github.muntashirakon.music.views.BreadCrumbLayout.Crumb
+import io.github.muntashirakon.music.views.BreadCrumbLayout.SelectionCallback
+import com.afollestad.materialcab.attached.AttachedCab
+import com.afollestad.materialcab.attached.destroy
+import com.afollestad.materialcab.attached.isActive
+import com.afollestad.materialcab.createCab
+import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.transition.MaterialFadeThrough
 import kotlinx.coroutines.Dispatchers
@@ -77,15 +79,13 @@ import java.lang.ref.WeakReference
 import java.util.*
 
 class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
-    IMainActivityFragmentCallbacks, SelectionCallback, ICallbacks,
-    LoaderManager.LoaderCallbacks<List<File>>, StorageClickListener, IScrollHelper {
+    IMainActivityFragmentCallbacks, ICabHolder, SelectionCallback, ICallbacks,
+    LoaderManager.LoaderCallbacks<List<File>>, StorageClickListener {
     private var _binding: FragmentFolderBinding? = null
     private val binding get() = _binding!!
-
-    val toolbar: Toolbar get() = binding.appBarLayout.toolbar
-
     private var adapter: SongFileAdapter? = null
     private var storageAdapter: StorageAdapter? = null
+    private var cab: AttachedCab? = null
     private val fileComparator = Comparator { lhs: File, rhs: File ->
         if (lhs.isDirectory && !rhs.isDirectory) {
             return@Comparator -1
@@ -98,16 +98,14 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
     private var storageItems = ArrayList<Storage>()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
         _binding = FragmentFolderBinding.bind(view)
         mainActivity.addMusicServiceEventListener(libraryViewModel)
-        mainActivity.setSupportActionBar(toolbar)
+        mainActivity.setSupportActionBar(binding.toolbar)
         mainActivity.supportActionBar?.title = null
         enterTransition = MaterialFadeThrough()
         reenterTransition = MaterialFadeThrough()
 
         setUpBreadCrumbs()
-        checkForMargins()
         setUpRecyclerView()
         setUpAdapter()
         setUpTitle()
@@ -117,10 +115,24 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                 override fun handleOnBackPressed() {
                     if (!handleBackPress()) {
                         remove()
-                        requireActivity().onBackPressedDispatcher.onBackPressed()
+                        requireActivity().onBackPressed()
                     }
                 }
             })
+        binding.toolbarContainer.drawNextToNavbar()
+        binding.appBarLayout.statusBarForeground =
+            MaterialShapeDrawable.createWithElevationOverlay(requireContext())
+    }
+
+    private fun setUpTitle() {
+        binding.toolbar.setNavigationOnClickListener {
+            findNavController().navigate(R.id.action_search, null, navOptions)
+        }
+        binding.appNameText.text = resources.getString(R.string.folders)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         if (savedInstanceState == null) {
             switchToFileAdapter()
             setCrumb(
@@ -130,38 +142,24 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                 true
             )
         } else {
-            binding.breadCrumbs.restoreFromStateWrapper(
-                BundleCompat.getParcelable(
-                    savedInstanceState,
-                    CRUMBS,
-                    BreadCrumbLayout.SavedStateWrapper::class.java
-                )
-            )
+            binding.breadCrumbs.restoreFromStateWrapper(savedInstanceState.getParcelable(CRUMBS))
             LoaderManager.getInstance(this).initLoader(LOADER_ID, null, this)
         }
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        if (_binding != null) {
-            outState.putParcelable(CRUMBS, binding.breadCrumbs.stateWrapper)
-        }
-    }
-
-    private fun setUpTitle() {
-        toolbar.setNavigationOnClickListener {
-            findNavController().navigate(R.id.action_search, null, navOptions)
-        }
-        binding.appBarLayout.title = resources.getString(R.string.folders)
-    }
-
     override fun onPause() {
         super.onPause()
         saveScrollPosition()
-        adapter?.actionMode?.finish()
+        if (cab.isActive()) {
+            cab.destroy()
+        }
     }
 
     override fun handleBackPress(): Boolean {
+        if (cab != null && cab!!.isActive()) {
+            cab?.destroy()
+            return true
+        }
         if (binding.breadCrumbs.popHistory()) {
             setCrumb(binding.breadCrumbs.lastHistory(), false)
             return true
@@ -187,7 +185,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                         lifecycleScope.launch(Dispatchers.IO) {
                             listSongs(
                                 requireContext(),
-                                listOf(file),
+                                toList(file),
                                 AUDIO_FILE_FILTER,
                                 fileComparator
                             ) { songs ->
@@ -200,12 +198,10 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                         }
                         return@setOnMenuItemClickListener true
                     }
-
                     R.id.action_add_to_blacklist -> {
                         BlacklistStore.getInstance(requireContext()).addPath(file)
                         return@setOnMenuItemClickListener true
                     }
-
                     R.id.action_set_as_start_directory -> {
                         startDirectory = file
                         showToast(
@@ -213,7 +209,6 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                         )
                         return@setOnMenuItemClickListener true
                     }
-
                     R.id.action_scan -> {
                         lifecycleScope.launch {
                             listPaths(file, AUDIO_FILE_FILTER) { paths -> scanPaths(paths) }
@@ -231,21 +226,19 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                         lifecycleScope.launch(Dispatchers.IO) {
                             listSongs(
                                 requireContext(),
-                                listOf(file),
+                                toList(file),
                                 AUDIO_FILE_FILTER,
                                 fileComparator
                             ) { songs ->
                                 if (songs.isNotEmpty()) {
-                                    val song = songs.first()
-                                    SongMenuHelper.handleMenuClick(
-                                        requireActivity(), song, itemId
+                                    SongsMenuHelper.handleMenuClick(
+                                        requireActivity(), songs, itemId
                                     )
                                 }
                             }
                         }
                         return@setOnMenuItemClickListener true
                     }
-
                     R.id.action_scan -> {
                         lifecycleScope.launch {
                             listPaths(file, AUDIO_FILE_FILTER) { paths -> scanPaths(paths) }
@@ -271,7 +264,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
             lifecycleScope.launch(Dispatchers.IO) {
                 listSongs(
                     requireContext(),
-                    listOf(mFile.parentFile),
+                    toList(mFile.parentFile),
                     fileFilter,
                     fileComparator
                 ) { songs ->
@@ -339,7 +332,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
     }
 
     override fun onPrepareMenu(menu: Menu) {
-        ToolbarContentTintHelper.handleOnPrepareOptionsMenu(requireActivity(), toolbar)
+        ToolbarContentTintHelper.handleOnPrepareOptionsMenu(requireActivity(), binding.toolbar)
     }
 
     override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
@@ -353,8 +346,8 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
         menu.removeItem(R.id.action_layout_type)
         menu.removeItem(R.id.action_sort_order)
         ToolbarContentTintHelper.handleOnCreateOptionsMenu(
-            requireContext(), toolbar, menu, ATHToolbarActivity.getToolbarBackgroundColor(
-                toolbar
+            requireContext(), binding.toolbar, menu, ATHToolbarActivity.getToolbarBackgroundColor(
+                binding.toolbar
             )
         )
     }
@@ -370,7 +363,6 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                 )
                 return true
             }
-
             R.id.action_scan -> {
                 val crumb = activeCrumb
                 if (crumb != null) {
@@ -380,10 +372,9 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                 }
                 return true
             }
-
             R.id.action_settings -> {
                 findNavController().navigate(
-                    R.id.settings_fragment,
+                    R.id.settingsActivity,
                     null,
                     navOptions
                 )
@@ -393,16 +384,41 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
         return false
     }
 
-    override fun onResume() {
-        super.onResume()
-        checkForMargins()
+    override fun onQueueChanged() {
+        super.onQueueChanged()
+        checkForPadding()
     }
 
-    private fun checkForMargins() {
-        if (mainActivity.isBottomNavVisible) {
-            binding.recyclerView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                bottomMargin = dip(R.dimen.bottom_nav_height)
+    override fun onServiceConnected() {
+        super.onServiceConnected()
+        checkForPadding()
+    }
+
+    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
+        if (cab != null && cab!!.isActive()) {
+            cab?.destroy()
+        }
+        cab = createCab(R.id.toolbar_container) {
+            menu(menuRes)
+            closeDrawable(R.drawable.ic_close)
+            backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor()))
+            slideDown()
+            onCreate { cab, menu -> callback.onCabCreated(cab, menu) }
+            onSelection {
+                callback.onCabItemClicked(it)
             }
+            onDestroy { callback.onCabFinished(it) }
+        }
+        return cab as AttachedCab
+    }
+
+    private fun checkForPadding() {
+        val count = adapter?.itemCount ?: 0
+        if (_binding != null) {
+            binding.recyclerView.updatePadding(
+                bottom = if (count > 0 && playingQueue.isNotEmpty()) dip(R.dimen.mini_player_height_expanded)
+                else dip(R.dimen.mini_player_height)
+            )
         }
     }
 
@@ -423,11 +439,13 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
     }
 
     private fun saveScrollPosition() {
-        activeCrumb?.scrollPosition =
-            (binding.recyclerView.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition()
+        val crumb = activeCrumb
+        if (crumb != null) {
+            crumb.scrollPosition =
+                (binding.recyclerView.layoutManager as LinearLayoutManager?)!!.findFirstVisibleItemPosition()
+        }
     }
 
-
     private fun scanPaths(toBeScanned: Array<String?>) {
         if (activity == null) {
             return
@@ -477,18 +495,24 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
     }
 
     private fun setUpRecyclerView() {
-        binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
+        binding.recyclerView.layoutManager = LinearLayoutManager(activity)
         create(
             binding.recyclerView
         )
     }
 
+    private fun toList(file: File): ArrayList<File> {
+        val files = ArrayList<File>(1)
+        files.add(file)
+        return files
+    }
+
     private fun updateAdapter(files: List<File>) {
         adapter?.swapDataSet(files)
         val crumb = activeCrumb
         if (crumb != null) {
-            (binding.recyclerView.layoutManager as LinearLayoutManager)
-                .scrollToPositionWithOffset(crumb.scrollPosition, 0)
+            (binding.recyclerView.layoutManager as LinearLayoutManager?)
+                ?.scrollToPositionWithOffset(crumb.scrollPosition, 0)
         }
     }
 
@@ -500,7 +524,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
     private suspend fun listPaths(
         file: File,
         fileFilter: FileFilter,
-        doOnPathListed: (paths: Array<String?>) -> Unit,
+        doOnPathListed: (paths: Array<String?>) -> Unit
     ) {
         val paths = try {
             val paths: Array<String?>
@@ -552,12 +576,12 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
         }
     }
 
-    private suspend fun listSongs(
+    suspend fun listSongs(
         context: Context,
-        files: List<File?>,
+        files: List<File>,
         fileFilter: FileFilter,
         fileComparator: Comparator<File>,
-        doOnSongsListed: (songs: List<Song>) -> Unit,
+        doOnSongsListed: (songs: List<Song>) -> Unit
     ) {
         val songs = try {
             val fileList = FileUtil.listFilesDeep(files, fileFilter)
@@ -582,18 +606,14 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
         )
     }
 
-    override fun scrollToTop() {
-        binding.recyclerView.scrollToPosition(0)
-        binding.appBarLayout.setExpanded(true, true)
-    }
-
     private fun switchToFileAdapter() {
-        adapter = SongFileAdapter(mainActivity, LinkedList(), R.layout.item_list, this)
+        adapter = SongFileAdapter(mainActivity, LinkedList(), R.layout.item_list, this, this)
         adapter!!.registerAdapterDataObserver(
             object : RecyclerView.AdapterDataObserver() {
                 override fun onChanged() {
                     super.onChanged()
                     checkIsEmpty()
+                    checkForPadding()
                 }
             })
         binding.recyclerView.adapter = adapter
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenreDetailsFragment.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenreDetailsFragment.kt
index 65d4e8594..0372b8649 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenreDetailsFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.genres
+package io.github.muntashirakon.music.fragments.genres
 
 import android.os.Bundle
 import android.view.Menu
@@ -25,14 +25,14 @@ import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.song.SongAdapter
-import code.name.monkey.retromusic.databinding.FragmentPlaylistDetailBinding
-import code.name.monkey.retromusic.extensions.dipToPix
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.helper.menu.GenreMenuHelper
-import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.song.SongAdapter
+import io.github.muntashirakon.music.databinding.FragmentPlaylistDetailBinding
+import io.github.muntashirakon.music.extensions.dipToPix
+import io.github.muntashirakon.music.fragments.base.AbsMainActivityFragment
+import io.github.muntashirakon.music.helper.menu.GenreMenuHelper
+import io.github.muntashirakon.music.model.Genre
+import io.github.muntashirakon.music.model.Song
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.transition.MaterialSharedAxis
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -71,7 +71,7 @@ class GenreDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playlist_
     }
 
     private fun setupRecyclerView() {
-        songAdapter = SongAdapter(requireActivity(), ArrayList(), R.layout.item_list)
+        songAdapter = SongAdapter(requireActivity(), ArrayList(), R.layout.item_list, null)
         binding.recyclerView.apply {
             itemAnimator = DefaultItemAnimator()
             layoutManager = LinearLayoutManager(requireContext())
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsViewModel.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenreDetailsViewModel.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsViewModel.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenreDetailsViewModel.kt
index cc6918b2c..33abd8f19 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsViewModel.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenreDetailsViewModel.kt
@@ -12,16 +12,16 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.genres
+package io.github.muntashirakon.music.fragments.genres
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
-import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.RealRepository
+import io.github.muntashirakon.music.interfaces.IMusicServiceEventListener
+import io.github.muntashirakon.music.model.Genre
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.repository.RealRepository
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenresFragment.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenresFragment.kt
index e581d7b26..b428db4b1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenresFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.genres
+package io.github.muntashirakon.music.fragments.genres
 
 import android.os.Bundle
 import android.view.Menu
@@ -23,14 +23,14 @@ import androidx.core.os.bundleOf
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import code.name.monkey.retromusic.EXTRA_GENRE
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.GenreAdapter
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewFragment
-import code.name.monkey.retromusic.interfaces.IGenreClickListener
-import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.util.RetroUtil
+import io.github.muntashirakon.music.EXTRA_GENRE
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.GenreAdapter
+import io.github.muntashirakon.music.fragments.ReloadType
+import io.github.muntashirakon.music.fragments.base.AbsRecyclerViewFragment
+import io.github.muntashirakon.music.interfaces.IGenreClickListener
+import io.github.muntashirakon.music.model.Genre
+import io.github.muntashirakon.music.util.RetroUtil
 import com.google.android.material.transition.MaterialSharedAxis
 
 class
@@ -73,7 +73,6 @@ GenresFragment : AbsRecyclerViewFragment<GenreAdapter, LinearLayoutManager>(),
     }
 
 
-
     override val titleRes: Int
         get() = R.string.genres
 
@@ -98,7 +97,9 @@ GenresFragment : AbsRecyclerViewFragment<GenreAdapter, LinearLayoutManager>(),
         reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
         findNavController().navigate(
             R.id.genreDetailsFragment,
-            bundleOf(EXTRA_GENRE to genre)
+            bundleOf(EXTRA_GENRE to genre),
+            null,
+            null
         )
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeBinding.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/home/HomeBinding.kt
similarity index 79%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeBinding.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/home/HomeBinding.kt
index 6970148a3..a74d5727d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeBinding.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/home/HomeBinding.kt
@@ -1,6 +1,6 @@
-package code.name.monkey.retromusic.fragments.home
+package io.github.muntashirakon.music.fragments.home
 
-import code.name.monkey.retromusic.databinding.FragmentHomeBinding
+import io.github.muntashirakon.music.databinding.FragmentHomeBinding
 
 class HomeBinding(
     homeBinding: FragmentHomeBinding
@@ -9,7 +9,7 @@ class HomeBinding(
     val container = homeBinding.container
     val contentContainer = homeBinding.contentContainer
     val appBarLayout = homeBinding.appBarLayout
-    val toolbar = homeBinding.appBarLayout.toolbar
+    val toolbar = homeBinding.toolbar
     val bannerImage = homeBinding.imageLayout.bannerImage
     val userImage = homeBinding.imageLayout.userImage
     val lastAdded = homeBinding.homeContent.absPlaylists.lastAdded
@@ -18,5 +18,6 @@ class HomeBinding(
     val history = homeBinding.homeContent.absPlaylists.history
     val recyclerView = homeBinding.homeContent.recyclerView
     val titleWelcome = homeBinding.imageLayout.titleWelcome
+    val appNameText = homeBinding.appNameText
     val suggestions = homeBinding.homeContent.suggestions
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/home/HomeFragment.kt
similarity index 81%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/home/HomeFragment.kt
index 3942692ec..a2b67e3e0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/home/HomeFragment.kt
@@ -12,43 +12,42 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.home
+package io.github.muntashirakon.music.fragments.home
 
 import android.os.Bundle
-import android.view.*
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import android.view.MenuItem.SHOW_AS_ACTION_IF_ROOM
+import android.view.View
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.os.bundleOf
 import androidx.core.view.doOnLayout
 import androidx.core.view.doOnPreDraw
 import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
 import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.adapter.HomeAdapter
-import code.name.monkey.retromusic.databinding.FragmentHomeBinding
-import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog
-import code.name.monkey.retromusic.dialogs.ImportPlaylistDialog
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.dip
-import code.name.monkey.retromusic.extensions.elevatedAccentColor
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.profileBannerOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.userProfileOptions
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.IScrollHelper
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.PreferenceUtil.userName
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.*
+import io.github.muntashirakon.music.adapter.HomeAdapter
+import io.github.muntashirakon.music.databinding.FragmentHomeBinding
+import io.github.muntashirakon.music.dialogs.CreatePlaylistDialog
+import io.github.muntashirakon.music.dialogs.ImportPlaylistDialog
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.drawNextToNavbar
+import io.github.muntashirakon.music.extensions.elevatedAccentColor
+import io.github.muntashirakon.music.fragments.ReloadType
+import io.github.muntashirakon.music.fragments.base.AbsMainActivityFragment
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.interfaces.IScrollHelper
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.PreferenceUtil.userName
+import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.transition.MaterialFadeThrough
 import com.google.android.material.transition.MaterialSharedAxis
 
@@ -70,8 +69,6 @@ class HomeFragment :
         enterTransition = MaterialFadeThrough().addTarget(binding.contentContainer)
         reenterTransition = MaterialFadeThrough().addTarget(binding.contentContainer)
 
-        checkForMargins()
-
         val homeAdapter = HomeAdapter(mainActivity)
         binding.recyclerView.apply {
             layoutManager = LinearLayoutManager(mainActivity)
@@ -89,6 +86,9 @@ class HomeFragment :
         colorButtons()
         postponeEnterTransition()
         view.doOnPreDraw { startPostponedEnterTransition() }
+        binding.appBarLayout.statusBarForeground =
+            MaterialShapeDrawable.createWithElevationOverlay(requireContext())
+        binding.toolbar.drawNextToNavbar()
         view.doOnLayout {
             adjustPlaylistButtons()
         }
@@ -162,17 +162,17 @@ class HomeFragment :
         binding.toolbar.setNavigationOnClickListener {
             findNavController().navigate(R.id.action_search, null, navOptions)
         }
-        binding.appBarLayout.title = getString(R.string.app_name)
+        binding.appNameText.text = getString(R.string.app_name)
     }
 
     private fun loadProfile() {
         binding.bannerImage?.let {
-            Glide.with(requireContext())
+            GlideApp.with(requireContext())
                 .load(RetroGlideExtension.getBannerModel())
                 .profileBannerOptions(RetroGlideExtension.getBannerModel())
                 .into(it)
         }
-        Glide.with(requireActivity())
+        GlideApp.with(requireActivity())
             .load(RetroGlideExtension.getUserModel())
             .userProfileOptions(RetroGlideExtension.getUserModel(), requireContext())
             .into(binding.userImage)
@@ -185,14 +185,6 @@ class HomeFragment :
         binding.actionShuffle.elevatedAccentColor()
     }
 
-    private fun checkForMargins() {
-        if (mainActivity.isBottomNavVisible) {
-            binding.recyclerView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                bottomMargin = dip(R.dimen.bottom_nav_height)
-            }
-        }
-    }
-
     override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.menu_main, menu)
         menu.removeItem(R.id.action_grid_size)
@@ -213,19 +205,17 @@ class HomeFragment :
     }
 
     fun setSharedAxisXTransitions() {
-        exitTransition =
-            MaterialSharedAxis(MaterialSharedAxis.X, true).addTarget(CoordinatorLayout::class.java)
+        exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true).addTarget(CoordinatorLayout::class.java)
         reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
     }
 
     private fun setSharedAxisYTransitions() {
-        exitTransition =
-            MaterialSharedAxis(MaterialSharedAxis.Y, true).addTarget(CoordinatorLayout::class.java)
+        exitTransition = MaterialSharedAxis(MaterialSharedAxis.Y, true).addTarget(CoordinatorLayout::class.java)
         reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Y, false)
     }
 
     private fun loadSuggestions(songs: List<Song>) {
-        if (!PreferenceUtil.homeSuggestions || songs.isEmpty()) {
+        if (songs.isEmpty()) {
             binding.suggestions.root.isVisible = false
             return
         }
@@ -261,7 +251,7 @@ class HomeFragment :
                     MusicPlayerRemote.playNextSong()
                 }
             }
-            Glide.with(this)
+            GlideApp.with(this)
                 .load(RetroGlideExtension.getSongModel(songs[index]))
                 .songCoverOptions(songs[index])
                 .into(imageView)
@@ -281,16 +271,14 @@ class HomeFragment :
     override fun onMenuItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_settings -> findNavController().navigate(
-                R.id.settings_fragment,
+                R.id.settingsActivity,
                 null,
                 navOptions
             )
-
             R.id.action_import_playlist -> ImportPlaylistDialog().show(
                 childFragmentManager,
                 "ImportPlaylist"
             )
-
             R.id.action_add_to_playlist -> CreatePlaylistDialog.create(emptyList()).show(
                 childFragmentManager,
                 "ShowCreatePlaylistDialog"
@@ -306,9 +294,7 @@ class HomeFragment :
 
     override fun onResume() {
         super.onResume()
-        checkForMargins()
         libraryViewModel.forceReload(ReloadType.HomeSections)
-        exitTransition = null
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/library/LibraryFragment.kt
similarity index 85%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/library/LibraryFragment.kt
index 2aa29e48d..520f0516b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/library/LibraryFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.library
+package io.github.muntashirakon.music.fragments.library
 
 import android.os.Bundle
 import android.view.Menu
@@ -24,14 +24,14 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.NavigationUI
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity.getToolbarBackgroundColor
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentLibraryBinding
-import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog
-import code.name.monkey.retromusic.dialogs.ImportPlaylistDialog
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentLibraryBinding
+import io.github.muntashirakon.music.dialogs.CreatePlaylistDialog
+import io.github.muntashirakon.music.dialogs.ImportPlaylistDialog
+import io.github.muntashirakon.music.extensions.whichFragment
+import io.github.muntashirakon.music.fragments.base.AbsMainActivityFragment
+import io.github.muntashirakon.music.model.CategoryInfo
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 class LibraryFragment : AbsMainActivityFragment(R.layout.fragment_library) {
 
@@ -74,7 +74,7 @@ class LibraryFragment : AbsMainActivityFragment(R.layout.fragment_library) {
             navGraph.setStartDestination(categoryInfo.category.id)
         }
         navController.graph = navGraph
-        NavigationUI.setupWithNavController(mainActivity.navigationView, navController)
+        NavigationUI.setupWithNavController(mainActivity.bottomNavigationView, navController)
         navController.addOnDestinationChangedListener { _, _, _ ->
             binding.appBarLayout.setExpanded(true, true)
         }
@@ -97,7 +97,7 @@ class LibraryFragment : AbsMainActivityFragment(R.layout.fragment_library) {
     override fun onMenuItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_settings -> findNavController().navigate(
-                R.id.settings_fragment,
+                R.id.settingsActivity,
                 null,
                 navOptions
             )
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/other/DetailListFragment.kt
similarity index 73%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/other/DetailListFragment.kt
index 53ce8f862..e41f174a0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/other/DetailListFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.other
+package io.github.muntashirakon.music.fragments.other
 
 import android.graphics.Color
 import android.os.Bundle
@@ -20,6 +20,7 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
+import androidx.activity.addCallback
 import androidx.core.os.bundleOf
 import androidx.core.view.doOnPreDraw
 import androidx.core.view.isVisible
@@ -28,27 +29,36 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.album.AlbumAdapter
-import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
-import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter
-import code.name.monkey.retromusic.adapter.song.SongAdapter
-import code.name.monkey.retromusic.databinding.FragmentPlaylistDetailBinding
-import code.name.monkey.retromusic.db.toSong
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.interfaces.IArtistClickListener
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.util.RetroUtil
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
+import io.github.muntashirakon.music.*
+import io.github.muntashirakon.music.adapter.album.AlbumAdapter
+import io.github.muntashirakon.music.adapter.artist.ArtistAdapter
+import io.github.muntashirakon.music.adapter.song.ShuffleButtonSongAdapter
+import io.github.muntashirakon.music.adapter.song.SongAdapter
+import io.github.muntashirakon.music.databinding.FragmentPlaylistDetailBinding
+import io.github.muntashirakon.music.db.toSong
+import io.github.muntashirakon.music.extensions.dipToPix
+import io.github.muntashirakon.music.extensions.surfaceColor
+import io.github.muntashirakon.music.fragments.base.AbsMainActivityFragment
+import io.github.muntashirakon.music.interfaces.IAlbumClickListener
+import io.github.muntashirakon.music.interfaces.IArtistClickListener
+import io.github.muntashirakon.music.interfaces.ICabCallback
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.model.Album
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.util.RetroColorUtil
+import io.github.muntashirakon.music.util.RetroUtil
+import com.afollestad.materialcab.attached.AttachedCab
+import com.afollestad.materialcab.attached.destroy
+import com.afollestad.materialcab.attached.isActive
+import com.afollestad.materialcab.createCab
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.transition.MaterialSharedAxis
 
 
 class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_detail),
-    IArtistClickListener, IAlbumClickListener {
+    IArtistClickListener, IAlbumClickListener, ICabHolder {
     private val args by navArgs<DetailListFragmentArgs>()
     private var _binding: FragmentPlaylistDetailBinding? = null
     private val binding get() = _binding!!
@@ -61,8 +71,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
             RECENT_ARTISTS,
             TOP_ALBUMS,
             RECENT_ALBUMS,
-            FAVOURITES,
-            -> {
+            FAVOURITES -> {
                 enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
                 returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
             }
@@ -94,8 +103,21 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
             TOP_PLAYED_PLAYLIST -> topPlayed()
         }
 
+        binding.recyclerView.adapter?.registerAdapterDataObserver(object : AdapterDataObserver() {
+            override fun onChanged() {
+                super.onChanged()
+                val height = dipToPix(52f)
+                binding.recyclerView.updatePadding(bottom = height.toInt())
+            }
+        })
         binding.appBarLayout.statusBarForeground =
             MaterialShapeDrawable.createWithElevationOverlay(requireContext())
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
+            if (!handleBackPress()) {
+                remove()
+                findNavController().navigateUp()
+            }
+        }
     }
 
     private fun lastAddedSongs() {
@@ -103,7 +125,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
         val songAdapter = ShuffleButtonSongAdapter(
             requireActivity(),
             mutableListOf(),
-            R.layout.item_list
+            R.layout.item_list, this
         )
         binding.recyclerView.apply {
             adapter = songAdapter
@@ -120,7 +142,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
         val songAdapter = ShuffleButtonSongAdapter(
             requireActivity(),
             mutableListOf(),
-            R.layout.item_list
+            R.layout.item_list, this
         )
         binding.recyclerView.apply {
             adapter = songAdapter
@@ -137,7 +159,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
         val songAdapter = ShuffleButtonSongAdapter(
             requireActivity(),
             mutableListOf(),
-            R.layout.item_list
+            R.layout.item_list, this
         )
         binding.recyclerView.apply {
             adapter = songAdapter
@@ -156,7 +178,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
         val songAdapter = SongAdapter(
             requireActivity(),
             mutableListOf(),
-            R.layout.item_list
+            R.layout.item_list, this
         )
         binding.recyclerView.apply {
             adapter = songAdapter
@@ -197,14 +219,14 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
         requireActivity(),
         artists,
         R.layout.item_grid_circle,
-        this
+        this, this@DetailListFragment
     )
 
     private fun albumAdapter(albums: List<Album>): AlbumAdapter = AlbumAdapter(
         requireActivity(),
         albums,
         R.layout.item_grid,
-        this
+        this, this@DetailListFragment
     )
 
     private fun linearLayoutManager(): LinearLayoutManager =
@@ -246,6 +268,39 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
         _binding = null
     }
 
+    private var cab: AttachedCab? = null
+
+    private fun handleBackPress(): Boolean {
+        cab?.let {
+            if (it.isActive()) {
+                it.destroy()
+                return true
+            }
+        }
+        return false
+    }
+
+    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
+        cab?.let {
+            println("Cab")
+            if (it.isActive()) {
+                it.destroy()
+            }
+        }
+        cab = createCab(R.id.toolbar_container) {
+            menu(menuRes)
+            closeDrawable(R.drawable.ic_close)
+            backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor()))
+            slideDown()
+            onCreate { cab, menu -> callback.onCabCreated(cab, menu) }
+            onSelection {
+                callback.onCabItemClicked(it)
+            }
+            onDestroy { callback.onCabFinished(it) }
+        }
+        return cab as AttachedCab
+    }
+
     override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.menu_clear_history, menu)
         if (showClearHistoryOption) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/lyrics/LyricsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/other/LyricsFragment.kt
similarity index 51%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/lyrics/LyricsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/other/LyricsFragment.kt
index a2980e382..13e7051f4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/lyrics/LyricsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/other/LyricsFragment.kt
@@ -12,10 +12,11 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.lyrics
+package io.github.muntashirakon.music.fragments.other
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
@@ -25,28 +26,33 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.IntentSenderRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.findNavController
 import androidx.transition.Fade
+import androidx.viewpager2.adapter.FragmentStateAdapter
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.tageditor.TagWriter
-import code.name.monkey.retromusic.databinding.FragmentLyricsBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.extensions.openUrl
-import code.name.monkey.retromusic.extensions.uri
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.lyrics.LrcView
-import code.name.monkey.retromusic.model.AudioTagInfo
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.FileUtils
-import code.name.monkey.retromusic.util.LyricUtil
-import code.name.monkey.retromusic.util.UriUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.activities.tageditor.TagWriter
+import io.github.muntashirakon.music.databinding.FragmentLyricsBinding
+import io.github.muntashirakon.music.databinding.FragmentNormalLyricsBinding
+import io.github.muntashirakon.music.databinding.FragmentSyncedLyricsBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsMainActivityFragment
+import io.github.muntashirakon.music.fragments.base.AbsMusicServiceFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper
+import io.github.muntashirakon.music.lyrics.LrcView
+import io.github.muntashirakon.music.model.AudioTagInfo
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.FileUtils
+import io.github.muntashirakon.music.util.LyricUtil
+import io.github.muntashirakon.music.util.UriUtil
 import com.afollestad.materialdialogs.input.input
+import com.google.android.material.tabs.TabLayoutMediator
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.jaudiotagger.audio.AudioFileIO
@@ -54,23 +60,14 @@ import org.jaudiotagger.tag.FieldKey
 import java.io.File
 import java.io.FileOutputStream
 import java.util.*
-import kotlin.collections.set
 
-class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
-    MusicProgressViewUpdateHelper.Callback {
+class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics) {
 
     private var _binding: FragmentLyricsBinding? = null
     private val binding get() = _binding!!
     private lateinit var song: Song
 
-    private lateinit var normalLyricsLauncher: ActivityResultLauncher<IntentSenderRequest>
-    private lateinit var editSyncedLyricsLauncher: ActivityResultLauncher<IntentSenderRequest>
-
-    private lateinit var cacheFile: File
-    private var syncedLyrics: String = ""
-    private lateinit var syncedFileUri: Uri
-
-    private var lyricsType: LyricsType = LyricsType.NORMAL_LYRICS
+    private lateinit var lyricsSectionsAdapter: LyricsSectionsAdapter
 
     private val googleSearchLrcUrl: String
         get() {
@@ -80,8 +77,22 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
             baseUrl += query
             return baseUrl
         }
+    private val syairSearchLrcUrl: String
+        get() {
+            var baseUrl = "https://www.syair.info/search?"
+            var query = song.title + "+" + song.artistName
+            query = "q=" + query.replace(" ", "+")
+            baseUrl += query
+            return baseUrl
+        }
 
-    private lateinit var updateHelper: MusicProgressViewUpdateHelper
+    private lateinit var normalLyricsLauncher: ActivityResultLauncher<IntentSenderRequest>
+    private lateinit var newSyncedLyricsLauncher: ActivityResultLauncher<Intent>
+    private lateinit var editSyncedLyricsLauncher: ActivityResultLauncher<IntentSenderRequest>
+
+    private lateinit var cacheFile: File
+    private var syncedLyrics: String = ""
+    private lateinit var syncedFileUri: Uri
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -92,6 +103,14 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
                     FileUtils.copyFileToUri(requireContext(), cacheFile, song.uri)
                 }
             }
+        newSyncedLyricsLauncher =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                if (result.resultCode == Activity.RESULT_OK) {
+                    context?.contentResolver?.openOutputStream(result.data?.data!!)?.use {
+                        it.write(syncedLyrics.toByteArray())
+                    }
+                }
+            }
         editSyncedLyricsLauncher =
             registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) {
                 if (it.resultCode == Activity.RESULT_OK) {
@@ -106,44 +125,38 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        updateTitleSong()
         enterTransition = Fade()
         exitTransition = Fade()
+        lyricsSectionsAdapter = LyricsSectionsAdapter(requireActivity())
         _binding = FragmentLyricsBinding.bind(view)
-        updateHelper = MusicProgressViewUpdateHelper(this, 500, 1000)
-        updateTitleSong()
-        setupLyricsView()
-        loadLyrics()
+        binding.container.transitionName = "lyrics"
 
         setupWakelock()
         setupViews()
         setupToolbar()
     }
 
-    private fun setupLyricsView() {
-        binding.lyricsView.apply {
-            setCurrentColor(accentColor())
-            setTimeTextColor(accentColor())
-            setTimelineColor(accentColor())
-            setTimelineTextColor(accentColor())
-            setDraggable(true, LrcView.OnPlayClickListener {
-                MusicPlayerRemote.seekTo(it.toInt())
-                return@OnPlayClickListener true
-            })
-        }
-    }
-
-    override fun onUpdateProgressViews(progress: Int, total: Int) {
-        binding.lyricsView.updateTime(progress.toLong())
-    }
-
     private fun setupViews() {
+        binding.lyricsPager.adapter = lyricsSectionsAdapter
+        TabLayoutMediator(binding.tabLyrics, binding.lyricsPager) { tab, position ->
+            tab.text = when (position) {
+                0 -> getString(R.string.synced_lyrics)
+                1 -> getString(R.string.normal_lyrics)
+                else -> ""
+            }
+        }.attach()
+//        lyricsPager.isUserInputEnabled = false
+
+        binding.tabLyrics.setSelectedTabIndicatorColor(accentColor())
+        binding.tabLyrics.setTabTextColors(textColorSecondary(), accentColor())
         binding.editButton.accentColor()
         binding.editButton.setOnClickListener {
-            when (lyricsType) {
-                LyricsType.SYNCED_LYRICS -> {
+            when (binding.lyricsPager.currentItem) {
+                0 -> {
                     editSyncedLyrics()
                 }
-                LyricsType.NORMAL_LYRICS -> {
+                1 -> {
                     editNormalLyrics()
                 }
             }
@@ -153,13 +166,11 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
     override fun onPlayingMetaChanged() {
         super.onPlayingMetaChanged()
         updateTitleSong()
-        loadLyrics()
     }
 
     override fun onServiceConnected() {
         super.onServiceConnected()
         updateTitleSong()
-        loadLyrics()
     }
 
     private fun updateTitleSong() {
@@ -179,7 +190,7 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
     }
 
     override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.menu_lyrics, menu)
+        inflater.inflate(R.menu.menu_search, menu)
         ToolbarContentTintHelper.handleOnCreateOptionsMenu(
             requireContext(),
             binding.toolbar,
@@ -190,23 +201,27 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
 
     override fun onMenuItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.action_search) {
-            openUrl(googleSearchLrcUrl)
+            openUrl(when (binding.lyricsPager.currentItem) {
+                    0 -> syairSearchLrcUrl
+                    1 -> googleSearchLrcUrl
+                    else -> googleSearchLrcUrl
+                }
+            )
         }
         return false
     }
 
+
     @SuppressLint("CheckResult")
-    private fun editNormalLyrics(lyrics: String? = null) {
-        val file = File(song.data)
-        val content = lyrics ?: try {
-            AudioFileIO.read(file).tagOrCreateDefault.getFirst(FieldKey.LYRICS)
+    private fun editNormalLyrics() {
+        var content = ""
+        val file = File(MusicPlayerRemote.currentSong.data)
+        try {
+            content = AudioFileIO.read(file).tagOrCreateDefault.getFirst(FieldKey.LYRICS)
         } catch (e: Exception) {
             e.printStackTrace()
-            ""
         }
 
-        val song = song
-
         materialDialog().show {
             title(res = R.string.edit_normal_lyrics)
             input(
@@ -216,6 +231,7 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
             ) { _, input ->
                 val fieldKeyValueMap = EnumMap<FieldKey, String>(FieldKey::class.java)
                 fieldKeyValueMap[FieldKey.LYRICS] = input.toString()
+                syncedLyrics = input.toString()
                 GlobalScope.launch {
                     if (VersionUtils.hasR()) {
                         cacheFile = TagWriter.writeTagsToFilesR(
@@ -242,7 +258,7 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
                 }
             }
             positiveButton(res = R.string.save) {
-                loadNormalLyrics()
+                (lyricsSectionsAdapter.fragments[1].first as NormalLyrics).loadNormalLyrics()
             }
             negativeButton(res = android.R.string.cancel)
         }
@@ -250,10 +266,9 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
 
 
     @SuppressLint("CheckResult")
-    private fun editSyncedLyrics(lyrics: String? = null) {
-        val content = lyrics ?: LyricUtil.getStringFromLrc(LyricUtil.getSyncedLyricsFile(song))
+    private fun editSyncedLyrics() {
+        val content: String = LyricUtil.getStringFromLrc(LyricUtil.getSyncedLyricsFile(song))
 
-        val song = song
         materialDialog().show {
             title(res = R.string.edit_synced_lyrics)
             input(
@@ -276,98 +291,145 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
                             IntentSenderRequest.Builder(pendingIntent).build()
                         )
                     } else {
-                        val fieldKeyValueMap = EnumMap<FieldKey, String>(FieldKey::class.java)
-                        fieldKeyValueMap[FieldKey.LYRICS] = input.toString()
-                        GlobalScope.launch {
-                            cacheFile = TagWriter.writeTagsToFilesR(
-                                requireContext(),
-                                AudioTagInfo(listOf(song.data), fieldKeyValueMap, null)
-                            )[0]
-                            val pendingIntent = MediaStore.createWriteRequest(
-                                requireContext().contentResolver,
-                                listOf(song.uri)
-                            )
-
-                            normalLyricsLauncher.launch(
-                                IntentSenderRequest.Builder(pendingIntent).build()
-                            )
-                        }
+                        val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
+                        intent.addCategory(Intent.CATEGORY_OPENABLE)
+                        intent.type = "*/*"
+                        intent.putExtra(
+                            Intent.EXTRA_TITLE,
+                            LyricUtil.getLrcOriginalPath(File(song.data).name)
+                        )
+                        newSyncedLyricsLauncher.launch(intent)
                     }
                 } else {
                     LyricUtil.writeLrc(song, input.toString())
                 }
             }
             positiveButton(res = R.string.save) {
-                loadLRCLyrics()
+                (lyricsSectionsAdapter.fragments[0].first as SyncedLyrics).loadLRCLyrics()
             }
             negativeButton(res = android.R.string.cancel)
         }
     }
 
-    private fun loadNormalLyrics() {
-        val file = File(song.data)
-        val lyrics = try {
-            AudioFileIO.read(file).tagOrCreateDefault.getFirst(FieldKey.LYRICS)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            ""
+    class LyricsSectionsAdapter(fragmentActivity: FragmentActivity) :
+        FragmentStateAdapter(fragmentActivity) {
+        val fragments = listOf(
+            Pair(SyncedLyrics(), R.string.synced_lyrics),
+            Pair(NormalLyrics(), R.string.normal_lyrics)
+        )
+
+
+        override fun getItemCount(): Int {
+            return fragments.size
+        }
+
+        override fun createFragment(position: Int): Fragment {
+            return fragments[position].first
         }
-        binding.normalLyrics.isVisible = !lyrics.isNullOrEmpty()
-        binding.noLyricsFound.isVisible = lyrics.isNullOrEmpty()
-        binding.normalLyrics.text = lyrics
     }
 
-    /**
-     * @return success
-     */
-    private fun loadLRCLyrics(): Boolean {
-        val lrcFile = LyricUtil.getSyncedLyricsFile(song)
-        if (lrcFile != null) {
-            binding.lyricsView.loadLrc(lrcFile)
-        } else {
-            val embeddedLyrics = LyricUtil.getEmbeddedSyncedLyrics(song.data)
-            if (embeddedLyrics != null) {
-                binding.lyricsView.loadLrc(embeddedLyrics)
-            } else {
-                binding.lyricsView.setLabel(getString(R.string.empty))
-                return false
+    class NormalLyrics : AbsMusicServiceFragment(R.layout.fragment_normal_lyrics) {
+
+        private var _binding: FragmentNormalLyricsBinding? = null
+        private val binding get() = _binding!!
+
+        override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+            _binding = FragmentNormalLyricsBinding.bind(view)
+            loadNormalLyrics()
+            super.onViewCreated(view, savedInstanceState)
+        }
+
+        fun loadNormalLyrics() {
+            var lyrics: String? = null
+            val file = File(MusicPlayerRemote.currentSong.data)
+            try {
+                lyrics = AudioFileIO.read(file).tagOrCreateDefault.getFirst(FieldKey.LYRICS)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+            binding.noLyricsFound.isVisible = lyrics.isNullOrEmpty()
+            binding.normalLyrics.text = lyrics
+        }
+
+        override fun onPlayingMetaChanged() {
+            super.onPlayingMetaChanged()
+            loadNormalLyrics()
+        }
+
+        override fun onServiceConnected() {
+            super.onServiceConnected()
+            loadNormalLyrics()
+        }
+
+        override fun onDestroyView() {
+            super.onDestroyView()
+            _binding = null
+        }
+    }
+
+    class SyncedLyrics : AbsMusicServiceFragment(R.layout.fragment_synced_lyrics),
+        MusicProgressViewUpdateHelper.Callback {
+
+        private var _binding: FragmentSyncedLyricsBinding? = null
+        private val binding get() = _binding!!
+        private lateinit var updateHelper: MusicProgressViewUpdateHelper
+
+        override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+            updateHelper = MusicProgressViewUpdateHelper(this, 500, 1000)
+            _binding = FragmentSyncedLyricsBinding.bind(view)
+            setupLyricsView()
+            loadLRCLyrics()
+            super.onViewCreated(view, savedInstanceState)
+        }
+
+        fun loadLRCLyrics() {
+            binding.lyricsView.setLabel(getString(R.string.empty))
+            LyricUtil.getSyncedLyricsFile(MusicPlayerRemote.currentSong)?.let {
+                binding.lyricsView.loadLrc(it)
             }
         }
-        return true
-    }
 
-    private fun loadLyrics() {
-        lyricsType = if (!loadLRCLyrics()) {
-            binding.lyricsView.isVisible = false
-            loadNormalLyrics()
-            LyricsType.NORMAL_LYRICS
-        } else {
-            binding.normalLyrics.isVisible = false
-            binding.noLyricsFound.isVisible = false
-            binding.lyricsView.isVisible = true
-            LyricsType.SYNCED_LYRICS
+        private fun setupLyricsView() {
+            binding.lyricsView.apply {
+                setCurrentColor(accentColor())
+                setTimeTextColor(accentColor())
+                setTimelineColor(accentColor())
+                setTimelineTextColor(accentColor())
+                setDraggable(true, LrcView.OnPlayClickListener {
+                    MusicPlayerRemote.seekTo(it.toInt())
+                    return@OnPlayClickListener true
+                })
+            }
         }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        updateHelper.start()
-    }
+        override fun onUpdateProgressViews(progress: Int, total: Int) {
+            binding.lyricsView.updateTime(progress.toLong())
+        }
 
-    override fun onPause() {
-        super.onPause()
-        updateHelper.stop()
+        override fun onPlayingMetaChanged() {
+            super.onPlayingMetaChanged()
+            loadLRCLyrics()
+        }
+
+        override fun onServiceConnected() {
+            super.onServiceConnected()
+            loadLRCLyrics()
+        }
+
+        override fun onResume() {
+            super.onResume()
+            updateHelper.start()
+        }
+
+        override fun onPause() {
+            super.onPause()
+            updateHelper.stop()
+        }
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
         if (MusicPlayerRemote.playingQueue.isNotEmpty())
-            mainActivity.expandPanel()
-        _binding = null
-    }
-
-    enum class LyricsType {
-        NORMAL_LYRICS,
-        SYNCED_LYRICS
+            (requireActivity() as MainActivity).expandPanel()
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/other/MiniPlayerFragment.kt
similarity index 82%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/other/MiniPlayerFragment.kt
index 0ae18f6dd..59986ee76 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/other/MiniPlayerFragment.kt
@@ -12,8 +12,9 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.other
+package io.github.muntashirakon.music.fragments.other
 
+import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
@@ -22,23 +23,23 @@ import android.text.style.ForegroundColorSpan
 import android.view.GestureDetector
 import android.view.MotionEvent
 import android.view.View
+import android.view.animation.DecelerateInterpolator
 import androidx.core.text.toSpannable
 import androidx.core.view.isVisible
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentMiniPlayerBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.show
-import code.name.monkey.retromusic.extensions.textColorPrimary
-import code.name.monkey.retromusic.extensions.textColorSecondary
-import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentMiniPlayerBinding
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.show
+import io.github.muntashirakon.music.extensions.textColorPrimary
+import io.github.muntashirakon.music.extensions.textColorSecondary
+import io.github.muntashirakon.music.fragments.base.AbsMusicServiceFragment
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper
+import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RetroUtil
 import kotlin.math.abs
 
 open class MiniPlayerFragment : AbsMusicServiceFragment(R.layout.fragment_mini_player),
@@ -65,10 +66,7 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(R.layout.fragment_mini_p
         _binding = FragmentMiniPlayerBinding.bind(view)
         view.setOnTouchListener(FlingPlayBackController(requireContext()))
         setUpMiniPlayer()
-        setUpButtons()
-    }
 
-    fun setUpButtons() {
         if (RetroUtil.isTablet) {
             binding.actionNext.show()
             binding.actionPrevious.show()
@@ -114,7 +112,7 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(R.layout.fragment_mini_p
 
     private fun updateSongCover() {
         val song = MusicPlayerRemote.currentSong
-        Glide.with(requireContext())
+        GlideApp.with(requireContext())
             .load(RetroGlideExtension.getSongModel(song))
             .transition(RetroGlideExtension.getDefaultTransition())
             .songCoverOptions(song)
@@ -138,7 +136,10 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(R.layout.fragment_mini_p
 
     override fun onUpdateProgressViews(progress: Int, total: Int) {
         binding.progressBar.max = total
-        binding.progressBar.progress = progress
+        val animator = ObjectAnimator.ofInt(binding.progressBar, "progress", progress)
+        animator.duration = 1000
+        animator.interpolator = DecelerateInterpolator()
+        animator.start()
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/PlayingQueueRVFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/other/PlayingQueueRVFragment.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/other/PlayingQueueRVFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/other/PlayingQueueRVFragment.kt
index ba2199833..1a05ac221 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/PlayingQueueRVFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/other/PlayingQueueRVFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.other
+package io.github.muntashirakon.music.fragments.other
 
 import android.os.Bundle
 import android.view.View
@@ -20,10 +20,10 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
-import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.song.PlayingQueueAdapter
+import io.github.muntashirakon.music.fragments.base.AbsRecyclerViewFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
 import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager
@@ -55,7 +55,7 @@ class PlayingQueueRVFragment : AbsRecyclerViewFragment<PlayingQueueAdapter, Line
             setNavigationOnClickListener {
                 findNavController().navigateUp()
             }
-            setNavigationIcon(R.drawable.ic_arrow_back)
+            setNavigationIcon(R.drawable.ic_keyboard_backspace_black)
         }
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/other/UserInfoFragment.kt
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/other/UserInfoFragment.kt
index 16a013a0a..209b0b137 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/other/UserInfoFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.other
+package io.github.muntashirakon.music.fragments.other
 
 import android.app.Activity
 import android.graphics.Bitmap
@@ -29,19 +29,18 @@ import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
-import code.name.monkey.retromusic.Constants.USER_BANNER
-import code.name.monkey.retromusic.Constants.USER_PROFILE
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentUserInfoBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.applyToolbar
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.profileBannerOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.userProfileOptions
-import code.name.monkey.retromusic.util.ImageUtil
-import code.name.monkey.retromusic.util.PreferenceUtil.userName
+import io.github.muntashirakon.music.Constants.USER_BANNER
+import io.github.muntashirakon.music.Constants.USER_PROFILE
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentUserInfoBinding
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.applyToolbar
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.util.ImageUtil
+import io.github.muntashirakon.music.util.PreferenceUtil.userName
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.DiskCacheStrategy
@@ -55,14 +54,14 @@ import com.google.android.material.transition.MaterialContainerTransform
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import java.io.File
 
 class UserInfoFragment : Fragment() {
 
     private var _binding: FragmentUserInfoBinding? = null
     private val binding get() = _binding!!
-    private val libraryViewModel: LibraryViewModel by activityViewModel()
+    private val libraryViewModel: LibraryViewModel by sharedViewModel()
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -156,12 +155,12 @@ class UserInfoFragment : Fragment() {
 
     private fun loadProfile() {
         binding.bannerImage.let {
-            Glide.with(this)
+            GlideApp.with(this)
                 .load(RetroGlideExtension.getBannerModel())
                 .profileBannerOptions(RetroGlideExtension.getBannerModel())
                 .into(it)
         }
-        Glide.with(this)
+        GlideApp.with(this)
             .load(RetroGlideExtension.getUserModel())
             .userProfileOptions(RetroGlideExtension.getUserModel(), requireContext())
             .into(binding.userImage)
@@ -210,11 +209,9 @@ class UserInfoFragment : Fragment() {
                     doIfResultOk(uri)
                 }
             }
-
             ImagePicker.RESULT_ERROR -> {
                 showToast(ImagePicker.getError(data))
             }
-
             else -> {
                 showToast("Task Cancelled")
             }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/VolumeFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/other/VolumeFragment.kt
similarity index 74%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/other/VolumeFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/other/VolumeFragment.kt
index a8b10d297..f5524b59b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/VolumeFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/other/VolumeFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.other
+package io.github.muntashirakon.music.fragments.other
 
 import android.graphics.Color
 import android.graphics.PorterDuff
@@ -21,19 +21,19 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.SeekBar
 import androidx.core.content.getSystemService
 import androidx.fragment.app.Fragment
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentVolumeBinding
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.volume.AudioVolumeObserver
-import code.name.monkey.retromusic.volume.OnAudioVolumeChangedListener
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentVolumeBinding
+import io.github.muntashirakon.music.extensions.applyColor
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.volume.AudioVolumeObserver
+import io.github.muntashirakon.music.volume.OnAudioVolumeChangedListener
 
-class VolumeFragment : Fragment(), Slider.OnChangeListener, OnAudioVolumeChangedListener,
+class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolumeChangedListener,
     View.OnClickListener {
 
     private var _binding: FragmentVolumeBinding? = null
@@ -47,7 +47,7 @@ class VolumeFragment : Fragment(), Slider.OnChangeListener, OnAudioVolumeChanged
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?,
+        savedInstanceState: Bundle?
     ): View {
         _binding = FragmentVolumeBinding.inflate(inflater, container, false)
         return binding.root
@@ -68,17 +68,15 @@ class VolumeFragment : Fragment(), Slider.OnChangeListener, OnAudioVolumeChanged
         audioVolumeObserver?.register(AudioManager.STREAM_MUSIC, this)
 
         val audioManager = audioManager
-        binding.volumeSeekBar.valueTo =
-            audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC).toFloat()
-        binding.volumeSeekBar.value =
-            audioManager.getStreamVolume(AudioManager.STREAM_MUSIC).toFloat()
-        binding.volumeSeekBar.addOnChangeListener(this)
+        binding.volumeSeekBar.max = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+        binding.volumeSeekBar.progress = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
+        binding.volumeSeekBar.setOnSeekBarChangeListener(this)
     }
 
     override fun onAudioVolumeChanged(currentVolume: Int, maxVolume: Int) {
         if (_binding != null) {
-            binding.volumeSeekBar.valueTo = maxVolume.toFloat()
-            binding.volumeSeekBar.value = currentVolume.toFloat()
+            binding.volumeSeekBar.max = maxVolume
+            binding.volumeSeekBar.progress = currentVolume
             binding.volumeDown.setImageResource(if (currentVolume == 0) R.drawable.ic_volume_off else R.drawable.ic_volume_down)
         }
     }
@@ -89,11 +87,17 @@ class VolumeFragment : Fragment(), Slider.OnChangeListener, OnAudioVolumeChanged
         _binding = null
     }
 
-    override fun onValueChange(slider: Slider, value: Float, fromUser: Boolean) {
+    override fun onProgressChanged(seekBar: SeekBar, i: Int, b: Boolean) {
         val audioManager = audioManager
-        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, value.toInt(), 0)
-        setPauseWhenZeroVolume(value < 1f)
-        binding.volumeDown.setImageResource(if (value == 0f) R.drawable.ic_volume_off else R.drawable.ic_volume_down)
+        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, i, 0)
+        setPauseWhenZeroVolume(i < 1)
+        binding.volumeDown.setImageResource(if (i == 0) R.drawable.ic_volume_off else R.drawable.ic_volume_down)
+    }
+
+    override fun onStartTrackingTouch(seekBar: SeekBar) {
+    }
+
+    override fun onStopTrackingTouch(seekBar: SeekBar) {
     }
 
     override fun onClick(view: View) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/CoverLyricsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/CoverLyricsFragment.kt
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/CoverLyricsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/CoverLyricsFragment.kt
index ee32e72d3..69f6fdaad 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/CoverLyricsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/CoverLyricsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.fragments.player
+package io.github.muntashirakon.music.fragments.player
 
 import android.content.SharedPreferences
 import android.os.Bundle
@@ -8,21 +8,19 @@ import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.SHOW_LYRICS
-import code.name.monkey.retromusic.databinding.FragmentCoverLyricsBinding
-import code.name.monkey.retromusic.extensions.dipToPix
-import code.name.monkey.retromusic.fragments.NowPlayingScreen
-import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToLyrics
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics
-import code.name.monkey.retromusic.model.lyrics.Lyrics
-import code.name.monkey.retromusic.util.LyricUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.SHOW_LYRICS
+import io.github.muntashirakon.music.databinding.FragmentCoverLyricsBinding
+import io.github.muntashirakon.music.fragments.NowPlayingScreen
+import io.github.muntashirakon.music.fragments.base.AbsMusicServiceFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.base.goToLyrics
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper
+import io.github.muntashirakon.music.model.lyrics.AbsSynchronizedLyrics
+import io.github.muntashirakon.music.model.lyrics.Lyrics
+import io.github.muntashirakon.music.util.LyricUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.jaudiotagger.audio.exceptions.CannotReadException
@@ -58,17 +56,6 @@ class CoverLyricsFragment : AbsMusicServiceFragment(R.layout.fragment_cover_lyri
         }
     }
 
-    fun setColors(color: MediaNotificationProcessor) {
-        binding.run {
-            playerLyrics.background = null
-            playerLyricsLine1.setTextColor(color.primaryTextColor)
-            playerLyricsLine1.setShadowLayer(dipToPix(10f), 0f, 0f, color.backgroundColor)
-            playerLyricsLine2.setTextColor(color.primaryTextColor)
-            playerLyricsLine2.setShadowLayer(dipToPix(10f), 0f, 0f, color.backgroundColor)
-        }
-
-    }
-
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         if (key == SHOW_LYRICS) {
             if (sharedPreferences?.getBoolean(key, false) == true) {
@@ -115,6 +102,8 @@ class CoverLyricsFragment : AbsMusicServiceFragment(R.layout.fragment_cover_lyri
                 null
             }
         }
+
+
     }
 
     override fun onUpdateProgressViews(progress: Int, total: Int) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/PlayerAlbumCoverFragment.kt
similarity index 78%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/PlayerAlbumCoverFragment.kt
index ca8bc97be..6e08c8530 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/PlayerAlbumCoverFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player
+package io.github.muntashirakon.music.fragments.player
 
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
@@ -28,27 +28,27 @@ import androidx.preference.PreferenceManager
 import androidx.viewpager.widget.ViewPager
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.retromusic.LYRICS_TYPE
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.SHOW_LYRICS
-import code.name.monkey.retromusic.adapter.album.AlbumCoverPagerAdapter
-import code.name.monkey.retromusic.adapter.album.AlbumCoverPagerAdapter.AlbumCoverFragment
-import code.name.monkey.retromusic.databinding.FragmentPlayerAlbumCoverBinding
-import code.name.monkey.retromusic.extensions.isColorLight
-import code.name.monkey.retromusic.extensions.surfaceColor
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
-import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
-import code.name.monkey.retromusic.fragments.base.goToLyrics
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.lyrics.CoverLrcView
-import code.name.monkey.retromusic.model.lyrics.Lyrics
-import code.name.monkey.retromusic.transform.CarousalPagerTransformer
-import code.name.monkey.retromusic.transform.ParallaxPagerTransformer
-import code.name.monkey.retromusic.util.CoverLyricsType
-import code.name.monkey.retromusic.util.LyricUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.LYRICS_TYPE
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.SHOW_LYRICS
+import io.github.muntashirakon.music.adapter.album.AlbumCoverPagerAdapter
+import io.github.muntashirakon.music.adapter.album.AlbumCoverPagerAdapter.AlbumCoverFragment
+import io.github.muntashirakon.music.databinding.FragmentPlayerAlbumCoverBinding
+import io.github.muntashirakon.music.extensions.isColorLight
+import io.github.muntashirakon.music.extensions.surfaceColor
+import io.github.muntashirakon.music.fragments.NowPlayingScreen.*
+import io.github.muntashirakon.music.fragments.base.AbsMusicServiceFragment
+import io.github.muntashirakon.music.fragments.base.goToLyrics
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper
+import io.github.muntashirakon.music.lyrics.CoverLrcView
+import io.github.muntashirakon.music.model.lyrics.Lyrics
+import io.github.muntashirakon.music.transform.CarousalPagerTransformer
+import io.github.muntashirakon.music.transform.ParallaxPagerTransformer
+import io.github.muntashirakon.music.util.LyricUtil
+import io.github.muntashirakon.music.util.LyricsType
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -85,19 +85,21 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
     }
 
     private fun updateLyrics() {
+        binding.lyricsView.setLabel(context?.getString(R.string.no_lyrics_found))
         val song = MusicPlayerRemote.currentSong
         lifecycleScope.launch(Dispatchers.IO) {
             val lrcFile = LyricUtil.getSyncedLyricsFile(song)
             if (lrcFile != null) {
-                binding.lyricsView.loadLrc(lrcFile)
+                withContext(Dispatchers.Main) {
+                    binding.lyricsView.loadLrc(lrcFile)
+                }
             } else {
                 val embeddedLyrics = LyricUtil.getEmbeddedSyncedLyrics(song.data)
-                if (embeddedLyrics != null) {
-                    binding.lyricsView.loadLrc(embeddedLyrics)
-                } else {
-                    withContext(Dispatchers.Main) {
+                withContext(Dispatchers.Main) {
+                    if (embeddedLyrics != null) {
+                        binding.lyricsView.loadLrc(embeddedLyrics)
+                    } else {
                         binding.lyricsView.reset()
-                        binding.lyricsView.setLabel(context?.getString(R.string.no_lyrics_found))
                     }
                 }
             }
@@ -113,22 +115,6 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         _binding = FragmentPlayerAlbumCoverBinding.bind(view)
-        setupViewPager()
-        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this, 500, 1000)
-        maybeInitLyrics()
-        lrcView.apply {
-            setDraggable(true) { time ->
-                MusicPlayerRemote.seekTo(time.toInt())
-                MusicPlayerRemote.resumePlaying()
-                true
-            }
-            setOnClickListener {
-                goToLyrics(requireActivity())
-            }
-        }
-    }
-
-    private fun setupViewPager() {
         binding.viewPager.addOnPageChangeListener(this)
         val nps = PreferenceUtil.nowPlayingScreen
 
@@ -154,6 +140,18 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
                 PreferenceUtil.albumCoverTransform
             )
         }
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this, 500, 1000)
+        maybeInitLyrics()
+        lrcView.apply {
+            setDraggable(true) { time ->
+                MusicPlayerRemote.seekTo(time.toInt())
+                MusicPlayerRemote.resumePlaying()
+                true
+            }
+            setOnClickListener {
+                goToLyrics(requireActivity())
+            }
+        }
     }
 
     override fun onResume() {
@@ -178,9 +176,7 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
     }
 
     override fun onPlayingMetaChanged() {
-        if (viewPager.currentItem != MusicPlayerRemote.position) {
-            viewPager.setCurrentItem(MusicPlayerRemote.position, true)
-        }
+        binding.viewPager.currentItem = MusicPlayerRemote.position
         updateLyrics()
     }
 
@@ -189,18 +185,15 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
-        when (key) {
-            SHOW_LYRICS -> {
-                if (PreferenceUtil.showLyrics) {
-                    maybeInitLyrics()
-                } else {
-                    showLyrics(false)
-                    progressViewUpdateHelper?.stop()
-                }
-            }
-            LYRICS_TYPE -> {
+        if (key == SHOW_LYRICS) {
+            if (sharedPreferences.getBoolean(key, false)) {
                 maybeInitLyrics()
+            } else {
+                showLyrics(false)
+                progressViewUpdateHelper?.stop()
             }
+        } else if (key == LYRICS_TYPE) {
+            maybeInitLyrics()
         }
     }
 
@@ -218,7 +211,7 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
         binding.coverLyrics.isVisible = false
         binding.lyricsView.isVisible = false
         binding.viewPager.isVisible = true
-        val lyrics: View = if (PreferenceUtil.lyricsType == CoverLyricsType.REPLACE_COVER) {
+        val lyrics: View = if (PreferenceUtil.lyricsType == LyricsType.REPLACE_COVER) {
             ObjectAnimator.ofFloat(viewPager, View.ALPHA, if (visible) 0F else 1F).start()
             lrcView
         } else {
@@ -238,7 +231,7 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
         // Don't show lyrics container for below conditions
         if (lyricViewNpsList.contains(nps) && PreferenceUtil.showLyrics) {
             showLyrics(true)
-            if (PreferenceUtil.lyricsType == CoverLyricsType.REPLACE_COVER) {
+            if (PreferenceUtil.lyricsType == LyricsType.REPLACE_COVER) {
                 progressViewUpdateHelper?.start()
             }
         } else {
@@ -249,13 +242,15 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
 
     private fun updatePlayingQueue() {
         binding.viewPager.apply {
-            adapter = AlbumCoverPagerAdapter(parentFragmentManager, MusicPlayerRemote.playingQueue)
-            setCurrentItem(MusicPlayerRemote.position, true)
+            adapter = AlbumCoverPagerAdapter(childFragmentManager, MusicPlayerRemote.playingQueue)
+            adapter?.notifyDataSetChanged()
+            currentItem = MusicPlayerRemote.position
             onPageSelected(MusicPlayerRemote.position)
         }
     }
 
-    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
+    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+    }
 
     override fun onPageSelected(position: Int) {
         currentPosition = position
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/adaptive/AdaptiveFragment.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/adaptive/AdaptiveFragment.kt
index e5e2159ac..1c34f2b0b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/adaptive/AdaptiveFragment.kt
@@ -12,20 +12,20 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.adaptive
+package io.github.muntashirakon.music.fragments.player.adaptive
 
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentAdaptivePlayerBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentAdaptivePlayerBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class AdaptiveFragment : AbsPlayerFragment(R.layout.fragment_adaptive_player) {
 
@@ -60,7 +60,7 @@ class AdaptiveFragment : AbsPlayerFragment(R.layout.fragment_adaptive_player) {
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             ToolbarContentTintHelper.colorizeToolbar(this, surfaceColor(), requireActivity())
             setTitleTextColor(textColorPrimary())
             setSubtitleTextColor(textColorSecondary())
@@ -113,6 +113,11 @@ class AdaptiveFragment : AbsPlayerFragment(R.layout.fragment_adaptive_player) {
     }
 
     override fun onHide() {
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt
index d954cfdb0..f1c5f55a7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt
@@ -12,24 +12,25 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.adaptive
+package io.github.muntashirakon.music.fragments.player.adaptive
 
 import android.os.Bundle
 import android.view.View
 import android.widget.ImageButton
+import android.widget.SeekBar
 import android.widget.TextView
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentAdaptivePlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentAdaptivePlayerPlaybackControlsBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class AdaptivePlaybackControlsFragment :
     AbsPlayerControlsFragment(R.layout.fragment_adaptive_player_playback_controls) {
@@ -37,7 +38,7 @@ class AdaptivePlaybackControlsFragment :
     private var _binding: FragmentAdaptivePlayerPlaybackControlsBinding? = null
     private val binding get() = _binding!!
 
-    override val progressSlider: Slider
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
@@ -123,7 +124,7 @@ class AdaptivePlaybackControlsFragment :
         val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
             color.primaryTextColor
         } else {
-            accentColor()
+            ThemeStore.accentColor(requireContext())
         }.ripAlpha()
 
         TintHelper.setTintAuto(
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/blur/BlurPlaybackControlsFragment.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/blur/BlurPlaybackControlsFragment.kt
index 4a92f1ca4..fdb9c4613 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/blur/BlurPlaybackControlsFragment.kt
@@ -12,38 +12,38 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.blur
+package io.github.muntashirakon.music.fragments.player.blur
 
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageButton
+import android.widget.SeekBar
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentBlurPlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.extensions.getSongInfo
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.extensions.show
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentBlurPlayerPlaybackControlsBinding
+import io.github.muntashirakon.music.extensions.applyColor
+import io.github.muntashirakon.music.extensions.getSongInfo
+import io.github.muntashirakon.music.extensions.hide
+import io.github.muntashirakon.music.extensions.show
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class BlurPlaybackControlsFragment :
     AbsPlayerControlsFragment(R.layout.fragment_blur_player_playback_controls) {
     private var _binding: FragmentBlurPlayerPlaybackControlsBinding? = null
     private val binding get() = _binding!!
 
-    override val progressSlider: Slider
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
@@ -118,7 +118,7 @@ class BlurPlaybackControlsFragment :
     override fun setColor(color: MediaNotificationProcessor) {
         lastPlaybackControlsColor = Color.WHITE
         lastDisabledPlaybackControlsColor =
-            ContextCompat.getColor(requireContext(), code.name.monkey.appthemehelper.R.color.md_grey_500)
+            ContextCompat.getColor(requireContext(), R.color.md_grey_500)
 
         binding.title.setTextColor(lastPlaybackControlsColor)
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/blur/BlurPlayerFragment.kt
similarity index 77%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/blur/BlurPlayerFragment.kt
index bd0f09c96..5e0d6f101 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/blur/BlurPlayerFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.blur
+package io.github.muntashirakon.music.fragments.player.blur
 
 import android.content.SharedPreferences
 import android.graphics.Color
@@ -23,29 +23,24 @@ import android.view.View
 import androidx.appcompat.widget.Toolbar
 import androidx.preference.PreferenceManager
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.NEW_BLUR_AMOUNT
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentBlurBinding
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.glide.BlurTransformation
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.simpleSongCoverOptions
-import code.name.monkey.retromusic.glide.crossfadeListener
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil.blurAmount
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
-import com.bumptech.glide.RequestBuilder
+import io.github.muntashirakon.music.NEW_BLUR_AMOUNT
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentBlurBinding
+import io.github.muntashirakon.music.extensions.drawAboveSystemBars
+import io.github.muntashirakon.music.extensions.whichFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.glide.*
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.PreferenceUtil.blurAmount
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 
 class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur),
     SharedPreferences.OnSharedPreferenceChangeListener {
 
-    private var lastRequest: RequestBuilder<Drawable>? = null
+    private var lastRequest: GlideRequest<Drawable>? = null
 
     override fun playerToolbar(): Toolbar {
         return binding.playerToolbar
@@ -77,7 +72,7 @@ class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur),
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             ToolbarContentTintHelper.colorizeToolbar(this, Color.WHITE, activity)
         }.setOnMenuItemClickListener(this)
     }
@@ -106,6 +101,10 @@ class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur),
     override fun onHide() {
     }
 
+    override fun onBackPressed(): Boolean {
+        return false
+    }
+
     override fun toolbarIconColor(): Int {
         return Color.WHITE
     }
@@ -115,14 +114,14 @@ class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur),
 
     private fun updateBlur() {
         // https://github.com/bumptech/glide/issues/527#issuecomment-148840717
-        Glide.with(this)
+        GlideApp.with(this)
             .load(RetroGlideExtension.getSongModel(MusicPlayerRemote.currentSong))
             .simpleSongCoverOptions(MusicPlayerRemote.currentSong)
             .transform(
                 BlurTransformation.Builder(requireContext()).blurRadius(blurAmount.toFloat())
                     .build()
             ).thumbnail(lastRequest)
-            .error(Glide.with(this).load(ColorDrawable(Color.DKGRAY)).fitCenter())
+            .error(GlideApp.with(this).load(ColorDrawable(Color.DKGRAY)).fitCenter())
             .also {
                 lastRequest = it.clone()
                 it.crossfadeListener()
@@ -140,13 +139,9 @@ class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur),
         updateBlur()
     }
 
-    override fun onPause() {
-        super.onPause()
-        lastRequest = null
-    }
-
     override fun onResume() {
         super.onResume()
+        lastRequest = null
         PreferenceManager.getDefaultSharedPreferences(requireContext())
             .registerOnSharedPreferenceChangeListener(this)
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/card/CardFragment.kt
similarity index 81%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/card/CardFragment.kt
index 3553c35ab..4410af9e0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/card/CardFragment.kt
@@ -12,22 +12,22 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.card
+package io.github.muntashirakon.music.fragments.player.card
 
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentCardPlayerBinding
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentCardPlayerBinding
+import io.github.muntashirakon.music.extensions.drawAboveSystemBars
+import io.github.muntashirakon.music.extensions.whichFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class CardFragment : AbsPlayerFragment(R.layout.fragment_card_player) {
     override fun playerToolbar(): Toolbar {
@@ -49,6 +49,11 @@ class CardFragment : AbsPlayerFragment(R.layout.fragment_card_player) {
 
     override fun onHide() {
         playbackControlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
@@ -92,7 +97,7 @@ class CardFragment : AbsPlayerFragment(R.layout.fragment_card_player) {
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@CardFragment)
 
             ToolbarContentTintHelper.colorizeToolbar(this, Color.WHITE, activity)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/card/CardPlaybackControlsFragment.kt
similarity index 85%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/card/CardPlaybackControlsFragment.kt
index 306412da4..ad0fbe023 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/card/CardPlaybackControlsFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.card
+package io.github.muntashirakon.music.fragments.player.card
 
 import android.graphics.PorterDuff
 import android.os.Bundle
@@ -20,19 +20,23 @@ import android.view.View
 import android.widget.ImageButton
 import android.widget.SeekBar
 import android.widget.TextView
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentCardPlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentCardPlayerPlaybackControlsBinding
+import io.github.muntashirakon.music.extensions.getSongInfo
+import io.github.muntashirakon.music.extensions.hide
+import io.github.muntashirakon.music.extensions.ripAlpha
+import io.github.muntashirakon.music.extensions.show
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class CardPlaybackControlsFragment :
     AbsPlayerControlsFragment(R.layout.fragment_card_player_playback_controls) {
@@ -41,7 +45,7 @@ class CardPlaybackControlsFragment :
     private var _binding: FragmentCardPlayerPlaybackControlsBinding? = null
     private val binding get() = _binding!!
 
-    override val seekBar: SeekBar
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
@@ -134,7 +138,7 @@ class CardPlaybackControlsFragment :
         val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
             color.primaryTextColor
         } else {
-            accentColor().ripAlpha()
+            ThemeStore.accentColor(requireContext()).ripAlpha()
         }
         binding.image.setColorFilter(colorFinal, PorterDuff.Mode.SRC_IN)
         TintHelper.setTintAuto(
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/cardblur/CardBlurFragment.kt
similarity index 75%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/cardblur/CardBlurFragment.kt
index a5ac12b2d..8cd2c753f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/cardblur/CardBlurFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.cardblur
+package io.github.muntashirakon.music.fragments.player.cardblur
 
 import android.content.SharedPreferences
 import android.graphics.Color
@@ -22,24 +22,19 @@ import android.view.View
 import androidx.appcompat.widget.Toolbar
 import androidx.preference.PreferenceManager
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.NEW_BLUR_AMOUNT
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentCardBlurPlayerBinding
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
-import code.name.monkey.retromusic.glide.BlurTransformation
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.simpleSongCoverOptions
-import code.name.monkey.retromusic.glide.crossfadeListener
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil.blurAmount
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
-import com.bumptech.glide.RequestBuilder
+import io.github.muntashirakon.music.NEW_BLUR_AMOUNT
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentCardBlurPlayerBinding
+import io.github.muntashirakon.music.extensions.drawAboveSystemBars
+import io.github.muntashirakon.music.extensions.whichFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.fragments.player.normal.PlayerFragment
+import io.github.muntashirakon.music.glide.*
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.PreferenceUtil.blurAmount
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player),
     SharedPreferences.OnSharedPreferenceChangeListener {
@@ -54,7 +49,7 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player),
 
     private var _binding: FragmentCardBlurPlayerBinding? = null
     private val binding get() = _binding!!
-    private var lastRequest: RequestBuilder<Drawable>? = null
+    private var lastRequest: GlideRequest<Drawable>? = null
 
     override fun onShow() {
         playbackControlsFragment.show()
@@ -62,6 +57,11 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player),
 
     override fun onHide() {
         playbackControlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
@@ -74,8 +74,8 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player),
         libraryViewModel.updateColor(color.backgroundColor)
         ToolbarContentTintHelper.colorizeToolbar(binding.playerToolbar, Color.WHITE, activity)
 
-        binding.title.setTextColor(Color.WHITE)
-        binding.text.setTextColor(Color.WHITE)
+        binding.playerToolbar.setTitleTextColor(Color.WHITE)
+        binding.playerToolbar.setSubtitleTextColor(Color.WHITE)
     }
 
     override fun toggleFavorite(song: Song) {
@@ -94,7 +94,7 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player),
         _binding = FragmentCardBlurPlayerBinding.bind(view)
         setUpSubFragments()
         setUpPlayerToolbar()
-        binding.playerToolbar.drawAboveSystemBars()
+        binding.cardContainer?.drawAboveSystemBars()
     }
 
     private fun setUpSubFragments() {
@@ -108,7 +108,7 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player),
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setTitleTextColor(Color.WHITE)
             setSubtitleTextColor(Color.WHITE)
             ToolbarContentTintHelper.colorizeToolbar(binding.playerToolbar, Color.WHITE, activity)
@@ -130,15 +130,15 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player),
 
     private fun updateSong() {
         val song = MusicPlayerRemote.currentSong
-        binding.run {
-            title.text = song.title
-            text.text = song.artistName
+        binding.playerToolbar.apply {
+            title = song.title
+            subtitle = song.artistName
         }
     }
 
     private fun updateBlur() {
         // https://github.com/bumptech/glide/issues/527#issuecomment-148840717
-        Glide.with(this)
+        GlideApp.with(this)
             .load(RetroGlideExtension.getSongModel(MusicPlayerRemote.currentSong))
             .simpleSongCoverOptions(MusicPlayerRemote.currentSong)
             .transform(
@@ -152,11 +152,6 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player),
             }
     }
 
-    override fun onPause() {
-        super.onPause()
-        lastRequest = null
-    }
-
     override fun onResume() {
         super.onResume()
         lastRequest = null
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt
index 8ada49c95..a89140f18 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt
@@ -12,28 +12,28 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.cardblur
+package io.github.muntashirakon.music.fragments.player.cardblur
 
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageButton
+import android.widget.SeekBar
 import android.widget.TextView
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentCardBlurPlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.extensions.getSongInfo
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.extensions.show
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentCardBlurPlayerPlaybackControlsBinding
+import io.github.muntashirakon.music.extensions.applyColor
+import io.github.muntashirakon.music.extensions.getSongInfo
+import io.github.muntashirakon.music.extensions.hide
+import io.github.muntashirakon.music.extensions.show
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class CardBlurPlaybackControlsFragment :
     AbsPlayerControlsFragment(R.layout.fragment_card_blur_player_playback_controls) {
@@ -41,7 +41,7 @@ class CardBlurPlaybackControlsFragment :
     private var _binding: FragmentCardBlurPlayerPlaybackControlsBinding? = null
     private val binding get() = _binding!!
 
-    override val progressSlider: Slider
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/circle/CirclePlayerFragment.kt
similarity index 72%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/circle/CirclePlayerFragment.kt
index fb1144e30..b257a0148 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/circle/CirclePlayerFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.circle
+package io.github.muntashirakon.music.fragments.player.circle
 
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
@@ -25,34 +25,37 @@ import android.os.Bundle
 import android.view.View
 import android.view.animation.Animation
 import android.view.animation.LinearInterpolator
+import android.widget.SeekBar
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.getSystemService
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentCirclePlayerBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.MusicSeekSkipTouchListener
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.simpleSongCoverOptions
-import code.name.monkey.retromusic.glide.crossfadeListener
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper.Callback
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import code.name.monkey.retromusic.volume.AudioVolumeObserver
-import code.name.monkey.retromusic.volume.OnAudioVolumeChangedListener
-import com.bumptech.glide.Glide
-import com.bumptech.glide.RequestBuilder
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentCirclePlayerBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.MusicSeekSkipTouchListener
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.GlideRequest
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.crossfadeListener
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper.Callback
+import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
+import io.github.muntashirakon.music.misc.SimpleOnSeekbarChangeListener
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.ViewUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.volume.AudioVolumeObserver
+import io.github.muntashirakon.music.volume.OnAudioVolumeChangedListener
 import me.tankery.lib.circularseekbar.CircularSeekBar
 
 /**
@@ -73,9 +76,7 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player),
     private val binding get() = _binding!!
 
     private var rotateAnimator: ObjectAnimator? = null
-    private var lastRequest: RequestBuilder<Drawable>? = null
-
-    var isSeeking = false
+    private var lastRequest: GlideRequest<Drawable>? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -100,7 +101,7 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player),
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@CirclePlayerFragment)
             ToolbarContentTintHelper.colorizeToolbar(
                 this,
@@ -112,6 +113,11 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player),
 
     private fun setupViews() {
         setUpProgressSlider()
+        ViewUtil.setProgressDrawable(
+            binding.progressSlider,
+            ThemeStore.accentColor(requireContext()),
+            false
+        )
         binding.volumeSeekBar.circleProgressColor = accentColor()
         binding.volumeSeekBar.circleColor = ColorUtil.withAlpha(accentColor(), 0.25f)
         setUpPlayPauseFab()
@@ -129,16 +135,11 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player),
     private fun setUpPrevNext() {
         updatePrevNextColor()
         binding.nextButton.setOnTouchListener(MusicSeekSkipTouchListener(requireActivity(), true))
-        binding.previousButton.setOnTouchListener(
-            MusicSeekSkipTouchListener(
-                requireActivity(),
-                false
-            )
-        )
+        binding.previousButton.setOnTouchListener(MusicSeekSkipTouchListener(requireActivity(), false))
     }
 
     private fun updatePrevNextColor() {
-        val accentColor = accentColor()
+        val accentColor = ThemeStore.accentColor(requireContext())
         binding.nextButton.setColorFilter(accentColor, PorterDuff.Mode.SRC_IN)
         binding.previousButton.setColorFilter(accentColor, PorterDuff.Mode.SRC_IN)
     }
@@ -146,7 +147,7 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player),
     private fun setUpPlayPauseFab() {
         TintHelper.setTintAuto(
             binding.playPauseButton,
-            accentColor(),
+            ThemeStore.accentColor(requireContext()),
             false
         )
         binding.playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
@@ -165,6 +166,7 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player),
 
     override fun onResume() {
         super.onResume()
+        lastRequest = null
         progressViewUpdateHelper.start()
         if (audioVolumeObserver == null) {
             audioVolumeObserver = AudioVolumeObserver(requireActivity())
@@ -181,7 +183,6 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player),
 
     override fun onPause() {
         super.onPause()
-        lastRequest = null
         progressViewUpdateHelper.stop()
     }
 
@@ -195,6 +196,8 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player),
     override fun onHide() {
     }
 
+    override fun onBackPressed(): Boolean = false
+
     override fun toolbarIconColor(): Int =
         colorControlNormal()
 
@@ -239,11 +242,11 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player),
         } else {
             binding.songInfo.hide()
         }
-        Glide.with(this)
+        GlideApp.with(this)
             .load(RetroGlideExtension.getSongModel(MusicPlayerRemote.currentSong))
             .simpleSongCoverOptions(MusicPlayerRemote.currentSong)
             .thumbnail(lastRequest)
-            .error(Glide.with(this).load(R.drawable.default_audio_art).fitCenter())
+            .error(GlideApp.with(this).load(R.drawable.default_audio_art).fitCenter())
             .fitCenter().also {
                 lastRequest = it.clone()
                 it.crossfadeListener()
@@ -272,11 +275,7 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player),
     }
 
 
-    override fun onProgressChanged(
-        circularSeekBar: CircularSeekBar?,
-        progress: Float,
-        fromUser: Boolean,
-    ) {
+    override fun onProgressChanged(seekBar: CircularSeekBar?, progress: Float, fromUser: Boolean) {
         val audioManager = audioManager
         audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, progress.toInt(), 0)
     }
@@ -287,39 +286,28 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player),
     override fun onStopTrackingTouch(seekBar: CircularSeekBar?) {
     }
 
-    private fun setUpProgressSlider() {
+    fun setUpProgressSlider() {
         binding.progressSlider.applyColor(accentColor())
-        val progressSlider = binding.progressSlider
-        progressSlider.addOnChangeListener(Slider.OnChangeListener { _, value, fromUser ->
-            if (fromUser) {
-                onUpdateProgressViews(
-                    value.toInt(),
-                    MusicPlayerRemote.songDurationMillis
-                )
-            }
-        })
-        progressSlider.addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
-            override fun onStartTrackingTouch(slider: Slider) {
-                isSeeking = true
-                progressViewUpdateHelper.stop()
-            }
-
-            override fun onStopTrackingTouch(slider: Slider) {
-                isSeeking = false
-                MusicPlayerRemote.seekTo(slider.value.toInt())
-                progressViewUpdateHelper.start()
+        binding.progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(
+                        MusicPlayerRemote.songProgressMillis,
+                        MusicPlayerRemote.songDurationMillis
+                    )
+                }
             }
         })
     }
 
     override fun onUpdateProgressViews(progress: Int, total: Int) {
-        val progressSlider = binding.progressSlider
-        progressSlider.valueTo = total.toFloat()
+        binding.progressSlider.max = total
 
-        progressSlider.valueTo = total.toFloat()
-
-        progressSlider.value =
-            progress.toFloat().coerceIn(progressSlider.valueFrom, progressSlider.valueTo)
+        val animator = ObjectAnimator.ofInt(binding.progressSlider, "progress", progress)
+        animator.duration = AbsPlayerControlsFragment.SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
 
         binding.songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
         binding.songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/classic/ClassicPlayerFragment.kt
similarity index 91%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/classic/ClassicPlayerFragment.kt
index ed51772bd..84fc6404d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/classic/ClassicPlayerFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.classic
+package io.github.muntashirakon.music.fragments.player.classic
 
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
@@ -23,7 +23,6 @@ import android.os.Bundle
 import android.view.View
 import android.view.animation.LinearInterpolator
 import android.widget.SeekBar
-import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.commit
@@ -32,27 +31,27 @@ import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
-import code.name.monkey.retromusic.databinding.FragmentClassicPlayerBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.MusicSeekSkipTouchListener
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.fragments.other.VolumeFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ViewUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.song.PlayingQueueAdapter
+import io.github.muntashirakon.music.databinding.FragmentClassicPlayerBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.MusicSeekSkipTouchListener
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.fragments.other.VolumeFragment
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper
+import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
+import io.github.muntashirakon.music.misc.SimpleOnSeekbarChangeListener
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.ViewUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetBehavior.from
 import com.google.android.material.card.MaterialCardView
@@ -86,7 +85,7 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player
 
     private val bottomSheetCallbackList = object : BottomSheetBehavior.BottomSheetCallback() {
         override fun onSlide(bottomSheet: View, slideOffset: Float) {
-            mainActivity.getBottomSheetBehavior().isDraggable = false
+            mainActivity.getBottomSheetBehavior().isDraggable = false   
             binding.playerQueueSheet.setContentPadding(
                 binding.playerQueueSheet.contentPaddingLeft,
                 (slideOffset * binding.statusBar.height).toInt(),
@@ -103,12 +102,10 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player
                 BottomSheetBehavior.STATE_DRAGGING -> {
                     mainActivity.getBottomSheetBehavior().isDraggable = false
                 }
-
                 BottomSheetBehavior.STATE_COLLAPSED -> {
                     resetToCurrentPosition()
                     mainActivity.getBottomSheetBehavior().isDraggable = true
                 }
-
                 else -> {
                     mainActivity.getBottomSheetBehavior().isDraggable = true
                 }
@@ -164,13 +161,6 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player
         binding.text.setOnClickListener {
             goToArtist(requireActivity())
         }
-        requireActivity().onBackPressedDispatcher.addCallback(object: OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                if (getQueuePanel().state == BottomSheetBehavior.STATE_EXPANDED) {
-                    getQueuePanel().state = BottomSheetBehavior.STATE_COLLAPSED
-                }
-            }
-        })
     }
 
     private fun hideVolumeIfAvailable() {
@@ -265,6 +255,16 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player
     override fun onHide() {
     }
 
+    override fun onBackPressed(): Boolean {
+        var wasExpanded = false
+        if (getQueuePanel().state == BottomSheetBehavior.STATE_EXPANDED) {
+            wasExpanded = getQueuePanel().state == BottomSheetBehavior.STATE_EXPANDED
+            getQueuePanel().state = BottomSheetBehavior.STATE_COLLAPSED
+            return wasExpanded
+        }
+        return wasExpanded
+    }
+
     override fun toolbarIconColor(): Int {
         return Color.WHITE
     }
@@ -377,7 +377,7 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player
 
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.inflateMenu(R.menu.menu_player)
-        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressed() }
         binding.playerToolbar.setOnMenuItemClickListener(this)
 
         ToolbarContentTintHelper.colorizeToolbar(
@@ -491,7 +491,6 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player
                     lastPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
-
             else -> binding.playerControlsContainer.shuffleButton.setColorFilter(
                 lastDisabledPlaybackControlsColor,
                 PorterDuff.Mode.SRC_IN
@@ -512,7 +511,6 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player
                     PorterDuff.Mode.SRC_IN
                 )
             }
-
             MusicService.REPEAT_MODE_ALL -> {
                 binding.playerControlsContainer.repeatButton.setImageResource(R.drawable.ic_repeat)
                 binding.playerControlsContainer.repeatButton.setColorFilter(
@@ -520,7 +518,6 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player
                     PorterDuff.Mode.SRC_IN
                 )
             }
-
             MusicService.REPEAT_MODE_THIS -> {
                 binding.playerControlsContainer.repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 binding.playerControlsContainer.repeatButton.setColorFilter(
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/color/ColorFragment.kt
similarity index 83%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/color/ColorFragment.kt
index 12221274d..bcf20efa2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/color/ColorFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.color
+package io.github.muntashirakon.music.fragments.player.color
 
 import android.animation.ValueAnimator
 import android.os.Bundle
@@ -20,16 +20,16 @@ import android.view.View
 import androidx.appcompat.widget.Toolbar
 import androidx.core.animation.doOnEnd
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentColorPlayerBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentColorPlayerBinding
+import io.github.muntashirakon.music.extensions.colorControlNormal
+import io.github.muntashirakon.music.extensions.drawAboveSystemBars
+import io.github.muntashirakon.music.extensions.whichFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class ColorFragment : AbsPlayerFragment(R.layout.fragment_color_player) {
 
@@ -79,6 +79,11 @@ class ColorFragment : AbsPlayerFragment(R.layout.fragment_color_player) {
 
     override fun onHide() {
         playbackControlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
@@ -119,7 +124,7 @@ class ColorFragment : AbsPlayerFragment(R.layout.fragment_color_player) {
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@ColorFragment)
             ToolbarContentTintHelper.colorizeToolbar(
                 this,
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/color/ColorPlaybackControlsFragment.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/color/ColorPlaybackControlsFragment.kt
index 084d2aaf3..51a6f3bc6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/color/ColorPlaybackControlsFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.color
+package io.github.muntashirakon.music.fragments.player.color
 
 import android.animation.Animator
 import android.graphics.Color
@@ -22,22 +22,22 @@ import android.view.ViewAnimationUtils
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageButton
+import android.widget.SeekBar
 import android.widget.TextView
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentColorPlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.extensions.getSongInfo
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.extensions.show
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentColorPlayerPlaybackControlsBinding
+import io.github.muntashirakon.music.extensions.applyColor
+import io.github.muntashirakon.music.extensions.getSongInfo
+import io.github.muntashirakon.music.extensions.hide
+import io.github.muntashirakon.music.extensions.show
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import kotlin.math.sqrt
 
 class ColorPlaybackControlsFragment :
@@ -46,7 +46,7 @@ class ColorPlaybackControlsFragment :
     private var _binding: FragmentColorPlayerPlaybackControlsBinding? = null
     private val binding get() = _binding!!
 
-    override val progressSlider: Slider
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/fit/FitFragment.kt
similarity index 81%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/fit/FitFragment.kt
index 54a9c9f22..d6d4e4ee3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/fit/FitFragment.kt
@@ -12,22 +12,22 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.fit
+package io.github.muntashirakon.music.fragments.player.fit
 
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentFitBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentFitBinding
+import io.github.muntashirakon.music.extensions.colorControlNormal
+import io.github.muntashirakon.music.extensions.drawAboveSystemBars
+import io.github.muntashirakon.music.extensions.whichFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class FitFragment : AbsPlayerFragment(R.layout.fragment_fit) {
     private var _binding: FragmentFitBinding? = null
@@ -49,6 +49,11 @@ class FitFragment : AbsPlayerFragment(R.layout.fragment_fit) {
 
     override fun onHide() {
         playbackControlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
@@ -95,7 +100,7 @@ class FitFragment : AbsPlayerFragment(R.layout.fragment_fit) {
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@FitFragment)
             ToolbarContentTintHelper.colorizeToolbar(
                 this,
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/fit/FitPlaybackControlsFragment.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/fit/FitPlaybackControlsFragment.kt
index 8cf981725..78fa68233 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/fit/FitPlaybackControlsFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.fit
+package io.github.muntashirakon.music.fragments.player.fit
 
 import android.os.Bundle
 import android.view.View
@@ -20,18 +20,19 @@ import android.view.animation.DecelerateInterpolator
 import android.widget.ImageButton
 import android.widget.SeekBar
 import android.widget.TextView
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentFitPlaybackControlsBinding
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentFitPlaybackControlsBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class FitPlaybackControlsFragment :
     AbsPlayerControlsFragment(R.layout.fragment_fit_playback_controls) {
@@ -39,7 +40,7 @@ class FitPlaybackControlsFragment :
     private var _binding: FragmentFitPlaybackControlsBinding? = null
     private val binding get() = _binding!!
 
-    override val seekBar: SeekBar
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
@@ -127,7 +128,7 @@ class FitPlaybackControlsFragment :
         val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
             color.primaryTextColor
         } else {
-            accentColor().ripAlpha()
+            ThemeStore.accentColor(requireContext()).ripAlpha()
         }
 
         volumeFragment?.setTintable(colorFinal)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/flat/FlatPlaybackControlsFragment.kt
similarity index 85%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/flat/FlatPlaybackControlsFragment.kt
index 02bdcb7aa..929fdcd79 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/flat/FlatPlaybackControlsFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.flat
+package io.github.muntashirakon.music.fragments.player.flat
 
 import android.os.Bundle
 import android.view.View
@@ -20,21 +20,22 @@ import android.view.animation.DecelerateInterpolator
 import android.widget.ImageButton
 import android.widget.SeekBar
 import android.widget.TextView
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentFlatPlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper.Callback
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentFlatPlayerPlaybackControlsBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper.Callback
+import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class FlatPlaybackControlsFragment :
     AbsPlayerControlsFragment(R.layout.fragment_flat_player_playback_controls), Callback {
@@ -42,7 +43,7 @@ class FlatPlaybackControlsFragment :
     private var _binding: FragmentFlatPlayerPlaybackControlsBinding? = null
     private val binding get() = _binding!!
 
-    override val seekBar: SeekBar
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
@@ -109,7 +110,7 @@ class FlatPlaybackControlsFragment :
         val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
             color.primaryTextColor
         } else {
-            accentColor().ripAlpha()
+            ThemeStore.accentColor(requireContext()).ripAlpha()
         }
 
         updateTextColors(colorFinal)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/flat/FlatPlayerFragment.kt
similarity index 81%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/flat/FlatPlayerFragment.kt
index 23cd4f63f..e0da9ee8c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/flat/FlatPlayerFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.flat
+package io.github.muntashirakon.music.fragments.player.flat
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
@@ -23,19 +23,19 @@ import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentFlatPlayerBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ViewUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import code.name.monkey.retromusic.views.DrawableGradient
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentFlatPlayerBinding
+import io.github.muntashirakon.music.extensions.colorControlNormal
+import io.github.muntashirakon.music.extensions.drawAboveSystemBars
+import io.github.muntashirakon.music.extensions.whichFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.ViewUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.views.DrawableGradient
 
 class FlatPlayerFragment : AbsPlayerFragment(R.layout.fragment_flat_player) {
     override fun playerToolbar(): Toolbar {
@@ -61,7 +61,7 @@ class FlatPlayerFragment : AbsPlayerFragment(R.layout.fragment_flat_player) {
 
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.inflateMenu(R.menu.menu_player)
-        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressed() }
         binding.playerToolbar.setOnMenuItemClickListener(this)
         ToolbarContentTintHelper.colorizeToolbar(
             binding.playerToolbar,
@@ -100,6 +100,11 @@ class FlatPlayerFragment : AbsPlayerFragment(R.layout.fragment_flat_player) {
 
     override fun onHide() {
         controlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/full/FullPlaybackControlsFragment.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/full/FullPlaybackControlsFragment.kt
index f7e34433c..2b67495fb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/full/FullPlaybackControlsFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.full
+package io.github.muntashirakon.music.fragments.player.full
 
 import android.content.Intent
 import android.content.res.ColorStateList
@@ -23,32 +23,32 @@ import android.view.MenuItem
 import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageButton
+import android.widget.SeekBar
 import android.widget.TextView
 import androidx.appcompat.widget.PopupMenu
 import androidx.lifecycle.lifecycleScope
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentFullPlayerControlsBinding
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.toSongEntity
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentFullPlayerControlsBinding
+import io.github.muntashirakon.music.db.PlaylistEntity
+import io.github.muntashirakon.music.db.toSongEntity
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.fragments.ReloadType
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 /**
  * Created by hemanths on 20/09/17.
@@ -58,11 +58,11 @@ class FullPlaybackControlsFragment :
     AbsPlayerControlsFragment(R.layout.fragment_full_player_controls),
     PopupMenu.OnMenuItemClickListener {
 
-    private val libraryViewModel: LibraryViewModel by activityViewModel()
+    private val libraryViewModel: LibraryViewModel by sharedViewModel()
     private var _binding: FragmentFullPlayerControlsBinding? = null
     private val binding get() = _binding!!
 
-    override val progressSlider: Slider
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
@@ -177,9 +177,10 @@ class FullPlaybackControlsFragment :
 
     private fun setUpPlayPauseFab() {
         binding.playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
-
-        binding.playPauseButton.pivotX = (binding.playPauseButton.width / 2).toFloat()
-        binding.playPauseButton.pivotY = (binding.playPauseButton.height / 2).toFloat()
+        binding.playPauseButton.post {
+            binding.playPauseButton.pivotX = (binding.playPauseButton.width / 2).toFloat()
+            binding.playPauseButton.pivotY = (binding.playPauseButton.height / 2).toFloat()
+        }
     }
 
     private fun setUpMusicControllers() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/full/FullPlayerFragment.kt
similarity index 79%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/full/FullPlayerFragment.kt
index 9d418e21d..54afd6840 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/full/FullPlayerFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.full
+package io.github.muntashirakon.music.fragments.player.full
 
 import android.content.res.ColorStateList
 import android.graphics.Color
@@ -20,22 +20,20 @@ import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentFullBinding
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.extensions.show
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.fragments.player.CoverLyricsFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentFullBinding
+import io.github.muntashirakon.music.extensions.drawAboveSystemBars
+import io.github.muntashirakon.music.extensions.hide
+import io.github.muntashirakon.music.extensions.show
+import io.github.muntashirakon.music.extensions.whichFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) {
     private var _binding: FragmentFullBinding? = null
@@ -52,7 +50,7 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) {
 
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.apply {
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
         }
     }
 
@@ -86,6 +84,10 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) {
     override fun onHide() {
     }
 
+    override fun onBackPressed(): Boolean {
+        return false
+    }
+
     override fun toolbarIconColor(): Int {
         return Color.WHITE
     }
@@ -96,7 +98,6 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) {
         controlsFragment.setColor(color)
         libraryViewModel.updateColor(color.backgroundColor)
         ToolbarContentTintHelper.colorizeToolbar(binding.playerToolbar, Color.WHITE, activity)
-        binding.coverLyrics.getFragment<CoverLyricsFragment>().setColors(color)
     }
 
     override fun onFavoriteToggled() {
@@ -132,7 +133,7 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) {
         libraryViewModel.artist(MusicPlayerRemote.currentSong.artistId)
             .observe(viewLifecycleOwner) { artist ->
                 if (artist.id != -1L) {
-                    Glide.with(requireActivity())
+                    GlideApp.with(requireActivity())
                         .load(RetroGlideExtension.getArtistModel(artist))
                         .artistImageOptions(artist)
                         .into(binding.artistImage)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/gradient/GradientPlayerFragment.kt
similarity index 85%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/gradient/GradientPlayerFragment.kt
index ca4cebac7..34d895bdd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/gradient/GradientPlayerFragment.kt
@@ -12,8 +12,9 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.gradient
+package io.github.muntashirakon.music.fragments.player.gradient
 
+import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
 import android.graphics.Color
@@ -21,7 +22,8 @@ import android.graphics.PorterDuff
 import android.graphics.drawable.AnimatedVectorDrawable
 import android.os.Bundle
 import android.view.View
-import androidx.activity.OnBackPressedCallback
+import android.view.animation.LinearInterpolator
+import android.widget.SeekBar
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.PopupMenu
 import androidx.appcompat.widget.Toolbar
@@ -35,27 +37,26 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
-import code.name.monkey.retromusic.databinding.FragmentGradientPlayerBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.MusicSeekSkipTouchListener
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.fragments.other.VolumeFragment
-import code.name.monkey.retromusic.fragments.player.CoverLyricsFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.song.PlayingQueueAdapter
+import io.github.muntashirakon.music.databinding.FragmentGradientPlayerBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.MusicSeekSkipTouchListener
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.fragments.other.VolumeFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper
+import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
+import io.github.muntashirakon.music.misc.SimpleOnSeekbarChangeListener
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetBehavior.*
-import com.google.android.material.slider.Slider
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
 import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager
@@ -96,19 +97,15 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         }
 
         override fun onStateChanged(bottomSheet: View, newState: Int) {
-            onBackPressedCallback.isEnabled = newState == STATE_EXPANDED
             when (newState) {
                 STATE_EXPANDED,
-                STATE_DRAGGING,
-                -> {
+                STATE_DRAGGING -> {
                     mainActivity.getBottomSheetBehavior().isDraggable = false
                 }
-
                 STATE_COLLAPSED -> {
                     resetToCurrentPosition()
                     mainActivity.getBottomSheetBehavior().isDraggable = true
                 }
-
                 else -> {
                     mainActivity.getBottomSheetBehavior().isDraggable = true
                 }
@@ -116,17 +113,6 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         }
     }
 
-    private val onBackPressedCallback = object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-            if (getQueuePanel().state == STATE_EXPANDED) {
-                getQueuePanel().state = STATE_COLLAPSED
-            } else {
-                isEnabled = false
-                requireActivity().onBackPressedDispatcher.onBackPressed()
-            }
-        }
-    }
-
     private fun setupFavourite() {
         binding.playbackControlsFragment.songFavourite.setOnClickListener {
             toggleFavorite(MusicPlayerRemote.currentSong)
@@ -175,15 +161,11 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         ViewCompat.setOnApplyWindowInsetsListener(
             (binding.container)
         ) { v: View, insets: WindowInsetsCompat ->
-            navBarHeight = insets.getBottomInsets()
+            navBarHeight = insets.safeGetBottomInsets()
             v.updatePadding(bottom = navBarHeight)
             insets
         }
         binding.playbackControlsFragment.root.drawAboveSystemBars()
-        requireActivity().onBackPressedDispatcher.addCallback(
-            viewLifecycleOwner,
-            onBackPressedCallback
-        )
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -221,6 +203,16 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
     override fun onHide() {
     }
 
+    override fun onBackPressed(): Boolean {
+        var wasExpanded = false
+        if (getQueuePanel().state == STATE_EXPANDED) {
+            wasExpanded = getQueuePanel().state == STATE_EXPANDED
+            getQueuePanel().state = STATE_COLLAPSED
+            return wasExpanded
+        }
+        return wasExpanded
+    }
+
     override fun toolbarIconColor(): Int {
         return Color.WHITE
     }
@@ -277,7 +269,6 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         updateRepeatState()
         updateShuffleState()
         updatePrevNextColor()
-        binding.coverLyrics.getFragment<CoverLyricsFragment>().setColors(color)
     }
 
     override fun onFavoriteToggled() {
@@ -321,6 +312,7 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         super.onServiceConnected()
         updateSong()
         updatePlayPauseDrawableState()
+        updatePlayPauseDrawableState()
         updateQueue()
         updateIsFavoriteIcon()
     }
@@ -394,15 +386,8 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
     @SuppressLint("ClickableViewAccessibility")
     private fun setUpPrevNext() {
         updatePrevNextColor()
-        binding.playbackControlsFragment.nextButton.setOnTouchListener(
-            MusicSeekSkipTouchListener(
-                requireActivity(),
-                true
-            )
-        )
-        binding.playbackControlsFragment.previousButton.setOnTouchListener(
-            MusicSeekSkipTouchListener(requireActivity(), false)
-        )
+        binding.playbackControlsFragment.nextButton.setOnTouchListener(MusicSeekSkipTouchListener(requireActivity(), true))
+        binding.playbackControlsFragment.previousButton.setOnTouchListener(MusicSeekSkipTouchListener(requireActivity(), false))
     }
 
     private fun updatePrevNextColor() {
@@ -427,7 +412,6 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
                     lastPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
-
             else -> binding.shuffleButton.setColorFilter(
                 lastDisabledPlaybackControlsColor,
                 PorterDuff.Mode.SRC_IN
@@ -448,7 +432,6 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
                     PorterDuff.Mode.SRC_IN
                 )
             }
-
             MusicService.REPEAT_MODE_ALL -> {
                 binding.repeatButton.setImageResource(R.drawable.ic_repeat)
                 binding.repeatButton.setColorFilter(
@@ -456,7 +439,6 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
                     PorterDuff.Mode.SRC_IN
                 )
             }
-
             MusicService.REPEAT_MODE_THIS -> {
                 binding.repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 binding.repeatButton.setColorFilter(
@@ -487,7 +469,7 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         oldLeft: Int,
         oldTop: Int,
         oldRight: Int,
-        oldBottom: Int,
+        oldBottom: Int
     ) {
         val panel = getQueuePanel()
         if (panel.state == STATE_COLLAPSED) {
@@ -560,34 +542,30 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
     }
 
     private fun setUpProgressSlider() {
-        val progressSlider = binding.playbackControlsFragment.progressSlider
-        progressSlider.addOnChangeListener(Slider.OnChangeListener { _, value, fromUser ->
-            if (fromUser) {
-                onUpdateProgressViews(
-                    value.toInt(),
-                    MusicPlayerRemote.songDurationMillis
-                )
-            }
-        })
-        progressSlider.addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
-            override fun onStartTrackingTouch(slider: Slider) {
-                progressViewUpdateHelper.stop()
-            }
-
-            override fun onStopTrackingTouch(slider: Slider) {
-                MusicPlayerRemote.seekTo(slider.value.toInt())
-                progressViewUpdateHelper.start()
+        binding.playbackControlsFragment.progressSlider.setOnSeekBarChangeListener(object :
+            SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(
+                        MusicPlayerRemote.songProgressMillis,
+                        MusicPlayerRemote.songDurationMillis
+                    )
+                }
             }
         })
     }
 
     override fun onUpdateProgressViews(progress: Int, total: Int) {
-        val progressSlider = binding.playbackControlsFragment.progressSlider
-        progressSlider.valueTo = total.toFloat()
-
-        progressSlider.value =
-            progress.toFloat().coerceIn(progressSlider.valueFrom, progressSlider.valueTo)
-
+        binding.playbackControlsFragment.progressSlider.max = total
+        val animator = ObjectAnimator.ofInt(
+            binding.playbackControlsFragment.progressSlider,
+            "progress",
+            progress
+        )
+        animator.duration = AbsPlayerControlsFragment.SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
         binding.playbackControlsFragment.songTotalTime.text =
             MusicUtil.getReadableDurationString(total.toLong())
         binding.playbackControlsFragment.songCurrentProgress.text =
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/home/HomePlayerFragment.kt
similarity index 83%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/home/HomePlayerFragment.kt
index c374010dc..8209fe5fd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/home/HomePlayerFragment.kt
@@ -12,22 +12,22 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.home
+package io.github.muntashirakon.music.fragments.player.home
 
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentHomePlayerBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentHomePlayerBinding
+import io.github.muntashirakon.music.extensions.colorControlNormal
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class HomePlayerFragment : AbsPlayerFragment(R.layout.fragment_home_player),
     MusicProgressViewUpdateHelper.Callback {
@@ -84,6 +84,10 @@ class HomePlayerFragment : AbsPlayerFragment(R.layout.fragment_home_player),
         binding.text.text = song.artistName
     }
 
+    override fun onBackPressed(): Boolean {
+        return false
+    }
+
     override fun toolbarIconColor(): Int {
         return Color.WHITE
     }
@@ -118,7 +122,7 @@ class HomePlayerFragment : AbsPlayerFragment(R.layout.fragment_home_player),
 
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.inflateMenu(R.menu.menu_player)
-        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressed() }
         binding.playerToolbar.setOnMenuItemClickListener(this)
 
         ToolbarContentTintHelper.colorizeToolbar(
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/lockscreen/LockScreenControlsFragment.kt
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/lockscreen/LockScreenControlsFragment.kt
index 564cdfdc0..09746dbb0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/lockscreen/LockScreenControlsFragment.kt
@@ -12,28 +12,28 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.lockscreen
+package io.github.muntashirakon.music.fragments.player.lockscreen
 
 import android.os.Bundle
 import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageButton
+import android.widget.SeekBar
 import android.widget.TextView
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentLockScreenPlaybackControlsBinding
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.extensions.ripAlpha
-import code.name.monkey.retromusic.extensions.textColorSecondary
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentLockScreenPlaybackControlsBinding
+import io.github.muntashirakon.music.extensions.applyColor
+import io.github.muntashirakon.music.extensions.ripAlpha
+import io.github.muntashirakon.music.extensions.textColorSecondary
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 /**
  * @author Hemanth S (h4h13).
@@ -44,7 +44,7 @@ class LockScreenControlsFragment :
     private var _binding: FragmentLockScreenPlaybackControlsBinding? = null
     private val binding get() = _binding!!
 
-    override val progressSlider: Slider
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
@@ -103,19 +103,18 @@ class LockScreenControlsFragment :
     }
 
     override fun setColor(color: MediaNotificationProcessor) {
-        val context = context ?: return
 
-        val colorBg = ATHUtil.resolveColor(context, android.R.attr.colorBackground)
+        val colorBg = ATHUtil.resolveColor(requireContext(), android.R.attr.colorBackground)
         if (ColorUtil.isColorLight(colorBg)) {
             lastPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryTextColor(context, true)
+                MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
             lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryDisabledTextColor(context, true)
+                MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
         } else {
             lastPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryTextColor(context, false)
+                MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
             lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryDisabledTextColor(context, false)
+                MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false)
         }
 
         val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
@@ -136,7 +135,7 @@ class LockScreenControlsFragment :
 
         TintHelper.setTintAuto(
             binding.playPauseButton,
-            MaterialValueHelper.getPrimaryTextColor(context, isDark),
+            MaterialValueHelper.getPrimaryTextColor(requireContext(), isDark),
             false
         )
         TintHelper.setTintAuto(binding.playPauseButton, colorFinal, true)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/material/MaterialControlsFragment.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/material/MaterialControlsFragment.kt
index e5984476a..7344a1ba7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/material/MaterialControlsFragment.kt
@@ -12,27 +12,27 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.material
+package io.github.muntashirakon.music.fragments.player.material
 
 import android.graphics.PorterDuff
 import android.os.Bundle
 import android.view.View
 import android.widget.ImageButton
+import android.widget.SeekBar
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentMaterialPlaybackControlsBinding
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentMaterialPlaybackControlsBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 /**
  * @author Hemanth S (h4h13).
@@ -44,7 +44,7 @@ class MaterialControlsFragment :
     private var _binding: FragmentMaterialPlaybackControlsBinding? = null
     private val binding get() = _binding!!
 
-    override val progressSlider: Slider
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/material/MaterialFragment.kt
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/material/MaterialFragment.kt
index ee88983c7..6f8cccd49 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/material/MaterialFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.material
+package io.github.muntashirakon.music.fragments.player.material
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
@@ -21,21 +21,21 @@ import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentMaterialBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.surfaceColor
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ViewUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import code.name.monkey.retromusic.views.DrawableGradient
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentMaterialBinding
+import io.github.muntashirakon.music.extensions.colorControlNormal
+import io.github.muntashirakon.music.extensions.drawAboveSystemBars
+import io.github.muntashirakon.music.extensions.surfaceColor
+import io.github.muntashirakon.music.extensions.whichFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.fragments.player.normal.PlayerFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.ViewUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.views.DrawableGradient
 
 /**
  * @author Hemanth S (h4h13).
@@ -90,6 +90,11 @@ class MaterialFragment : AbsPlayerFragment(R.layout.fragment_material) {
 
     override fun onHide() {
         playbackControlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor() = colorControlNormal()
@@ -139,7 +144,7 @@ class MaterialFragment : AbsPlayerFragment(R.layout.fragment_material) {
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@MaterialFragment)
             ToolbarContentTintHelper.colorizeToolbar(
                 this,
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlaybackControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/md3/MD3PlaybackControlsFragment.kt
similarity index 73%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlaybackControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/md3/MD3PlaybackControlsFragment.kt
index 796bce973..35b972f46 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlaybackControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/md3/MD3PlaybackControlsFragment.kt
@@ -12,35 +12,40 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.md3
+package io.github.muntashirakon.music.fragments.player.md3
 
+import android.animation.ObjectAnimator
 import android.os.Bundle
 import android.view.View
+import android.view.animation.LinearInterpolator
 import android.widget.ImageButton
+import android.widget.SeekBar
 import android.widget.TextView
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentMd3PlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentMd3PlayerPlaybackControlsBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper
+import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class MD3PlaybackControlsFragment :
     AbsPlayerControlsFragment(R.layout.fragment_md3_player_playback_controls) {
 
+    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
     private var _binding: FragmentMd3PlayerPlaybackControlsBinding? = null
     private val binding get() = _binding!!
 
-    override val progressSlider: Slider
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
@@ -61,6 +66,11 @@ class MD3PlaybackControlsFragment :
     override val songCurrentProgress: TextView
         get() = binding.songCurrentProgress
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         _binding = FragmentMd3PlayerPlaybackControlsBinding.bind(view)
@@ -129,6 +139,16 @@ class MD3PlaybackControlsFragment :
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper.stop()
+    }
+
     override fun onServiceConnected() {
         updatePlayPauseDrawableState()
         updateRepeatState()
@@ -137,6 +157,7 @@ class MD3PlaybackControlsFragment :
     }
 
     override fun onPlayingMetaChanged() {
+        super.onPlayingMetaChanged()
         updateSong()
     }
 
@@ -175,6 +196,18 @@ class MD3PlaybackControlsFragment :
 
     public override fun hide() {}
 
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        binding.progressSlider.max = total
+
+        val animator = ObjectAnimator.ofInt(binding.progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        binding.songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        binding.songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/md3/MD3PlayerFragment.kt
similarity index 78%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/md3/MD3PlayerFragment.kt
index f90aadb81..2d69c837a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/md3/MD3PlayerFragment.kt
@@ -12,21 +12,21 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.md3
+package io.github.muntashirakon.music.fragments.player.md3
 
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentMd3PlayerBinding
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentMd3PlayerBinding
+import io.github.muntashirakon.music.extensions.drawAboveSystemBars
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class MD3PlayerFragment : AbsPlayerFragment(R.layout.fragment_md3_player) {
 
@@ -45,10 +45,15 @@ class MD3PlayerFragment : AbsPlayerFragment(R.layout.fragment_md3_player) {
 
     override fun onHide() {
         controlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
-        return ATHUtil.resolveColor(requireContext(), androidx.appcompat.R.attr.colorControlNormal)
+        return ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal)
     }
 
     override fun onColorChanged(color: MediaNotificationProcessor) {
@@ -58,7 +63,7 @@ class MD3PlayerFragment : AbsPlayerFragment(R.layout.fragment_md3_player) {
 
         ToolbarContentTintHelper.colorizeToolbar(
             binding.playerToolbar,
-            ATHUtil.resolveColor(requireContext(), androidx.appcompat.R.attr.colorControlNormal),
+            ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal),
             requireActivity()
         )
     }
@@ -98,12 +103,12 @@ class MD3PlayerFragment : AbsPlayerFragment(R.layout.fragment_md3_player) {
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.inflateMenu(R.menu.menu_player)
         //binding.playerToolbar.menu.setUpWithIcons()
-        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressed() }
         binding.playerToolbar.setOnMenuItemClickListener(this)
 
         ToolbarContentTintHelper.colorizeToolbar(
             binding.playerToolbar,
-            ATHUtil.resolveColor(requireContext(), androidx.appcompat.R.attr.colorControlNormal),
+            ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal),
             requireActivity()
         )
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/normal/PlayerFragment.kt
similarity index 86%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/normal/PlayerFragment.kt
index 45bbac39d..972879410 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/normal/PlayerFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.normal
+package io.github.muntashirakon.music.fragments.player.normal
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
@@ -24,18 +24,18 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.view.isVisible
 import androidx.preference.PreferenceManager
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.SNOWFALL
-import code.name.monkey.retromusic.databinding.FragmentPlayerBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ViewUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import code.name.monkey.retromusic.views.DrawableGradient
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.SNOWFALL
+import io.github.muntashirakon.music.databinding.FragmentPlayerBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.ViewUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.views.DrawableGradient
 
 class PlayerFragment : AbsPlayerFragment(R.layout.fragment_player),
     SharedPreferences.OnSharedPreferenceChangeListener {
@@ -82,6 +82,11 @@ class PlayerFragment : AbsPlayerFragment(R.layout.fragment_player),
 
     override fun onHide() {
         controlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor() = colorControlNormal()
@@ -142,7 +147,7 @@ class PlayerFragment : AbsPlayerFragment(R.layout.fragment_player),
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.inflateMenu(R.menu.menu_player)
         //binding.playerToolbar.menu.setUpWithIcons()
-        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressed() }
         binding.playerToolbar.setOnMenuItemClickListener(this)
 
         ToolbarContentTintHelper.colorizeToolbar(
@@ -159,7 +164,6 @@ class PlayerFragment : AbsPlayerFragment(R.layout.fragment_player),
     }
 
     private fun startOrStopSnow(isSnowFalling: Boolean) {
-        if (_binding == null) return
         if (isSnowFalling && !surfaceColor().isColorLight) {
             binding.snowfallView.isVisible = true
             binding.snowfallView.restartFalling()
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/normal/PlayerPlaybackControlsFragment.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/normal/PlayerPlaybackControlsFragment.kt
index cf644dedf..079fd5121 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/normal/PlayerPlaybackControlsFragment.kt
@@ -12,27 +12,28 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.normal
+package io.github.muntashirakon.music.fragments.player.normal
 
 import android.os.Bundle
 import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageButton
+import android.widget.SeekBar
 import android.widget.TextView
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentPlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentPlayerPlaybackControlsBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class PlayerPlaybackControlsFragment :
     AbsPlayerControlsFragment(R.layout.fragment_player_playback_controls) {
@@ -40,7 +41,7 @@ class PlayerPlaybackControlsFragment :
     private var _binding: FragmentPlayerPlaybackControlsBinding? = null
     private val binding get() = _binding!!
 
-    override val progressSlider: Slider
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
@@ -93,7 +94,7 @@ class PlayerPlaybackControlsFragment :
         val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
             color.primaryTextColor
         } else {
-            accentColor()
+            ThemeStore.accentColor(requireContext())
         }.ripAlpha()
 
         TintHelper.setTintAuto(
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerControlFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/peek/PeekPlayerControlFragment.kt
similarity index 85%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerControlFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/peek/PeekPlayerControlFragment.kt
index 36150ad80..fdb46c19c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerControlFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/peek/PeekPlayerControlFragment.kt
@@ -12,27 +12,27 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.peek
+package io.github.muntashirakon.music.fragments.player.peek
 
 import android.graphics.Color
 import android.graphics.PorterDuff
 import android.os.Bundle
 import android.view.View
 import android.widget.ImageButton
+import android.widget.SeekBar
 import android.widget.TextView
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentPeekControlPlayerBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentPeekControlPlayerBinding
+import io.github.muntashirakon.music.extensions.applyColor
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 /**
  * Created by hemanths on 2019-10-04.
@@ -43,7 +43,7 @@ class PeekPlayerControlFragment : AbsPlayerControlsFragment(R.layout.fragment_pe
     private var _binding: FragmentPeekControlPlayerBinding? = null
     private val binding get() = _binding!!
 
-    override val progressSlider: Slider
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
@@ -82,7 +82,7 @@ class PeekPlayerControlFragment : AbsPlayerControlsFragment(R.layout.fragment_pe
             if (PreferenceUtil.isAdaptiveColor) {
                 color.primaryTextColor
             } else {
-                accentColor()
+                ThemeStore.accentColor(requireContext())
             }
         binding.progressSlider.applyColor(controlsColor)
         volumeFragment?.setTintableColor(controlsColor)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/peek/PeekPlayerFragment.kt
similarity index 82%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/peek/PeekPlayerFragment.kt
index 3fe563dc8..c928125e3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/peek/PeekPlayerFragment.kt
@@ -12,22 +12,22 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.peek
+package io.github.muntashirakon.music.fragments.player.peek
 
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentPeekPlayerBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentPeekPlayerBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 /**
  * Created by hemanths on 2019-10-03.
@@ -68,7 +68,7 @@ class PeekPlayerFragment : AbsPlayerFragment(R.layout.fragment_peek_player) {
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@PeekPlayerFragment)
             ToolbarContentTintHelper.colorizeToolbar(
                 this,
@@ -88,6 +88,10 @@ class PeekPlayerFragment : AbsPlayerFragment(R.layout.fragment_peek_player) {
     override fun onHide() {
     }
 
+    override fun onBackPressed(): Boolean {
+        return false
+    }
+
     override fun toolbarIconColor() = colorControlNormal()
 
     override val paletteColor: Int
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/plain/PlainPlaybackControlsFragment.kt
similarity index 86%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/plain/PlainPlaybackControlsFragment.kt
index c5c7869ed..65be2f649 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/plain/PlainPlaybackControlsFragment.kt
@@ -12,25 +12,29 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.plain
+package io.github.muntashirakon.music.fragments.player.plain
 
 import android.os.Bundle
 import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageButton
+import android.widget.SeekBar
 import android.widget.TextView
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentPlainControlsFragmentBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentPlainControlsFragmentBinding
+import io.github.muntashirakon.music.extensions.applyColor
+import io.github.muntashirakon.music.extensions.getSongInfo
+import io.github.muntashirakon.music.extensions.hide
+import io.github.muntashirakon.music.extensions.show
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 /**
  * @author Hemanth S (h4h13).
@@ -42,7 +46,7 @@ class PlainPlaybackControlsFragment :
     private var _binding: FragmentPlainControlsFragmentBinding? = null
     private val binding get() = _binding!!
 
-    override val progressSlider: Slider
+    override val progressSlider: SeekBar
         get() = binding.progressSlider
 
     override val shuffleButton: ImageButton
@@ -130,7 +134,7 @@ class PlainPlaybackControlsFragment :
         val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
             color.primaryTextColor
         } else {
-            accentColor()
+            ThemeStore.accentColor(requireContext())
         }
         volumeFragment?.setTintable(colorFinal)
         binding.progressSlider.applyColor(colorFinal)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/plain/PlainPlayerFragment.kt
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/plain/PlainPlayerFragment.kt
index a2cc47387..c87c1d272 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/plain/PlainPlayerFragment.kt
@@ -12,24 +12,24 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.plain
+package io.github.muntashirakon.music.fragments.player.plain
 
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentPlainPlayerBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentPlainPlayerBinding
+import io.github.muntashirakon.music.extensions.colorControlNormal
+import io.github.muntashirakon.music.extensions.drawAboveSystemBars
+import io.github.muntashirakon.music.extensions.whichFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class PlainPlayerFragment : AbsPlayerFragment(R.layout.fragment_plain_player) {
     override fun playerToolbar(): Toolbar {
@@ -63,7 +63,7 @@ class PlainPlayerFragment : AbsPlayerFragment(R.layout.fragment_plain_player) {
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@PlainPlayerFragment)
             ToolbarContentTintHelper.colorizeToolbar(
                 this,
@@ -102,6 +102,11 @@ class PlainPlayerFragment : AbsPlayerFragment(R.layout.fragment_plain_player) {
 
     override fun onHide() {
         plainPlaybackControlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor() = colorControlNormal()
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/simple/SimplePlaybackControlsFragment.kt
similarity index 86%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/simple/SimplePlaybackControlsFragment.kt
index 1d487ddb8..ac3be7487 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/simple/SimplePlaybackControlsFragment.kt
@@ -12,29 +12,29 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.simple
+package io.github.muntashirakon.music.fragments.player.simple
 
 import android.os.Bundle
 import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageButton
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentSimpleControlsFragmentBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.getSongInfo
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.extensions.show
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentSimpleControlsFragmentBinding
+import io.github.muntashirakon.music.extensions.getSongInfo
+import io.github.muntashirakon.music.extensions.hide
+import io.github.muntashirakon.music.extensions.show
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 /**
  * @author Hemanth S (h4h13).
@@ -154,7 +154,7 @@ class SimplePlaybackControlsFragment :
         val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
             color.primaryTextColor
         } else {
-            accentColor()
+            ThemeStore.accentColor(requireContext())
         }
 
         volumeFragment?.setTintable(colorFinal)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/simple/SimplePlayerFragment.kt
similarity index 79%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/simple/SimplePlayerFragment.kt
index fd7f41e1b..97af6f118 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/simple/SimplePlayerFragment.kt
@@ -12,22 +12,22 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.simple
+package io.github.muntashirakon.music.fragments.player.simple
 
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentSimplePlayerBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentSimplePlayerBinding
+import io.github.muntashirakon.music.extensions.colorControlNormal
+import io.github.muntashirakon.music.extensions.drawAboveSystemBars
+import io.github.muntashirakon.music.extensions.whichFragment
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 /**
  * @author Hemanth S (h4h13).
@@ -71,6 +71,10 @@ class SimplePlayerFragment : AbsPlayerFragment(R.layout.fragment_simple_player)
         controlsFragment.hide()
     }
 
+    override fun onBackPressed(): Boolean {
+        return false
+    }
+
     override fun toolbarIconColor() = colorControlNormal()
 
     override fun onColorChanged(color: MediaNotificationProcessor) {
@@ -97,7 +101,7 @@ class SimplePlayerFragment : AbsPlayerFragment(R.layout.fragment_simple_player)
 
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.inflateMenu(R.menu.menu_player)
-        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressed() }
         binding.playerToolbar.setOnMenuItemClickListener(this)
         ToolbarContentTintHelper.colorizeToolbar(
             binding.playerToolbar,
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/tiny/TinyPlaybackControlsFragment.kt
similarity index 86%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/tiny/TinyPlaybackControlsFragment.kt
index 2104ddf50..35e144752 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/tiny/TinyPlaybackControlsFragment.kt
@@ -12,16 +12,16 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.tiny
+package io.github.muntashirakon.music.fragments.player.tiny
 
 import android.os.Bundle
 import android.view.View
 import android.widget.ImageButton
 import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentTinyControlsFragmentBinding
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentTinyControlsFragmentBinding
+import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 
 class TinyPlaybackControlsFragment :
     AbsPlayerControlsFragment(R.layout.fragment_tiny_controls_fragment) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/player/tiny/TinyPlayerFragment.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/player/tiny/TinyPlayerFragment.kt
index 72489846e..4465b01c0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/player/tiny/TinyPlayerFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.player.tiny
+package io.github.muntashirakon.music.fragments.player.tiny
 
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
@@ -27,22 +27,21 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.content.getSystemService
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentTinyPlayerBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ViewUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentTinyPlayerBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
+import io.github.muntashirakon.music.fragments.base.goToAlbum
+import io.github.muntashirakon.music.fragments.base.goToArtist
+import io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper
+import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.ViewUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import kotlin.math.abs
 
 class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player),
@@ -63,6 +62,10 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player),
 
     override fun onHide() {}
 
+    override fun onBackPressed(): Boolean {
+        return false
+    }
+
     override fun toolbarIconColor(): Int {
         return toolbarColor
     }
@@ -156,7 +159,7 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player),
     private fun setUpPlayerToolbar() {
         binding.playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@TinyPlayerFragment)
         }
     }
@@ -210,8 +213,8 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player),
             gestureDetector = GestureDetector(context, object :
                 GestureDetector.SimpleOnGestureListener() {
 
-                override fun onLongPress(e: MotionEvent) {
-                    if (abs(e.y - initialY) <= 2) {
+                override fun onLongPress(e: MotionEvent?) {
+                    if (abs(e!!.y - initialY) <= 2) {
                         vibrate()
                         isDragEnabled = true
                         binding.progressBar.parent.requestDisallowInterceptTouchEvent(true)
@@ -248,7 +251,6 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player),
                     initialY = event.y.toInt()
                     progressViewUpdateHelper.stop()
                 }
-
                 MotionEvent.ACTION_UP,
                 MotionEvent.ACTION_CANCEL -> {
                     progressViewUpdateHelper.start()
@@ -258,7 +260,6 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player),
                         return true
                     }
                 }
-
                 MotionEvent.ACTION_MOVE -> {
                     if (isDragEnabled) {
                         val diffY = (initialY - event.y).toInt()
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistDetailsFragment.kt
similarity index 60%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistDetailsFragment.kt
index 352bf453b..792fd61a7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistDetailsFragment.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.fragments.playlists
+package io.github.muntashirakon.music.fragments.playlists
 
 import android.graphics.Color
 import android.os.Bundle
@@ -12,40 +12,43 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.song.OrderablePlaylistSongAdapter
-import code.name.monkey.retromusic.databinding.FragmentPlaylistDetailNewBinding
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.toSongs
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.elevatedAccentColor
-import code.name.monkey.retromusic.extensions.surfaceColor
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension.playlistOptions
-import code.name.monkey.retromusic.glide.playlistPreview.PlaylistPreview
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.ThemedFastScroller
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.song.OrderablePlaylistSongAdapter
+import io.github.muntashirakon.music.databinding.FragmentPlaylistDetailBinding
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.db.toSongs
+import io.github.muntashirakon.music.extensions.dip
+import io.github.muntashirakon.music.extensions.surfaceColor
+import io.github.muntashirakon.music.fragments.base.AbsMainActivityFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.menu.PlaylistMenuHelper
+import io.github.muntashirakon.music.interfaces.ICabCallback
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.RetroColorUtil
+import com.afollestad.materialcab.attached.AttachedCab
+import com.afollestad.materialcab.attached.destroy
+import com.afollestad.materialcab.attached.isActive
+import com.afollestad.materialcab.createCab
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.transition.MaterialArcMotion
 import com.google.android.material.transition.MaterialContainerTransform
 import com.google.android.material.transition.MaterialSharedAxis
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator
+import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
 
-class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playlist_detail_new) {
+class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playlist_detail),
+    ICabHolder {
     private val arguments by navArgs<PlaylistDetailsFragmentArgs>()
     private val viewModel by viewModel<PlaylistDetailsViewModel> {
-        parametersOf(arguments.extraPlaylistId)
+        parametersOf(arguments.extraPlaylist)
     }
 
-    private var _binding: FragmentPlaylistDetailNewBinding? = null
+    private var _binding: FragmentPlaylistDetailBinding? = null
     private val binding get() = _binding!!
 
     private lateinit var playlist: PlaylistWithSongs
@@ -63,26 +66,14 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentPlaylistDetailNewBinding.bind(view)
+        _binding = FragmentPlaylistDetailBinding.bind(view)
         enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true).addTarget(view)
         returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
         mainActivity.setSupportActionBar(binding.toolbar)
-        binding.toolbar.title = null
-//        binding.container.transitionName = playlist.playlistEntity.playlistName
-
+        binding.container.transitionName = "playlist"
+        playlist = arguments.extraPlaylist
+        binding.toolbar.title = playlist.playlistEntity.playlistName
         setUpRecyclerView()
-        setupButtons()
-        viewModel.getPlaylist().observe(viewLifecycleOwner) { playlistWithSongs ->
-            playlist = playlistWithSongs
-            Glide.with(this)
-                .load(PlaylistPreview(playlistWithSongs))
-                .playlistOptions()
-                .into(binding.image)
-            binding.title.text = playlist.playlistEntity.playlistName
-            binding.subtitle.text =
-                MusicUtil.getPlaylistInfoString(requireContext(), playlist.songs.toSongs())
-            binding.collapsingAppBarLayout.title = playlist.playlistEntity.playlistName
-        }
         viewModel.getSongs().observe(viewLifecycleOwner) {
             songs(it.toSongs())
         }
@@ -97,27 +88,13 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
             MaterialShapeDrawable.createWithElevationOverlay(requireContext())
     }
 
-    private fun setupButtons() {
-        binding.playButton.apply {
-            setOnClickListener {
-                MusicPlayerRemote.openQueue(playlistSongAdapter.dataSet, 0, true)
-            }
-            accentColor()
-        }
-        binding.shuffleButton.apply {
-            setOnClickListener {
-                MusicPlayerRemote.openAndShuffleQueue(playlistSongAdapter.dataSet, true)
-            }
-            elevatedAccentColor()
-        }
-    }
-
     private fun setUpRecyclerView() {
         playlistSongAdapter = OrderablePlaylistSongAdapter(
-            arguments.extraPlaylistId,
+            playlist.playlistEntity,
             requireActivity(),
             ArrayList(),
-            R.layout.item_queue
+            R.layout.item_queue,
+            this
         )
 
         val dragDropManager = RecyclerViewDragDropManager()
@@ -125,12 +102,15 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
         val wrappedAdapter: RecyclerView.Adapter<*> =
             dragDropManager.createWrappedAdapter(playlistSongAdapter)
 
+
+        val animator: GeneralItemAnimator = DraggableItemAnimator()
+        binding.recyclerView.itemAnimator = animator
+
+        dragDropManager.attachRecyclerView(binding.recyclerView)
+
         binding.recyclerView.apply {
-            adapter = wrappedAdapter
             layoutManager = LinearLayoutManager(requireContext())
-            itemAnimator = DraggableItemAnimator()
-            dragDropManager.attachRecyclerView(this)
-            ThemedFastScroller.create(this)
+            binding.recyclerView.adapter = wrappedAdapter
         }
         playlistSongAdapter.registerAdapterDataObserver(object :
             RecyclerView.AdapterDataObserver() {
@@ -149,7 +129,17 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
         return PlaylistMenuHelper.handleMenuClick(requireActivity(), playlist, item)
     }
 
+    private fun checkForPadding() {
+        val itemCount: Int = playlistSongAdapter.itemCount
+        if (itemCount > 0 && MusicPlayerRemote.playingQueue.isNotEmpty()) {
+            binding.recyclerView.updatePadding(bottom = dip(R.dimen.mini_player_height))
+        } else {
+            binding.recyclerView.updatePadding(bottom = 0)
+        }
+    }
+
     private fun checkIsEmpty() {
+        checkForPadding()
         binding.empty.isVisible = playlistSongAdapter.itemCount == 0
         binding.emptyText.isVisible = playlistSongAdapter.itemCount == 0
     }
@@ -182,4 +172,27 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
         super.onDestroyView()
         _binding = null
     }
+
+    private var cab: AttachedCab? = null
+
+    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
+        cab?.let {
+            println("Cab")
+            if (it.isActive()) {
+                it.destroy()
+            }
+        }
+        cab = createCab(R.id.toolbar_container) {
+            menu(menuRes)
+            closeDrawable(R.drawable.ic_close)
+            backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor()))
+            slideDown()
+            onCreate { cab, menu -> callback.onCabCreated(cab, menu) }
+            onSelection {
+                callback.onCabItemClicked(it)
+            }
+            onDestroy { callback.onCabFinished(it) }
+        }
+        return cab as AttachedCab
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistDetailsViewModel.kt
similarity index 65%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistDetailsViewModel.kt
index ce2f452f5..cc90c19f7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistDetailsViewModel.kt
@@ -12,23 +12,21 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.playlists
+package io.github.muntashirakon.music.fragments.playlists
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.SongEntity
-import code.name.monkey.retromusic.repository.RealRepository
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.db.SongEntity
+import io.github.muntashirakon.music.repository.RealRepository
 
 class PlaylistDetailsViewModel(
     private val realRepository: RealRepository,
-    private var playlistId: Long
+    private var playlist: PlaylistWithSongs
 ) : ViewModel() {
     fun getSongs(): LiveData<List<SongEntity>> =
-        realRepository.playlistSongs(playlistId)
+        realRepository.playlistSongs(playlist.playlistEntity.playListId)
 
     fun playlistExists(): LiveData<Boolean> =
-        realRepository.checkPlaylistExists(playlistId)
-
-    fun getPlaylist(): LiveData<PlaylistWithSongs> = realRepository.getPlaylist(playlistId)
+        realRepository.checkPlaylistExists(playlist.playlistEntity.playListId)
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistsFragment.kt
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistsFragment.kt
index 258fb0ed2..ee0cda9bb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistsFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.playlists
+package io.github.muntashirakon.music.fragments.playlists
 
 import android.os.Bundle
 import android.view.*
@@ -20,16 +20,16 @@ import androidx.core.os.bundleOf
 import androidx.core.view.MenuCompat
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
-import code.name.monkey.retromusic.EXTRA_PLAYLIST_ID
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.playlist.PlaylistAdapter
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewCustomGridSizeFragment
-import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder
-import code.name.monkey.retromusic.interfaces.IPlaylistClickListener
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
+import io.github.muntashirakon.music.EXTRA_PLAYLIST
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.playlist.PlaylistAdapter
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.fragments.ReloadType
+import io.github.muntashirakon.music.fragments.base.AbsRecyclerViewCustomGridSizeFragment
+import io.github.muntashirakon.music.helper.SortOrder.PlaylistSortOrder
+import io.github.muntashirakon.music.interfaces.IPlaylistClickListener
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RetroUtil
 import com.google.android.material.transition.MaterialSharedAxis
 
 class PlaylistsFragment :
@@ -65,6 +65,7 @@ class PlaylistsFragment :
             requireActivity(),
             dataSet,
             itemLayoutRes(),
+            null,
             this
         )
     }
@@ -75,12 +76,12 @@ class PlaylistsFragment :
         if (RetroUtil.isLandscape) {
             gridSizeItem.setTitle(R.string.action_grid_size_land)
         }
-        setupGridSizeMenu(gridSizeItem.subMenu!!)
+        setupGridSizeMenu(gridSizeItem.subMenu)
         menu.removeItem(R.id.action_layout_type)
         menu.add(0, R.id.action_add_to_playlist, 0, R.string.new_playlist_title)
         menu.add(0, R.id.action_import_playlist, 0, R.string.import_playlist)
         menu.findItem(R.id.action_settings).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
+        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu)
         MenuCompat.setGroupDividerEnabled(menu, true)
     }
 
@@ -105,7 +106,7 @@ class PlaylistsFragment :
             7 -> gridSizeMenu.findItem(R.id.action_grid_size_7).isChecked = true
             8 -> gridSizeMenu.findItem(R.id.action_grid_size_8).isChecked = true
         }
-        val gridSize = if (RetroUtil.isLandscape) 4 else 3
+        val gridSize = if (RetroUtil.isLandscape) 4 else 2
         if (gridSize < 8) {
             gridSizeMenu.findItem(R.id.action_grid_size_8).isVisible = false
         }
@@ -241,7 +242,9 @@ class PlaylistsFragment :
         reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
         findNavController().navigate(
             R.id.playlistDetailsFragment,
-            bundleOf(EXTRA_PLAYLIST_ID to playlistWithSongs.playlistEntity.playListId)
+            bundleOf(EXTRA_PLAYLIST to playlistWithSongs),
+            null,
+            null
         )
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/queue/PlayingQueueFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/queue/PlayingQueueFragment.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/queue/PlayingQueueFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/queue/PlayingQueueFragment.kt
index 0526ade15..4fcc7b9b9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/queue/PlayingQueueFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/queue/PlayingQueueFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.queue
+package io.github.muntashirakon.music.fragments.queue
 
 import android.content.res.ColorStateList
 import android.os.Bundle
@@ -23,15 +23,15 @@ import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
-import code.name.monkey.retromusic.databinding.FragmentPlayingQueueBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.ThemedFastScroller
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.adapter.song.PlayingQueueAdapter
+import io.github.muntashirakon.music.databinding.FragmentPlayingQueueBinding
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.fragments.base.AbsMusicServiceFragment
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.ThemedFastScroller
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
 import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager
@@ -49,9 +49,6 @@ class PlayingQueueFragment : AbsMusicServiceFragment(R.layout.fragment_playing_q
     private var playingQueueAdapter: PlayingQueueAdapter? = null
     private lateinit var linearLayoutManager: LinearLayoutManager
 
-    val mainActivity: MainActivity
-        get() = activity as MainActivity
-
     private fun getUpNextAndQueueTime(): String {
         val duration = MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.position)
         return MusicUtil.buildInfoString(
@@ -71,7 +68,6 @@ class PlayingQueueFragment : AbsMusicServiceFragment(R.layout.fragment_playing_q
             MusicPlayerRemote.clearQueue()
         }
         checkForPadding()
-        mainActivity.collapsePanel()
     }
 
     private fun setUpRecyclerView() {
@@ -79,6 +75,9 @@ class PlayingQueueFragment : AbsMusicServiceFragment(R.layout.fragment_playing_q
         recyclerViewDragDropManager = RecyclerViewDragDropManager()
         recyclerViewSwipeManager = RecyclerViewSwipeManager()
 
+        val animator = DraggableItemAnimator()
+        animator.supportsChangeAnimations = false
+
         playingQueueAdapter = PlayingQueueAdapter(
             requireActivity(),
             MusicPlayerRemote.playingQueue.toMutableList(),
@@ -90,15 +89,12 @@ class PlayingQueueFragment : AbsMusicServiceFragment(R.layout.fragment_playing_q
 
         linearLayoutManager = LinearLayoutManager(requireContext())
 
-
-        binding.recyclerView.apply {
-            layoutManager = linearLayoutManager
-            adapter = wrappedAdapter
-            itemAnimator = DraggableItemAnimator()
-            recyclerViewTouchActionGuardManager?.attachRecyclerView(this)
-            recyclerViewDragDropManager?.attachRecyclerView(this)
-            recyclerViewSwipeManager?.attachRecyclerView(this)
-        }
+        binding.recyclerView.layoutManager = linearLayoutManager
+        binding.recyclerView.adapter = wrappedAdapter
+        binding.recyclerView.itemAnimator = animator
+        recyclerViewTouchActionGuardManager?.attachRecyclerView(binding.recyclerView)
+        recyclerViewDragDropManager?.attachRecyclerView(binding.recyclerView)
+        recyclerViewSwipeManager?.attachRecyclerView(binding.recyclerView)
         linearLayoutManager.scrollToPositionWithOffset(MusicPlayerRemote.position + 1, 0)
 
         binding.recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
@@ -178,12 +174,11 @@ class PlayingQueueFragment : AbsMusicServiceFragment(R.layout.fragment_playing_q
         playingQueueAdapter = null
         super.onDestroy()
         if (MusicPlayerRemote.playingQueue.isNotEmpty())
-            mainActivity.expandPanel()
+            (requireActivity() as MainActivity).expandPanel()
     }
 
     private fun setupToolbar() {
         binding.appBarLayout.toolbar.subtitle = getUpNextAndQueueTime()
-        binding.appBarLayout.toolbar.isTitleCentered = false
         binding.clearQueue.backgroundTintList = ColorStateList.valueOf(accentColor())
         ColorStateList.valueOf(
             MaterialValueHelper.getPrimaryTextColor(
@@ -201,7 +196,7 @@ class PlayingQueueFragment : AbsMusicServiceFragment(R.layout.fragment_playing_q
             }
             setTitle(R.string.now_playing_queue)
             setTitleTextAppearance(context, R.style.ToolbarTextAppearanceNormal)
-            setNavigationIcon(R.drawable.ic_arrow_back)
+            setNavigationIcon(R.drawable.ic_keyboard_backspace_black)
             ToolbarContentTintHelper.colorBackButton(this)
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/search/SearchFragment.kt
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/search/SearchFragment.kt
index 808aa6732..11091e418 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/search/SearchFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.search
+package io.github.muntashirakon.music.fragments.search
 
 import android.app.Activity.RESULT_OK
 import android.content.ActivityNotFoundException
@@ -29,12 +29,17 @@ import androidx.core.widget.doAfterTextChanged
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.TransitionManager
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.SearchAdapter
-import code.name.monkey.retromusic.databinding.FragmentSearchBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.appthemehelper.ThemeStore
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.SearchAdapter
+import io.github.muntashirakon.music.databinding.FragmentSearchBinding
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.extensions.dipToPix
+import io.github.muntashirakon.music.extensions.focusAndShowKeyboard
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.fragments.base.AbsMainActivityFragment
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.views.addAlpha
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import com.google.android.material.shape.MaterialShapeDrawable
@@ -128,7 +133,7 @@ class SearchFragment : AbsMainActivityFragment(R.layout.fragment_search),
 
             val colors = intArrayOf(
                 android.R.color.transparent,
-                accentColor().addAlpha(0.5F)
+                ThemeStore.accentColor(requireContext()).addAlpha(0.5F)
             )
 
             chips.forEach {
@@ -146,20 +151,14 @@ class SearchFragment : AbsMainActivityFragment(R.layout.fragment_search),
         }
     }
 
-    private fun checkForMargins() {
-        if (mainActivity.isBottomNavVisible) {
-            binding.recyclerView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                bottomMargin = dip(R.dimen.bottom_nav_height)
-            }
-        }
-    }
-
     private fun setupRecyclerView() {
         searchAdapter = SearchAdapter(requireActivity(), emptyList())
         searchAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
             override fun onChanged() {
                 super.onChanged()
                 binding.empty.isVisible = searchAdapter.itemCount < 1
+                val height = dipToPix(52f)
+                binding.recyclerView.updatePadding(bottom = height.toInt())
             }
         })
         binding.recyclerView.apply {
@@ -225,11 +224,6 @@ class SearchFragment : AbsMainActivityFragment(R.layout.fragment_search),
             }
         }
 
-    override fun onResume() {
-        super.onResume()
-        checkForMargins()
-    }
-
     override fun onDestroyView() {
         hideKeyboard(view)
         super.onDestroyView()
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/AbsSettingsFragment.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/settings/AbsSettingsFragment.kt
index 3991dc229..c1fa27272 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/AbsSettingsFragment.kt
@@ -10,23 +10,21 @@
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
-package code.name.monkey.retromusic.fragments.settings
+package io.github.muntashirakon.music.fragments.settings
 
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.os.Bundle
 import android.view.View
-import androidx.core.view.updatePadding
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceManager
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceFragmentCompat
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.dip
-import code.name.monkey.retromusic.preferences.*
+import code.name.monkey.appthemehelper.util.VersionUtils
+import io.github.muntashirakon.music.activities.OnThemeChangedListener
+import io.github.muntashirakon.music.preferences.*
 import dev.chrisbanes.insetter.applyInsetter
 
 /**
@@ -64,10 +62,9 @@ abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() {
             listView.overScrollMode = View.OVER_SCROLL_NEVER
         }
 
-        listView.updatePadding(bottom = dip(R.dimen.mini_player_height))
         listView.applyInsetter {
             type(navigationBars = true) {
-                padding(vertical = true)
+                padding()
             }
         }
         invalidateSettings()
@@ -100,6 +97,10 @@ abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() {
     }
 
     fun restartActivity() {
-        activity?.recreate()
+        if (activity is OnThemeChangedListener && !VersionUtils.hasS()) {
+            (activity as OnThemeChangedListener).onThemeValuesChanged()
+        } else {
+            activity?.recreate()
+        }
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/AudioSettings.kt
similarity index 74%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/settings/AudioSettings.kt
index d493085c0..71ef45bd7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/AudioSettings.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.settings
+package io.github.muntashirakon.music.fragments.settings
 
 import android.Manifest.permission.BLUETOOTH_CONNECT
 import android.content.Intent
@@ -22,11 +22,10 @@ import android.os.Bundle
 import androidx.core.app.ActivityCompat
 import androidx.preference.Preference
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.BLUETOOTH_PLAYBACK
-import code.name.monkey.retromusic.EQUALIZER
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsBaseActivity.Companion.BLUETOOTH_PERMISSION_REQUEST
-import code.name.monkey.retromusic.util.NavigationUtil
+import io.github.muntashirakon.music.BLUETOOTH_PLAYBACK
+import io.github.muntashirakon.music.EQUALIZER
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.util.NavigationUtil
 
 /**
  * @author Hemanth S (h4h13).
@@ -49,16 +48,11 @@ class AudioSettings : AbsSettingsFragment() {
         if (VersionUtils.hasS()) {
             bluetoothPreference?.setOnPreferenceChangeListener { _, newValue ->
                 if (newValue as Boolean) {
-                    if (ActivityCompat.checkSelfPermission(
-                            requireContext(),
-                            BLUETOOTH_CONNECT
-                        ) != PERMISSION_GRANTED
+                    if (ActivityCompat.checkSelfPermission(requireContext(),
+                            BLUETOOTH_CONNECT) != PERMISSION_GRANTED
                     ) {
-                        ActivityCompat.requestPermissions(
-                            requireActivity(), arrayOf(
-                                BLUETOOTH_CONNECT
-                            ), BLUETOOTH_PERMISSION_REQUEST
-                        )
+                        ActivityCompat.requestPermissions(requireActivity(), arrayOf(
+                            BLUETOOTH_CONNECT), 100)
                     }
                 }
                 return@setOnPreferenceChangeListener true
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/ImageSettingFragment.kt
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/settings/ImageSettingFragment.kt
index 50f984a49..e62283b90 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/ImageSettingFragment.kt
@@ -12,10 +12,10 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.settings
+package io.github.muntashirakon.music.fragments.settings
 
 import android.os.Bundle
-import code.name.monkey.retromusic.R
+import io.github.muntashirakon.music.R
 
 /**
  * @author Hemanth S (h4h13).
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/MainSettingsFragment.kt
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/settings/MainSettingsFragment.kt
index 263f60945..417ec08ca 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/MainSettingsFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.settings
+package io.github.muntashirakon.music.fragments.settings
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -20,9 +20,9 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentMainSettingsBinding
-import code.name.monkey.retromusic.extensions.drawAboveSystemBarsWithPadding
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.FragmentMainSettingsBinding
+import io.github.muntashirakon.music.extensions.drawAboveSystemBarsWithPadding
 
 class MainSettingsFragment : Fragment(), View.OnClickListener {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/NotificationSettingsFragment.kt
similarity index 91%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/settings/NotificationSettingsFragment.kt
index 2abffa6b0..c29aa220d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/NotificationSettingsFragment.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.settings
+package io.github.muntashirakon.music.fragments.settings
 
 import android.content.SharedPreferences
 import android.os.Build.VERSION
@@ -20,10 +20,10 @@ import android.os.Build.VERSION_CODES
 import android.os.Bundle
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
-import code.name.monkey.retromusic.CLASSIC_NOTIFICATION
-import code.name.monkey.retromusic.COLORED_NOTIFICATION
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.CLASSIC_NOTIFICATION
+import io.github.muntashirakon.music.COLORED_NOTIFICATION
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 /**
  * @author Hemanth S (h4h13).
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/NowPlayingSettingsFragment.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/settings/NowPlayingSettingsFragment.kt
index 955cf9af0..5660c9737 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/NowPlayingSettingsFragment.kt
@@ -12,15 +12,15 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.settings
+package io.github.muntashirakon.music.fragments.settings
 
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.*
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 /**
  * @author Hemanth S (h4h13).
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/OtherSettingsFragment.kt
similarity index 64%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/settings/OtherSettingsFragment.kt
index fcc625105..b924609b1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/OtherSettingsFragment.kt
@@ -12,21 +12,17 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.settings
+package io.github.muntashirakon.music.fragments.settings
 
 import android.os.Bundle
 import android.view.View
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.os.LocaleListCompat
 import androidx.preference.Preference
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
-import code.name.monkey.retromusic.LANGUAGE_NAME
-import code.name.monkey.retromusic.LAST_ADDED_CUTOFF
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType.HomeSections
-import code.name.monkey.retromusic.util.PreferenceUtil
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import io.github.muntashirakon.music.LANGUAGE_NAME
+import io.github.muntashirakon.music.LAST_ADDED_CUTOFF
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.fragments.ReloadType.HomeSections
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 /**
@@ -34,19 +30,18 @@ import org.koin.androidx.viewmodel.ext.android.sharedViewModel
  */
 
 class OtherSettingsFragment : AbsSettingsFragment() {
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
+    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
 
     override fun invalidateSettings() {
         val languagePreference: ATEListPreference? = findPreference(LANGUAGE_NAME)
         languagePreference?.setOnPreferenceChangeListener { _, _ ->
+            println("Invalidated")
             restartActivity()
             return@setOnPreferenceChangeListener true
         }
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        PreferenceUtil.languageCode =
-            AppCompatDelegate.getApplicationLocales().toLanguageTags().ifEmpty { "auto" }
         addPreferencesFromResource(R.xml.pref_advanced)
     }
 
@@ -61,15 +56,7 @@ class OtherSettingsFragment : AbsSettingsFragment() {
         val languagePreference: Preference? = findPreference(LANGUAGE_NAME)
         languagePreference?.setOnPreferenceChangeListener { prefs, newValue ->
             setSummary(prefs, newValue)
-            if (newValue as? String == "auto") {
-                AppCompatDelegate.setApplicationLocales(LocaleListCompat.getEmptyLocaleList())
-            } else {
-                AppCompatDelegate.setApplicationLocales(
-                    LocaleListCompat.forLanguageTags(
-                        newValue as? String
-                    )
-                )
-            }
+            requireActivity().recreate()
             true
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/PersonalizeSettingsFragment.kt
similarity index 64%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/settings/PersonalizeSettingsFragment.kt
index 42dee53b9..e9ab1b815 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/PersonalizeSettingsFragment.kt
@@ -12,32 +12,30 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.settings
+package io.github.muntashirakon.music.fragments.settings
 
 import android.os.Bundle
 import android.view.View
+import androidx.preference.TwoStatePreference
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
-import code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.*
+import io.github.muntashirakon.music.*
 
 class PersonalizeSettingsFragment : AbsSettingsFragment() {
 
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        addPreferencesFromResource(R.xml.pref_ui)
-        // Hide Blur album art preference on Android 11+ devices as the lockscreen album art feature was removed by Google
-        // And if the feature is present in some Custom ROM's there is also an option to set blur so this preference is unnecessary on Android 11 and above
-        val blurredAlbumArt: ATESwitchPreference? = findPreference(BLURRED_ALBUM_ART)
-        blurredAlbumArt?.isVisible = !VersionUtils.hasR()
+    override fun invalidateSettings() {
+        val toggleFullScreen: TwoStatePreference? = findPreference(TOGGLE_FULL_SCREEN)
+        toggleFullScreen?.setOnPreferenceChangeListener { _, _ ->
+            restartActivity()
+            true
+        }
     }
 
-    override fun invalidateSettings() {}
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        addPreferencesFromResource(R.xml.pref_ui)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val albumArtOnLockscreen: ATESwitchPreference? = findPreference(ALBUM_ART_ON_LOCK_SCREEN)
-        albumArtOnLockscreen?.isVisible = !VersionUtils.hasT()
-
         val homeArtistStyle: ATEListPreference? = findPreference(HOME_ARTIST_GRID_STYLE)
         homeArtistStyle?.setOnPreferenceChangeListener { preference, newValue ->
             setSummary(preference, newValue)
@@ -53,10 +51,5 @@ class PersonalizeSettingsFragment : AbsSettingsFragment() {
             setSummary(prefs, newValue)
             true
         }
-        val appBarMode: ATEListPreference? = findPreference(APPBAR_MODE)
-        appBarMode?.setOnPreferenceChangeListener { _, _ ->
-            restartActivity()
-            true
-        }
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/ThemeSettingsFragment.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/settings/ThemeSettingsFragment.kt
index 87ac19699..91f7c77cd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/settings/ThemeSettingsFragment.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.fragments.settings
+package io.github.muntashirakon.music.fragments.settings
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -25,11 +25,10 @@ import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEColorPreference
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.*
+import io.github.muntashirakon.music.appshortcuts.DynamicShortcutManager
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.util.PreferenceUtil
 import com.afollestad.materialdialogs.color.colorChooser
 import com.google.android.material.color.DynamicColors
 
@@ -126,15 +125,9 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
             restartActivity()
             true
         }
-
-        val adaptiveColor: ATESwitchPreference? = findPreference(ADAPTIVE_COLOR_APP)
-        adaptiveColor?.isEnabled =
-            PreferenceUtil.nowPlayingScreen in listOf(Normal, Material, Flat)
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.pref_general)
-        val wallpaperAccent: ATESwitchPreference? = findPreference(WALLPAPER_ACCENT)
-        wallpaperAccent?.isVisible = VersionUtils.hasOreoMR1() && !VersionUtils.hasS()
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt b/app/src/main/java/io/github/muntashirakon/music/fragments/songs/SongsFragment.kt
similarity index 81%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt
rename to app/src/main/java/io/github/muntashirakon/music/fragments/songs/SongsFragment.kt
index 997fc327c..97f62b070 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/fragments/songs/SongsFragment.kt
@@ -12,22 +12,32 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.fragments.songs
+package io.github.muntashirakon.music.fragments.songs
 
 import android.os.Bundle
 import android.view.*
+import androidx.activity.addCallback
 import androidx.annotation.LayoutRes
 import androidx.recyclerview.widget.GridLayoutManager
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.song.SongAdapter
-import code.name.monkey.retromusic.fragments.GridStyle
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewCustomGridSizeFragment
-import code.name.monkey.retromusic.helper.SortOrder.SongSortOrder
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.song.SongAdapter
+import io.github.muntashirakon.music.extensions.surfaceColor
+import io.github.muntashirakon.music.fragments.GridStyle
+import io.github.muntashirakon.music.fragments.ReloadType
+import io.github.muntashirakon.music.fragments.base.AbsRecyclerViewCustomGridSizeFragment
+import io.github.muntashirakon.music.helper.SortOrder.SongSortOrder
+import io.github.muntashirakon.music.interfaces.ICabCallback
+import io.github.muntashirakon.music.interfaces.ICabHolder
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RetroColorUtil
+import io.github.muntashirakon.music.util.RetroUtil
+import com.afollestad.materialcab.attached.AttachedCab
+import com.afollestad.materialcab.attached.destroy
+import com.afollestad.materialcab.attached.isActive
+import com.afollestad.materialcab.createCab
 
-class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLayoutManager>() {
+class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLayoutManager>(),
+    ICabHolder {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         libraryViewModel.getSongs().observe(viewLifecycleOwner) {
@@ -36,6 +46,12 @@ class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLay
             else
                 adapter?.swapDataSet(listOf())
         }
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
+            if (!handleBackPress()) {
+                remove()
+                requireActivity().onBackPressed()
+            }
+        }
     }
 
     override val titleRes: Int
@@ -60,7 +76,8 @@ class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLay
         return SongAdapter(
             requireActivity(),
             dataSet,
-            itemLayoutRes()
+            itemLayoutRes(),
+            this
         )
     }
 
@@ -113,22 +130,15 @@ class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLay
         if (RetroUtil.isLandscape) {
             gridSizeItem.setTitle(R.string.action_grid_size_land)
         }
-        setUpGridSizeMenu(gridSizeItem.subMenu!!)
+        setUpGridSizeMenu(gridSizeItem.subMenu)
         val layoutItem = menu.findItem(R.id.action_layout_type)
-        setupLayoutMenu(layoutItem.subMenu!!)
-        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
+        setupLayoutMenu(layoutItem.subMenu)
+        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu)
     }
 
     private fun setUpSortOrderMenu(sortOrderMenu: SubMenu) {
         val currentSortOrder: String? = getSortOrder()
         sortOrderMenu.clear()
-        sortOrderMenu.add(
-            0,
-            R.id.action_song_default_sort_order,
-            0,
-            R.string.sort_order_default
-        ).isChecked =
-            currentSortOrder == SongSortOrder.SONG_DEFAULT
         sortOrderMenu.add(
             0,
             R.id.action_song_sort_order_asc,
@@ -257,7 +267,6 @@ class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLay
 
     private fun handleSortOrderMenuItem(item: MenuItem): Boolean {
         val sortOrder: String = when (item.itemId) {
-            R.id.action_song_default_sort_order -> SongSortOrder.SONG_DEFAULT
             R.id.action_song_sort_order_asc -> SongSortOrder.SONG_A_Z
             R.id.action_song_sort_order_desc -> SongSortOrder.SONG_Z_A
             R.id.action_song_sort_order_artist -> SongSortOrder.SONG_ARTIST
@@ -322,7 +331,9 @@ class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLay
 
     override fun onPause() {
         super.onPause()
-        adapter?.actionMode?.finish()
+        if (cab.isActive()) {
+            cab.destroy()
+        }
     }
 
     companion object {
@@ -334,4 +345,37 @@ class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLay
             return SongsFragment()
         }
     }
+
+    private var cab: AttachedCab? = null
+
+    private fun handleBackPress(): Boolean {
+        cab?.let {
+            if (it.isActive()) {
+                it.destroy()
+                return true
+            }
+        }
+        return false
+    }
+
+    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
+        cab?.let {
+            println("Cab")
+            if (it.isActive()) {
+                it.destroy()
+            }
+        }
+        cab = createCab(R.id.toolbar_container) {
+            menu(menuRes)
+            closeDrawable(R.drawable.ic_close)
+            backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor()))
+            slideDown()
+            onCreate { cab, menu -> callback.onCabCreated(cab, menu) }
+            onSelection {
+                callback.onCabItemClicked(it)
+            }
+            onDestroy { callback.onCabFinished(it) }
+        }
+        return cab as AttachedCab
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/BlurTransformation.kt b/app/src/main/java/io/github/muntashirakon/music/glide/BlurTransformation.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/glide/BlurTransformation.kt
rename to app/src/main/java/io/github/muntashirakon/music/glide/BlurTransformation.kt
index a2bb033f8..a90b70a93 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/BlurTransformation.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/BlurTransformation.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.glide
+package io.github.muntashirakon.music.glide
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -6,27 +6,35 @@ import android.graphics.Canvas
 import android.graphics.Paint
 import android.renderscript.*
 import androidx.annotation.FloatRange
-import code.name.monkey.retromusic.BuildConfig
-import code.name.monkey.retromusic.helper.StackBlur
-import code.name.monkey.retromusic.util.ImageUtil
+import io.github.muntashirakon.music.BuildConfig
+import io.github.muntashirakon.music.helper.StackBlur
+import io.github.muntashirakon.music.util.ImageUtil
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
 import java.security.MessageDigest
 
 
 @Suppress("Deprecation")
-class BlurTransformation private constructor(builder: Builder) : BitmapTransformation() {
+class BlurTransformation : BitmapTransformation {
 
     private var context: Context? = null
     private var blurRadius = 0f
     private var sampling = 0
 
-    init {
+    private fun init(builder: Builder) {
         this.context = builder.context
         this.blurRadius = builder.blurRadius
         this.sampling = builder.sampling
     }
 
+    private constructor(builder: Builder) : super() {
+        init(builder)
+    }
+
+    private constructor(builder: Builder, bitmapPool: BitmapPool) : super() {
+        init(builder)
+    }
+
     class Builder(val context: Context) {
         private var bitmapPool: BitmapPool? = null
         var blurRadius = DEFAULT_BLUR_RADIUS
@@ -61,7 +69,7 @@ class BlurTransformation private constructor(builder: Builder) : BitmapTransform
 
         fun build(): BlurTransformation {
             return if (bitmapPool != null) {
-                BlurTransformation(this)
+                BlurTransformation(this, bitmapPool!!)
             } else BlurTransformation(this)
         }
     }
@@ -70,7 +78,7 @@ class BlurTransformation private constructor(builder: Builder) : BitmapTransform
         pool: BitmapPool,
         toTransform: Bitmap,
         outWidth: Int,
-        outHeight: Int,
+        outHeight: Int
     ): Bitmap {
         val sampling = if (this.sampling == 0) {
             ImageUtil.calculateInSampleSize(toTransform.width, toTransform.height, 100)
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt b/app/src/main/java/io/github/muntashirakon/music/glide/RetroGlideExtension.kt
similarity index 65%
rename from app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt
rename to app/src/main/java/io/github/muntashirakon/music/glide/RetroGlideExtension.kt
index 11439ace9..79d6e63cd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/RetroGlideExtension.kt
@@ -1,33 +1,36 @@
-package code.name.monkey.retromusic.glide
+package io.github.muntashirakon.music.glide
 
 import android.content.Context
 import android.graphics.drawable.Drawable
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.App.Companion.getContext
-import code.name.monkey.retromusic.Constants.USER_BANNER
-import code.name.monkey.retromusic.Constants.USER_PROFILE
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.glide.artistimage.ArtistImage
-import code.name.monkey.retromusic.glide.audiocover.AudioFileCover
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.ArtistSignatureUtil
-import code.name.monkey.retromusic.util.CustomArtistImageUtil.Companion.getFile
-import code.name.monkey.retromusic.util.CustomArtistImageUtil.Companion.getInstance
-import code.name.monkey.retromusic.util.MusicUtil.getMediaStoreAlbumCoverUri
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.App.Companion.getContext
+import io.github.muntashirakon.music.Constants.USER_BANNER
+import io.github.muntashirakon.music.Constants.USER_PROFILE
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.accentColor
+import io.github.muntashirakon.music.glide.artistimage.ArtistImage
+import io.github.muntashirakon.music.glide.audiocover.AudioFileCover
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.ArtistSignatureUtil
+import io.github.muntashirakon.music.util.CustomArtistImageUtil.Companion.getFile
+import io.github.muntashirakon.music.util.CustomArtistImageUtil.Companion.getInstance
+import io.github.muntashirakon.music.util.MusicUtil.getMediaStoreAlbumCoverUri
+import io.github.muntashirakon.music.util.PreferenceUtil
 import com.bumptech.glide.GenericTransitionOptions
 import com.bumptech.glide.Priority
 import com.bumptech.glide.RequestBuilder
-import com.bumptech.glide.RequestManager
+import com.bumptech.glide.annotation.GlideExtension
+import com.bumptech.glide.annotation.GlideOption
+import com.bumptech.glide.annotation.GlideType
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.Key
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.BaseRequestOptions
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
 import com.bumptech.glide.request.target.Target.SIZE_ORIGINAL
@@ -37,6 +40,7 @@ import com.bumptech.glide.signature.MediaStoreSignature
 import java.io.File
 
 
+@GlideExtension
 object RetroGlideExtension {
 
     private const val DEFAULT_ARTIST_IMAGE =
@@ -50,8 +54,10 @@ object RetroGlideExtension {
 
     private const val DEFAULT_ANIMATION = android.R.anim.fade_in
 
-    fun RequestManager.asBitmapPalette(): RequestBuilder<BitmapPaletteWrapper> {
-        return this.`as`(BitmapPaletteWrapper::class.java)
+    @JvmStatic
+    @GlideType(BitmapPaletteWrapper::class)
+    fun asBitmapPalette(requestBuilder: RequestBuilder<BitmapPaletteWrapper>): RequestBuilder<BitmapPaletteWrapper> {
+        return requestBuilder
     }
 
     private fun getSongModel(song: Song, ignoreMediaStore: Boolean): Any {
@@ -94,10 +100,14 @@ object RetroGlideExtension {
         }
     }
 
-    fun <T> RequestBuilder<T>.artistImageOptions(
+    @JvmStatic
+    @GlideOption
+    fun artistImageOptions(
+        baseRequestOptions: BaseRequestOptions<*>,
         artist: Artist
-    ): RequestBuilder<T> {
-        return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY_ARTIST)
+    ): BaseRequestOptions<*> {
+        return baseRequestOptions
+            .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY_ARTIST)
             .priority(Priority.LOW)
             .error(getDrawable(DEFAULT_ARTIST_IMAGE))
             .placeholder(getDrawable(DEFAULT_ARTIST_IMAGE))
@@ -105,52 +115,70 @@ object RetroGlideExtension {
             .signature(createSignature(artist))
     }
 
-    fun <T> RequestBuilder<T>.songCoverOptions(
+    @JvmStatic
+    @GlideOption
+    fun songCoverOptions(
+        baseRequestOptions: BaseRequestOptions<*>,
         song: Song
-    ): RequestBuilder<T> {
-        return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+    ): BaseRequestOptions<*> {
+        return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
             .error(getDrawable(DEFAULT_SONG_IMAGE))
             .placeholder(getDrawable(DEFAULT_SONG_IMAGE))
             .signature(createSignature(song))
     }
 
-    fun <T> RequestBuilder<T>.simpleSongCoverOptions(
+    @JvmStatic
+    @GlideOption
+    fun simpleSongCoverOptions(
+        baseRequestOptions: BaseRequestOptions<*>,
         song: Song
-    ): RequestBuilder<T> {
-        return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+    ): BaseRequestOptions<*> {
+        return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
             .signature(createSignature(song))
     }
 
-    fun <T> RequestBuilder<T>.albumCoverOptions(
+    @JvmStatic
+    @GlideOption
+    fun albumCoverOptions(
+        baseRequestOptions: BaseRequestOptions<*>,
         song: Song
-    ): RequestBuilder<T> {
-        return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+    ): BaseRequestOptions<*> {
+        return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
             .error(ContextCompat.getDrawable(getContext(), DEFAULT_ALBUM_IMAGE))
             .placeholder(ContextCompat.getDrawable(getContext(), DEFAULT_ALBUM_IMAGE))
             .signature(createSignature(song))
     }
 
-    fun <T> RequestBuilder<T>.userProfileOptions(
+    @JvmStatic
+    @GlideOption
+    fun userProfileOptions(
+        baseRequestOptions: BaseRequestOptions<*>,
         file: File,
         context: Context
-    ): RequestBuilder<T> {
-        return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+    ): BaseRequestOptions<*> {
+        return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
             .error(getErrorUserProfile(context))
             .signature(createSignature(file))
     }
 
-    fun <T> RequestBuilder<T>.profileBannerOptions(
+    @JvmStatic
+    @GlideOption
+    fun profileBannerOptions(
+        baseRequestOptions: BaseRequestOptions<*>,
         file: File
-    ): RequestBuilder<T> {
-        return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+    ): BaseRequestOptions<*> {
+        return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
             .placeholder(DEFAULT_ERROR_IMAGE_BANNER)
             .error(DEFAULT_ERROR_IMAGE_BANNER)
             .signature(createSignature(file))
     }
 
-    fun <T> RequestBuilder<T>.playlistOptions(): RequestBuilder<T> {
-        return diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
-            .placeholder(getDrawable(DEFAULT_ALBUM_IMAGE))
+    @JvmStatic
+    @GlideOption
+    fun playlistOptions(
+        baseRequestOptions: BaseRequestOptions<*>
+    ): BaseRequestOptions<*> {
+        return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
             .error(getDrawable(DEFAULT_ALBUM_IMAGE))
     }
 
@@ -195,7 +223,7 @@ object RetroGlideExtension {
 }
 
 // https://github.com/bumptech/glide/issues/527#issuecomment-148840717
-fun RequestBuilder<Drawable>.crossfadeListener(): RequestBuilder<Drawable> {
+fun GlideRequest<Drawable>.crossfadeListener(): GlideRequest<Drawable> {
     return listener(object : RequestListener<Drawable> {
         override fun onLoadFailed(
             e: GlideException?,
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt b/app/src/main/java/io/github/muntashirakon/music/glide/RetroMusicColoredTarget.kt
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt
rename to app/src/main/java/io/github/muntashirakon/music/glide/RetroMusicColoredTarget.kt
index 19a1a1712..5e263aa69 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/RetroMusicColoredTarget.kt
@@ -12,15 +12,15 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.glide
+package io.github.muntashirakon.music.glide
 
 import android.graphics.drawable.Drawable
 import android.widget.ImageView
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteTarget
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import io.github.muntashirakon.music.App
+import io.github.muntashirakon.music.extensions.colorControlNormal
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteTarget
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import com.bumptech.glide.request.transition.Transition
 
 abstract class RetroMusicColoredTarget(view: ImageView) : BitmapPaletteTarget(view) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt b/app/src/main/java/io/github/muntashirakon/music/glide/RetroMusicGlideModule.kt
similarity index 65%
rename from app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt
rename to app/src/main/java/io/github/muntashirakon/music/glide/RetroMusicGlideModule.kt
index be5e36056..0e8434ed2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/RetroMusicGlideModule.kt
@@ -12,18 +12,18 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.glide
+package io.github.muntashirakon.music.glide
 
 import android.content.Context
 import android.graphics.Bitmap
-import code.name.monkey.retromusic.glide.artistimage.ArtistImage
-import code.name.monkey.retromusic.glide.artistimage.Factory
-import code.name.monkey.retromusic.glide.audiocover.AudioFileCover
-import code.name.monkey.retromusic.glide.audiocover.AudioFileCoverLoader
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteTranscoder
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.glide.playlistPreview.PlaylistPreview
-import code.name.monkey.retromusic.glide.playlistPreview.PlaylistPreviewLoader
+import io.github.muntashirakon.music.glide.artistimage.ArtistImage
+import io.github.muntashirakon.music.glide.artistimage.Factory
+import io.github.muntashirakon.music.glide.audiocover.AudioFileCover
+import io.github.muntashirakon.music.glide.audiocover.AudioFileCoverLoader
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteTranscoder
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.glide.playlistPreview.PlaylistPreview
+import io.github.muntashirakon.music.glide.playlistPreview.PlaylistPreviewLoader
 import com.bumptech.glide.Glide
 import com.bumptech.glide.Registry
 import com.bumptech.glide.annotation.GlideModule
@@ -33,11 +33,7 @@ import java.io.InputStream
 @GlideModule
 class RetroMusicGlideModule : AppGlideModule() {
     override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
-        registry.prepend(
-            PlaylistPreview::class.java,
-            Bitmap::class.java,
-            PlaylistPreviewLoader.Factory(context)
-        )
+        registry.prepend(PlaylistPreview::class.java, Bitmap::class.java, PlaylistPreviewLoader.Factory(context))
         registry.prepend(
             AudioFileCover::class.java,
             InputStream::class.java,
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt b/app/src/main/java/io/github/muntashirakon/music/glide/SingleColorTarget.kt
similarity index 76%
rename from app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt
rename to app/src/main/java/io/github/muntashirakon/music/glide/SingleColorTarget.kt
index 6323411f8..f8a92c2c7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/SingleColorTarget.kt
@@ -12,20 +12,21 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.glide
+package io.github.muntashirakon.music.glide
 
 import android.graphics.drawable.Drawable
 import android.widget.ImageView
 import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteTarget
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.util.ColorUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteTarget
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.util.ColorUtil
 import com.bumptech.glide.request.transition.Transition
 
 abstract class SingleColorTarget(view: ImageView) : BitmapPaletteTarget(view) {
 
     private val defaultFooterColor: Int
-        get() = ATHUtil.resolveColor(view.context, androidx.appcompat.R.attr.colorControlNormal)
+        get() = ATHUtil.resolveColor(view.context, R.attr.colorControlNormal)
 
     abstract fun onColorReady(color: Int)
 
@@ -42,7 +43,7 @@ abstract class SingleColorTarget(view: ImageView) : BitmapPaletteTarget(view) {
         onColorReady(
             ColorUtil.getColor(
                 resource.palette,
-                ATHUtil.resolveColor(view.context, androidx.appcompat.R.attr.colorPrimary)
+                ATHUtil.resolveColor(view.context, R.attr.colorPrimary)
             )
         )
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImage.kt b/app/src/main/java/io/github/muntashirakon/music/glide/artistimage/ArtistImage.kt
similarity index 72%
rename from app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImage.kt
rename to app/src/main/java/io/github/muntashirakon/music/glide/artistimage/ArtistImage.kt
index da9de7d42..ffae31a12 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImage.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/artistimage/ArtistImage.kt
@@ -1,6 +1,6 @@
-package code.name.monkey.retromusic.glide.artistimage
+package io.github.muntashirakon.music.glide.artistimage
 
-import code.name.monkey.retromusic.model.Artist
+import io.github.muntashirakon.music.model.Artist
 
 class ArtistImage(val artist: Artist){
     override fun equals(other: Any?): Boolean {
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageFetcher.kt b/app/src/main/java/io/github/muntashirakon/music/glide/artistimage/ArtistImageFetcher.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageFetcher.kt
rename to app/src/main/java/io/github/muntashirakon/music/glide/artistimage/ArtistImageFetcher.kt
index 65dfef68a..8e54d762f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageFetcher.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/artistimage/ArtistImageFetcher.kt
@@ -1,10 +1,10 @@
-package code.name.monkey.retromusic.glide.artistimage
+package io.github.muntashirakon.music.glide.artistimage
 
 import android.content.Context
 import com.bumptech.glide.Priority
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.data.DataFetcher
-import code.name.monkey.retromusic.util.MusicUtil
+import io.github.muntashirakon.music.util.MusicUtil
 import java.io.FileNotFoundException
 import java.io.InputStream
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt b/app/src/main/java/io/github/muntashirakon/music/glide/artistimage/ArtistImageLoader.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt
rename to app/src/main/java/io/github/muntashirakon/music/glide/artistimage/ArtistImageLoader.kt
index 7a85edf95..9547386bc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/artistimage/ArtistImageLoader.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.glide.artistimage
+package io.github.muntashirakon.music.glide.artistimage
 
 import android.content.Context
 import com.bumptech.glide.load.Options
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCover.kt b/app/src/main/java/io/github/muntashirakon/music/glide/audiocover/AudioFileCover.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCover.kt
rename to app/src/main/java/io/github/muntashirakon/music/glide/audiocover/AudioFileCover.kt
index 0045669c1..efb823d35 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCover.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/audiocover/AudioFileCover.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.glide.audiocover
+package io.github.muntashirakon.music.glide.audiocover
 
 /** @author Karim Abou Zeid (kabouzeid)
  */
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverFetcher.kt b/app/src/main/java/io/github/muntashirakon/music/glide/audiocover/AudioFileCoverFetcher.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverFetcher.kt
rename to app/src/main/java/io/github/muntashirakon/music/glide/audiocover/AudioFileCoverFetcher.kt
index 897d46730..66dc25e11 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverFetcher.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/audiocover/AudioFileCoverFetcher.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.glide.audiocover
+package io.github.muntashirakon.music.glide.audiocover
 
 import android.media.MediaMetadataRetriever
 import com.bumptech.glide.Priority
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverLoader.kt b/app/src/main/java/io/github/muntashirakon/music/glide/audiocover/AudioFileCoverLoader.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverLoader.kt
rename to app/src/main/java/io/github/muntashirakon/music/glide/audiocover/AudioFileCoverLoader.kt
index 0008f09c1..54cee6254 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverLoader.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/audiocover/AudioFileCoverLoader.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.glide.audiocover
+package io.github.muntashirakon.music.glide.audiocover
 
 import com.bumptech.glide.load.Options
 import com.bumptech.glide.load.model.ModelLoader
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverUtils.java b/app/src/main/java/io/github/muntashirakon/music/glide/audiocover/AudioFileCoverUtils.java
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverUtils.java
rename to app/src/main/java/io/github/muntashirakon/music/glide/audiocover/AudioFileCoverUtils.java
index 5c7fa7aad..1c706b2d2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverUtils.java
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/audiocover/AudioFileCoverUtils.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.glide.audiocover;
+package io.github.muntashirakon.music.glide.audiocover;
 
 import org.jaudiotagger.audio.exceptions.CannotReadException;
 import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException;
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteResource.java b/app/src/main/java/io/github/muntashirakon/music/glide/palette/BitmapPaletteResource.java
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteResource.java
rename to app/src/main/java/io/github/muntashirakon/music/glide/palette/BitmapPaletteResource.java
index da3c4bb6c..1936c99a6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteResource.java
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/palette/BitmapPaletteResource.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.glide.palette;
+package io.github.muntashirakon.music.glide.palette;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTarget.java b/app/src/main/java/io/github/muntashirakon/music/glide/palette/BitmapPaletteTarget.java
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTarget.java
rename to app/src/main/java/io/github/muntashirakon/music/glide/palette/BitmapPaletteTarget.java
index 4fb766049..412b90ad0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTarget.java
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/palette/BitmapPaletteTarget.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.glide.palette;
+package io.github.muntashirakon.music.glide.palette;
 
 import android.widget.ImageView;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTranscoder.java b/app/src/main/java/io/github/muntashirakon/music/glide/palette/BitmapPaletteTranscoder.java
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTranscoder.java
rename to app/src/main/java/io/github/muntashirakon/music/glide/palette/BitmapPaletteTranscoder.java
index 0e96b8090..419fc31ab 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTranscoder.java
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/palette/BitmapPaletteTranscoder.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.glide.palette;
+package io.github.muntashirakon.music.glide.palette;
 
 import android.graphics.Bitmap;
 
@@ -22,7 +22,7 @@ import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.transcode.ResourceTranscoder;
 
-import code.name.monkey.retromusic.util.RetroColorUtil;
+import io.github.muntashirakon.music.util.RetroColorUtil;
 
 public class BitmapPaletteTranscoder implements ResourceTranscoder<Bitmap,  BitmapPaletteWrapper> {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteWrapper.java b/app/src/main/java/io/github/muntashirakon/music/glide/palette/BitmapPaletteWrapper.java
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteWrapper.java
rename to app/src/main/java/io/github/muntashirakon/music/glide/palette/BitmapPaletteWrapper.java
index db647f6ef..32be1d2cd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteWrapper.java
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/palette/BitmapPaletteWrapper.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.glide.palette;
+package io.github.muntashirakon.music.glide.palette;
 
 import android.graphics.Bitmap;
 
diff --git a/app/src/main/java/io/github/muntashirakon/music/glide/playlistPreview/PlaylistPreview.kt b/app/src/main/java/io/github/muntashirakon/music/glide/playlistPreview/PlaylistPreview.kt
new file mode 100644
index 000000000..4cbc5aeaa
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/playlistPreview/PlaylistPreview.kt
@@ -0,0 +1,31 @@
+package io.github.muntashirakon.music.glide.playlistPreview
+
+import io.github.muntashirakon.music.db.PlaylistEntity
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.db.toSongs
+import io.github.muntashirakon.music.model.Song
+
+class PlaylistPreview(val playlistWithSongs: PlaylistWithSongs) {
+
+    val playlistEntity: PlaylistEntity get() = playlistWithSongs.playlistEntity
+    val songs: List<Song> get() = playlistWithSongs.songs.toSongs()
+
+    override fun equals(other: Any?): Boolean {
+        if (other is PlaylistPreview) {
+            if (other.playlistEntity.playListId != playlistEntity.playListId) {
+                return false
+            }
+            if (other.songs.size != songs.size) {
+                return false
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun hashCode(): Int {
+        var result = playlistEntity.playListId.hashCode()
+        result = 31 * result + playlistWithSongs.songs.size
+        return result
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewFetcher.kt b/app/src/main/java/io/github/muntashirakon/music/glide/playlistPreview/PlaylistPreviewFetcher.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewFetcher.kt
rename to app/src/main/java/io/github/muntashirakon/music/glide/playlistPreview/PlaylistPreviewFetcher.kt
index 5443b5825..fefbca185 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewFetcher.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/playlistPreview/PlaylistPreviewFetcher.kt
@@ -1,8 +1,8 @@
-package code.name.monkey.retromusic.glide.playlistPreview
+package io.github.muntashirakon.music.glide.playlistPreview
 
 import android.content.Context
 import android.graphics.Bitmap
-import code.name.monkey.retromusic.util.AutoGeneratedPlaylistBitmap
+import io.github.muntashirakon.music.util.AutoGeneratedPlaylistBitmap
 import com.bumptech.glide.Priority
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.data.DataFetcher
@@ -17,7 +17,7 @@ class PlaylistPreviewFetcher(val context: Context, private val playlistPreview:
                 val bitmap =
                     AutoGeneratedPlaylistBitmap.getBitmap(
                         context,
-                        playlistPreview.songs
+                        playlistPreview.songs.shuffled()
                     )
                 callback.onDataReady(bitmap)
             } catch (e: Exception) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewLoader.kt b/app/src/main/java/io/github/muntashirakon/music/glide/playlistPreview/PlaylistPreviewLoader.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewLoader.kt
rename to app/src/main/java/io/github/muntashirakon/music/glide/playlistPreview/PlaylistPreviewLoader.kt
index 6dae74c9a..0fac0e554 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewLoader.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/glide/playlistPreview/PlaylistPreviewLoader.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.glide.playlistPreview
+package io.github.muntashirakon.music.glide.playlistPreview
 
 import android.content.Context
 import android.graphics.Bitmap
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt b/app/src/main/java/io/github/muntashirakon/music/helper/BackupHelper.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/BackupHelper.kt
index 50869e936..8fcd1c5a0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/BackupHelper.kt
@@ -1,18 +1,18 @@
-package code.name.monkey.retromusic.helper
+package io.github.muntashirakon.music.helper
 
 import android.content.Context
 import android.os.Environment
-import code.name.monkey.retromusic.BuildConfig
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.toSongEntity
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.extensions.zipOutputStream
-import code.name.monkey.retromusic.helper.BackupContent.*
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.Repository
-import code.name.monkey.retromusic.repository.SongRepository
-import code.name.monkey.retromusic.util.getExternalStoragePublicDirectory
+import io.github.muntashirakon.music.BuildConfig
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.PlaylistEntity
+import io.github.muntashirakon.music.db.toSongEntity
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.extensions.zipOutputStream
+import io.github.muntashirakon.music.helper.BackupContent.*
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.repository.Repository
+import io.github.muntashirakon.music.repository.SongRepository
+import io.github.muntashirakon.music.util.getExternalStoragePublicDirectory
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/HorizontalAdapterHelper.kt b/app/src/main/java/io/github/muntashirakon/music/helper/HorizontalAdapterHelper.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/helper/HorizontalAdapterHelper.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/HorizontalAdapterHelper.kt
index f98508bf8..162262be8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/HorizontalAdapterHelper.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/HorizontalAdapterHelper.kt
@@ -12,11 +12,11 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.helper
+package io.github.muntashirakon.music.helper
 
 import android.content.Context
 import android.view.ViewGroup
-import code.name.monkey.retromusic.R
+import io.github.muntashirakon.music.R
 
 object HorizontalAdapterHelper {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/M3UConstants.java b/app/src/main/java/io/github/muntashirakon/music/helper/M3UConstants.java
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/helper/M3UConstants.java
rename to app/src/main/java/io/github/muntashirakon/music/helper/M3UConstants.java
index f2956897b..1d9ea5c5d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/M3UConstants.java
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/M3UConstants.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.helper;
+package io.github.muntashirakon.music.helper;
 
 public interface M3UConstants {
   String EXTENSION = "m3u";
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.kt b/app/src/main/java/io/github/muntashirakon/music/helper/M3UWriter.kt
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/M3UWriter.kt
index fb895743e..6883a5ce3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/M3UWriter.kt
@@ -12,12 +12,12 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.helper
+package io.github.muntashirakon.music.helper
 
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.toSongs
-import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.db.toSongs
+import io.github.muntashirakon.music.model.Playlist
+import io.github.muntashirakon.music.model.Song
 import java.io.*
 
 object M3UWriter : M3UConstants {
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt b/app/src/main/java/io/github/muntashirakon/music/helper/MusicPlayerRemote.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/MusicPlayerRemote.kt
index 3c20e2aca..5ee91fd03 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/MusicPlayerRemote.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.helper
+package io.github.muntashirakon.music.helper
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -23,18 +23,17 @@ import android.os.IBinder
 import android.provider.DocumentsContract
 import android.widget.Toast
 import androidx.core.content.ContextCompat
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.SongRepository
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.getExternalStorageDirectory
-import code.name.monkey.retromusic.util.logE
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.repository.SongRepository
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.getExternalStorageDirectory
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import java.io.File
 import java.util.*
-import kotlin.collections.set
 
 
 object MusicPlayerRemote : KoinComponent {
@@ -44,6 +43,14 @@ object MusicPlayerRemote : KoinComponent {
 
     private val songRepository by inject<SongRepository>()
 
+    var isCasting: Boolean = false
+        set(value) {
+            field = value
+            if (value) {
+                musicService?.quit()
+            }
+        }
+
     @JvmStatic
     val isPlaying: Boolean
         get() = musicService != null && musicService!!.isPlaying
@@ -64,6 +71,9 @@ object MusicPlayerRemote : KoinComponent {
             musicService?.nextSong
         } else Song.emptySong
 
+    /**
+     * Async
+     */
     var position: Int
         get() = if (musicService != null) {
             musicService!!.position
@@ -111,18 +121,20 @@ object MusicPlayerRemote : KoinComponent {
 
     fun bindToService(context: Context, callback: ServiceConnection): ServiceToken? {
 
-        val realActivity = (context as Activity).parent ?: context
-        val contextWrapper = ContextWrapper(realActivity)
-        val intent = Intent(contextWrapper, MusicService::class.java)
-
-        // https://issuetracker.google.com/issues/76112072#comment184
-        // Workaround for ForegroundServiceDidNotStartInTimeException
-        try {
-            context.startService(intent)
-        } catch (e: Exception) {
-            ContextCompat.startForegroundService(context, intent)
+        var realActivity: Activity? = (context as Activity).parent
+        if (realActivity == null) {
+            realActivity = context
         }
 
+        val contextWrapper = ContextWrapper(realActivity)
+        val intent = Intent(contextWrapper, MusicService::class.java)
+        try {
+            contextWrapper.startService(intent)
+        } catch (ignored: IllegalStateException) {
+            runCatching {
+                ContextCompat.startForegroundService(context, intent)
+            }
+        }
         val binder = ServiceBinder(callback)
 
         if (contextWrapper.bindService(
@@ -172,6 +184,9 @@ object MusicPlayerRemote : KoinComponent {
         return musicService?.playingQueue?.size ?: -1
     }
 
+    /**
+     * Async
+     */
     fun playSongAt(position: Int) {
         musicService?.playSongAt(position)
     }
@@ -217,9 +232,14 @@ object MusicPlayerRemote : KoinComponent {
             ) && musicService != null
         ) {
             musicService?.openQueue(queue, startPosition, startPlaying)
+            if (PreferenceUtil.isShuffleModeOn)
+                setShuffleMode(MusicService.SHUFFLE_MODE_NONE)
         }
     }
 
+    /**
+     * Async
+     */
     @JvmStatic
     fun openAndShuffleQueue(queue: List<Song>, startPlaying: Boolean) {
         var startPosition = 0
@@ -417,13 +437,13 @@ object MusicPlayerRemote : KoinComponent {
                     }
                 }
             }
-            if (songs.isNullOrEmpty()) {
+            if (songs == null || songs.isEmpty()) {
                 var songFile: File? = null
                 if (uri.authority != null && uri.authority == "com.android.externalstorage.documents") {
-                    val path = uri.path?.split(":".toRegex(), 2)?.get(1)
-                    if (path != null) {
-                        songFile = File(getExternalStorageDirectory(), path)
-                    }
+                    songFile = File(
+                        getExternalStorageDirectory(),
+                        uri.path?.split(":".toRegex(), 2)?.get(1)
+                    )
                 }
                 if (songFile == null) {
                     val path = getFilePathFromUri(context, uri)
@@ -437,14 +457,12 @@ object MusicPlayerRemote : KoinComponent {
                     songs = songRepository.songsByFilePath(songFile.absolutePath, true)
                 }
             }
-            if (!songs.isNullOrEmpty()) {
+            if (songs != null && songs.isNotEmpty()) {
                 openQueue(songs, 0, true)
             } else {
-                try {
-                    context.showToast(R.string.unplayable_file)
-                } catch (e: Exception) {
-                    logE("The file is not listed in the media store")
-                }
+                // TODO the file is not listed in the media store
+                context.showToast(R.string.unplayable_file)
+                println("The file is not listed in the media store")
             }
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.kt b/app/src/main/java/io/github/muntashirakon/music/helper/MusicProgressViewUpdateHelper.kt
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/MusicProgressViewUpdateHelper.kt
index 37deb038e..3214bf3e0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/MusicProgressViewUpdateHelper.kt
@@ -12,10 +12,9 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.helper
+package io.github.muntashirakon.music.helper
 
 import android.os.Handler
-import android.os.Looper
 import android.os.Message
 import kotlin.math.max
 
@@ -24,27 +23,22 @@ class MusicProgressViewUpdateHelper : Handler {
     private var callback: Callback? = null
     private var intervalPlaying: Int = 0
     private var intervalPaused: Int = 0
-    private var firstUpdate = true
 
     fun start() {
-        queueNextRefresh(refreshProgressViews().toLong())
+        queueNextRefresh(1)
     }
 
     fun stop() {
         removeMessages(CMD_REFRESH_PROGRESS_VIEWS)
     }
 
-    constructor(callback: Callback) : super(Looper.getMainLooper()) {
+    constructor(callback: Callback) {
         this.callback = callback
         this.intervalPlaying = UPDATE_INTERVAL_PLAYING
         this.intervalPaused = UPDATE_INTERVAL_PAUSED
     }
 
-    constructor(
-        callback: Callback,
-        intervalPlaying: Int,
-        intervalPaused: Int,
-    ) : super(Looper.getMainLooper()) {
+    constructor(callback: Callback, intervalPlaying: Int, intervalPaused: Int) {
         this.callback = callback
         this.intervalPlaying = intervalPlaying
         this.intervalPaused = intervalPaused
@@ -60,11 +54,10 @@ class MusicProgressViewUpdateHelper : Handler {
     private fun refreshProgressViews(): Int {
         val progressMillis = MusicPlayerRemote.songProgressMillis
         val totalMillis = MusicPlayerRemote.songDurationMillis
-        if (totalMillis > 0) {
-            firstUpdate = false
+        if (totalMillis > 0)
             callback?.onUpdateProgressViews(progressMillis, totalMillis)
-        }
-        if (!MusicPlayerRemote.isPlaying && !firstUpdate) {
+
+        if (!MusicPlayerRemote.isPlaying) {
             return intervalPaused
         }
 
@@ -86,7 +79,7 @@ class MusicProgressViewUpdateHelper : Handler {
     companion object {
         private const val CMD_REFRESH_PROGRESS_VIEWS = 1
         private const val MIN_INTERVAL = 20
-        private const val UPDATE_INTERVAL_PLAYING = 500
+        private const val UPDATE_INTERVAL_PLAYING = 1000
         private const val UPDATE_INTERVAL_PAUSED = 500
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/PlayPauseButtonOnClickHandler.kt b/app/src/main/java/io/github/muntashirakon/music/helper/PlayPauseButtonOnClickHandler.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/helper/PlayPauseButtonOnClickHandler.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/PlayPauseButtonOnClickHandler.kt
index 50be97474..9d4180a56 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/PlayPauseButtonOnClickHandler.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/PlayPauseButtonOnClickHandler.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.helper
+package io.github.muntashirakon.music.helper
 
 import android.view.View
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.kt b/app/src/main/java/io/github/muntashirakon/music/helper/SearchQueryHelper.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/SearchQueryHelper.kt
index 06c76294d..1607d0592 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/SearchQueryHelper.kt
@@ -12,13 +12,13 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.helper
+package io.github.muntashirakon.music.helper
 
 import android.app.SearchManager
 import android.os.Bundle
 import android.provider.MediaStore
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.RealSongRepository
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.repository.RealSongRepository
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/ShuffleHelper.kt b/app/src/main/java/io/github/muntashirakon/music/helper/ShuffleHelper.kt
similarity index 91%
rename from app/src/main/java/code/name/monkey/retromusic/helper/ShuffleHelper.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/ShuffleHelper.kt
index 02a621cba..18c401ced 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/ShuffleHelper.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/ShuffleHelper.kt
@@ -12,9 +12,9 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.helper
+package io.github.muntashirakon.music.helper
 
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.model.Song
 
 object ShuffleHelper {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.kt b/app/src/main/java/io/github/muntashirakon/music/helper/SortOrder.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/SortOrder.kt
index ee3e2a018..e1acbe57b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/SortOrder.kt
@@ -12,10 +12,10 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.helper
+package io.github.muntashirakon.music.helper
 
 import android.provider.MediaStore
-import code.name.monkey.retromusic.ALBUM_ARTIST
+import io.github.muntashirakon.music.ALBUM_ARTIST
 
 class SortOrder {
 
@@ -72,10 +72,8 @@ class SortOrder {
 
         companion object {
 
-            const val SONG_DEFAULT = MediaStore.Audio.Media.DEFAULT_SORT_ORDER
-
             /* Song sort order A-Z */
-            const val SONG_A_Z = MediaStore.Audio.Media.TITLE
+            const val SONG_A_Z = MediaStore.Audio.Media.DEFAULT_SORT_ORDER
 
             /* Song sort order Z-A */
             const val SONG_Z_A = "$SONG_A_Z DESC"
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/StackBlur.java b/app/src/main/java/io/github/muntashirakon/music/helper/StackBlur.java
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/helper/StackBlur.java
rename to app/src/main/java/io/github/muntashirakon/music/helper/StackBlur.java
index 9c100da91..7f640df22 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/StackBlur.java
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/StackBlur.java
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.helper;
+package io.github.muntashirakon.music.helper;
 
 import android.graphics.Bitmap;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/StopWatch.kt b/app/src/main/java/io/github/muntashirakon/music/helper/StopWatch.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/helper/StopWatch.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/StopWatch.kt
index b287bac49..3d78d77ad 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/StopWatch.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/StopWatch.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.helper
+package io.github.muntashirakon.music.helper
 
 /**
  * Simple thread safe stop watch.
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/WallpaperAccentManager.kt b/app/src/main/java/io/github/muntashirakon/music/helper/WallpaperAccentManager.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/helper/WallpaperAccentManager.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/WallpaperAccentManager.kt
index 8a72c9b45..e7a908554 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/WallpaperAccentManager.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/WallpaperAccentManager.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.helper
+package io.github.muntashirakon.music.helper
 
 import android.app.WallpaperManager
 import android.content.Context
@@ -6,7 +6,7 @@ import android.os.Handler
 import android.os.Looper
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 class WallpaperAccentManager(val context: Context) {
 
@@ -43,7 +43,7 @@ class WallpaperAccentManager(val context: Context) {
                 .getWallpaperColors(WallpaperManager.FLAG_SYSTEM)
             if (colors != null) {
                 val primaryColor = colors.primaryColor.toArgb()
-                ThemeStore.editTheme(context).wallpaperColor(context, primaryColor).commit()
+                    ThemeStore.editTheme(context).wallpaperColor(context, primaryColor).commit()
             }
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/GenreMenuHelper.kt b/app/src/main/java/io/github/muntashirakon/music/helper/menu/GenreMenuHelper.kt
similarity index 83%
rename from app/src/main/java/code/name/monkey/retromusic/helper/menu/GenreMenuHelper.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/menu/GenreMenuHelper.kt
index aa682acea..51c8e5088 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/GenreMenuHelper.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/menu/GenreMenuHelper.kt
@@ -12,17 +12,17 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.helper.menu
+package io.github.muntashirakon.music.helper.menu
 
 import android.view.MenuItem
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.GenreRepository
-import code.name.monkey.retromusic.repository.RealRepository
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.dialogs.AddToPlaylistDialog
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Genre
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.repository.GenreRepository
+import io.github.muntashirakon.music.repository.RealRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/PlaylistMenuHelper.kt b/app/src/main/java/io/github/muntashirakon/music/helper/menu/PlaylistMenuHelper.kt
similarity index 83%
rename from app/src/main/java/code/name/monkey/retromusic/helper/menu/PlaylistMenuHelper.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/menu/PlaylistMenuHelper.kt
index fb9b3cdab..ac76a9f2d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/PlaylistMenuHelper.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/menu/PlaylistMenuHelper.kt
@@ -12,19 +12,19 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.helper.menu
+package io.github.muntashirakon.music.helper.menu
 
 import android.view.MenuItem
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.toSongs
-import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
-import code.name.monkey.retromusic.dialogs.DeletePlaylistDialog
-import code.name.monkey.retromusic.dialogs.RenamePlaylistDialog
-import code.name.monkey.retromusic.dialogs.SavePlaylistDialog
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.repository.RealRepository
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.db.toSongs
+import io.github.muntashirakon.music.dialogs.AddToPlaylistDialog
+import io.github.muntashirakon.music.dialogs.DeletePlaylistDialog
+import io.github.muntashirakon.music.dialogs.RenamePlaylistDialog
+import io.github.muntashirakon.music.dialogs.SavePlaylistDialog
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.repository.RealRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt b/app/src/main/java/io/github/muntashirakon/music/helper/menu/SongMenuHelper.kt
similarity index 81%
rename from app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/menu/SongMenuHelper.kt
index a6b8009dd..f817d6142 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/menu/SongMenuHelper.kt
@@ -13,7 +13,7 @@
  *
  */
 
-package code.name.monkey.retromusic.helper.menu
+package io.github.muntashirakon.music.helper.menu
 
 import android.content.Intent
 import android.view.MenuItem
@@ -22,23 +22,23 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.findNavController
-import code.name.monkey.retromusic.EXTRA_ALBUM_ID
-import code.name.monkey.retromusic.EXTRA_ARTIST_ID
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
-import code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity
-import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
-import code.name.monkey.retromusic.dialogs.DeleteSongsDialog
-import code.name.monkey.retromusic.dialogs.SongDetailDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.IPaletteColorHolder
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.providers.BlacklistStore
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.RingtoneManager
+import io.github.muntashirakon.music.EXTRA_ALBUM_ID
+import io.github.muntashirakon.music.EXTRA_ARTIST_ID
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.tageditor.AbsTagEditorActivity
+import io.github.muntashirakon.music.activities.tageditor.SongTagEditorActivity
+import io.github.muntashirakon.music.dialogs.AddToPlaylistDialog
+import io.github.muntashirakon.music.dialogs.DeleteSongsDialog
+import io.github.muntashirakon.music.dialogs.SongDetailDialog
+import io.github.muntashirakon.music.fragments.LibraryViewModel
+import io.github.muntashirakon.music.fragments.ReloadType
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.interfaces.IPaletteColorHolder
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.providers.BlacklistStore
+import io.github.muntashirakon.music.repository.RealRepository
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.RingtoneManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -65,7 +65,7 @@ object SongMenuHelper : KoinComponent {
             R.id.action_share -> {
                 activity.startActivity(
                     Intent.createChooser(
-                        MusicUtil.createShareSongFileIntent(activity, song),
+                        MusicUtil.createShareSongFileIntent(song, activity),
                         null
                     )
                 )
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongsMenuHelper.kt b/app/src/main/java/io/github/muntashirakon/music/helper/menu/SongsMenuHelper.kt
similarity index 72%
rename from app/src/main/java/code/name/monkey/retromusic/helper/menu/SongsMenuHelper.kt
rename to app/src/main/java/io/github/muntashirakon/music/helper/menu/SongsMenuHelper.kt
index b5d236734..2ef26ff6e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongsMenuHelper.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/helper/menu/SongsMenuHelper.kt
@@ -12,17 +12,15 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.helper.menu
+package io.github.muntashirakon.music.helper.menu
 
-import android.content.Intent
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
-import code.name.monkey.retromusic.dialogs.DeleteSongsDialog
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.util.MusicUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.dialogs.AddToPlaylistDialog
+import io.github.muntashirakon.music.dialogs.DeleteSongsDialog
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.repository.RealRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -55,15 +53,6 @@ object SongsMenuHelper : KoinComponent {
                 }
                 return true
             }
-            R.id.action_share -> {
-                activity.startActivity(
-                    Intent.createChooser(
-                        MusicUtil.createShareMultipleSongIntent(activity, songs),
-                        null
-                    )
-                )
-                return true
-            }
             R.id.action_delete_from_device -> {
                 DeleteSongsDialog.create(songs)
                     .show(activity.supportFragmentManager, "DELETE_SONGS")
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IAlbumArtistClickListener.kt b/app/src/main/java/io/github/muntashirakon/music/interfaces/IAlbumArtistClickListener.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IAlbumArtistClickListener.kt
rename to app/src/main/java/io/github/muntashirakon/music/interfaces/IAlbumArtistClickListener.kt
index 4def2ad35..8da597637 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IAlbumArtistClickListener.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/interfaces/IAlbumArtistClickListener.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 import android.view.View
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IAlbumClickListener.kt b/app/src/main/java/io/github/muntashirakon/music/interfaces/IAlbumClickListener.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IAlbumClickListener.kt
rename to app/src/main/java/io/github/muntashirakon/music/interfaces/IAlbumClickListener.kt
index c5412d0f2..fd38730e3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IAlbumClickListener.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/interfaces/IAlbumClickListener.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 import android.view.View
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IArtistClickListener.kt b/app/src/main/java/io/github/muntashirakon/music/interfaces/IArtistClickListener.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IArtistClickListener.kt
rename to app/src/main/java/io/github/muntashirakon/music/interfaces/IArtistClickListener.kt
index f1c1f7450..eea86d0ae 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IArtistClickListener.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/interfaces/IArtistClickListener.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 import android.view.View
 
diff --git a/app/src/main/java/io/github/muntashirakon/music/interfaces/ICabCallback.kt b/app/src/main/java/io/github/muntashirakon/music/interfaces/ICabCallback.kt
new file mode 100644
index 000000000..844731833
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/interfaces/ICabCallback.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2020 Hemanth Savarla.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ */
+package io.github.muntashirakon.music.interfaces
+
+import android.view.Menu
+import android.view.MenuItem
+import com.afollestad.materialcab.attached.AttachedCab
+
+interface ICabCallback {
+    fun onCabCreated(cab: AttachedCab, menu: Menu): Boolean
+
+    fun onCabItemClicked(item: MenuItem): Boolean
+
+    fun onCabFinished(cab: AttachedCab): Boolean
+}
diff --git a/app/src/main/java/io/github/muntashirakon/music/interfaces/ICabHolder.kt b/app/src/main/java/io/github/muntashirakon/music/interfaces/ICabHolder.kt
new file mode 100644
index 000000000..913861041
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/interfaces/ICabHolder.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2020 Hemanth Savarla.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ */
+package io.github.muntashirakon.music.interfaces
+
+import com.afollestad.materialcab.attached.AttachedCab
+
+interface ICabHolder {
+
+    fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/ICallbacks.kt b/app/src/main/java/io/github/muntashirakon/music/interfaces/ICallbacks.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/ICallbacks.kt
rename to app/src/main/java/io/github/muntashirakon/music/interfaces/ICallbacks.kt
index b44a01f0e..f23dc5b6a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/ICallbacks.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/interfaces/ICallbacks.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 import android.view.MenuItem
 import android.view.View
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IGenreClickListener.kt b/app/src/main/java/io/github/muntashirakon/music/interfaces/IGenreClickListener.kt
similarity index 52%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IGenreClickListener.kt
rename to app/src/main/java/io/github/muntashirakon/music/interfaces/IGenreClickListener.kt
index f5c6aeb4f..de22e64dc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IGenreClickListener.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/interfaces/IGenreClickListener.kt
@@ -1,7 +1,7 @@
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 import android.view.View
-import code.name.monkey.retromusic.model.Genre
+import io.github.muntashirakon.music.model.Genre
 
 interface IGenreClickListener {
     fun onClickGenre(genre: Genre, view: View)
diff --git a/app/src/main/java/io/github/muntashirakon/music/interfaces/IHomeClickListener.kt b/app/src/main/java/io/github/muntashirakon/music/interfaces/IHomeClickListener.kt
new file mode 100644
index 000000000..868f99854
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/interfaces/IHomeClickListener.kt
@@ -0,0 +1,13 @@
+package io.github.muntashirakon.music.interfaces
+
+import io.github.muntashirakon.music.model.Album
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.model.Genre
+
+interface IHomeClickListener {
+    fun onAlbumClick(album: Album)
+
+    fun onArtistClick(artist: Artist)
+
+    fun onGenreClick(genre: Genre)
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IMainActivityFragmentCallbacks.kt b/app/src/main/java/io/github/muntashirakon/music/interfaces/IMainActivityFragmentCallbacks.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IMainActivityFragmentCallbacks.kt
rename to app/src/main/java/io/github/muntashirakon/music/interfaces/IMainActivityFragmentCallbacks.kt
index 14a93c47a..954b8cc6c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IMainActivityFragmentCallbacks.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/interfaces/IMainActivityFragmentCallbacks.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 /**
  * Created by hemanths on 14/08/17.
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IMusicServiceEventListener.kt b/app/src/main/java/io/github/muntashirakon/music/interfaces/IMusicServiceEventListener.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IMusicServiceEventListener.kt
rename to app/src/main/java/io/github/muntashirakon/music/interfaces/IMusicServiceEventListener.kt
index 4d3991809..dc954ca58 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IMusicServiceEventListener.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/interfaces/IMusicServiceEventListener.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 interface IMusicServiceEventListener {
     fun onServiceConnected()
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IPaletteColorHolder.kt b/app/src/main/java/io/github/muntashirakon/music/interfaces/IPaletteColorHolder.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IPaletteColorHolder.kt
rename to app/src/main/java/io/github/muntashirakon/music/interfaces/IPaletteColorHolder.kt
index 82c617075..078fc8224 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IPaletteColorHolder.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/interfaces/IPaletteColorHolder.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 /**
  * @author Aidan Follestad (afollestad)
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IPlaylistClickListener.kt b/app/src/main/java/io/github/muntashirakon/music/interfaces/IPlaylistClickListener.kt
similarity index 56%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IPlaylistClickListener.kt
rename to app/src/main/java/io/github/muntashirakon/music/interfaces/IPlaylistClickListener.kt
index 3b0eb141d..afcef7713 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IPlaylistClickListener.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/interfaces/IPlaylistClickListener.kt
@@ -1,7 +1,7 @@
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 import android.view.View
-import code.name.monkey.retromusic.db.PlaylistWithSongs
+import io.github.muntashirakon.music.db.PlaylistWithSongs
 
 interface IPlaylistClickListener {
     fun onPlaylistClick(playlistWithSongs: PlaylistWithSongs, view: View)
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IScrollHelper.kt b/app/src/main/java/io/github/muntashirakon/music/interfaces/IScrollHelper.kt
similarity index 50%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IScrollHelper.kt
rename to app/src/main/java/io/github/muntashirakon/music/interfaces/IScrollHelper.kt
index 112bdcdc1..461d8f8d1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IScrollHelper.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/interfaces/IScrollHelper.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.interfaces
+package io.github.muntashirakon.music.interfaces
 
 interface IScrollHelper {
     fun scrollToTop()
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/CoverLrcView.kt b/app/src/main/java/io/github/muntashirakon/music/lyrics/CoverLrcView.kt
similarity index 77%
rename from app/src/main/java/code/name/monkey/retromusic/lyrics/CoverLrcView.kt
rename to app/src/main/java/io/github/muntashirakon/music/lyrics/CoverLrcView.kt
index 891181c3d..77f0826a1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/lyrics/CoverLrcView.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/lyrics/CoverLrcView.kt
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package code.name.monkey.retromusic.lyrics
+package io.github.muntashirakon.music.lyrics
 
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
@@ -19,6 +19,7 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.drawable.Drawable
+import android.os.AsyncTask
 import android.os.Looper
 import android.text.Layout
 import android.text.StaticLayout
@@ -33,10 +34,8 @@ import android.view.animation.LinearInterpolator
 import android.widget.Scroller
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.withSave
-import code.name.monkey.retromusic.R
-import kotlinx.coroutines.*
+import io.github.muntashirakon.music.R
 import java.io.File
-import java.lang.Runnable
 import kotlin.math.abs
 
 /**
@@ -46,7 +45,7 @@ import kotlin.math.abs
 class CoverLrcView @JvmOverloads constructor(
     context: Context?,
     attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
+    defStyleAttr: Int = 0
 ) : View(context, attrs, defStyleAttr) {
     private val mLrcEntryList: MutableList<LrcEntry> = ArrayList()
     private val mLrcPaint = TextPaint()
@@ -72,6 +71,7 @@ class CoverLrcView @JvmOverloads constructor(
     private var mScroller: Scroller? = null
     private var mOffset = 0f
     private var mCurrentLine = 0
+    private var flag: Any? = null
     private var isShowTimeline = false
     private var isTouching = false
     private var isFling = false
@@ -84,8 +84,9 @@ class CoverLrcView @JvmOverloads constructor(
         }
     }
 
-    private val viewScope = CoroutineScope(Dispatchers.Main + Job())
-
+    /**
+     * 手势监听器
+     */
     private val mSimpleOnGestureListener: SimpleOnGestureListener =
         object : SimpleOnGestureListener() {
             override fun onDown(e: MotionEvent): Boolean {
@@ -107,7 +108,7 @@ class CoverLrcView @JvmOverloads constructor(
                 e1: MotionEvent,
                 e2: MotionEvent,
                 distanceX: Float,
-                distanceY: Float,
+                distanceY: Float
             ): Boolean {
                 if (mOffset == getOffset(0) && distanceY < 0F) {
                     return super.onScroll(e1, e2, distanceX, distanceY)
@@ -127,7 +128,7 @@ class CoverLrcView @JvmOverloads constructor(
                 e1: MotionEvent,
                 e2: MotionEvent,
                 velocityX: Float,
-                velocityY: Float,
+                velocityY: Float
             ): Boolean {
                 if (hasLrc()) {
                     mScroller!!.fling(
@@ -249,31 +250,52 @@ class CoverLrcView @JvmOverloads constructor(
         mScroller = Scroller(context)
     }
 
+    /** 设置非当前行歌词字体颜色  */
     fun setNormalColor(normalColor: Int) {
         mNormalTextColor = normalColor
         postInvalidate()
     }
 
+    /** 普通歌词文本字体大小  */
+    fun setNormalTextSize(size: Float) {
+        mNormalTextSize = size
+    }
+
+    /** 当前歌词文本字体大小  */
+    fun setCurrentTextSize(size: Float) {
+        mCurrentTextSize = size
+    }
+
+    /** 设置当前行歌词的字体颜色  */
     fun setCurrentColor(currentColor: Int) {
         mCurrentTextColor = currentColor
         postInvalidate()
     }
 
+    /** 设置拖动歌词时选中歌词的字体颜色  */
     fun setTimelineTextColor(timelineTextColor: Int) {
         mTimelineTextColor = timelineTextColor
         postInvalidate()
     }
 
+    /** 设置拖动歌词时时间线的颜色  */
     fun setTimelineColor(timelineColor: Int) {
         mTimelineColor = timelineColor
         postInvalidate()
     }
 
+    /** 设置拖动歌词时右侧时间字体颜色  */
     fun setTimeTextColor(timeTextColor: Int) {
         mTimeTextColor = timeTextColor
         postInvalidate()
     }
 
+    /**
+     * 设置歌词是否允许拖动
+     *
+     * @param draggable 是否允许拖动
+     * @param onPlayClickListener 设置歌词拖动后播放按钮点击监听器，如果允许拖动，则不能为 null
+     */
     fun setDraggable(draggable: Boolean, onPlayClickListener: OnPlayClickListener?) {
         mOnPlayClickListener = if (draggable) {
             requireNotNull(onPlayClickListener) { "if draggable == true, onPlayClickListener must not be null" }
@@ -283,6 +305,17 @@ class CoverLrcView @JvmOverloads constructor(
         }
     }
 
+    /**
+     * 设置播放按钮点击监听器
+     *
+     * @param onPlayClickListener 如果为非 null ，则激活歌词拖动功能，否则将将禁用歌词拖动功能
+     */
+    @Deprecated("use {@link #setDraggable(boolean, OnPlayClickListener)} instead")
+    fun setOnPlayClickListener(onPlayClickListener: OnPlayClickListener?) {
+        mOnPlayClickListener = onPlayClickListener
+    }
+
+    /** 设置歌词为空时屏幕中央显示的文字，如“暂无歌词”  */
     fun setLabel(label: String?) {
         runOnUi {
             mDefaultLabel = label
@@ -290,40 +323,128 @@ class CoverLrcView @JvmOverloads constructor(
         }
     }
 
+    /**
+     * 加载歌词文件
+     *
+     * @param lrcFile 歌词文件
+     */
     fun loadLrc(lrcFile: File) {
+        loadLrc(lrcFile, null)
+    }
+
+    /**
+     * 加载双语歌词文件，两种语言的歌词时间戳需要一致
+     *
+     * @param mainLrcFile 第一种语言歌词文件
+     * @param secondLrcFile 第二种语言歌词文件
+     */
+    private fun loadLrc(mainLrcFile: File, secondLrcFile: File?) {
         runOnUi {
             reset()
-            viewScope.launch(Dispatchers.IO) {
-                val lrcEntries = LrcUtils.parseLrc(arrayOf(lrcFile, null))
-                withContext(Dispatchers.Main) {
-                    onLrcLoaded(lrcEntries)
-                }
+            val sb = StringBuilder("file://")
+            sb.append(mainLrcFile.path)
+            if (secondLrcFile != null) {
+                sb.append("#").append(secondLrcFile.path)
             }
+            val flag = sb.toString()
+            this.flag = flag
+            object : AsyncTask<File?, Int?, List<LrcEntry>>() {
+                override fun doInBackground(vararg params: File?): List<LrcEntry>? {
+                    return LrcUtils.parseLrc(params)
+                }
+
+                override fun onPostExecute(lrcEntries: List<LrcEntry>) {
+                    if (flag == flag) {
+                        onLrcLoaded(lrcEntries)
+                        this@CoverLrcView.flag = null
+                    }
+                }
+            }.execute(mainLrcFile, secondLrcFile)
         }
     }
 
+    /**
+     * 加载歌词文本
+     *
+     * @param lrcText 歌词文本
+     */
     fun loadLrc(lrcText: String?) {
+        loadLrc(lrcText, null)
+    }
+
+    /**
+     * 加载双语歌词文本，两种语言的歌词时间戳需要一致
+     *
+     * @param mainLrcText 第一种语言歌词文本
+     * @param secondLrcText 第二种语言歌词文本
+     */
+    private fun loadLrc(mainLrcText: String?, secondLrcText: String?) {
         runOnUi {
             reset()
-            viewScope.launch(Dispatchers.IO) {
-                val lrcEntries = LrcUtils.parseLrc(arrayOf(lrcText, null))
-                withContext(Dispatchers.Main) {
-                    onLrcLoaded(lrcEntries)
-                }
+            val sb = StringBuilder("file://")
+            sb.append(mainLrcText)
+            if (secondLrcText != null) {
+                sb.append("#").append(secondLrcText)
             }
+            val flag = sb.toString()
+            this.flag = flag
+            object : AsyncTask<String?, Int?, List<LrcEntry>>() {
+                override fun doInBackground(vararg params: String?): List<LrcEntry>? {
+                    return LrcUtils.parseLrc(params)
+                }
+
+                override fun onPostExecute(lrcEntries: List<LrcEntry>) {
+                    if (flag == flag) {
+                        onLrcLoaded(lrcEntries)
+                        this@CoverLrcView.flag = null
+                    }
+                }
+            }.execute(mainLrcText, secondLrcText)
         }
     }
 
+    /**
+     * 加载在线歌词，默认使用 utf-8 编码
+     *
+     * @param lrcUrl 歌词文件的网络地址
+     */
+    @JvmOverloads
+    fun loadLrcByUrl(lrcUrl: String, charset: String? = "utf-8") {
+        val flag = "url://$lrcUrl"
+        this.flag = flag
+        object : AsyncTask<String?, Int?, String>() {
+            override fun doInBackground(vararg params: String?): String? {
+                return LrcUtils.getContentFromNetwork(params[0], params[1])
+            }
+
+            override fun onPostExecute(lrcText: String) {
+                if (flag == flag) {
+                    loadLrc(lrcText)
+                }
+            }
+        }.execute(lrcUrl, charset)
+    }
+
+    /**
+     * 歌词是否有效
+     *
+     * @return true，如果歌词有效，否则false
+     */
     fun hasLrc(): Boolean {
         return mLrcEntryList.isNotEmpty()
     }
 
+    /**
+     * 刷新歌词
+     *
+     * @param time 当前播放时间
+     */
     fun updateTime(time: Long) {
         runOnUi {
             if (!hasLrc()) {
                 return@runOnUi
             }
-            val line = findShowLine(time + 300L)
+            val line = findShowLine(time)
             if (line != mCurrentLine) {
                 mCurrentLine = line
                 if (!isShowTimeline) {
@@ -351,9 +472,9 @@ class CoverLrcView @JvmOverloads constructor(
         super.onDraw(canvas)
         val centerY = height / 2
 
+        // 无歌词文件
         if (!hasLrc()) {
             mLrcPaint.color = mCurrentTextColor
-            @Suppress("Deprecation")
             @SuppressLint("DrawAllocation") val staticLayout = StaticLayout(
                 mDefaultLabel,
                 mLrcPaint,
@@ -395,6 +516,11 @@ class CoverLrcView @JvmOverloads constructor(
         }
     }
 
+    /**
+     * 画一行歌词
+     *
+     * @param y 歌词中心 Y 坐标
+     */
     private fun drawText(canvas: Canvas, staticLayout: StaticLayout, y: Float) {
         canvas.withSave {
             translate(mLrcPadding, y - (staticLayout.height shr 1))
@@ -444,7 +570,6 @@ class CoverLrcView @JvmOverloads constructor(
 
     override fun onDetachedFromWindow() {
         removeCallbacks(hideTimelineRunnable)
-        viewScope.cancel()
         super.onDetachedFromWindow()
     }
 
@@ -488,10 +613,12 @@ class CoverLrcView @JvmOverloads constructor(
         invalidate()
     }
 
+    /** 将中心行微调至正中心  */
     private fun adjustCenter() {
         smoothScrollTo(centerLine, ADJUST_DURATION)
     }
 
+    /** 滚动到某一行  */
     private fun smoothScrollTo(line: Int, duration: Long = mAnimationDuration) {
         val offset = getOffset(line)
         endAnimation()
@@ -502,16 +629,19 @@ class CoverLrcView @JvmOverloads constructor(
                 mOffset = animation.animatedValue as Float
                 invalidate()
             }
+            LrcUtils.resetDurationScale()
             start()
         }
     }
 
+    /** 结束滚动动画  */
     private fun endAnimation() {
         if (mAnimator != null && mAnimator!!.isRunning) {
             mAnimator!!.end()
         }
     }
 
+    /** 二分法查找当前时间应该显示的行数（最后一个 <= time 的行数）  */
     private fun findShowLine(time: Long): Int {
         var left = 0
         var right = mLrcEntryList.size
@@ -530,6 +660,7 @@ class CoverLrcView @JvmOverloads constructor(
         return 0
     }
 
+    /** 获取当前在视图中央的行数  */
     private val centerLine: Int
         get() {
             var centerLine = 0
@@ -543,6 +674,7 @@ class CoverLrcView @JvmOverloads constructor(
             return centerLine
         }
 
+    /** 获取歌词距离视图顶部的距离 采用懒加载方式  */
     private fun getOffset(line: Int): Float {
         if (mLrcEntryList.isEmpty()) return 0F
         if (mLrcEntryList[line].offset == Float.MIN_VALUE) {
@@ -556,9 +688,11 @@ class CoverLrcView @JvmOverloads constructor(
         return mLrcEntryList[line].offset
     }
 
+    /** 获取歌词宽度  */
     private val lrcWidth: Float
         get() = width - mLrcPadding * 2
 
+    /** 在主线程中运行  */
     private fun runOnUi(r: Runnable) {
         if (Looper.myLooper() == Looper.getMainLooper()) {
             r.run()
@@ -567,10 +701,20 @@ class CoverLrcView @JvmOverloads constructor(
         }
     }
 
+    /** 播放按钮点击监听器，点击后应该跳转到指定播放位置  */
     fun interface OnPlayClickListener {
+        /**
+         * 播放按钮被点击，应该跳转到指定播放位置
+         *
+         * @return 是否成功消费该事件，如果成功消费，则会更新UI
+         */
         fun onPlayClick(time: Long): Boolean
     }
 
+    fun interface OnFlingXListener {
+        fun onFlingX(velocityX: Float): Boolean
+    }
+
     companion object {
         private const val ADJUST_DURATION: Long = 100
         private const val TIMELINE_KEEP_TIME = 4 * DateUtils.SECOND_IN_MILLIS
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/Lrc.java b/app/src/main/java/io/github/muntashirakon/music/lyrics/Lrc.java
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/lyrics/Lrc.java
rename to app/src/main/java/io/github/muntashirakon/music/lyrics/Lrc.java
index b3a0c736c..493fac9cd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/lyrics/Lrc.java
+++ b/app/src/main/java/io/github/muntashirakon/music/lyrics/Lrc.java
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.lyrics;
+package io.github.muntashirakon.music.lyrics;
 
 /**
  * Desc : 歌词实体 Author : Lauzy Date : 2017/10/13 Blog : http://www.jianshu.com/u/e76853f863a9 Email :
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcEntry.java b/app/src/main/java/io/github/muntashirakon/music/lyrics/LrcEntry.java
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/lyrics/LrcEntry.java
rename to app/src/main/java/io/github/muntashirakon/music/lyrics/LrcEntry.java
index 75fc63a4d..1beb263d5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcEntry.java
+++ b/app/src/main/java/io/github/muntashirakon/music/lyrics/LrcEntry.java
@@ -12,7 +12,7 @@
  * permissions and limitations under the License.
  */
 
-package code.name.monkey.retromusic.lyrics;
+package io.github.muntashirakon.music.lyrics;
 
 import android.text.Layout;
 import android.text.StaticLayout;
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcUtils.java b/app/src/main/java/io/github/muntashirakon/music/lyrics/LrcUtils.java
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/lyrics/LrcUtils.java
rename to app/src/main/java/io/github/muntashirakon/music/lyrics/LrcUtils.java
index 7b7eba15e..21c3c4e38 100644
--- a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcUtils.java
+++ b/app/src/main/java/io/github/muntashirakon/music/lyrics/LrcUtils.java
@@ -12,8 +12,9 @@
  * permissions and limitations under the License.
  */
 
-package code.name.monkey.retromusic.lyrics;
+package io.github.muntashirakon.music.lyrics;
 
+import android.animation.ValueAnimator;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 
@@ -24,6 +25,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.lang.reflect.Field;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -206,4 +208,14 @@ class LrcUtils {
     String ss = String.format(Locale.getDefault(), "%02d", s);
     return mm + ":" + ss;
   }
+
+  static void resetDurationScale() {
+    try {
+      Field mField = ValueAnimator.class.getDeclaredField("sDurationScale");
+      mField.setAccessible(true);
+      mField.setFloat(null, 1);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
 }
diff --git a/app/src/main/java/io/github/muntashirakon/music/lyrics/LrcView.java b/app/src/main/java/io/github/muntashirakon/music/lyrics/LrcView.java
new file mode 100644
index 000000000..1bab00a38
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/lyrics/LrcView.java
@@ -0,0 +1,779 @@
+/*
+ * Copyright (C) 2017 wangchenyan
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package io.github.muntashirakon.music.lyrics;
+
+import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.os.Looper;
+import android.text.Layout;
+import android.text.StaticLayout;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.util.AttributeSet;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.LinearInterpolator;
+import android.widget.Scroller;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import io.github.muntashirakon.music.BuildConfig;
+import io.github.muntashirakon.music.R;
+
+/**
+ * 歌词 Created by wcy on 2015/11/9.
+ */
+@SuppressLint("StaticFieldLeak")
+public class LrcView extends View {
+  private static final long ADJUST_DURATION = 100;
+  private static final long TIMELINE_KEEP_TIME = 4 * DateUtils.SECOND_IN_MILLIS;
+
+  private final List<LrcEntry> mLrcEntryList = new ArrayList<>();
+  private final TextPaint mLrcPaint = new TextPaint();
+  private final TextPaint mTimePaint = new TextPaint();
+  private Paint.FontMetrics mTimeFontMetrics;
+  private Drawable mPlayDrawable;
+  private float mDividerHeight;
+  private long mAnimationDuration;
+  private int mNormalTextColor;
+  private float mNormalTextSize;
+  private int mCurrentTextColor;
+  private float mCurrentTextSize;
+  private int mTimelineTextColor;
+  private int mTimelineColor;
+  private int mTimeTextColor;
+  private int mDrawableWidth;
+  private int mTimeTextWidth;
+  private String mDefaultLabel;
+  private float mLrcPadding;
+  private OnPlayClickListener mOnPlayClickListener;
+  private ValueAnimator mAnimator;
+  private GestureDetector mGestureDetector;
+  private Scroller mScroller;
+  private float mOffset;
+  private int mCurrentLine;
+  private Object mFlag;
+  private boolean isShowTimeline;
+  private boolean isTouching;
+  private boolean isFling;
+  private int mTextGravity; // 歌词显示位置，靠左/居中/靠右
+  private final Runnable hideTimelineRunnable =
+          new Runnable() {
+            @Override
+            public void run() {
+              if (hasLrc() && isShowTimeline) {
+                isShowTimeline = false;
+                smoothScrollTo(mCurrentLine);
+              }
+            }
+          };
+  /**
+   * 手势监听器
+   */
+  private final GestureDetector.SimpleOnGestureListener mSimpleOnGestureListener =
+          new GestureDetector.SimpleOnGestureListener() {
+            @Override
+            public boolean onDown(MotionEvent e) {
+              if (hasLrc() && mOnPlayClickListener != null) {
+                mScroller.forceFinished(true);
+                removeCallbacks(hideTimelineRunnable);
+                isTouching = true;
+                isShowTimeline = true;
+                invalidate();
+                return true;
+          }
+          return super.onDown(e);
+        }
+
+        @Override
+        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+          if (hasLrc()) {
+            mOffset += -distanceY;
+            mOffset = Math.min(mOffset, getOffset(0));
+            mOffset = Math.max(mOffset, getOffset(mLrcEntryList.size() - 1));
+            invalidate();
+            getParent().requestDisallowInterceptTouchEvent(true);
+            return true;
+          }
+          return super.onScroll(e1, e2, distanceX, distanceY);
+        }
+
+        @Override
+        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+          if (hasLrc()) {
+            mScroller.fling(
+                0,
+                (int) mOffset,
+                0,
+                (int) velocityY,
+                0,
+                0,
+                (int) getOffset(mLrcEntryList.size() - 1),
+                (int) getOffset(0));
+            isFling = true;
+            return true;
+          }
+          return super.onFling(e1, e2, velocityX, velocityY);
+        }
+
+        @Override
+        public boolean onSingleTapConfirmed(MotionEvent e) {
+          if (hasLrc()
+              && isShowTimeline
+              && mPlayDrawable.getBounds().contains((int) e.getX(), (int) e.getY())) {
+            int centerLine = getCenterLine();
+            long centerLineTime = mLrcEntryList.get(centerLine).getTime();
+            // onPlayClick 消费了才更新 UI
+            if (mOnPlayClickListener != null && mOnPlayClickListener.onPlayClick(centerLineTime)) {
+              isShowTimeline = false;
+              removeCallbacks(hideTimelineRunnable);
+              mCurrentLine = centerLine;
+              invalidate();
+              return true;
+            }
+          }
+          return super.onSingleTapConfirmed(e);
+        }
+      };
+
+  public LrcView(Context context) {
+    this(context, null);
+  }
+
+  public LrcView(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public LrcView(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+    init(attrs);
+  }
+
+  private void init(AttributeSet attrs) {
+    TypedArray ta = getContext().obtainStyledAttributes(attrs, R.styleable.LrcView);
+    mCurrentTextSize =
+        ta.getDimension(
+            R.styleable.LrcView_lrcTextSize, getResources().getDimension(R.dimen.lrc_text_size));
+    mNormalTextSize =
+        ta.getDimension(
+            R.styleable.LrcView_lrcNormalTextSize,
+            getResources().getDimension(R.dimen.lrc_text_size));
+    if (mNormalTextSize == 0) {
+      mNormalTextSize = mCurrentTextSize;
+    }
+
+    mDividerHeight =
+        ta.getDimension(
+            R.styleable.LrcView_lrcDividerHeight,
+            getResources().getDimension(R.dimen.lrc_divider_height));
+    int defDuration = getResources().getInteger(R.integer.lrc_animation_duration);
+    mAnimationDuration = ta.getInt(R.styleable.LrcView_lrcAnimationDuration, defDuration);
+    mAnimationDuration = (mAnimationDuration < 0) ? defDuration : mAnimationDuration;
+    mNormalTextColor =
+        ta.getColor(
+            R.styleable.LrcView_lrcNormalTextColor,
+            getResources().getColor(R.color.lrc_normal_text_color));
+    mCurrentTextColor =
+        ta.getColor(
+            R.styleable.LrcView_lrcCurrentTextColor,
+            getResources().getColor(R.color.lrc_current_text_color));
+    mTimelineTextColor =
+        ta.getColor(
+            R.styleable.LrcView_lrcTimelineTextColor,
+            getResources().getColor(R.color.lrc_timeline_text_color));
+    mDefaultLabel = ta.getString(R.styleable.LrcView_lrcLabel);
+    mDefaultLabel =
+        TextUtils.isEmpty(mDefaultLabel) ? getContext().getString(R.string.empty) : mDefaultLabel;
+    mLrcPadding = ta.getDimension(R.styleable.LrcView_lrcPadding, 0);
+    mTimelineColor =
+        ta.getColor(
+            R.styleable.LrcView_lrcTimelineColor,
+            getResources().getColor(R.color.lrc_timeline_color));
+    float timelineHeight =
+        ta.getDimension(
+            R.styleable.LrcView_lrcTimelineHeight,
+            getResources().getDimension(R.dimen.lrc_timeline_height));
+    mPlayDrawable = ta.getDrawable(R.styleable.LrcView_lrcPlayDrawable);
+    mPlayDrawable =
+        (mPlayDrawable == null)
+            ? getResources().getDrawable(R.drawable.ic_play_arrow)
+            : mPlayDrawable;
+    mTimeTextColor =
+        ta.getColor(
+            R.styleable.LrcView_lrcTimeTextColor,
+            getResources().getColor(R.color.lrc_time_text_color));
+    float timeTextSize =
+        ta.getDimension(
+            R.styleable.LrcView_lrcTimeTextSize,
+            getResources().getDimension(R.dimen.lrc_time_text_size));
+    mTextGravity = ta.getInteger(R.styleable.LrcView_lrcTextGravity, LrcEntry.GRAVITY_CENTER);
+
+    ta.recycle();
+
+    mDrawableWidth = (int) getResources().getDimension(R.dimen.lrc_drawable_width);
+    mTimeTextWidth = (int) getResources().getDimension(R.dimen.lrc_time_width);
+
+    mLrcPaint.setAntiAlias(true);
+    mLrcPaint.setTextSize(mCurrentTextSize);
+    mLrcPaint.setTextAlign(Paint.Align.LEFT);
+    mTimePaint.setAntiAlias(true);
+    mTimePaint.setTextSize(timeTextSize);
+    mTimePaint.setTextAlign(Paint.Align.CENTER);
+    //noinspection SuspiciousNameCombination
+    mTimePaint.setStrokeWidth(timelineHeight);
+    mTimePaint.setStrokeCap(Paint.Cap.ROUND);
+    mTimeFontMetrics = mTimePaint.getFontMetrics();
+
+    mGestureDetector = new GestureDetector(getContext(), mSimpleOnGestureListener);
+    mGestureDetector.setIsLongpressEnabled(false);
+    mScroller = new Scroller(getContext());
+  }
+
+  /** 设置非当前行歌词字体颜色 */
+  public void setNormalColor(int normalColor) {
+    mNormalTextColor = normalColor;
+    postInvalidate();
+  }
+
+  /** 普通歌词文本字体大小 */
+  public void setNormalTextSize(float size) {
+    mNormalTextSize = size;
+  }
+
+  /** 当前歌词文本字体大小 */
+  public void setCurrentTextSize(float size) {
+    mCurrentTextSize = size;
+  }
+
+  /** 设置当前行歌词的字体颜色 */
+  public void setCurrentColor(int currentColor) {
+    mCurrentTextColor = currentColor;
+    postInvalidate();
+  }
+
+  /** 设置拖动歌词时选中歌词的字体颜色 */
+  public void setTimelineTextColor(int timelineTextColor) {
+    mTimelineTextColor = timelineTextColor;
+    postInvalidate();
+  }
+
+  /** 设置拖动歌词时时间线的颜色 */
+  public void setTimelineColor(int timelineColor) {
+    mTimelineColor = timelineColor;
+    postInvalidate();
+  }
+
+  /** 设置拖动歌词时右侧时间字体颜色 */
+  public void setTimeTextColor(int timeTextColor) {
+    mTimeTextColor = timeTextColor;
+    postInvalidate();
+  }
+
+  /**
+   * 设置歌词是否允许拖动
+   *
+   * @param draggable 是否允许拖动
+   * @param onPlayClickListener 设置歌词拖动后播放按钮点击监听器，如果允许拖动，则不能为 null
+   */
+  public void setDraggable(boolean draggable, OnPlayClickListener onPlayClickListener) {
+    if (draggable) {
+      if (onPlayClickListener == null) {
+        throw new IllegalArgumentException(
+            "if draggable == true, onPlayClickListener must not be null");
+      }
+      mOnPlayClickListener = onPlayClickListener;
+    } else {
+      mOnPlayClickListener = null;
+    }
+  }
+
+  /**
+   * 设置播放按钮点击监听器
+   *
+   * @param onPlayClickListener 如果为非 null ，则激活歌词拖动功能，否则将将禁用歌词拖动功能
+   * @deprecated use {@link #setDraggable(boolean, OnPlayClickListener)} instead
+   */
+  @Deprecated
+  public void setOnPlayClickListener(OnPlayClickListener onPlayClickListener) {
+    mOnPlayClickListener = onPlayClickListener;
+  }
+
+  /** 设置歌词为空时屏幕中央显示的文字，如“暂无歌词” */
+  public void setLabel(String label) {
+    runOnUi(
+        () -> {
+          mDefaultLabel = label;
+          invalidate();
+        });
+  }
+
+  /**
+   * 加载歌词文件
+   *
+   * @param lrcFile 歌词文件
+   */
+  public void loadLrc(File lrcFile) {
+    loadLrc(lrcFile, null);
+  }
+
+  /**
+   * 加载双语歌词文件，两种语言的歌词时间戳需要一致
+   *
+   * @param mainLrcFile 第一种语言歌词文件
+   * @param secondLrcFile 第二种语言歌词文件
+   */
+  public void loadLrc(File mainLrcFile, File secondLrcFile) {
+    runOnUi(
+        () -> {
+          reset();
+
+          StringBuilder sb = new StringBuilder("file://");
+          sb.append(mainLrcFile.getPath());
+          if (secondLrcFile != null) {
+            sb.append("#").append(secondLrcFile.getPath());
+          }
+          String flag = sb.toString();
+          setFlag(flag);
+          new AsyncTask<File, Integer, List<LrcEntry>>() {
+            @Override
+            protected List<LrcEntry> doInBackground(File... params) {
+              return LrcUtils.parseLrc(params);
+            }
+
+            @Override
+            protected void onPostExecute(List<LrcEntry> lrcEntries) {
+              if (getFlag() == flag) {
+                onLrcLoaded(lrcEntries);
+                setFlag(null);
+              }
+            }
+          }.execute(mainLrcFile, secondLrcFile);
+        });
+  }
+
+  /**
+   * 加载歌词文本
+   *
+   * @param lrcText 歌词文本
+   */
+  public void loadLrc(String lrcText) {
+    loadLrc(lrcText, null);
+  }
+
+  /**
+   * 加载双语歌词文本，两种语言的歌词时间戳需要一致
+   *
+   * @param mainLrcText 第一种语言歌词文本
+   * @param secondLrcText 第二种语言歌词文本
+   */
+  public void loadLrc(String mainLrcText, String secondLrcText) {
+    runOnUi(
+        () -> {
+          reset();
+
+          StringBuilder sb = new StringBuilder("file://");
+          sb.append(mainLrcText);
+          if (secondLrcText != null) {
+            sb.append("#").append(secondLrcText);
+          }
+          String flag = sb.toString();
+          setFlag(flag);
+          new AsyncTask<String, Integer, List<LrcEntry>>() {
+            @Override
+            protected List<LrcEntry> doInBackground(String... params) {
+              return LrcUtils.parseLrc(params);
+            }
+
+            @Override
+            protected void onPostExecute(List<LrcEntry> lrcEntries) {
+              if (getFlag() == flag) {
+                onLrcLoaded(lrcEntries);
+                setFlag(null);
+              }
+            }
+          }.execute(mainLrcText, secondLrcText);
+        });
+  }
+
+  /**
+   * 加载在线歌词，默认使用 utf-8 编码
+   *
+   * @param lrcUrl 歌词文件的网络地址
+   */
+  public void loadLrcByUrl(String lrcUrl) {
+    loadLrcByUrl(lrcUrl, "utf-8");
+  }
+
+  /**
+   * 加载在线歌词
+   *
+   * @param lrcUrl 歌词文件的网络地址
+   * @param charset 编码格式
+   */
+  public void loadLrcByUrl(String lrcUrl, String charset) {
+    String flag = "url://" + lrcUrl;
+    setFlag(flag);
+    new AsyncTask<String, Integer, String>() {
+      @Override
+      protected String doInBackground(String... params) {
+        return LrcUtils.getContentFromNetwork(params[0], params[1]);
+      }
+
+      @Override
+      protected void onPostExecute(String lrcText) {
+        if (getFlag() == flag) {
+          loadLrc(lrcText);
+        }
+      }
+    }.execute(lrcUrl, charset);
+  }
+
+  /**
+   * 歌词是否有效
+   *
+   * @return true，如果歌词有效，否则false
+   */
+  public boolean hasLrc() {
+    return !mLrcEntryList.isEmpty();
+  }
+
+  /**
+   * 刷新歌词
+   *
+   * @param time 当前播放时间
+   */
+  public void updateTime(long time) {
+    runOnUi(
+        () -> {
+          if (!hasLrc()) {
+            return;
+          }
+
+          int line = findShowLine(time);
+          if (line != mCurrentLine) {
+            mCurrentLine = line;
+            if (!isShowTimeline) {
+              smoothScrollTo(line);
+            } else {
+              invalidate();
+            }
+          }
+        });
+  }
+
+  /**
+   * 将歌词滚动到指定时间
+   *
+   * @param time 指定的时间
+   * @deprecated 请使用 {@link #updateTime(long)} 代替
+   */
+  @Deprecated
+  public void onDrag(long time) {
+    updateTime(time);
+  }
+
+  @Override
+  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+    super.onLayout(changed, left, top, right, bottom);
+    if (changed) {
+      initPlayDrawable();
+      initEntryList();
+      if (hasLrc()) {
+        smoothScrollTo(mCurrentLine, 0L);
+      }
+    }
+  }
+
+  @Override
+  protected void onDraw(Canvas canvas) {
+    super.onDraw(canvas);
+
+    int centerY = getHeight() / 2;
+
+    // 无歌词文件
+    if (!hasLrc()) {
+      mLrcPaint.setColor(mCurrentTextColor);
+      @SuppressLint("DrawAllocation")
+      StaticLayout staticLayout =
+          new StaticLayout(
+              mDefaultLabel,
+              mLrcPaint,
+              (int) getLrcWidth(),
+              Layout.Alignment.ALIGN_CENTER,
+              1f,
+              0f,
+              false);
+      drawText(canvas, staticLayout, centerY);
+      return;
+    }
+
+    int centerLine = getCenterLine();
+
+    if (isShowTimeline) {
+      mPlayDrawable.draw(canvas);
+
+      mTimePaint.setColor(mTimelineColor);
+      canvas.drawLine(mTimeTextWidth, centerY, getWidth() - mTimeTextWidth, centerY, mTimePaint);
+
+      mTimePaint.setColor(mTimeTextColor);
+      String timeText = LrcUtils.formatTime(mLrcEntryList.get(centerLine).getTime());
+      float timeX = getWidth() - mTimeTextWidth / 2;
+      float timeY = centerY - (mTimeFontMetrics.descent + mTimeFontMetrics.ascent) / 2;
+      canvas.drawText(timeText, timeX, timeY, mTimePaint);
+    }
+
+    canvas.translate(0, mOffset);
+
+    float y = 0;
+    for (int i = 0; i < mLrcEntryList.size(); i++) {
+      if (i > 0) {
+        y +=
+            ((mLrcEntryList.get(i - 1).getHeight() + mLrcEntryList.get(i).getHeight()) >> 1)
+                + mDividerHeight;
+      }
+      if (BuildConfig.DEBUG) {
+        // mLrcPaint.setTypeface(ResourcesCompat.getFont(getContext(), R.font.sans));
+      }
+      if (i == mCurrentLine) {
+        mLrcPaint.setTextSize(mCurrentTextSize);
+        mLrcPaint.setColor(mCurrentTextColor);
+      } else if (isShowTimeline && i == centerLine) {
+        mLrcPaint.setColor(mTimelineTextColor);
+      } else {
+        mLrcPaint.setTextSize(mNormalTextSize);
+        mLrcPaint.setColor(mNormalTextColor);
+      }
+      drawText(canvas, mLrcEntryList.get(i).getStaticLayout(), y);
+    }
+  }
+
+  /**
+   * 画一行歌词
+   *
+   * @param y 歌词中心 Y 坐标
+   */
+  private void drawText(Canvas canvas, StaticLayout staticLayout, float y) {
+    canvas.save();
+    canvas.translate(mLrcPadding, y - (staticLayout.getHeight() >> 1));
+    staticLayout.draw(canvas);
+    canvas.restore();
+  }
+
+  @Override
+  public boolean onTouchEvent(MotionEvent event) {
+    if (event.getAction() == MotionEvent.ACTION_UP
+        || event.getAction() == MotionEvent.ACTION_CANCEL) {
+      isTouching = false;
+      if (hasLrc() && !isFling) {
+        adjustCenter();
+        postDelayed(hideTimelineRunnable, TIMELINE_KEEP_TIME);
+      }
+    }
+    return mGestureDetector.onTouchEvent(event);
+  }
+
+  @Override
+  public void computeScroll() {
+    if (mScroller.computeScrollOffset()) {
+      mOffset = mScroller.getCurrY();
+      invalidate();
+    }
+
+    if (isFling && mScroller.isFinished()) {
+      isFling = false;
+      if (hasLrc() && !isTouching) {
+        adjustCenter();
+        postDelayed(hideTimelineRunnable, TIMELINE_KEEP_TIME);
+      }
+    }
+  }
+
+  @Override
+  protected void onDetachedFromWindow() {
+    removeCallbacks(hideTimelineRunnable);
+    super.onDetachedFromWindow();
+  }
+
+  private void onLrcLoaded(List<LrcEntry> entryList) {
+    if (entryList != null && !entryList.isEmpty()) {
+      mLrcEntryList.addAll(entryList);
+    }
+
+    Collections.sort(mLrcEntryList);
+
+    initEntryList();
+    invalidate();
+  }
+
+  private void initPlayDrawable() {
+    int l = (mTimeTextWidth - mDrawableWidth) / 2;
+    int t = getHeight() / 2 - mDrawableWidth / 2;
+    int r = l + mDrawableWidth;
+    int b = t + mDrawableWidth;
+    mPlayDrawable.setBounds(l, t, r, b);
+  }
+
+  private void initEntryList() {
+    if (!hasLrc() || getWidth() == 0) {
+      return;
+    }
+
+    for (LrcEntry lrcEntry : mLrcEntryList) {
+      lrcEntry.init(mLrcPaint, (int) getLrcWidth(), mTextGravity);
+    }
+
+    mOffset = getHeight() / 2;
+  }
+
+  private void reset() {
+    endAnimation();
+    mScroller.forceFinished(true);
+    isShowTimeline = false;
+    isTouching = false;
+    isFling = false;
+    removeCallbacks(hideTimelineRunnable);
+    mLrcEntryList.clear();
+    mOffset = 0;
+    mCurrentLine = 0;
+    invalidate();
+  }
+
+  /** 将中心行微调至正中心 */
+  private void adjustCenter() {
+    smoothScrollTo(getCenterLine(), ADJUST_DURATION);
+  }
+
+  /** 滚动到某一行 */
+  private void smoothScrollTo(int line) {
+    smoothScrollTo(line, mAnimationDuration);
+  }
+
+  /** 滚动到某一行 */
+  private void smoothScrollTo(int line, long duration) {
+    float offset = getOffset(line);
+    endAnimation();
+
+    mAnimator = ValueAnimator.ofFloat(mOffset, offset);
+    mAnimator.setDuration(duration);
+    mAnimator.setInterpolator(new LinearInterpolator());
+    mAnimator.addUpdateListener(
+        animation -> {
+          mOffset = (float) animation.getAnimatedValue();
+          invalidate();
+        });
+    LrcUtils.resetDurationScale();
+    mAnimator.start();
+  }
+
+  /** 结束滚动动画 */
+  private void endAnimation() {
+    if (mAnimator != null && mAnimator.isRunning()) {
+      mAnimator.end();
+    }
+  }
+
+  /** 二分法查找当前时间应该显示的行数（最后一个 <= time 的行数） */
+  private int findShowLine(long time) {
+    int left = 0;
+    int right = mLrcEntryList.size();
+    while (left <= right) {
+      int middle = (left + right) / 2;
+      long middleTime = mLrcEntryList.get(middle).getTime();
+
+      if (time < middleTime) {
+        right = middle - 1;
+      } else {
+        if (middle + 1 >= mLrcEntryList.size() || time < mLrcEntryList.get(middle + 1).getTime()) {
+          return middle;
+        }
+
+        left = middle + 1;
+      }
+    }
+
+    return 0;
+  }
+
+  /** 获取当前在视图中央的行数 */
+  private int getCenterLine() {
+    int centerLine = 0;
+    float minDistance = Float.MAX_VALUE;
+    for (int i = 0; i < mLrcEntryList.size(); i++) {
+      if (Math.abs(mOffset - getOffset(i)) < minDistance) {
+        minDistance = Math.abs(mOffset - getOffset(i));
+        centerLine = i;
+      }
+    }
+    return centerLine;
+  }
+
+  /** 获取歌词距离视图顶部的距离 采用懒加载方式 */
+  private float getOffset(int line) {
+    if (mLrcEntryList.get(line).getOffset() == Float.MIN_VALUE) {
+      float offset = getHeight() / 2;
+      for (int i = 1; i <= line; i++) {
+        offset -=
+            ((mLrcEntryList.get(i - 1).getHeight() + mLrcEntryList.get(i).getHeight()) >> 1)
+                + mDividerHeight;
+      }
+      mLrcEntryList.get(line).setOffset(offset);
+    }
+
+    return mLrcEntryList.get(line).getOffset();
+  }
+
+  /** 获取歌词宽度 */
+  private float getLrcWidth() {
+    return getWidth() - mLrcPadding * 2;
+  }
+
+  /** 在主线程中运行 */
+  private void runOnUi(Runnable r) {
+    if (Looper.myLooper() == Looper.getMainLooper()) {
+      r.run();
+    } else {
+      post(r);
+    }
+  }
+
+  private Object getFlag() {
+    return mFlag;
+  }
+
+  private void setFlag(Object flag) {
+    this.mFlag = flag;
+  }
+
+  /** 播放按钮点击监听器，点击后应该跳转到指定播放位置 */
+  public interface OnPlayClickListener {
+    /**
+     * 播放按钮被点击，应该跳转到指定播放位置
+     *
+     * @return 是否成功消费该事件，如果成功消费，则会更新UI
+     */
+    boolean onPlayClick(long time);
+  }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/CustomFragmentStatePagerAdapter.java b/app/src/main/java/io/github/muntashirakon/music/misc/CustomFragmentStatePagerAdapter.java
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/misc/CustomFragmentStatePagerAdapter.java
rename to app/src/main/java/io/github/muntashirakon/music/misc/CustomFragmentStatePagerAdapter.java
index c1de399a2..faefe0628 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/CustomFragmentStatePagerAdapter.java
+++ b/app/src/main/java/io/github/muntashirakon/music/misc/CustomFragmentStatePagerAdapter.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.misc;
+package io.github.muntashirakon.music.misc;
 
 import android.os.Bundle;
 import android.os.Parcelable;
diff --git a/app/src/main/java/io/github/muntashirakon/music/misc/GenericFileProvider.java b/app/src/main/java/io/github/muntashirakon/music/misc/GenericFileProvider.java
new file mode 100644
index 000000000..18ad0d9cf
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/misc/GenericFileProvider.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package io.github.muntashirakon.music.misc;
+
+import androidx.core.content.FileProvider;
+
+public class GenericFileProvider extends FileProvider {}
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/SimpleOnSeekbarChangeListener.kt b/app/src/main/java/io/github/muntashirakon/music/misc/SimpleOnSeekbarChangeListener.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/misc/SimpleOnSeekbarChangeListener.kt
rename to app/src/main/java/io/github/muntashirakon/music/misc/SimpleOnSeekbarChangeListener.kt
index a19a9cb1e..89183d4e4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/SimpleOnSeekbarChangeListener.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/misc/SimpleOnSeekbarChangeListener.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.misc
+package io.github.muntashirakon.music.misc
 
 import android.widget.SeekBar
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java b/app/src/main/java/io/github/muntashirakon/music/misc/UpdateToastMediaScannerCompletionListener.java
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java
rename to app/src/main/java/io/github/muntashirakon/music/misc/UpdateToastMediaScannerCompletionListener.java
index d749cf223..861b9d57a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java
+++ b/app/src/main/java/io/github/muntashirakon/music/misc/UpdateToastMediaScannerCompletionListener.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.misc;
+package io.github.muntashirakon.music.misc;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -23,7 +23,7 @@ import android.widget.Toast;
 import java.lang.ref.WeakReference;
 import java.util.List;
 
-import code.name.monkey.retromusic.R;
+import io.github.muntashirakon.music.R;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/WrappedAsyncTaskLoader.kt b/app/src/main/java/io/github/muntashirakon/music/misc/WrappedAsyncTaskLoader.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/misc/WrappedAsyncTaskLoader.kt
rename to app/src/main/java/io/github/muntashirakon/music/misc/WrappedAsyncTaskLoader.kt
index 7c596c5fc..dd3679bb6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/WrappedAsyncTaskLoader.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/misc/WrappedAsyncTaskLoader.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.misc
+package io.github.muntashirakon.music.misc
 
 import android.content.Context
 import androidx.loader.content.AsyncTaskLoader
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/AbsCustomPlaylist.kt b/app/src/main/java/io/github/muntashirakon/music/model/AbsCustomPlaylist.kt
similarity index 64%
rename from app/src/main/java/code/name/monkey/retromusic/model/AbsCustomPlaylist.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/AbsCustomPlaylist.kt
index ad5f3b1e2..f44c4679b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/AbsCustomPlaylist.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/AbsCustomPlaylist.kt
@@ -1,8 +1,8 @@
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
-import code.name.monkey.retromusic.repository.LastAddedRepository
-import code.name.monkey.retromusic.repository.SongRepository
-import code.name.monkey.retromusic.repository.TopPlayedRepository
+import io.github.muntashirakon.music.repository.LastAddedRepository
+import io.github.muntashirakon.music.repository.SongRepository
+import io.github.muntashirakon.music.repository.TopPlayedRepository
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Album.kt b/app/src/main/java/io/github/muntashirakon/music/model/Album.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/model/Album.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/Album.kt
index c894955bd..9e28ae650 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Album.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/Album.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
 data class Album(
     val id: Long,
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Artist.kt b/app/src/main/java/io/github/muntashirakon/music/model/Artist.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/model/Artist.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/Artist.kt
index e82aed2d8..c45c5bc34 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Artist.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/Artist.kt
@@ -12,11 +12,11 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
-import code.name.monkey.retromusic.helper.SortOrder
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.helper.SortOrder
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
 import java.text.Collator
 
 data class Artist(
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/ArtworkInfo.kt b/app/src/main/java/io/github/muntashirakon/music/model/ArtworkInfo.kt
similarity index 70%
rename from app/src/main/java/code/name/monkey/retromusic/model/ArtworkInfo.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/ArtworkInfo.kt
index a0bfead2b..19f2dc486 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/ArtworkInfo.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/ArtworkInfo.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
 import android.graphics.Bitmap
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/AudioTagInfo.kt b/app/src/main/java/io/github/muntashirakon/music/model/AudioTagInfo.kt
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/model/AudioTagInfo.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/AudioTagInfo.kt
index 3ac895df0..d70d1c7c4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/AudioTagInfo.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/AudioTagInfo.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
 import org.jaudiotagger.tag.FieldKey
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.kt b/app/src/main/java/io/github/muntashirakon/music/model/CategoryInfo.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/CategoryInfo.kt
index 19218e9c3..bde88e322 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/CategoryInfo.kt
@@ -11,17 +11,18 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
 import android.os.Parcelable
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import code.name.monkey.retromusic.R
+import io.github.muntashirakon.music.R
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class CategoryInfo(
     val category: Category,
+    @get:JvmName("isVisible")
     var visible: Boolean
 ) : Parcelable {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Genre.kt b/app/src/main/java/io/github/muntashirakon/music/model/Genre.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/model/Genre.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/Genre.kt
index 782c2bccb..154b039a6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Genre.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/Genre.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Home.kt b/app/src/main/java/io/github/muntashirakon/music/model/Home.kt
similarity index 89%
rename from app/src/main/java/code/name/monkey/retromusic/model/Home.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/Home.kt
index 9a12344f3..403ffbb8a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Home.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/Home.kt
@@ -12,10 +12,10 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
 import androidx.annotation.StringRes
-import code.name.monkey.retromusic.HomeSection
+import io.github.muntashirakon.music.HomeSection
 
 data class Home(
     val arrayList: List<Any>,
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Playlist.kt b/app/src/main/java/io/github/muntashirakon/music/model/Playlist.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/model/Playlist.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/Playlist.kt
index f822540a9..9c0bc4bc5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Playlist.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/Playlist.kt
@@ -1,9 +1,9 @@
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
 import android.content.Context
 import android.os.Parcelable
-import code.name.monkey.retromusic.repository.RealPlaylistRepository
-import code.name.monkey.retromusic.util.MusicUtil
+import io.github.muntashirakon.music.repository.RealPlaylistRepository
+import io.github.muntashirakon.music.util.MusicUtil
 import kotlinx.parcelize.Parcelize
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.kt b/app/src/main/java/io/github/muntashirakon/music/model/PlaylistSong.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/PlaylistSong.kt
index ccbb31c2f..1d8d003b0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/PlaylistSong.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
 import kotlinx.parcelize.Parcelize
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Song.kt b/app/src/main/java/io/github/muntashirakon/music/model/Song.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/model/Song.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/Song.kt
index cfd61a937..0b1bc3d74 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Song.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/Song.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.model
+package io.github.muntashirakon.music.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/lyrics/AbsSynchronizedLyrics.java b/app/src/main/java/io/github/muntashirakon/music/model/lyrics/AbsSynchronizedLyrics.java
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/model/lyrics/AbsSynchronizedLyrics.java
rename to app/src/main/java/io/github/muntashirakon/music/model/lyrics/AbsSynchronizedLyrics.java
index f939003e9..306b4c675 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/lyrics/AbsSynchronizedLyrics.java
+++ b/app/src/main/java/io/github/muntashirakon/music/model/lyrics/AbsSynchronizedLyrics.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.model.lyrics;
+package io.github.muntashirakon.music.model.lyrics;
 
 import android.util.SparseArray;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/lyrics/Lyrics.java b/app/src/main/java/io/github/muntashirakon/music/model/lyrics/Lyrics.java
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/model/lyrics/Lyrics.java
rename to app/src/main/java/io/github/muntashirakon/music/model/lyrics/Lyrics.java
index c466949f8..3d95fd344 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/lyrics/Lyrics.java
+++ b/app/src/main/java/io/github/muntashirakon/music/model/lyrics/Lyrics.java
@@ -12,11 +12,11 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.model.lyrics;
+package io.github.muntashirakon.music.model.lyrics;
 
 import java.util.ArrayList;
 
-import code.name.monkey.retromusic.model.Song;
+import io.github.muntashirakon.music.model.Song;
 
 public class Lyrics {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/lyrics/SynchronizedLyricsLRC.java b/app/src/main/java/io/github/muntashirakon/music/model/lyrics/SynchronizedLyricsLRC.java
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/model/lyrics/SynchronizedLyricsLRC.java
rename to app/src/main/java/io/github/muntashirakon/music/model/lyrics/SynchronizedLyricsLRC.java
index 409184913..ae1854fff 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/lyrics/SynchronizedLyricsLRC.java
+++ b/app/src/main/java/io/github/muntashirakon/music/model/lyrics/SynchronizedLyricsLRC.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.model.lyrics;
+package io.github.muntashirakon.music.model.lyrics;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.kt b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/AbsSmartPlaylist.kt
similarity index 60%
rename from app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/AbsSmartPlaylist.kt
index 8098f2c07..5711b2de8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/AbsSmartPlaylist.kt
@@ -1,8 +1,8 @@
-package code.name.monkey.retromusic.model.smartplaylist
+package io.github.muntashirakon.music.model.smartplaylist
 
 import androidx.annotation.DrawableRes
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.AbsCustomPlaylist
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.model.AbsCustomPlaylist
 
 abstract class AbsSmartPlaylist(
     name: String,
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.kt b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/HistoryPlaylist.kt
similarity index 65%
rename from app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/HistoryPlaylist.kt
index c3becdf66..9f4b2c5ba 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/HistoryPlaylist.kt
@@ -1,8 +1,8 @@
-package code.name.monkey.retromusic.model.smartplaylist
+package io.github.muntashirakon.music.model.smartplaylist
 
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.App
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.model.Song
 import kotlinx.parcelize.Parcelize
 import org.koin.core.component.KoinComponent
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.kt b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/LastAddedPlaylist.kt
similarity index 61%
rename from app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/LastAddedPlaylist.kt
index f3b7b1b13..c9a8a07cc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/LastAddedPlaylist.kt
@@ -1,8 +1,8 @@
-package code.name.monkey.retromusic.model.smartplaylist
+package io.github.muntashirakon.music.model.smartplaylist
 
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.App
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.model.Song
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotPlayedPlaylist.kt b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/NotPlayedPlaylist.kt
similarity index 54%
rename from app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotPlayedPlaylist.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/NotPlayedPlaylist.kt
index a6786ac78..4d6e9b7cb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotPlayedPlaylist.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/NotPlayedPlaylist.kt
@@ -1,14 +1,14 @@
-package code.name.monkey.retromusic.model.smartplaylist
+package io.github.muntashirakon.music.model.smartplaylist
 
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.App
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.model.Song
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
 class NotPlayedPlaylist : AbsSmartPlaylist(
     name = App.getContext().getString(R.string.not_recently_played),
-    iconRes = R.drawable.ic_audiotrack
+    iconRes = R.drawable.ic_watch_later
 ) {
     override fun songs(): List<Song> {
         return topPlayedRepository.notRecentlyPlayedTracks()
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/PlaylistIdGenerator.kt b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/PlaylistIdGenerator.kt
similarity index 81%
rename from app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/PlaylistIdGenerator.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/PlaylistIdGenerator.kt
index baefff7b9..c22510f4a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/PlaylistIdGenerator.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/PlaylistIdGenerator.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.model.smartplaylist
+package io.github.muntashirakon.music.model.smartplaylist
 
 import androidx.annotation.DrawableRes
 import kotlin.math.abs
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.kt b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/ShuffleAllPlaylist.kt
similarity index 60%
rename from app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/ShuffleAllPlaylist.kt
index 35c07d71c..c558fb79f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/ShuffleAllPlaylist.kt
@@ -1,8 +1,8 @@
-package code.name.monkey.retromusic.model.smartplaylist
+package io.github.muntashirakon.music.model.smartplaylist
 
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.App
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.model.Song
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/TopTracksPlaylist.kt b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/TopTracksPlaylist.kt
similarity index 61%
rename from app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/TopTracksPlaylist.kt
rename to app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/TopTracksPlaylist.kt
index d33be0207..4b07da125 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/TopTracksPlaylist.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/model/smartplaylist/TopTracksPlaylist.kt
@@ -1,8 +1,8 @@
-package code.name.monkey.retromusic.model.smartplaylist
+package io.github.muntashirakon.music.model.smartplaylist
 
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.App
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.model.Song
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt b/app/src/main/java/io/github/muntashirakon/music/preferences/AlbumCoverStylePreferenceDialog.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/preferences/AlbumCoverStylePreferenceDialog.kt
index f86723b71..2c21d69d0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/preferences/AlbumCoverStylePreferenceDialog.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.preferences
+package io.github.muntashirakon.music.preferences
 
 import android.app.Dialog
 import android.content.Context
@@ -27,15 +27,13 @@ import androidx.fragment.app.DialogFragment
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.PreferenceDialogNowPlayingScreenBinding
-import code.name.monkey.retromusic.databinding.PreferenceNowPlayingScreenItemBinding
-import code.name.monkey.retromusic.fragments.AlbumCoverStyle.*
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ViewUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.PreferenceDialogNowPlayingScreenBinding
+import io.github.muntashirakon.music.databinding.PreferenceNowPlayingScreenItemBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.AlbumCoverStyle.*
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.ViewUtil
 import com.bumptech.glide.Glide
 
 class AlbumCoverStylePreference @JvmOverloads constructor(
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt b/app/src/main/java/io/github/muntashirakon/music/preferences/BlacklistPreferenceDialog.kt
similarity index 73%
rename from app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/preferences/BlacklistPreferenceDialog.kt
index 15e95fedc..6e073ce03 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/preferences/BlacklistPreferenceDialog.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.preferences
+package io.github.muntashirakon.music.preferences
 
 import android.app.Dialog
 import android.content.Context
@@ -23,15 +23,16 @@ import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat.SRC_IN
 import androidx.core.text.parseAsHtml
 import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentActivity
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.dialogs.BlacklistFolderChooserDialog
-import code.name.monkey.retromusic.extensions.accentTextColor
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.providers.BlacklistStore
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.dialogs.BlacklistFolderChooserDialog
+import io.github.muntashirakon.music.extensions.accentTextColor
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.colorControlNormal
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.providers.BlacklistStore
 import java.io.File
 
 class BlacklistPreference @JvmOverloads constructor(
@@ -52,18 +53,21 @@ class BlacklistPreference @JvmOverloads constructor(
 
 class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog.FolderCallback {
     companion object {
+        private var mContext: Context? = null
+        private var mActivity: FragmentActivity? = null
+
         fun newInstance(): BlacklistPreferenceDialog {
             return BlacklistPreferenceDialog()
         }
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        mContext = requireContext()
+        mActivity = requireActivity()
         val chooserDialog =
             childFragmentManager.findFragmentByTag("FOLDER_CHOOSER") as BlacklistFolderChooserDialog?
         chooserDialog?.setCallback(this)
-        val context = requireActivity()
-
-        refreshBlacklistData(context)
+        refreshBlacklistData()
         return materialDialog(R.string.blacklist)
             .setPositiveButton(R.string.done) { _, _ ->
                 dismiss()
@@ -71,9 +75,7 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
             .setNeutralButton(R.string.clear_action) { _, _ ->
                 materialDialog(R.string.clear_blacklist)
                     .setMessage(R.string.do_you_want_to_clear_the_blacklist)
-                    .setPositiveButton(R.string.clear_action) { _, _ ->
-                        BlacklistStore.getInstance(context).clear()
-                    }
+                    .setPositiveButton(R.string.clear_action, null)
                     .setNegativeButton(android.R.string.cancel, null)
                     .create()
                     .colorButtons()
@@ -82,7 +84,7 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
             .setNegativeButton(R.string.add_action) { _, _ ->
                 val dialog = BlacklistFolderChooserDialog.create()
                 dialog.setCallback(this@BlacklistPreferenceDialog)
-                dialog.show(requireActivity().supportFragmentManager, "FOLDER_CHOOSER")
+                dialog.show(mActivity!!.supportFragmentManager, "FOLDER_CHOOSER")
             }
             .setItems(paths.toTypedArray()) { _, which ->
                 materialDialog(R.string.remove_from_blacklist)
@@ -93,7 +95,9 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
                         ).parseAsHtml()
                     )
                     .setPositiveButton(R.string.remove_action) { _, _ ->
-                        BlacklistStore.getInstance(context).removePath(File(paths[which]))
+                        BlacklistStore.getInstance(mContext!!)
+                            .removePath(File(paths[which]))
+                        refreshBlacklistData()
                     }
                     .setNegativeButton(android.R.string.cancel, null)
                     .create()
@@ -104,16 +108,21 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
                 setOnShowListener {
                     getButton(AlertDialog.BUTTON_POSITIVE).accentTextColor()
                     getButton(AlertDialog.BUTTON_NEGATIVE).accentTextColor()
-                    getButton(AlertDialog.BUTTON_NEUTRAL).accentTextColor()
+                    getButton(AlertDialog.BUTTON_NEUTRAL).apply {
+                        accentTextColor()
+                        setOnClickListener {
+                            BlacklistStore.getInstance(mContext!!).clear()
+                            dismiss()
+                        }
+                    }
                 }
             }
     }
 
     private lateinit var paths: ArrayList<String>
 
-    private fun refreshBlacklistData(context: Context?) {
-        if (context == null) return
-        this.paths = BlacklistStore.getInstance(context).paths
+    private fun refreshBlacklistData() {
+        this.paths = BlacklistStore.getInstance(requireContext()).paths
         val dialog = dialog as MaterialAlertDialogBuilder?
         dialog?.setItems(paths.toTypedArray(), null)
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/DurationPreference.kt b/app/src/main/java/io/github/muntashirakon/music/preferences/DurationPreference.kt
similarity index 82%
rename from app/src/main/java/code/name/monkey/retromusic/preferences/DurationPreference.kt
rename to app/src/main/java/io/github/muntashirakon/music/preferences/DurationPreference.kt
index 6f7445c25..6020633b9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/DurationPreference.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/preferences/DurationPreference.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.preferences
+package io.github.muntashirakon.music.preferences
 
 import android.app.Dialog
 import android.content.Context
@@ -9,13 +9,13 @@ import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat.SRC_IN
 import androidx.fragment.app.DialogFragment
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.PreferenceDialogAudioFadeBinding
-import code.name.monkey.retromusic.extensions.addAccentColor
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.PreferenceDialogAudioFadeBinding
+import io.github.muntashirakon.music.extensions.addAccentColor
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.colorControlNormal
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.util.PreferenceUtil
 import com.google.android.material.slider.Slider
 
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt b/app/src/main/java/io/github/muntashirakon/music/preferences/LibraryPreference.kt
similarity index 81%
rename from app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt
rename to app/src/main/java/io/github/muntashirakon/music/preferences/LibraryPreference.kt
index 16603b6af..d93c0c8e3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/preferences/LibraryPreference.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.preferences
+package io.github.muntashirakon.music.preferences
 
 import android.app.Dialog
 import android.content.Context
@@ -23,15 +23,15 @@ import androidx.core.graphics.BlendModeCompat.SRC_IN
 import androidx.fragment.app.DialogFragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference
-import code.name.monkey.retromusic.adapter.CategoryInfoAdapter
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.PreferenceDialogLibraryCategoriesBinding
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.adapter.CategoryInfoAdapter
+import io.github.muntashirakon.music.databinding.PreferenceDialogLibraryCategoriesBinding
+import io.github.muntashirakon.music.extensions.colorButtons
+import io.github.muntashirakon.music.extensions.colorControlNormal
+import io.github.muntashirakon.music.extensions.materialDialog
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.model.CategoryInfo
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 class LibraryPreference @JvmOverloads constructor(
     context: Context,
@@ -54,7 +54,7 @@ class LibraryPreferenceDialog : DialogFragment() {
 
         val categoryAdapter = CategoryInfoAdapter()
         binding.recyclerView.apply {
-            layoutManager = LinearLayoutManager(requireContext())
+            layoutManager = LinearLayoutManager(activity)
             adapter = categoryAdapter
             categoryAdapter.attachToRecyclerView(this)
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt b/app/src/main/java/io/github/muntashirakon/music/preferences/NowPlayingScreenPreferenceDialog.kt
similarity index 89%
rename from app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
rename to app/src/main/java/io/github/muntashirakon/music/preferences/NowPlayingScreenPreferenceDialog.kt
index cd8aa21a2..d3dd31602 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/preferences/NowPlayingScreenPreferenceDialog.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.preferences
+package io.github.muntashirakon.music.preferences
 
 import android.app.Dialog
 import android.content.Context
@@ -27,15 +27,13 @@ import androidx.fragment.app.DialogFragment
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.materialDialog
 import com.bumptech.glide.Glide
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.PreferenceNowPlayingScreenItemBinding
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ViewUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.PreferenceNowPlayingScreenItemBinding
+import io.github.muntashirakon.music.extensions.*
+import io.github.muntashirakon.music.fragments.NowPlayingScreen.*
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.ViewUtil
 
 class NowPlayingScreenPreference @JvmOverloads constructor(
     context: Context,
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java b/app/src/main/java/io/github/muntashirakon/music/providers/BlacklistStore.java
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java
rename to app/src/main/java/io/github/muntashirakon/music/providers/BlacklistStore.java
index b125385a6..3d4b07e2b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java
+++ b/app/src/main/java/io/github/muntashirakon/music/providers/BlacklistStore.java
@@ -12,10 +12,10 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.providers;
+package io.github.muntashirakon.music.providers;
 
-import static code.name.monkey.retromusic.service.MusicService.MEDIA_STORE_CHANGED;
-import static code.name.monkey.retromusic.util.FileUtilsKt.getExternalStoragePublicDirectory;
+import static io.github.muntashirakon.music.service.MusicService.MEDIA_STORE_CHANGED;
+import static io.github.muntashirakon.music.util.FileUtilsKt.getExternalStoragePublicDirectory;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -30,8 +30,8 @@ import androidx.annotation.NonNull;
 import java.io.File;
 import java.util.ArrayList;
 
-import code.name.monkey.retromusic.util.FileUtil;
-import code.name.monkey.retromusic.util.PreferenceUtil;
+import io.github.muntashirakon.music.util.FileUtil;
+import io.github.muntashirakon.music.util.PreferenceUtil;
 
 public class BlacklistStore extends SQLiteOpenHelper {
   public static final String DATABASE_NAME = "blacklist.db";
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/HistoryStore.java b/app/src/main/java/io/github/muntashirakon/music/providers/HistoryStore.java
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/providers/HistoryStore.java
rename to app/src/main/java/io/github/muntashirakon/music/providers/HistoryStore.java
index 36ba86299..70b849b77 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/HistoryStore.java
+++ b/app/src/main/java/io/github/muntashirakon/music/providers/HistoryStore.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.providers;
+package io.github.muntashirakon.music.providers;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java b/app/src/main/java/io/github/muntashirakon/music/providers/MusicPlaybackQueueStore.java
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
rename to app/src/main/java/io/github/muntashirakon/music/providers/MusicPlaybackQueueStore.java
index f1349ad7a..4c8f626e5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
+++ b/app/src/main/java/io/github/muntashirakon/music/providers/MusicPlaybackQueueStore.java
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.providers;
+package io.github.muntashirakon.music.providers;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -26,10 +26,10 @@ import androidx.annotation.Nullable;
 
 import java.util.List;
 
-import code.name.monkey.retromusic.App;
-import code.name.monkey.retromusic.Constants;
-import code.name.monkey.retromusic.model.Song;
-import code.name.monkey.retromusic.repository.RealSongRepository;
+import io.github.muntashirakon.music.App;
+import io.github.muntashirakon.music.Constants;
+import io.github.muntashirakon.music.model.Song;
+import io.github.muntashirakon.music.repository.RealSongRepository;
 
 /**
  * @author Andrew Neal, modified for Phonograph by Karim Abou Zeid
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java b/app/src/main/java/io/github/muntashirakon/music/providers/SongPlayCountStore.java
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java
rename to app/src/main/java/io/github/muntashirakon/music/providers/SongPlayCountStore.java
index 9d3112969..5c8ebc5a1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java
+++ b/app/src/main/java/io/github/muntashirakon/music/providers/SongPlayCountStore.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.providers;
+package io.github.muntashirakon.music.providers;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt b/app/src/main/java/io/github/muntashirakon/music/repository/AlbumRepository.kt
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt
rename to app/src/main/java/io/github/muntashirakon/music/repository/AlbumRepository.kt
index 541d98cba..836b70ebb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/AlbumRepository.kt
@@ -12,13 +12,13 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.repository
+package io.github.muntashirakon.music.repository
 
 import android.provider.MediaStore.Audio.AudioColumns
-import code.name.monkey.retromusic.helper.SortOrder
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.helper.SortOrder
+import io.github.muntashirakon.music.model.Album
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.PreferenceUtil
 import java.text.Collator
 
 
@@ -72,11 +72,9 @@ class RealAlbumRepository(private val songRepository: RealSongRepository) :
     // We don't need sorted list of songs (with sortAlbumSongs())
     // cuz we are just displaying Albums(Cover Arts) anyway and not songs
     fun splitIntoAlbums(
-        songs: List<Song>,
-        sorted: Boolean = true
+        songs: List<Song>
     ): List<Album> {
         val grouped = songs.groupBy { it.albumId }.map { Album(it.key, it.value) }
-        if (!sorted) return grouped
         val collator = Collator.getInstance()
         return when (PreferenceUtil.albumSortOrder) {
             SortOrder.AlbumSortOrder.ALBUM_A_Z -> {
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/ArtistRepository.kt b/app/src/main/java/io/github/muntashirakon/music/repository/ArtistRepository.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/repository/ArtistRepository.kt
rename to app/src/main/java/io/github/muntashirakon/music/repository/ArtistRepository.kt
index 8b11976ff..088f077e8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/ArtistRepository.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/ArtistRepository.kt
@@ -12,14 +12,14 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.repository
+package io.github.muntashirakon.music.repository
 
 import android.provider.MediaStore.Audio.AudioColumns
-import code.name.monkey.retromusic.ALBUM_ARTIST
-import code.name.monkey.retromusic.helper.SortOrder
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.ALBUM_ARTIST
+import io.github.muntashirakon.music.helper.SortOrder
+import io.github.muntashirakon.music.model.Album
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.util.PreferenceUtil
 import java.text.Collator
 
 interface ArtistRepository {
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/GenreRepository.kt b/app/src/main/java/io/github/muntashirakon/music/repository/GenreRepository.kt
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/repository/GenreRepository.kt
rename to app/src/main/java/io/github/muntashirakon/music/repository/GenreRepository.kt
index 668bdc64f..03f640fde 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/GenreRepository.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/GenreRepository.kt
@@ -12,19 +12,19 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.repository
+package io.github.muntashirakon.music.repository
 
 import android.content.ContentResolver
 import android.database.Cursor
 import android.provider.BaseColumns
 import android.provider.MediaStore.Audio.Genres
-import code.name.monkey.retromusic.Constants.IS_MUSIC
-import code.name.monkey.retromusic.Constants.baseProjection
-import code.name.monkey.retromusic.extensions.getLong
-import code.name.monkey.retromusic.extensions.getStringOrNull
-import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.Constants.IS_MUSIC
+import io.github.muntashirakon.music.Constants.baseProjection
+import io.github.muntashirakon.music.extensions.getLong
+import io.github.muntashirakon.music.extensions.getStringOrNull
+import io.github.muntashirakon.music.model.Genre
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 interface GenreRepository {
     fun genres(query: String): List<Genre>
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/LastAddedSongsRepository.kt b/app/src/main/java/io/github/muntashirakon/music/repository/LastAddedSongsRepository.kt
similarity index 83%
rename from app/src/main/java/code/name/monkey/retromusic/repository/LastAddedSongsRepository.kt
rename to app/src/main/java/io/github/muntashirakon/music/repository/LastAddedSongsRepository.kt
index dae6854c7..c5a73f5a8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/LastAddedSongsRepository.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/LastAddedSongsRepository.kt
@@ -12,14 +12,14 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.repository
+package io.github.muntashirakon.music.repository
 
 import android.database.Cursor
 import android.provider.MediaStore
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.model.Album
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 /**
  * Created by hemanths on 16/08/17.
@@ -42,7 +42,7 @@ class RealLastAddedRepository(
     }
 
     override fun recentAlbums(): List<Album> {
-        return albumRepository.splitIntoAlbums(recentSongs(), sorted = false)
+        return albumRepository.splitIntoAlbums(recentSongs())
     }
 
     override fun recentArtists(): List<Artist> {
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistRepository.kt b/app/src/main/java/io/github/muntashirakon/music/repository/PlaylistRepository.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/repository/PlaylistRepository.kt
rename to app/src/main/java/io/github/muntashirakon/music/repository/PlaylistRepository.kt
index 75fbeaca1..32cc638b6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistRepository.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/PlaylistRepository.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.repository
+package io.github.muntashirakon.music.repository
 
 import android.content.ContentResolver
 import android.database.Cursor
@@ -20,14 +20,14 @@ import android.provider.BaseColumns
 import android.provider.MediaStore.Audio.AudioColumns
 import android.provider.MediaStore.Audio.Playlists.*
 import android.provider.MediaStore.Audio.PlaylistsColumns
-import code.name.monkey.retromusic.Constants
-import code.name.monkey.retromusic.extensions.getInt
-import code.name.monkey.retromusic.extensions.getLong
-import code.name.monkey.retromusic.extensions.getString
-import code.name.monkey.retromusic.extensions.getStringOrNull
-import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.model.PlaylistSong
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.Constants
+import io.github.muntashirakon.music.extensions.getInt
+import io.github.muntashirakon.music.extensions.getLong
+import io.github.muntashirakon.music.extensions.getString
+import io.github.muntashirakon.music.extensions.getStringOrNull
+import io.github.muntashirakon.music.model.Playlist
+import io.github.muntashirakon.music.model.PlaylistSong
+import io.github.muntashirakon.music.model.Song
 
 /**
  * Created by hemanths on 16/08/17.
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistSongsLoader.kt b/app/src/main/java/io/github/muntashirakon/music/repository/PlaylistSongsLoader.kt
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/repository/PlaylistSongsLoader.kt
rename to app/src/main/java/io/github/muntashirakon/music/repository/PlaylistSongsLoader.kt
index abdec08fb..1eb9e0bd3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistSongsLoader.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/PlaylistSongsLoader.kt
@@ -12,20 +12,20 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.repository
+package io.github.muntashirakon.music.repository
 
 import android.content.Context
 import android.database.Cursor
 import android.provider.MediaStore.Audio.AudioColumns
 import android.provider.MediaStore.Audio.Playlists.Members
-import code.name.monkey.retromusic.Constants
-import code.name.monkey.retromusic.Constants.IS_MUSIC
-import code.name.monkey.retromusic.extensions.getInt
-import code.name.monkey.retromusic.extensions.getLong
-import code.name.monkey.retromusic.extensions.getString
-import code.name.monkey.retromusic.extensions.getStringOrNull
-import code.name.monkey.retromusic.model.PlaylistSong
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.Constants
+import io.github.muntashirakon.music.Constants.IS_MUSIC
+import io.github.muntashirakon.music.extensions.getInt
+import io.github.muntashirakon.music.extensions.getLong
+import io.github.muntashirakon.music.extensions.getString
+import io.github.muntashirakon.music.extensions.getStringOrNull
+import io.github.muntashirakon.music.model.PlaylistSong
+import io.github.muntashirakon.music.model.Song
 
 /**
  * Created by hemanths on 16/08/17.
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt b/app/src/main/java/io/github/muntashirakon/music/repository/Repository.kt
similarity index 82%
rename from app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
rename to app/src/main/java/io/github/muntashirakon/music/repository/Repository.kt
index abad14fbb..791657a3e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/Repository.kt
@@ -12,22 +12,19 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.repository
+package io.github.muntashirakon.music.repository
 
 import android.content.Context
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.map
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.db.*
-import code.name.monkey.retromusic.fragments.search.Filter
-import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.model.smartplaylist.NotPlayedPlaylist
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
+import androidx.lifecycle.Transformations
+import io.github.muntashirakon.music.*
+import io.github.muntashirakon.music.db.*
+import io.github.muntashirakon.music.fragments.search.Filter
+import io.github.muntashirakon.music.model.*
+import io.github.muntashirakon.music.model.smartplaylist.NotPlayedPlaylist
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 interface Repository {
-
     fun historySong(): List<HistoryEntity>
     fun favorites(): LiveData<List<SongEntity>>
     fun observableHistorySongs(): LiveData<List<Song>>
@@ -54,6 +51,7 @@ interface Repository {
     suspend fun topAlbumsHome(): Home
     suspend fun recentAlbumsHome(): Home
     suspend fun favoritePlaylistHome(): Home
+    suspend fun suggestionsHome(): Home
     suspend fun suggestions(): List<Song>
     suspend fun genresHome(): Home
     suspend fun playlists(): Home
@@ -73,16 +71,20 @@ interface Repository {
     suspend fun deletePlaylistSongs(playlists: List<PlaylistEntity>)
     suspend fun favoritePlaylist(): PlaylistEntity
     suspend fun isFavoriteSong(songEntity: SongEntity): List<SongEntity>
-    suspend fun upsertSongInHistory(currentSong: Song)
+    suspend fun addSongToHistory(currentSong: Song)
+    suspend fun songPresentInHistory(currentSong: Song): HistoryEntity?
+    suspend fun updateHistorySong(currentSong: Song)
     suspend fun favoritePlaylistSongs(): List<SongEntity>
     suspend fun recentSongs(): List<Song>
     suspend fun topPlayedSongs(): List<Song>
-    suspend fun upsertSongInPlayCount(playCountEntity: PlayCountEntity)
+    suspend fun insertSongInPlayCount(playCountEntity: PlayCountEntity)
+    suspend fun updateSongInPlayCount(playCountEntity: PlayCountEntity)
     suspend fun deleteSongInPlayCount(playCountEntity: PlayCountEntity)
     suspend fun deleteSongInHistory(songId: Long)
     suspend fun clearSongHistory()
-    suspend fun findSongExistInPlayCount(songId: Long): PlayCountEntity?
+    suspend fun checkSongExistInPlayCount(songId: Long): List<PlayCountEntity>
     suspend fun playCountSongs(): List<PlayCountEntity>
+    suspend fun blackListPaths(): List<BlackListStoreEntity>
     suspend fun deleteSongs(songs: List<Song>)
     suspend fun searchArtists(query: String): List<Artist>
     suspend fun searchSongs(query: String): List<Song>
@@ -90,7 +92,6 @@ interface Repository {
     suspend fun isSongFavorite(songId: Long): Boolean
     fun getSongByGenre(genreId: Long): Song
     fun checkPlaylistExists(playListId: Long): LiveData<Boolean>
-    fun getPlaylist(playlistId: Long): LiveData<PlaylistWithSongs>
 }
 
 class RealRepository(
@@ -106,6 +107,7 @@ class RealRepository(
     private val roomRepository: RoomRepository,
 ) : Repository {
 
+
     override suspend fun deleteSongs(songs: List<Song>) = roomRepository.deleteSongs(songs)
 
     override suspend fun searchSongs(query: String): List<Song> = songRepository.songs(query)
@@ -185,8 +187,6 @@ class RealRepository(
     override suspend fun fetchPlaylistWithSongs(): List<PlaylistWithSongs> =
         roomRepository.playlistWithSongs()
 
-    override fun getPlaylist(playlistId: Long): LiveData<PlaylistWithSongs> = roomRepository.getPlaylist(playlistId)
-
     override suspend fun playlistSongs(playlistWithSongs: PlaylistWithSongs): List<Song> =
         playlistWithSongs.songs.map {
             it.toSong()
@@ -230,8 +230,14 @@ class RealRepository(
     override suspend fun isFavoriteSong(songEntity: SongEntity): List<SongEntity> =
         roomRepository.isFavoriteSong(songEntity)
 
-    override suspend fun upsertSongInHistory(currentSong: Song) =
-        roomRepository.upsertSongInHistory(currentSong)
+    override suspend fun addSongToHistory(currentSong: Song) =
+        roomRepository.addSongToHistory(currentSong)
+
+    override suspend fun songPresentInHistory(currentSong: Song): HistoryEntity? =
+        roomRepository.songPresentInHistory(currentSong)
+
+    override suspend fun updateHistorySong(currentSong: Song) =
+        roomRepository.updateHistorySong(currentSong)
 
     override suspend fun favoritePlaylistSongs(): List<SongEntity> =
         roomRepository.favoritePlaylistSongs(context.getString(R.string.favorites))
@@ -240,8 +246,11 @@ class RealRepository(
 
     override suspend fun topPlayedSongs(): List<Song> = topPlayedRepository.topTracks()
 
-    override suspend fun upsertSongInPlayCount(playCountEntity: PlayCountEntity) =
-        roomRepository.upsertSongInPlayCount(playCountEntity)
+    override suspend fun insertSongInPlayCount(playCountEntity: PlayCountEntity) =
+        roomRepository.insertSongInPlayCount(playCountEntity)
+
+    override suspend fun updateSongInPlayCount(playCountEntity: PlayCountEntity) =
+        roomRepository.updateSongInPlayCount(playCountEntity)
 
     override suspend fun deleteSongInPlayCount(playCountEntity: PlayCountEntity) =
         roomRepository.deleteSongInPlayCount(playCountEntity)
@@ -253,14 +262,17 @@ class RealRepository(
         roomRepository.clearSongHistory()
     }
 
-    override suspend fun findSongExistInPlayCount(songId: Long): PlayCountEntity? =
-        roomRepository.findSongExistInPlayCount(songId)
+    override suspend fun checkSongExistInPlayCount(songId: Long): List<PlayCountEntity> =
+        roomRepository.checkSongExistInPlayCount(songId)
 
     override suspend fun playCountSongs(): List<PlayCountEntity> =
         roomRepository.playCountSongs()
 
+    override suspend fun blackListPaths(): List<BlackListStoreEntity> =
+        roomRepository.blackListPaths()
+
     override fun observableHistorySongs(): LiveData<List<Song>> =
-        roomRepository.observableHistorySongs().map {
+        Transformations.map(roomRepository.observableHistorySongs()) {
             it.fromHistoryToSongs()
         }
 
@@ -270,7 +282,29 @@ class RealRepository(
     override fun favorites(): LiveData<List<SongEntity>> =
         roomRepository.favoritePlaylistLiveData(context.getString(R.string.favorites))
 
+    var suggestions = Home(
+        listOf(), SUGGESTIONS,
+        R.string.suggestion_songs
+    )
+
+    override suspend fun suggestionsHome(): Home {
+        if (!PreferenceUtil.homeSuggestions) return Home(
+            listOf(),
+            SUGGESTIONS,
+            R.string.suggestion_songs
+        )
+        // Don't reload Suggestions everytime
+        if (suggestions.arrayList.isEmpty()) {
+            val songs = NotPlayedPlaylist().songs().shuffled().takeIf {
+                it.size > 9
+            } ?: emptyList()
+            suggestions = Home(songs, SUGGESTIONS, R.string.suggestion_songs)
+        }
+        return suggestions
+    }
+
     override suspend fun suggestions(): List<Song> {
+        if (!PreferenceUtil.homeSuggestions) return listOf()
         return NotPlayedPlaylist().songs().shuffled().takeIf {
             it.size > 9
         } ?: emptyList()
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt b/app/src/main/java/io/github/muntashirakon/music/repository/RoomRepository.kt
similarity index 65%
rename from app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt
rename to app/src/main/java/io/github/muntashirakon/music/repository/RoomRepository.kt
index a38fc39f5..ef901dd2b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/RoomRepository.kt
@@ -1,21 +1,22 @@
-package code.name.monkey.retromusic.repository
+package io.github.muntashirakon.music.repository
 
 import android.content.Context
 import androidx.annotation.WorkerThread
 import androidx.lifecycle.LiveData
-import code.name.monkey.retromusic.db.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder.Companion.PLAYLIST_A_Z
-import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder.Companion.PLAYLIST_SONG_COUNT
-import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder.Companion.PLAYLIST_SONG_COUNT_DESC
-import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder.Companion.PLAYLIST_Z_A
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.*
+import io.github.muntashirakon.music.helper.SortOrder.PlaylistSortOrder.Companion.PLAYLIST_A_Z
+import io.github.muntashirakon.music.helper.SortOrder.PlaylistSortOrder.Companion.PLAYLIST_SONG_COUNT
+import io.github.muntashirakon.music.helper.SortOrder.PlaylistSortOrder.Companion.PLAYLIST_SONG_COUNT_DESC
+import io.github.muntashirakon.music.helper.SortOrder.PlaylistSortOrder.Companion.PLAYLIST_Z_A
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 
 interface RoomRepository {
     fun historySongs(): List<HistoryEntity>
     fun favoritePlaylistLiveData(favorite: String): LiveData<List<SongEntity>>
+    fun insertBlacklistPath(blackListStoreEntity: BlackListStoreEntity)
     fun observableHistorySongs(): LiveData<List<HistoryEntity>>
     fun getSongs(playListId: Long): LiveData<List<SongEntity>>
     suspend fun createPlaylist(playlistEntity: PlaylistEntity): Long
@@ -30,24 +31,33 @@ interface RoomRepository {
     suspend fun favoritePlaylist(favorite: String): PlaylistEntity
     suspend fun isFavoriteSong(songEntity: SongEntity): List<SongEntity>
     suspend fun removeSongFromPlaylist(songEntity: SongEntity)
-    suspend fun upsertSongInHistory(currentSong: Song)
+    suspend fun addSongToHistory(currentSong: Song)
+    suspend fun songPresentInHistory(song: Song): HistoryEntity?
+    suspend fun updateHistorySong(song: Song)
     suspend fun favoritePlaylistSongs(favorite: String): List<SongEntity>
-    suspend fun upsertSongInPlayCount(playCountEntity: PlayCountEntity)
+    suspend fun insertSongInPlayCount(playCountEntity: PlayCountEntity)
+    suspend fun updateSongInPlayCount(playCountEntity: PlayCountEntity)
     suspend fun deleteSongInPlayCount(playCountEntity: PlayCountEntity)
     suspend fun deleteSongInHistory(songId: Long)
     suspend fun clearSongHistory()
-    suspend fun findSongExistInPlayCount(songId: Long): PlayCountEntity?
+    suspend fun checkSongExistInPlayCount(songId: Long): List<PlayCountEntity>
     suspend fun playCountSongs(): List<PlayCountEntity>
+    suspend fun insertBlacklistPath(blackListStoreEntities: List<BlackListStoreEntity>)
+    suspend fun deleteBlacklistPath(blackListStoreEntity: BlackListStoreEntity)
+    suspend fun clearBlacklist()
+    suspend fun insertBlacklistPathAsync(blackListStoreEntity: BlackListStoreEntity)
+    suspend fun blackListPaths(): List<BlackListStoreEntity>
     suspend fun deleteSongs(songs: List<Song>)
     suspend fun isSongFavorite(context: Context, songId: Long): Boolean
     fun checkPlaylistExists(playListId: Long): LiveData<Boolean>
-    fun getPlaylist(playlistId: Long): LiveData<PlaylistWithSongs>
 }
 
 class RealRoomRepository(
     private val playlistDao: PlaylistDao,
+    private val blackListStoreDao: BlackListStoreDao,
     private val playCountDao: PlayCountDao,
-    private val historyDao: HistoryDao
+    private val historyDao: HistoryDao,
+    private val lyricsDao: LyricsDao
 ) : RoomRepository {
     @WorkerThread
     override suspend fun createPlaylist(playlistEntity: PlaylistEntity): Long =
@@ -79,9 +89,6 @@ class RealRoomRepository(
             }
         }
 
-    @WorkerThread
-    override fun getPlaylist(playlistId: Long): LiveData<PlaylistWithSongs> = playlistDao.getPlaylist(playlistId)
-
     @WorkerThread
     override suspend fun insertSongs(songs: List<SongEntity>) {
 
@@ -116,6 +123,7 @@ class RealRoomRepository(
         return if (playlist != null) {
             playlist
         } else {
+            println("Playlist Created")
             createPlaylist(PlaylistEntity(playlistName = favorite))
             playlistDao.playlist(favorite).first()
         }
@@ -130,8 +138,14 @@ class RealRoomRepository(
     override suspend fun removeSongFromPlaylist(songEntity: SongEntity) =
         playlistDao.deleteSongFromPlaylist(songEntity.playlistCreatorId, songEntity.id)
 
-    override suspend fun upsertSongInHistory(currentSong: Song) =
-        historyDao.upsertSongInHistory(currentSong.toHistoryEntity(System.currentTimeMillis()))
+    override suspend fun addSongToHistory(currentSong: Song) =
+        historyDao.insertSongInHistory(currentSong.toHistoryEntity(System.currentTimeMillis()))
+
+    override suspend fun songPresentInHistory(song: Song): HistoryEntity? =
+        historyDao.isSongPresentInHistory(song.id)
+
+    override suspend fun updateHistorySong(song: Song) =
+        historyDao.updateHistorySong(song.toHistoryEntity(System.currentTimeMillis()))
 
     override fun observableHistorySongs(): LiveData<List<HistoryEntity>> =
         historyDao.observableHistorySongs()
@@ -139,15 +153,20 @@ class RealRoomRepository(
     override fun historySongs(): List<HistoryEntity> = historyDao.historySongs()
 
     override fun favoritePlaylistLiveData(favorite: String): LiveData<List<SongEntity>> =
-        playlistDao.favoritesSongsLiveData(favorite)
+        playlistDao.favoritesSongsLiveData(
+            playlistDao.playlist(favorite).first().playListId
+        )
 
     override suspend fun favoritePlaylistSongs(favorite: String): List<SongEntity> =
         if (playlistDao.playlist(favorite).isNotEmpty()) playlistDao.favoritesSongs(
             playlistDao.playlist(favorite).first().playListId
         ) else emptyList()
 
-    override suspend fun upsertSongInPlayCount(playCountEntity: PlayCountEntity) =
-        playCountDao.upsertSongInPlayCount(playCountEntity)
+    override suspend fun insertSongInPlayCount(playCountEntity: PlayCountEntity) =
+        playCountDao.insertSongInPlayCount(playCountEntity)
+
+    override suspend fun updateSongInPlayCount(playCountEntity: PlayCountEntity) =
+        playCountDao.updateSongInPlayCount(playCountEntity)
 
     override suspend fun deleteSongInPlayCount(playCountEntity: PlayCountEntity) =
         playCountDao.deleteSongInPlayCount(playCountEntity)
@@ -160,16 +179,33 @@ class RealRoomRepository(
         historyDao.clearHistory()
     }
 
-    override suspend fun findSongExistInPlayCount(songId: Long): PlayCountEntity? =
-        playCountDao.findSongExistInPlayCount(songId)
+    override suspend fun checkSongExistInPlayCount(songId: Long): List<PlayCountEntity> =
+        playCountDao.checkSongExistInPlayCount(songId)
 
     override suspend fun playCountSongs(): List<PlayCountEntity> =
         playCountDao.playCountSongs()
 
+    override fun insertBlacklistPath(blackListStoreEntity: BlackListStoreEntity) =
+        blackListStoreDao.insertBlacklistPath(blackListStoreEntity)
+
+    override suspend fun insertBlacklistPath(blackListStoreEntities: List<BlackListStoreEntity>) =
+        blackListStoreDao.insertBlacklistPath(blackListStoreEntities)
+
+    override suspend fun insertBlacklistPathAsync(blackListStoreEntity: BlackListStoreEntity) =
+        blackListStoreDao.insertBlacklistPath(blackListStoreEntity)
+
+    override suspend fun blackListPaths(): List<BlackListStoreEntity> =
+        blackListStoreDao.blackListPaths()
+
     override suspend fun deleteSongs(songs: List<Song>) = songs.forEach {
         playCountDao.deleteSong(it.id)
     }
 
+    override suspend fun deleteBlacklistPath(blackListStoreEntity: BlackListStoreEntity) =
+        blackListStoreDao.deleteBlacklistPath(blackListStoreEntity)
+
+    override suspend fun clearBlacklist() = blackListStoreDao.clearBlacklist()
+
     override suspend fun isSongFavorite(context: Context, songId: Long): Boolean {
         return playlistDao.isSongExistsInPlaylist(
             playlistDao.playlist(context.getString(R.string.favorites)).firstOrNull()?.playListId
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt b/app/src/main/java/io/github/muntashirakon/music/repository/SearchRepository.kt
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt
rename to app/src/main/java/io/github/muntashirakon/music/repository/SearchRepository.kt
index 17b555ecd..bd5fc271b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/SearchRepository.kt
@@ -12,16 +12,16 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.repository
+package io.github.muntashirakon.music.repository
 
 import android.content.Context
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.fragments.search.Filter
-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.Song
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.fragments.search.Filter
+import io.github.muntashirakon.music.model.Album
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.model.Genre
+import io.github.muntashirakon.music.model.Song
 
 class RealSearchRepository(
     private val songRepository: SongRepository,
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/SongRepository.kt b/app/src/main/java/io/github/muntashirakon/music/repository/SongRepository.kt
similarity index 91%
rename from app/src/main/java/code/name/monkey/retromusic/repository/SongRepository.kt
rename to app/src/main/java/io/github/muntashirakon/music/repository/SongRepository.kt
index b6ddb4a69..c29cf26a1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/SongRepository.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/SongRepository.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.repository
+package io.github.muntashirakon.music.repository
 
 import android.content.Context
 import android.database.Cursor
@@ -21,18 +21,18 @@ import android.provider.MediaStore
 import android.provider.MediaStore.Audio.AudioColumns
 import android.provider.MediaStore.Audio.Media
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.Constants
-import code.name.monkey.retromusic.Constants.IS_MUSIC
-import code.name.monkey.retromusic.Constants.baseProjection
-import code.name.monkey.retromusic.extensions.getInt
-import code.name.monkey.retromusic.extensions.getLong
-import code.name.monkey.retromusic.extensions.getString
-import code.name.monkey.retromusic.extensions.getStringOrNull
-import code.name.monkey.retromusic.helper.SortOrder
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.providers.BlacklistStore
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.getExternalStoragePublicDirectory
+import io.github.muntashirakon.music.Constants
+import io.github.muntashirakon.music.Constants.IS_MUSIC
+import io.github.muntashirakon.music.Constants.baseProjection
+import io.github.muntashirakon.music.extensions.getInt
+import io.github.muntashirakon.music.extensions.getLong
+import io.github.muntashirakon.music.extensions.getString
+import io.github.muntashirakon.music.extensions.getStringOrNull
+import io.github.muntashirakon.music.helper.SortOrder
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.providers.BlacklistStore
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.getExternalStoragePublicDirectory
 import java.text.Collator
 
 /**
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/SortedCursor.java b/app/src/main/java/io/github/muntashirakon/music/repository/SortedCursor.java
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/repository/SortedCursor.java
rename to app/src/main/java/io/github/muntashirakon/music/repository/SortedCursor.java
index 531af65da..fcb915f25 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/SortedCursor.java
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/SortedCursor.java
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.repository;
+package io.github.muntashirakon.music.repository;
 
 import android.database.AbstractCursor;
 import android.database.Cursor;
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/SortedLongCursor.java b/app/src/main/java/io/github/muntashirakon/music/repository/SortedLongCursor.java
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/repository/SortedLongCursor.java
rename to app/src/main/java/io/github/muntashirakon/music/repository/SortedLongCursor.java
index 75996d4ab..81ffd06b8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/SortedLongCursor.java
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/SortedLongCursor.java
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.repository;
+package io.github.muntashirakon.music.repository;
 
 import android.database.AbstractCursor;
 import android.database.Cursor;
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/TopPlayedRepository.kt b/app/src/main/java/io/github/muntashirakon/music/repository/TopPlayedRepository.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/repository/TopPlayedRepository.kt
rename to app/src/main/java/io/github/muntashirakon/music/repository/TopPlayedRepository.kt
index 1470f7fc3..5e34e1600 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/TopPlayedRepository.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/repository/TopPlayedRepository.kt
@@ -12,19 +12,19 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.repository
+package io.github.muntashirakon.music.repository
 
 import android.content.Context
 import android.database.Cursor
 import android.provider.BaseColumns
 import android.provider.MediaStore
-import code.name.monkey.retromusic.Constants.NUMBER_OF_TOP_TRACKS
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.providers.HistoryStore
-import code.name.monkey.retromusic.providers.SongPlayCountStore
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.Constants.NUMBER_OF_TOP_TRACKS
+import io.github.muntashirakon.music.model.Album
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.providers.HistoryStore
+import io.github.muntashirakon.music.providers.SongPlayCountStore
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 
 /**
@@ -81,7 +81,7 @@ class RealTopPlayedRepository(
     }
 
     override fun topAlbums(): List<Album> {
-        return albumRepository.splitIntoAlbums(topTracks(), sorted = false)
+        return albumRepository.splitIntoAlbums(topTracks())
     }
 
     override fun topArtists(): List<Artist> {
diff --git a/app/src/main/java/io/github/muntashirakon/music/service/AudioFader.kt b/app/src/main/java/io/github/muntashirakon/music/service/AudioFader.kt
new file mode 100644
index 000000000..52259f466
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/service/AudioFader.kt
@@ -0,0 +1,66 @@
+package io.github.muntashirakon.music.service
+
+import android.animation.Animator
+import android.animation.ValueAnimator
+import android.media.MediaPlayer
+import androidx.core.animation.doOnEnd
+import io.github.muntashirakon.music.service.playback.Playback
+import io.github.muntashirakon.music.util.PreferenceUtil
+
+class AudioFader {
+    companion object {
+
+        @JvmStatic
+        inline fun createFadeAnimator(
+            fadeIn: Boolean /* fadeIn -> true  fadeOut -> false*/,
+            mediaPlayer: MediaPlayer,
+            crossinline endAction: (animator: Animator) -> Unit /* Code to run when Animator Ends*/
+        ): Animator? {
+            val duration = PreferenceUtil.crossFadeDuration * 1000
+            if (duration == 0) {
+                return null
+            }
+            val startValue = if (fadeIn) 0f else 1.0f
+            val endValue = if (fadeIn) 1.0f else 0f
+            return ValueAnimator.ofFloat(startValue, endValue).apply {
+                this.duration = duration.toLong()
+                addUpdateListener { animation: ValueAnimator ->
+                    mediaPlayer.setVolume(
+                        animation.animatedValue as Float, animation.animatedValue as Float
+                    )
+                }
+                doOnEnd {
+                    endAction(it)
+                    // Set end values
+                    mediaPlayer.setVolume(endValue, endValue)
+                }
+            }
+        }
+
+        @JvmStatic
+        fun startFadeAnimator(
+            playback: Playback,
+            fadeIn: Boolean /* fadeIn -> true  fadeOut -> false*/,
+            callback: Runnable /* Code to run when Animator Ends*/
+        ) {
+            val duration = PreferenceUtil.audioFadeDuration.toLong()
+            if (duration == 0L) {
+                callback.run()
+                return
+            }
+            val startValue = if (fadeIn) 0f else 1.0f
+            val endValue = if (fadeIn) 1.0f else 0f
+            val animator = ValueAnimator.ofFloat(startValue, endValue)
+            animator.duration = duration
+            animator.addUpdateListener { animation: ValueAnimator ->
+                playback.setVolume(
+                    animation.animatedValue as Float
+                )
+            }
+            animator.doOnEnd {
+                callback.run()
+            }
+            animator.start()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt b/app/src/main/java/io/github/muntashirakon/music/service/CrossFadePlayer.kt
similarity index 62%
rename from app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt
rename to app/src/main/java/io/github/muntashirakon/music/service/CrossFadePlayer.kt
index 06590c269..48d977d89 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/service/CrossFadePlayer.kt
@@ -1,20 +1,27 @@
-package code.name.monkey.retromusic.service
+package io.github.muntashirakon.music.service
 
 import android.animation.Animator
 import android.content.Context
+import android.content.Intent
+import android.media.AudioAttributes
+import android.media.AudioManager
 import android.media.MediaPlayer
 import android.media.PlaybackParams
+import android.media.audiofx.AudioEffect
 import android.os.PowerManager
+import android.util.Log
+import androidx.core.net.toUri
 import code.name.monkey.appthemehelper.util.VersionUtils.hasMarshmallow
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.extensions.uri
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.AudioFader.Companion.createFadeAnimator
-import code.name.monkey.retromusic.service.playback.Playback.PlaybackCallbacks
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.logE
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.service.AudioFader.Companion.createFadeAnimator
+import io.github.muntashirakon.music.service.playback.Playback
+import io.github.muntashirakon.music.service.playback.Playback.PlaybackCallbacks
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.PreferenceUtil.playbackPitch
+import io.github.muntashirakon.music.util.PreferenceUtil.playbackSpeed
 import kotlinx.coroutines.*
 
 /** @author Prathamesh M */
@@ -26,7 +33,8 @@ import kotlinx.coroutines.*
 * play but with decreasing volume and start the player with the next song with increasing volume
 * and vice versa for upcoming song and so on.
 */
-class CrossFadePlayer(context: Context) : LocalPlayback(context) {
+class CrossFadePlayer(val context: Context) : Playback, MediaPlayer.OnCompletionListener,
+    MediaPlayer.OnErrorListener {
 
     private var currentPlayer: CurrentPlayer = CurrentPlayer.NOT_SET
     private var player1 = MediaPlayer()
@@ -34,11 +42,10 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
     private var durationListener = DurationListener()
     private var mIsInitialized = false
     private var hasDataSource: Boolean = false /* Whether first player has DataSource */
-    private var nextDataSource:String? = null
-    private var crossFadeAnimator: Animator? = null
-    override var callbacks: PlaybackCallbacks? = null
+    private var fadeInAnimator: Animator? = null
+    private var fadeOutAnimator: Animator? = null
+    private var callbacks: PlaybackCallbacks? = null
     private var crossFadeDuration = PreferenceUtil.crossFadeDuration
-    var isCrossFading = false
 
     init {
         player1.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
@@ -47,14 +54,9 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
     }
 
     override fun start(): Boolean {
-        super.start()
         durationListener.start()
-        resumeFade()
         return try {
             getCurrentPlayer()?.start()
-            if (isCrossFading) {
-                getNextPlayer()?.start()
-            }
             true
         } catch (e: IllegalStateException) {
             e.printStackTrace()
@@ -63,23 +65,23 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
     }
 
     override fun release() {
-        stop()
-        cancelFade()
         getCurrentPlayer()?.release()
         getNextPlayer()?.release()
-        durationListener.cancel()
+        durationListener.stop()
+    }
+
+    override fun setCallbacks(callbacks: PlaybackCallbacks) {
+        this.callbacks = callbacks
     }
 
     override fun stop() {
-        super.stop()
         getCurrentPlayer()?.reset()
         mIsInitialized = false
     }
 
     override fun pause(): Boolean {
-        super.pause()
         durationListener.stop()
-        pauseFade()
+        cancelFade()
         getCurrentPlayer()?.let {
             if (it.isPlaying) {
                 it.pause()
@@ -93,10 +95,8 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
         return true
     }
 
-    override fun seek(whereto: Int, force: Boolean): Int {
-        if (force) {
-            endFade()
-        }
+    override fun seek(whereto: Int): Int {
+        cancelFade()
         getNextPlayer()?.stop()
         return try {
             getCurrentPlayer()?.seekTo(whereto)
@@ -124,33 +124,56 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
     override val isPlaying: Boolean
         get() = mIsInitialized && getCurrentPlayer()?.isPlaying == true
 
-    override fun setDataSource(
-        song: Song,
-        force: Boolean,
-        completion: (success: Boolean) -> Unit,
-    ) {
+    override fun setDataSource(path: String, force: Boolean): Boolean {
+        cancelFade()
         if (force) hasDataSource = false
         mIsInitialized = false
         /* We've already set DataSource if initialized is true in setNextDataSource */
         if (!hasDataSource) {
-            getCurrentPlayer()?.let {
-                setDataSourceImpl(it, song.uri.toString()) { success ->
-                    mIsInitialized = success
-                    completion(success)
-                }
-            }
+            getCurrentPlayer()?.let { mIsInitialized = setDataSourceImpl(it, path) }
             hasDataSource = true
         } else {
-            completion(true)
             mIsInitialized = true
         }
+        return mIsInitialized
     }
 
-    override fun setNextDataSource(path: String?) {
-        // Store the next song path in nextDataSource, we'll need this just in case
-        // if the user closes the app, then we can't get the nextSong from musicService
-        // As MusicPlayerRemote won't have access to the musicService
-        nextDataSource = path
+    override fun setNextDataSource(path: String?) {}
+
+    /**
+     * @param player The {@link MediaPlayer} to use
+     * @param path The path of the file, or the http/rtsp URL of the stream you want to play
+     * @return True if the <code>player</code> has been prepared and is ready to play, false otherwise
+     */
+    private fun setDataSourceImpl(
+        player: MediaPlayer,
+        path: String,
+    ): Boolean {
+        player.reset()
+        player.setOnPreparedListener(null)
+        try {
+            if (path.startsWith("content://")) {
+                player.setDataSource(context, path.toUri())
+            } else {
+                player.setDataSource(path)
+            }
+            player.setAudioAttributes(
+                AudioAttributes.Builder().setLegacyStreamType(AudioManager.STREAM_MUSIC).build()
+            )
+            player.prepare()
+            player.setPlaybackSpeedPitch(playbackSpeed, playbackPitch)
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return false
+        }
+        player.setOnCompletionListener(this)
+        player.setOnErrorListener(this)
+        val intent = Intent(AudioEffect.ACTION_OPEN_AUDIO_EFFECT_CONTROL_SESSION)
+        intent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, audioSessionId)
+        intent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, context.packageName)
+        intent.putExtra(AudioEffect.EXTRA_CONTENT_TYPE, AudioEffect.CONTENT_TYPE_MUSIC)
+        context.sendBroadcast(intent)
+        return true
     }
 
     override fun setAudioSessionId(sessionId: Int): Boolean {
@@ -234,34 +257,25 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
         }
     }
 
-    private fun crossFade(fadeInMp: MediaPlayer, fadeOutMp: MediaPlayer) {
-        isCrossFading = true
-        crossFadeAnimator = createFadeAnimator(context, fadeInMp, fadeOutMp) {
-            crossFadeAnimator = null
+    private fun fadeIn(mediaPlayer: MediaPlayer) {
+        fadeInAnimator = createFadeAnimator(true, mediaPlayer) {
+            fadeInAnimator = null
             durationListener.start()
-            isCrossFading = false
         }
-        crossFadeAnimator?.start()
+        fadeInAnimator?.start()
     }
 
-    private fun endFade() {
-        crossFadeAnimator?.end()
-        crossFadeAnimator = null
+    private fun fadeOut(mediaPlayer: MediaPlayer) {
+        fadeOutAnimator = createFadeAnimator(false, mediaPlayer) {
+            fadeOutAnimator = null
+            mediaPlayer.stop()
+        }
+        fadeOutAnimator?.start()
     }
 
     private fun cancelFade() {
-        crossFadeAnimator?.cancel()
-        crossFadeAnimator = null
-    }
-
-    private fun pauseFade() {
-        crossFadeAnimator?.pause()
-    }
-
-    private fun resumeFade() {
-        if (crossFadeAnimator?.isPaused == true) {
-            crossFadeAnimator?.resume()
-        }
+        fadeInAnimator = null
+        fadeOutAnimator = null
     }
 
     override fun onError(mp: MediaPlayer?, what: Int, extra: Int): Boolean {
@@ -272,7 +286,7 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
         mIsInitialized = true
         mp?.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
         context.showToast(R.string.unplayable_file)
-        logE(what.toString() + extra)
+        Log.e(TAG, what.toString() + extra)
         return false
     }
 
@@ -289,7 +303,7 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
         fun start() {
             job?.cancel()
             job = launch {
-                while (isActive) {
+                while (true) {
                     delay(250)
                     onDurationUpdated(position(), duration())
                 }
@@ -301,26 +315,15 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
         }
     }
 
+
     fun onDurationUpdated(progress: Int, total: Int) {
         if (total > 0 && (total - progress).div(1000) == crossFadeDuration) {
             getNextPlayer()?.let { player ->
                 val nextSong = MusicPlayerRemote.nextSong
-                // Switch to other player (Crossfade) only if next song exists
-                // If we get an empty song it's can be because the app was cleared from background
-                // And MusicPlayerRemote don't have access to MusicService
-                if (nextSong != null && nextSong != Song.emptySong) {
-                    nextDataSource = null
-                    setDataSourceImpl(player, nextSong.uri.toString()) { success ->
-                        if (success) switchPlayer()
-                    }
-
-                }
-                // So we have to use the previously stored nextDataSource value
-                else if (!nextDataSource.isNullOrEmpty()) {
-                    setDataSourceImpl(player, nextDataSource!!) { success ->
-                        if (success) switchPlayer()
-                        nextDataSource = null
-                    }
+                if (nextSong != null) {
+                    setDataSourceImpl(player, MusicUtil.getSongFileUri(nextSong.id).toString())
+                    // Switch to other player / Crossfade only if next song exists
+                    switchPlayer()
                 }
             }
         }
@@ -328,7 +331,8 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
 
     private fun switchPlayer() {
         getNextPlayer()?.start()
-        crossFade(getNextPlayer()!!, getCurrentPlayer()!!)
+        getCurrentPlayer()?.let { fadeOut(it) }
+        getNextPlayer()?.let { fadeIn(it) }
         currentPlayer =
             if (currentPlayer == CurrentPlayer.PLAYER_ONE || currentPlayer == CurrentPlayer.NOT_SET) {
                 CurrentPlayer.PLAYER_TWO
@@ -344,8 +348,15 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
 
     override fun setPlaybackSpeedPitch(speed: Float, pitch: Float) {
         getCurrentPlayer()?.setPlaybackSpeedPitch(speed, pitch)
-        if (getNextPlayer()?.isPlaying == true) {
-            getNextPlayer()?.setPlaybackSpeedPitch(speed, pitch)
+    }
+
+    private fun MediaPlayer.setPlaybackSpeedPitch(speed: Float, pitch: Float) {
+        if (hasMarshmallow()) {
+            val wasPlaying: Boolean = isPlaying
+            playbackParams = PlaybackParams().setSpeed(speed).setPitch(pitch)
+            if (!wasPlaying) {
+                if (isPlaying) pause()
+            }
         }
     }
 
@@ -354,14 +365,4 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
     }
 }
 
-internal fun crossFadeScope(): CoroutineScope = CoroutineScope(Job() + Dispatchers.Default)
-
-fun MediaPlayer.setPlaybackSpeedPitch(speed: Float, pitch: Float) {
-    if (hasMarshmallow()) {
-        val wasPlaying = isPlaying
-        playbackParams = PlaybackParams().setSpeed(speed).setPitch(pitch)
-        if (!wasPlaying) {
-            pause()
-        }
-    }
-}
\ No newline at end of file
+internal fun crossFadeScope(): CoroutineScope = CoroutineScope(Job() + Dispatchers.Main)
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt b/app/src/main/java/io/github/muntashirakon/music/service/MediaSessionCallback.kt
similarity index 82%
rename from app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt
rename to app/src/main/java/io/github/muntashirakon/music/service/MediaSessionCallback.kt
index de1b54bf7..998ec1664 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/service/MediaSessionCallback.kt
@@ -12,26 +12,25 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.service
+package io.github.muntashirakon.music.service
 
+import android.content.Context
 import android.os.Bundle
 import android.provider.MediaStore
 import android.support.v4.media.session.MediaSessionCompat
-import code.name.monkey.retromusic.auto.AutoMediaIDHelper
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicPlayerRemote.cycleRepeatMode
-import code.name.monkey.retromusic.helper.ShuffleHelper.makeShuffleList
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.*
-import code.name.monkey.retromusic.service.MusicService.Companion.CYCLE_REPEAT
-import code.name.monkey.retromusic.service.MusicService.Companion.TOGGLE_FAVORITE
-import code.name.monkey.retromusic.service.MusicService.Companion.TOGGLE_SHUFFLE
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.logD
-import code.name.monkey.retromusic.util.logE
+import io.github.muntashirakon.music.auto.AutoMediaIDHelper
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
+import io.github.muntashirakon.music.helper.MusicPlayerRemote.cycleRepeatMode
+import io.github.muntashirakon.music.helper.ShuffleHelper.makeShuffleList
+import io.github.muntashirakon.music.model.Album
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.model.Playlist
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.repository.*
+import io.github.muntashirakon.music.service.MusicService.Companion.CYCLE_REPEAT
+import io.github.muntashirakon.music.service.MusicService.Companion.TOGGLE_FAVORITE
+import io.github.muntashirakon.music.service.MusicService.Companion.TOGGLE_SHUFFLE
+import io.github.muntashirakon.music.util.MusicUtil
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
@@ -40,7 +39,8 @@ import org.koin.core.component.inject
  */
 
 class MediaSessionCallback(
-    private val musicService: MusicService,
+    private val context: Context,
+    private val musicService: MusicService
 ) : MediaSessionCompat.Callback(), KoinComponent {
 
     private val songRepository by inject<SongRepository>()
@@ -53,7 +53,7 @@ class MediaSessionCallback(
     override fun onPlayFromMediaId(mediaId: String?, extras: Bundle?) {
         super.onPlayFromMediaId(mediaId, extras)
         val musicId = AutoMediaIDHelper.extractMusicID(mediaId!!)
-        logD("Music Id $musicId")
+        println(musicId)
         val itemId = musicId?.toLong() ?: -1
         val songs: ArrayList<Song> = ArrayList()
         when (val category = AutoMediaIDHelper.extractCategory(mediaId)) {
@@ -90,8 +90,7 @@ class MediaSessionCallback(
             AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_HISTORY,
             AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_SUGGESTIONS,
             AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_TOP_TRACKS,
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_QUEUE,
-            -> {
+            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_QUEUE -> {
                 val tracks: List<Song> = when (category) {
                     AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_HISTORY -> topPlayedRepository.recentlyPlayedTracks()
                     AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_SUGGESTIONS -> topPlayedRepository.recentlyPlayedTracks()
@@ -105,6 +104,8 @@ class MediaSessionCallback(
                 }
                 musicService.openQueue(songs, songIndex, true)
             }
+            else -> {
+            }
         }
         musicService.play()
     }
@@ -147,15 +148,9 @@ class MediaSessionCallback(
         musicService.play()
     }
 
-    override fun onPrepare() {
-        super.onPrepare()
-        if (musicService.currentSong != Song.emptySong)
-            musicService.restoreState(::onPlay)
-    }
-
     override fun onPlay() {
         super.onPlay()
-        if (musicService.currentSong != Song.emptySong) musicService.play()
+        musicService.play()
     }
 
     override fun onPause() {
@@ -170,7 +165,7 @@ class MediaSessionCallback(
 
     override fun onSkipToPrevious() {
         super.onSkipToPrevious()
-        musicService.playPreviousSong(true)
+        musicService.back(true)
     }
 
     override fun onStop() {
@@ -195,10 +190,11 @@ class MediaSessionCallback(
                 musicService.updateMediaSessionPlaybackState()
             }
             TOGGLE_FAVORITE -> {
-                musicService.toggleFavorite()
+                MusicUtil.toggleFavorite(context, MusicPlayerRemote.currentSong)
+                musicService.updateMediaSessionPlaybackState()
             }
             else -> {
-                logE("Unsupported action: $action")
+                println("Unsupported action: $action")
             }
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MediaStoreObserver.kt b/app/src/main/java/io/github/muntashirakon/music/service/MediaStoreObserver.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/service/MediaStoreObserver.kt
rename to app/src/main/java/io/github/muntashirakon/music/service/MediaStoreObserver.kt
index 27a6c3ccf..22463cce2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MediaStoreObserver.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/service/MediaStoreObserver.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.service
+package io.github.muntashirakon.music.service
 
 import android.database.ContentObserver
 import android.os.Handler
diff --git a/app/src/main/java/io/github/muntashirakon/music/service/MultiPlayer.java b/app/src/main/java/io/github/muntashirakon/music/service/MultiPlayer.java
new file mode 100644
index 000000000..43b6d7fe3
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/service/MultiPlayer.java
@@ -0,0 +1,368 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package io.github.muntashirakon.music.service;
+
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.media.PlaybackParams;
+import android.media.audiofx.AudioEffect;
+import android.net.Uri;
+import android.os.PowerManager;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.jetbrains.annotations.NotNull;
+
+import code.name.monkey.appthemehelper.util.VersionUtils;
+import io.github.muntashirakon.music.R;
+import io.github.muntashirakon.music.service.playback.Playback;
+import io.github.muntashirakon.music.util.PreferenceUtil;
+
+/**
+ * @author Andrew Neal, Karim Abou Zeid (kabouzeid)
+ */
+public class MultiPlayer
+        implements Playback, MediaPlayer.OnErrorListener, MediaPlayer.OnCompletionListener {
+    public static final String TAG = MultiPlayer.class.getSimpleName();
+
+    private MediaPlayer mCurrentMediaPlayer = new MediaPlayer();
+    private MediaPlayer mNextMediaPlayer;
+
+    private final Context context;
+    @Nullable
+    private Playback.PlaybackCallbacks callbacks;
+
+    private boolean mIsInitialized = false;
+
+    /**
+     * Constructor of <code>MultiPlayer</code>
+     */
+    MultiPlayer(final Context context) {
+        this.context = context;
+        mCurrentMediaPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK);
+    }
+
+    /**
+     * @param path The path of the file, or the http/rtsp URL of the stream you want to play
+     * @return True if the <code>player</code> has been prepared and is ready to play, false otherwise
+     */
+    @Override
+    public boolean setDataSource(@NotNull final String path, boolean force) {
+        mIsInitialized = false;
+        mIsInitialized = setDataSourceImpl(mCurrentMediaPlayer, path);
+        if (mIsInitialized) {
+            setNextDataSource(null);
+        }
+        return mIsInitialized;
+    }
+
+    /**
+     * @param player The {@link MediaPlayer} to use
+     * @param path   The path of the file, or the http/rtsp URL of the stream you want to play
+     * @return True if the <code>player</code> has been prepared and is ready to play, false otherwise
+     */
+    private boolean setDataSourceImpl(@NonNull final MediaPlayer player, @NonNull final String path) {
+        if (context == null) {
+            return false;
+        }
+        try {
+            player.reset();
+            player.setOnPreparedListener(null);
+            if (path.startsWith("content://")) {
+                player.setDataSource(context, Uri.parse(path));
+            } else {
+                player.setDataSource(path);
+            }
+            setPlaybackSpeedPitch(PreferenceUtil.INSTANCE.getPlaybackSpeed(), PreferenceUtil.INSTANCE.getPlaybackPitch());
+            player.setAudioStreamType(AudioManager.STREAM_MUSIC);
+            player.prepare();
+        } catch (Exception e) {
+            return false;
+        }
+        player.setOnCompletionListener(this);
+        player.setOnErrorListener(this);
+        final Intent intent = new Intent(AudioEffect.ACTION_OPEN_AUDIO_EFFECT_CONTROL_SESSION);
+        intent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, getAudioSessionId());
+        intent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, context.getPackageName());
+        intent.putExtra(AudioEffect.EXTRA_CONTENT_TYPE, AudioEffect.CONTENT_TYPE_MUSIC);
+        context.sendBroadcast(intent);
+        return true;
+    }
+
+    /**
+     * Set the MediaPlayer to start when this MediaPlayer finishes playback.
+     *
+     * @param path The path of the file, or the http/rtsp URL of the stream you want to play
+     */
+    @Override
+    public void setNextDataSource(@Nullable final String path) {
+        if (context == null) {
+            return;
+        }
+        try {
+            mCurrentMediaPlayer.setNextMediaPlayer(null);
+        } catch (IllegalArgumentException e) {
+            Log.i(TAG, "Next media player is current one, continuing");
+        } catch (IllegalStateException e) {
+            Log.e(TAG, "Media player not initialized!");
+            return;
+        }
+        if (mNextMediaPlayer != null) {
+            mNextMediaPlayer.release();
+            mNextMediaPlayer = null;
+        }
+        if (path == null) {
+            return;
+        }
+        if (PreferenceUtil.INSTANCE.isGapLessPlayback()) {
+            mNextMediaPlayer = new MediaPlayer();
+            mNextMediaPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK);
+            mNextMediaPlayer.setAudioSessionId(getAudioSessionId());
+            if (setDataSourceImpl(mNextMediaPlayer, path)) {
+                try {
+                    mCurrentMediaPlayer.setNextMediaPlayer(mNextMediaPlayer);
+                } catch (@NonNull IllegalArgumentException | IllegalStateException e) {
+                    Log.e(TAG, "setNextDataSource: setNextMediaPlayer()", e);
+                    if (mNextMediaPlayer != null) {
+                        mNextMediaPlayer.release();
+                        mNextMediaPlayer = null;
+                    }
+                }
+            } else {
+                if (mNextMediaPlayer != null) {
+                    mNextMediaPlayer.release();
+                    mNextMediaPlayer = null;
+                }
+            }
+        }
+    }
+
+    /**
+     * Sets the callbacks
+     *
+     * @param callbacks The callbacks to use
+     */
+    @Override
+    public void setCallbacks(@Nullable final Playback.PlaybackCallbacks callbacks) {
+        this.callbacks = callbacks;
+    }
+
+    /**
+     * @return True if the player is ready to go, false otherwise
+     */
+    @Override
+    public boolean isInitialized() {
+        return mIsInitialized;
+    }
+
+    /**
+     * Starts or resumes playback.
+     */
+    @Override
+    public boolean start() {
+        try {
+            mCurrentMediaPlayer.start();
+            return true;
+        } catch (IllegalStateException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Resets the MediaPlayer to its uninitialized state.
+     */
+    @Override
+    public void stop() {
+        mCurrentMediaPlayer.reset();
+        mIsInitialized = false;
+    }
+
+    /**
+     * Releases resources associated with this MediaPlayer object.
+     */
+    @Override
+    public void release() {
+        stop();
+        mCurrentMediaPlayer.release();
+        if (mNextMediaPlayer != null) {
+            mNextMediaPlayer.release();
+        }
+    }
+
+    /**
+     * Pauses playback. Call start() to resume.
+     */
+    @Override
+    public boolean pause() {
+        try {
+            mCurrentMediaPlayer.pause();
+            return true;
+        } catch (IllegalStateException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Checks whether the MultiPlayer is playing.
+     */
+    @Override
+    public boolean isPlaying() {
+        return mIsInitialized && mCurrentMediaPlayer.isPlaying();
+    }
+
+    /**
+     * Gets the duration of the file.
+     *
+     * @return The duration in milliseconds
+     */
+    @Override
+    public int duration() {
+        if (!mIsInitialized) {
+            return -1;
+        }
+        try {
+            return mCurrentMediaPlayer.getDuration();
+        } catch (IllegalStateException e) {
+            return -1;
+        }
+    }
+
+    /**
+     * Gets the current playback position.
+     *
+     * @return The current position in milliseconds
+     */
+    @Override
+    public int position() {
+        if (!mIsInitialized) {
+            return -1;
+        }
+        try {
+            return mCurrentMediaPlayer.getCurrentPosition();
+        } catch (IllegalStateException e) {
+            return -1;
+        }
+    }
+
+    /**
+     * Gets the current playback position.
+     *
+     * @param whereto The offset in milliseconds from the start to seek to
+     * @return The offset in milliseconds from the start to seek to
+     */
+    @Override
+    public int seek(final int whereto) {
+        try {
+            mCurrentMediaPlayer.seekTo(whereto);
+            return whereto;
+        } catch (IllegalStateException e) {
+            return -1;
+        }
+    }
+
+    @Override
+    public boolean setVolume(final float vol) {
+        try {
+            mCurrentMediaPlayer.setVolume(vol, vol);
+            return true;
+        } catch (IllegalStateException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Sets the audio session ID.
+     *
+     * @param sessionId The audio session ID
+     */
+    @Override
+    public boolean setAudioSessionId(final int sessionId) {
+        try {
+            mCurrentMediaPlayer.setAudioSessionId(sessionId);
+            return true;
+        } catch (@NonNull IllegalArgumentException | IllegalStateException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Returns the audio session ID.
+     *
+     * @return The current audio session ID.
+     */
+    @Override
+    public int getAudioSessionId() {
+        return mCurrentMediaPlayer.getAudioSessionId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean onError(final MediaPlayer mp, final int what, final int extra) {
+        mIsInitialized = false;
+        mCurrentMediaPlayer.release();
+        mCurrentMediaPlayer = new MediaPlayer();
+        mCurrentMediaPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK);
+        if (context != null) {
+            Toast.makeText(
+                    context,
+                    context.getResources().getString(R.string.unplayable_file),
+                    Toast.LENGTH_SHORT)
+                    .show();
+            Log.e(TAG, String.valueOf(what) + extra);
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onCompletion(final MediaPlayer mp) {
+        if (mp.equals(mCurrentMediaPlayer) && mNextMediaPlayer != null) {
+            mIsInitialized = false;
+            mCurrentMediaPlayer.release();
+            mCurrentMediaPlayer = mNextMediaPlayer;
+            mIsInitialized = true;
+            mNextMediaPlayer = null;
+            if (callbacks != null) callbacks.onTrackWentToNext();
+        } else {
+            if (callbacks != null) callbacks.onTrackEnded();
+        }
+    }
+
+    @Override
+    public void setCrossFadeDuration(int duration) {
+    }
+
+    @Override
+    public void setPlaybackSpeedPitch(float speed, float pitch) {
+        if (VersionUtils.INSTANCE.hasMarshmallow()) {
+            boolean wasPlaying = mCurrentMediaPlayer.isPlaying();
+            mCurrentMediaPlayer.setPlaybackParams(new PlaybackParams()
+                    .setSpeed(PreferenceUtil.INSTANCE.getPlaybackSpeed())
+                    .setPitch(PreferenceUtil.INSTANCE.getPlaybackPitch()));
+            if (!wasPlaying) {
+                if (mCurrentMediaPlayer.isPlaying()) mCurrentMediaPlayer.pause();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/io/github/muntashirakon/music/service/MusicService.kt
similarity index 60%
rename from app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
rename to app/src/main/java/io/github/muntashirakon/music/service/MusicService.kt
index f33d8341f..f8e782ab3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/service/MusicService.kt
@@ -11,11 +11,10 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.service
+package io.github.muntashirakon.music.service
 
 import android.annotation.SuppressLint
 import android.app.NotificationManager
-import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
 import android.bluetooth.BluetoothDevice
 import android.content.*
@@ -23,82 +22,83 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.content.pm.ServiceInfo
 import android.database.ContentObserver
 import android.graphics.Bitmap
-import android.graphics.BitmapFactory
 import android.graphics.drawable.Drawable
 import android.media.AudioManager
+import android.media.AudioManager.OnAudioFocusChangeListener
+import android.media.audiofx.AudioEffect
 import android.os.*
 import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
 import android.os.PowerManager.WakeLock
 import android.provider.MediaStore
 import android.support.v4.media.MediaBrowserCompat
+import android.support.v4.media.MediaDescriptionCompat
 import android.support.v4.media.MediaMetadataCompat
 import android.support.v4.media.session.MediaSessionCompat
 import android.support.v4.media.session.PlaybackStateCompat
+import android.telephony.PhoneStateListener
+import android.telephony.TelephonyManager
 import android.util.Log
 import android.widget.Toast
-import androidx.core.app.ServiceCompat
-import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import androidx.core.content.getSystemService
-import androidx.core.os.BundleCompat
+import androidx.media.AudioAttributesCompat
+import androidx.media.AudioAttributesCompat.CONTENT_TYPE_MUSIC
+import androidx.media.AudioFocusRequestCompat
+import androidx.media.AudioManagerCompat
 import androidx.media.MediaBrowserServiceCompat
+import androidx.media.session.MediaButtonReceiver.handleIntent
 import androidx.preference.PreferenceManager
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.appwidgets.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.LockScreenActivity
-import code.name.monkey.retromusic.appwidgets.*
-import code.name.monkey.retromusic.auto.AutoMediaIDHelper
-import code.name.monkey.retromusic.auto.AutoMusicProvider
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.extensions.toMediaSessionQueue
-import code.name.monkey.retromusic.extensions.uri
-import code.name.monkey.retromusic.glide.BlurTransformation
-import code.name.monkey.retromusic.glide.RetroGlideExtension.getSongModel
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.helper.ShuffleHelper.makeShuffleList
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.model.Song.Companion.emptySong
-import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
-import code.name.monkey.retromusic.providers.HistoryStore
-import code.name.monkey.retromusic.providers.MusicPlaybackQueueStore
-import code.name.monkey.retromusic.providers.SongPlayCountStore
-import code.name.monkey.retromusic.service.notification.PlayingNotification
-import code.name.monkey.retromusic.service.notification.PlayingNotificationClassic
-import code.name.monkey.retromusic.service.notification.PlayingNotificationImpl24
-import code.name.monkey.retromusic.service.playback.Playback
-import code.name.monkey.retromusic.service.playback.Playback.PlaybackCallbacks
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.MusicUtil.toggleFavorite
-import code.name.monkey.retromusic.util.PackageValidator
-import code.name.monkey.retromusic.util.PreferenceUtil.crossFadeDuration
-import code.name.monkey.retromusic.util.PreferenceUtil.isAlbumArtOnLockScreen
-import code.name.monkey.retromusic.util.PreferenceUtil.isBluetoothSpeaker
-import code.name.monkey.retromusic.util.PreferenceUtil.isBlurredAlbumArt
-import code.name.monkey.retromusic.util.PreferenceUtil.isClassicNotification
-import code.name.monkey.retromusic.util.PreferenceUtil.isHeadsetPlugged
-import code.name.monkey.retromusic.util.PreferenceUtil.isLockScreen
-import code.name.monkey.retromusic.util.PreferenceUtil.isPauseOnZeroVolume
-import code.name.monkey.retromusic.util.PreferenceUtil.playbackPitch
-import code.name.monkey.retromusic.util.PreferenceUtil.playbackSpeed
-import code.name.monkey.retromusic.util.PreferenceUtil.registerOnSharedPreferenceChangedListener
-import code.name.monkey.retromusic.util.PreferenceUtil.unregisterOnSharedPreferenceChangedListener
-import code.name.monkey.retromusic.volume.AudioVolumeObserver
-import code.name.monkey.retromusic.volume.OnAudioVolumeChangedListener
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.*
+import io.github.muntashirakon.music.activities.LockScreenActivity
+import io.github.muntashirakon.music.appwidgets.*
+import io.github.muntashirakon.music.auto.AutoMediaIDHelper
+import io.github.muntashirakon.music.auto.AutoMusicProvider
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.extensions.toMediaSessionQueue
+import io.github.muntashirakon.music.glide.BlurTransformation
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension.getDefaultTransition
+import io.github.muntashirakon.music.glide.RetroGlideExtension.getSongModel
+import io.github.muntashirakon.music.helper.MusicPlayerRemote.isCasting
+import io.github.muntashirakon.music.helper.ShuffleHelper.makeShuffleList
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.model.Song.Companion.emptySong
+import io.github.muntashirakon.music.model.smartplaylist.AbsSmartPlaylist
+import io.github.muntashirakon.music.providers.HistoryStore
+import io.github.muntashirakon.music.providers.MusicPlaybackQueueStore
+import io.github.muntashirakon.music.providers.SongPlayCountStore
+import io.github.muntashirakon.music.service.AudioFader.Companion.startFadeAnimator
+import io.github.muntashirakon.music.service.notification.PlayingNotification
+import io.github.muntashirakon.music.service.notification.PlayingNotificationClassic
+import io.github.muntashirakon.music.service.notification.PlayingNotificationImpl24
+import io.github.muntashirakon.music.service.playback.Playback
+import io.github.muntashirakon.music.service.playback.Playback.PlaybackCallbacks
+import io.github.muntashirakon.music.util.MusicUtil.getMediaStoreAlbumCoverUri
+import io.github.muntashirakon.music.util.MusicUtil.getSongFileUri
+import io.github.muntashirakon.music.util.MusicUtil.toggleFavorite
+import io.github.muntashirakon.music.util.PackageValidator
+import io.github.muntashirakon.music.util.PreferenceUtil.crossFadeDuration
+import io.github.muntashirakon.music.util.PreferenceUtil.isAlbumArtOnLockScreen
+import io.github.muntashirakon.music.util.PreferenceUtil.isBluetoothSpeaker
+import io.github.muntashirakon.music.util.PreferenceUtil.isBlurredAlbumArt
+import io.github.muntashirakon.music.util.PreferenceUtil.isClassicNotification
+import io.github.muntashirakon.music.util.PreferenceUtil.isHeadsetPlugged
+import io.github.muntashirakon.music.util.PreferenceUtil.isLockScreen
+import io.github.muntashirakon.music.util.PreferenceUtil.isPauseOnZeroVolume
+import io.github.muntashirakon.music.util.PreferenceUtil.playbackPitch
+import io.github.muntashirakon.music.util.PreferenceUtil.playbackSpeed
+import io.github.muntashirakon.music.util.PreferenceUtil.registerOnSharedPreferenceChangedListener
+import io.github.muntashirakon.music.util.PreferenceUtil.unregisterOnSharedPreferenceChangedListener
+import io.github.muntashirakon.music.volume.AudioVolumeObserver
+import io.github.muntashirakon.music.volume.OnAudioVolumeChangedListener
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.Target
 import com.bumptech.glide.request.transition.Transition
-import kotlinx.coroutines.*
-import kotlinx.coroutines.Dispatchers.Default
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.Dispatchers.Main
 import org.koin.java.KoinJavaComponent.get
 import java.util.*
 
-
 /**
  * @author Karim Abou Zeid (kabouzeid), Andrew Neal. Modified by Prathamesh More
  */
@@ -112,15 +112,11 @@ class MusicService : MediaBrowserServiceCompat(),
     @JvmField
     var pendingQuit = false
 
-    private lateinit var playbackManager: PlaybackManager
-
-    val playback: Playback? get() = playbackManager.playback
-
+    @JvmField
+    var playback: Playback? = null
     private var mPackageValidator: PackageValidator? = null
     private val mMusicProvider = get<AutoMusicProvider>(AutoMusicProvider::class.java)
-    private lateinit var storage: PersistentStorage
     private var trackEndedByCrossfade = false
-    private val serviceScope = CoroutineScope(Job() + Main)
 
     @JvmField
     var position = -1
@@ -131,7 +127,7 @@ class MusicService : MediaBrowserServiceCompat(),
     private val appWidgetText = AppWidgetText.instance
     private val appWidgetMd3 = AppWidgetMD3.instance
     private val appWidgetCircle = AppWidgetCircle.instance
-    private val widgetIntentReceiver = object : BroadcastReceiver() {
+    private val widgetIntentReceiver: BroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
             val command = intent.getStringExtra(EXTRA_APP_WIDGET_NAME)
             val ids = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS)
@@ -140,27 +136,21 @@ class MusicService : MediaBrowserServiceCompat(),
                     AppWidgetClassic.NAME -> {
                         appWidgetClassic.performUpdate(this@MusicService, ids)
                     }
-
                     AppWidgetSmall.NAME -> {
                         appWidgetSmall.performUpdate(this@MusicService, ids)
                     }
-
                     AppWidgetBig.NAME -> {
                         appWidgetBig.performUpdate(this@MusicService, ids)
                     }
-
                     AppWidgetCard.NAME -> {
                         appWidgetCard.performUpdate(this@MusicService, ids)
                     }
-
                     AppWidgetText.NAME -> {
                         appWidgetText.performUpdate(this@MusicService, ids)
                     }
-
                     AppWidgetMD3.NAME -> {
                         appWidgetMd3.performUpdate(this@MusicService, ids)
                     }
-
                     AppWidgetCircle.NAME -> {
                         appWidgetCircle.performUpdate(this@MusicService, ids)
                     }
@@ -168,7 +158,17 @@ class MusicService : MediaBrowserServiceCompat(),
             }
         }
     }
+    private var audioManager: AudioManager? = null
+        get() {
+            if (field == null) {
+                field = getSystemService()
+            }
+            return field
+        }
 
+    private val becomingNoisyReceiverIntentFilter =
+        IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY)
+    private var becomingNoisyReceiverRegistered = false
     private val bluetoothConnectedIntentFilter = IntentFilter(BluetoothDevice.ACTION_ACL_CONNECTED)
     private var bluetoothConnectedRegistered = false
     private val headsetReceiverIntentFilter = IntentFilter(Intent.ACTION_HEADSET_PLUG)
@@ -181,40 +181,39 @@ class MusicService : MediaBrowserServiceCompat(),
 
     @JvmField
     var playingQueue = ArrayList<Song>()
-
-    private var playerHandler: Handler? = null
-
-    private var playingNotification: PlayingNotification? = null
-
-    private val updateFavoriteReceiver = object : BroadcastReceiver() {
+    var isPausedByTransientLossOfFocus = false
+    private val becomingNoisyReceiver: BroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
-            isCurrentFavorite { isFavorite ->
-                if (!isForeground) {
-                    playingNotification?.updateMetadata(currentSong) {
-                        playingNotification?.setPlaying(isPlaying)
-                        playingNotification?.updateFavorite(isFavorite)
-                        startForegroundOrNotify()
-                    }
-                } else {
-                    playingNotification?.updateFavorite(isFavorite)
-                    startForegroundOrNotify()
-                }
-
-                appWidgetCircle.notifyChange(this@MusicService, FAVORITE_STATE_CHANGED)
+            if (intent.action != null
+                && intent.action == AudioManager.ACTION_AUDIO_BECOMING_NOISY
+            ) {
+                pause()
             }
         }
     }
+    private var playerHandler: PlaybackHandler? = null
+    private val audioFocusListener = OnAudioFocusChangeListener { focusChange ->
+        playerHandler?.obtainMessage(FOCUS_CHANGE, focusChange, 0)?.sendToTarget()
+    }
+    private var playingNotification: PlayingNotification? = null
 
-    private val lockScreenReceiver = object : BroadcastReceiver() {
+    private val updateFavoriteReceiver: BroadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            playingNotification?.updateFavorite(currentSong) { startForegroundOrNotify() }
+            appWidgetCircle.notifyChange(this@MusicService, FAVORITE_STATE_CHANGED)
+        }
+    }
+    private val lockScreenReceiver: BroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
             if (isLockScreen && isPlaying) {
                 val lockIntent = Intent(context, LockScreenActivity::class.java)
-                lockIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                lockIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
                 startActivity(lockIntent)
             }
         }
     }
-
+    private var queueSaveHandler: QueueSaveHandler? = null
+    private var queueSaveHandlerThread: HandlerThread? = null
     private var queuesRestored = false
 
     var repeatMode = 0
@@ -240,8 +239,7 @@ class MusicService : MediaBrowserServiceCompat(),
             val action = intent.action
             if (action != null) {
                 if (BluetoothDevice.ACTION_ACL_CONNECTED == action && isBluetoothSpeaker) {
-                    @Suppress("Deprecation")
-                    if (getSystemService<AudioManager>()!!.isBluetoothA2dpOn) {
+                    if (audioManager!!.isBluetoothA2dpOn) {
                         play()
                     }
                 }
@@ -249,20 +247,26 @@ class MusicService : MediaBrowserServiceCompat(),
         }
     }
 
-    private var receivedHeadsetConnected = false
-    private val headsetReceiver = object : BroadcastReceiver() {
+    private val phoneStateListener: PhoneStateListener = object : PhoneStateListener() {
+        override fun onCallStateChanged(state: Int, incomingNumber: String) {
+            when (state) {
+                TelephonyManager.CALL_STATE_IDLE ->                             // Not in call: Play music
+                    play()
+                TelephonyManager.CALL_STATE_RINGING, TelephonyManager.CALL_STATE_OFFHOOK ->                             // A call is dialing, active or on hold
+                    pause()
+            }
+            super.onCallStateChanged(state, incomingNumber)
+        }
+    }
+
+    private val headsetReceiver: BroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
             val action = intent.action
             if (action != null) {
                 if (Intent.ACTION_HEADSET_PLUG == action) {
                     when (intent.getIntExtra("state", -1)) {
                         0 -> pause()
-                        // Check whether the current song is empty which means the playing queue hasn't restored yet
-                        1 -> if (currentSong != emptySong) {
-                            play()
-                        } else {
-                            receivedHeadsetConnected = true
-                        }
+                        1 -> play()
                     }
                 }
             }
@@ -275,6 +279,8 @@ class MusicService : MediaBrowserServiceCompat(),
     private var isForeground = false
     override fun onCreate() {
         super.onCreate()
+        val telephonyManager = getSystemService<TelephonyManager>()
+        telephonyManager?.listen(phoneStateListener, PhoneStateListener.LISTEN_NONE)
         val powerManager = getSystemService<PowerManager>()
         if (powerManager != null) {
             wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, javaClass.name)
@@ -282,47 +288,91 @@ class MusicService : MediaBrowserServiceCompat(),
         wakeLock?.setReferenceCounted(false)
         musicPlayerHandlerThread = HandlerThread("PlaybackHandler")
         musicPlayerHandlerThread?.start()
-        playerHandler = Handler(musicPlayerHandlerThread!!.looper)
+        playerHandler = PlaybackHandler(this, musicPlayerHandlerThread!!.looper)
 
-        playbackManager = PlaybackManager(this)
-        playbackManager.setCallbacks(this)
+        // Set MultiPlayer when crossfade duration is 0 i.e. off
+        playback = if (crossFadeDuration == 0) {
+            MultiPlayer(this)
+        } else {
+            CrossFadePlayer(this)
+        }
+        playback?.setCallbacks(this)
         setupMediaSession()
 
+        // queue saving needs to run on a separate thread so that it doesn't block the playback handler
+        // events
+        queueSaveHandlerThread =
+            HandlerThread("QueueSaveHandler", Process.THREAD_PRIORITY_BACKGROUND)
+        queueSaveHandlerThread?.start()
+        queueSaveHandler = QueueSaveHandler(this, queueSaveHandlerThread!!.looper)
         uiThreadHandler = Handler(Looper.getMainLooper())
-        ContextCompat.registerReceiver(this, widgetIntentReceiver, IntentFilter(APP_WIDGET_UPDATE), ContextCompat.RECEIVER_NOT_EXPORTED)
-        ContextCompat.registerReceiver(this, updateFavoriteReceiver, IntentFilter(FAVORITE_STATE_CHANGED), ContextCompat.RECEIVER_NOT_EXPORTED)
-        registerReceiver(lockScreenReceiver, IntentFilter(Intent.ACTION_SCREEN_ON))
+        registerReceiver(widgetIntentReceiver, IntentFilter(APP_WIDGET_UPDATE))
+        registerReceiver(updateFavoriteReceiver, IntentFilter(FAVORITE_STATE_CHANGED))
+        registerReceiver(lockScreenReceiver, IntentFilter(Intent.ACTION_SCREEN_OFF))
         sessionToken = mediaSession?.sessionToken
         notificationManager = getSystemService()
         initNotification()
         mediaStoreObserver = MediaStoreObserver(this, playerHandler!!)
-        throttledSeekHandler = ThrottledSeekHandler(this, Handler(mainLooper))
-        contentResolver.registerContentObserver(
-            MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-            true,
-            mediaStoreObserver
-        )
-        contentResolver.registerContentObserver(
-            MediaStore.Audio.Media.INTERNAL_CONTENT_URI,
-            true,
-            mediaStoreObserver
-        )
+        throttledSeekHandler = ThrottledSeekHandler(this, playerHandler!!)
+        contentResolver
+            .registerContentObserver(
+                MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, true, mediaStoreObserver
+            )
+        contentResolver
+            .registerContentObserver(
+                MediaStore.Audio.Albums.EXTERNAL_CONTENT_URI, true, mediaStoreObserver
+            )
+        contentResolver
+            .registerContentObserver(
+                MediaStore.Audio.Artists.EXTERNAL_CONTENT_URI, true, mediaStoreObserver
+            )
+        contentResolver
+            .registerContentObserver(
+                MediaStore.Audio.Genres.EXTERNAL_CONTENT_URI, true, mediaStoreObserver
+            )
+        contentResolver
+            .registerContentObserver(
+                MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI, true, mediaStoreObserver
+            )
+        contentResolver
+            .registerContentObserver(
+                MediaStore.Audio.Media.INTERNAL_CONTENT_URI, true, mediaStoreObserver
+            )
+        contentResolver
+            .registerContentObserver(
+                MediaStore.Audio.Albums.INTERNAL_CONTENT_URI, true, mediaStoreObserver
+            )
+        contentResolver
+            .registerContentObserver(
+                MediaStore.Audio.Artists.INTERNAL_CONTENT_URI, true, mediaStoreObserver
+            )
+        contentResolver
+            .registerContentObserver(
+                MediaStore.Audio.Genres.INTERNAL_CONTENT_URI, true, mediaStoreObserver
+            )
+        contentResolver
+            .registerContentObserver(
+                MediaStore.Audio.Playlists.INTERNAL_CONTENT_URI, true, mediaStoreObserver
+            )
         val audioVolumeObserver = AudioVolumeObserver(this)
         audioVolumeObserver.register(AudioManager.STREAM_MUSIC, this)
         registerOnSharedPreferenceChangedListener(this)
         restoreState()
-        sendBroadcast(Intent("$RETRO_MUSIC_PACKAGE_NAME.RETRO_MUSIC_SERVICE_CREATED"))
+        sendBroadcast(Intent("code.name.monkey.retromusic.RETRO_MUSIC_SERVICE_CREATED"))
         registerHeadsetEvents()
         registerBluetoothConnected()
         mPackageValidator = PackageValidator(this, R.xml.allowed_media_browser_callers)
         mMusicProvider.setMusicService(this)
-        storage = PersistentStorage.getInstance(this)
     }
 
     override fun onDestroy() {
         unregisterReceiver(widgetIntentReceiver)
         unregisterReceiver(updateFavoriteReceiver)
         unregisterReceiver(lockScreenReceiver)
+        if (becomingNoisyReceiverRegistered) {
+            unregisterReceiver(becomingNoisyReceiver)
+            becomingNoisyReceiverRegistered = false
+        }
         if (headsetReceiverRegistered) {
             unregisterReceiver(headsetReceiver)
             headsetReceiverRegistered = false
@@ -334,15 +384,14 @@ class MusicService : MediaBrowserServiceCompat(),
         mediaSession?.isActive = false
         quit()
         releaseResources()
-        serviceScope.cancel()
         contentResolver.unregisterContentObserver(mediaStoreObserver)
         unregisterOnSharedPreferenceChangedListener(this)
         wakeLock?.release()
-        sendBroadcast(Intent("$RETRO_MUSIC_PACKAGE_NAME.RETRO_MUSIC_SERVICE_DESTROYED"))
+        sendBroadcast(Intent("code.name.monkey.retromusic.RETRO_MUSIC_SERVICE_DESTROYED"))
     }
 
-    private fun acquireWakeLock() {
-        wakeLock?.acquire(30000)
+    private fun acquireWakeLock(milli: Long) {
+        wakeLock?.acquire(milli)
     }
 
     private var pausedByZeroVolume = false
@@ -350,8 +399,10 @@ class MusicService : MediaBrowserServiceCompat(),
         if (isPauseOnZeroVolume) {
             if (isPlaying && currentVolume < 1) {
                 pause()
+                println("Paused")
                 pausedByZeroVolume = true
             } else if (pausedByZeroVolume && currentVolume >= 1) {
+                println("Played")
                 play()
                 pausedByZeroVolume = false
             }
@@ -406,11 +457,11 @@ class MusicService : MediaBrowserServiceCompat(),
     }
 
     val audioSessionId: Int
-        get() = playbackManager.audioSessionId
-
+        get() = if (playback != null) {
+            playback!!.audioSessionId
+        } else -1
     val currentSong: Song
         get() = getSongAt(getPosition())
-
     val nextSong: Song?
         get() = if (isLastTrack && repeatMode == REPEAT_MODE_NONE) {
             null
@@ -424,7 +475,6 @@ class MusicService : MediaBrowserServiceCompat(),
             REPEAT_MODE_ALL -> if (isLastTrack) {
                 position = 0
             }
-
             REPEAT_MODE_THIS -> if (force) {
                 if (isLastTrack) {
                     position = 0
@@ -432,11 +482,9 @@ class MusicService : MediaBrowserServiceCompat(),
             } else {
                 position -= 1
             }
-
             REPEAT_MODE_NONE -> if (isLastTrack) {
                 position -= 1
             }
-
             else -> if (isLastTrack) {
                 position -= 1
             }
@@ -444,16 +492,18 @@ class MusicService : MediaBrowserServiceCompat(),
         return position
     }
 
+    private fun getPlayingQueue(): List<Song> {
+        return playingQueue
+    }
+
     private fun getPosition(): Int {
         return position
     }
 
     private fun setPosition(position: Int) {
-        openTrackAndPrepareNextAt(position) { success ->
-            if (success) {
-                notifyChange(PLAY_STATE_CHANGED)
-            }
-        }
+        // handle this on the handlers thread to avoid blocking the ui thread
+        playerHandler?.removeMessages(SET_POSITION)
+        playerHandler?.obtainMessage(SET_POSITION, position, 0)?.sendToTarget()
     }
 
     private fun getPreviousPosition(force: Boolean): Int {
@@ -462,7 +512,6 @@ class MusicService : MediaBrowserServiceCompat(),
             REPEAT_MODE_ALL -> if (newPosition < 0) {
                 newPosition = playingQueue.size - 1
             }
-
             REPEAT_MODE_THIS -> if (force) {
                 if (newPosition < 0) {
                     newPosition = playingQueue.size - 1
@@ -470,11 +519,9 @@ class MusicService : MediaBrowserServiceCompat(),
             } else {
                 newPosition = getPosition()
             }
-
             REPEAT_MODE_NONE -> if (newPosition < 0) {
                 newPosition = 0
             }
-
             else -> if (newPosition < 0) {
                 newPosition = 0
             }
@@ -504,7 +551,6 @@ class MusicService : MediaBrowserServiceCompat(),
                 makeShuffleList(playingQueue, getPosition())
                 position = 0
             }
-
             SHUFFLE_MODE_NONE -> {
                 this.shuffleMode = shuffleMode
                 val currentSongId = Objects.requireNonNull(currentSong).id
@@ -531,10 +577,13 @@ class MusicService : MediaBrowserServiceCompat(),
     }
 
     val songDurationMillis: Int
-        get() = playbackManager.songDurationMillis
-
+        get() = if (playback != null) {
+            playback!!.duration()
+        } else -1
     val songProgressMillis: Int
-        get() = playbackManager.songProgressMillis
+        get() = if (playback != null) {
+            playback!!.position()
+        } else -1
 
     fun handleAndSendChangeInternal(what: String) {
         handleChangeInternal(what)
@@ -551,11 +600,10 @@ class MusicService : MediaBrowserServiceCompat(),
         }
     }
 
-    private val isLastTrack: Boolean
+    val isLastTrack: Boolean
         get() = getPosition() == playingQueue.size - 1
-
     val isPlaying: Boolean
-        get() = playbackManager.isPlaying
+        get() = playback != null && playback!!.isPlaying
 
     fun moveSong(from: Int, to: Int) {
         if (from == to) {
@@ -572,11 +620,9 @@ class MusicService : MediaBrowserServiceCompat(),
             currentPosition in to until from -> {
                 position = currentPosition + 1
             }
-
             currentPosition in (from + 1)..to -> {
                 position = currentPosition - 1
             }
-
             from == currentPosition -> {
                 position = to
             }
@@ -584,7 +630,7 @@ class MusicService : MediaBrowserServiceCompat(),
         notifyChange(QUEUE_CHANGED)
     }
 
-    private fun notifyChange(what: String) {
+    fun notifyChange(what: String) {
         handleAndSendChangeInternal(what)
         sendPublicIntent(what)
     }
@@ -612,9 +658,16 @@ class MusicService : MediaBrowserServiceCompat(),
              * By default return the browsable root. Treat the EXTRA_RECENT flag as a special case
              * and return the recent root instead.
              */
-            val isRecentRequest = rootHints?.getBoolean(BrowserRoot.EXTRA_RECENT) ?: false
-            val browserRootPath =
-                if (isRecentRequest) AutoMediaIDHelper.RECENT_ROOT else AutoMediaIDHelper.MEDIA_ID_ROOT
+            var isRecentRequest = false
+            if (rootHints != null) {
+                isRecentRequest =
+                    rootHints.getBoolean(BrowserRoot.EXTRA_RECENT)
+            }
+            val browserRootPath = if (isRecentRequest) {
+                AutoMediaIDHelper.RECENT_ROOT
+            } else {
+                AutoMediaIDHelper.MEDIA_ID_ROOT
+            }
             BrowserRoot(browserRootPath, null)
         }
     }
@@ -624,7 +677,16 @@ class MusicService : MediaBrowserServiceCompat(),
         result: Result<List<MediaBrowserCompat.MediaItem>>,
     ) {
         if (parentId == AutoMediaIDHelper.RECENT_ROOT) {
-            result.sendResult(listOf(storage.recentSong()))
+            val song = currentSong
+            val mediaItem = MediaBrowserCompat.MediaItem(
+                MediaDescriptionCompat.Builder()
+                    .setMediaId(song.id.toString())
+                    .setTitle(song.title)
+                    .setSubtitle(song.artistName)
+                    .setIconUri(getMediaStoreAlbumCoverUri(song.albumId))
+                    .build(), MediaBrowserCompat.MediaItem.FLAG_PLAYABLE
+            )
+            result.sendResult(listOf(mediaItem))
         } else {
             result.sendResult(mMusicProvider.getChildren(parentId, resources))
         }
@@ -635,29 +697,51 @@ class MusicService : MediaBrowserServiceCompat(),
     ) {
         when (key) {
             PLAYBACK_SPEED, PLAYBACK_PITCH -> {
-                updateMediaSessionPlaybackState()
-                playbackManager.setPlaybackSpeedPitch(playbackSpeed, playbackPitch)
+                playback?.setPlaybackSpeedPitch(playbackSpeed, playbackPitch)
             }
-
             CROSS_FADE_DURATION -> {
                 val progress = songProgressMillis
                 val wasPlaying = isPlaying
-
-                if (playbackManager.maybeSwitchToCrossFade(crossFadeDuration)) {
-                    restorePlaybackState(wasPlaying, progress)
-                } else {
-                    playbackManager.setCrossFadeDuration(crossFadeDuration)
+                /* Switch to MultiPlayer if Crossfade duration is 0 and
+                Playback is not an instance of MultiPlayer */
+                if (playback !is MultiPlayer && crossFadeDuration == 0) {
+                    if (playback != null) {
+                        playback?.release()
+                    }
+                    playback = null
+                    playback = MultiPlayer(this)
+                    playback?.setCallbacks(this)
+                    if (openTrackAndPrepareNextAt(position)) {
+                        seek(progress)
+                        if (wasPlaying) {
+                            play()
+                        }
+                    }
+                } else if (playback !is CrossFadePlayer && crossFadeDuration > 0) {
+                    if (playback != null) {
+                        playback?.release()
+                    }
+                    playback = null
+                    playback = CrossFadePlayer(this)
+                    playback?.setCallbacks(this)
+                    if (openTrackAndPrepareNextAt(position)) {
+                        seek(progress)
+                        if (wasPlaying) {
+                            play()
+                        }
+                    }
                 }
+                if (playback != null) playback?.setCrossFadeDuration(
+                    crossFadeDuration
+                )
             }
-
-            ALBUM_ART_ON_LOCK_SCREEN, BLURRED_ALBUM_ART -> updateMediaSessionMetaData(::updateMediaSessionPlaybackState)
+            ALBUM_ART_ON_LOCK_SCREEN, BLURRED_ALBUM_ART -> updateMediaSessionMetaData()
             COLORED_NOTIFICATION -> {
                 playingNotification?.updateMetadata(currentSong) {
                     playingNotification?.setPlaying(isPlaying)
                     startForegroundOrNotify()
                 }
             }
-
             CLASSIC_NOTIFICATION -> {
                 updateNotification()
                 playingNotification?.updateMetadata(currentSong) {
@@ -665,81 +749,50 @@ class MusicService : MediaBrowserServiceCompat(),
                     startForegroundOrNotify()
                 }
             }
-
+            PLAYBACK_SPEED -> updateMediaSessionPlaybackState()
             TOGGLE_HEADSET -> registerHeadsetEvents()
         }
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         if (intent != null && intent.action != null) {
-            serviceScope.launch {
-                restoreQueuesAndPositionIfNecessary()
-                when (intent.action) {
-                    ACTION_TOGGLE_PAUSE -> if (isPlaying) {
-                        pause()
-                    } else {
-                        play()
-                    }
-
-                    ACTION_PAUSE -> pause()
-                    ACTION_PLAY -> play()
-                    ACTION_PLAY_PLAYLIST -> playFromPlaylist(intent)
-                    ACTION_REWIND -> back(true)
-                    ACTION_SKIP -> playNextSong(true)
-                    ACTION_STOP, ACTION_QUIT -> {
-                        pendingQuit = false
-                        quit()
-                    }
-
-                    ACTION_PENDING_QUIT -> pendingQuit = true
-                    TOGGLE_FAVORITE -> toggleFavorite()
+            handleIntent(mediaSession, intent)
+            restoreQueuesAndPositionIfNecessary()
+            when (intent.action) {
+                ACTION_TOGGLE_PAUSE -> if (isPlaying) {
+                    pause()
+                } else {
+                    play()
                 }
+                ACTION_PAUSE -> pause()
+                ACTION_PLAY -> play()
+                ACTION_PLAY_PLAYLIST -> playFromPlaylist(intent)
+                ACTION_REWIND -> back(true)
+                ACTION_SKIP -> playNextSong(true)
+                ACTION_STOP, ACTION_QUIT -> {
+                    pendingQuit = false
+                    quit()
+                }
+                ACTION_PENDING_QUIT -> pendingQuit = true
+                TOGGLE_FAVORITE -> toggleFavorite(applicationContext, currentSong)
             }
         }
         return START_NOT_STICKY
     }
 
     override fun onTrackEnded() {
-        acquireWakeLock()
-        // if there is a timer finished, don't continue
-        if (pendingQuit
-            || repeatMode == REPEAT_MODE_NONE && isLastTrack
-        ) {
-            notifyChange(PLAY_STATE_CHANGED)
-            seek(0, false)
-            if (pendingQuit) {
-                pendingQuit = false
-                quit()
-            }
-        } else {
-            playNextSong(false)
-        }
-        releaseWakeLock()
+        acquireWakeLock(30000)
+        playerHandler?.sendEmptyMessage(TRACK_ENDED)
     }
 
     override fun onTrackEndedWithCrossfade() {
         trackEndedByCrossfade = true
-        onTrackEnded()
+        acquireWakeLock(30000)
+        playerHandler?.sendEmptyMessage(TRACK_ENDED)
     }
 
     override fun onTrackWentToNext() {
-        if (pendingQuit || repeatMode == REPEAT_MODE_NONE && isLastTrack) {
-            playbackManager.setNextDataSource(null)
-            pause(false)
-            seek(0, false)
-            if (pendingQuit) {
-                pendingQuit = false
-                quit()
-            }
-        } else {
-            position = nextPosition
-            prepareNextImpl()
-            notifyChange(META_CHANGED)
-        }
-    }
-
-    override fun onPlayStateChanged() {
-        notifyChange(PLAY_STATE_CHANGED)
+        playerHandler?.sendEmptyMessage(TRACK_WENT_TO_NEXT)
     }
 
     override fun onUnbind(intent: Intent): Boolean {
@@ -754,7 +807,7 @@ class MusicService : MediaBrowserServiceCompat(),
         startPosition: Int,
         startPlaying: Boolean,
     ) {
-        if (!playingQueue.isNullOrEmpty()
+        if (playingQueue != null && playingQueue.isNotEmpty()
             && startPosition >= 0 && startPosition < playingQueue.size
         ) {
             // it is important to copy the playing queue here first as we might add/remove songs later
@@ -775,32 +828,77 @@ class MusicService : MediaBrowserServiceCompat(),
     }
 
     @Synchronized
-    fun openTrackAndPrepareNextAt(position: Int, completion: (success: Boolean) -> Unit) {
+    fun openTrackAndPrepareNextAt(position: Int): Boolean {
         this.position = position
-        openCurrent { success ->
-            completion(success)
-            if (success) {
-                prepareNextImpl()
+        val prepared = openCurrent()
+        if (prepared) {
+            prepareNextImpl()
+        }
+        notifyChange(META_CHANGED)
+        notHandledMetaChangedForCurrentTrack = false
+        return prepared
+    }
+
+    fun pause() {
+        Log.i(TAG, "Paused")
+        isPausedByTransientLossOfFocus = false
+        if (playback != null && playback!!.isPlaying) {
+            startFadeAnimator(playback!!, false) {
+
+                //Code to run when Animator Ends
+                playback?.pause()
+                notifyChange(PLAY_STATE_CHANGED)
             }
-            notifyChange(META_CHANGED)
-            notHandledMetaChangedForCurrentTrack = false
         }
     }
 
-    fun pause(force: Boolean = false) {
-        playbackManager.pause(force) {
+    fun forcePause() {
+        isPausedByTransientLossOfFocus = false
+        if (playback != null && playback!!.isPlaying) {
+            playback?.pause()
             notifyChange(PLAY_STATE_CHANGED)
         }
     }
 
     @Synchronized
     fun play() {
-        playbackManager.play { playSongAt(getPosition()) }
-        if (notHandledMetaChangedForCurrentTrack) {
-            handleChangeInternal(META_CHANGED)
-            notHandledMetaChangedForCurrentTrack = false
+        if (requestFocus()) {
+            if (playback != null && !playback!!.isPlaying) {
+                if (!playback!!.isInitialized) {
+                    playSongAt(getPosition())
+                } else {
+                    //Don't Start playing when it's casting
+                    if (isCasting) {
+                        return
+                    }
+                    startFadeAnimator(playback!!, true) {
+
+                        // Code when Animator Ends
+                        if (!becomingNoisyReceiverRegistered) {
+                            registerReceiver(
+                                becomingNoisyReceiver,
+                                becomingNoisyReceiverIntentFilter
+                            )
+                            becomingNoisyReceiverRegistered = true
+                        }
+                        if (notHandledMetaChangedForCurrentTrack) {
+                            handleChangeInternal(META_CHANGED)
+                            notHandledMetaChangedForCurrentTrack = false
+                        }
+
+                        // fixes a bug where the volume would stay ducked because the
+                        // AudioManager.AUDIOFOCUS_GAIN event is not sent
+                        playerHandler?.removeMessages(DUCK)
+                        playerHandler?.sendEmptyMessage(UNDUCK)
+                    }
+                    //Start Playback with Animator
+                    playback?.start()
+                    notifyChange(PLAY_STATE_CHANGED)
+                }
+            }
+        } else {
+            showToast(R.string.audio_focus_denied)
         }
-        notifyChange(PLAY_STATE_CHANGED)
     }
 
     fun playNextSong(force: Boolean) {
@@ -812,19 +910,31 @@ class MusicService : MediaBrowserServiceCompat(),
     }
 
     fun playSongAt(position: Int) {
-        // Every chromecast method needs to run on main thread or you are greeted with IllegalStateException
-        // So it will use Main dispatcher
-        // And by using Default dispatcher for local playback we are reduce the burden of main thread
-        serviceScope.launch(if (playbackManager.isLocalPlayback) Default else Main) {
-            openTrackAndPrepareNextAt(position) { success ->
-                if (success) {
-                    play()
-                } else {
-                    runOnUiThread {
-                        showToast(R.string.unplayable_file)
-                    }
-                }
+        // handle this on the handlers thread to avoid blocking the ui thread
+        playerHandler?.removeMessages(PLAY_SONG)
+        playerHandler?.obtainMessage(PLAY_SONG, position, 0)?.sendToTarget()
+    }
+
+    fun playSongAtImpl(position: Int) {
+        if (openTrackAndPrepareNextAt(position)) {
+            play()
+        } else {
+            showToast(resources.getString(R.string.unplayable_file))
+        }
+    }
+
+    fun playSongs(songs: ArrayList<Song>?, shuffleMode: Int) {
+        if (songs != null && songs.isNotEmpty()) {
+            if (shuffleMode == SHUFFLE_MODE_SHUFFLE) {
+                val startPosition = Random().nextInt(songs.size)
+                openQueue(songs, startPosition, false)
+                setShuffleMode(shuffleMode)
+            } else {
+                openQueue(songs, 0, false)
             }
+            play()
+        } else {
+            showToast(R.string.playlist_is_empty)
         }
     }
 
@@ -832,38 +942,22 @@ class MusicService : MediaBrowserServiceCompat(),
     fun prepareNextImpl() {
         try {
             val nextPosition = getNextPosition(false)
-            playbackManager.setNextDataSource(getSongAt(nextPosition).uri.toString())
+            playback?.setNextDataSource(getTrackUri(getSongAt(nextPosition)))
             this.nextPosition = nextPosition
         } catch (ignored: Exception) {
         }
     }
 
-    fun toggleFavorite() {
-        serviceScope.launch {
-            toggleFavorite(currentSong)
-            sendBroadcast(Intent(FAVORITE_STATE_CHANGED))
-        }
-    }
-
-    fun isCurrentFavorite(completion: (isFavorite: Boolean) -> Unit) {
-        serviceScope.launch(IO) {
-            val isFavorite = MusicUtil.isFavorite(currentSong)
-            withContext(Main) {
-                completion(isFavorite)
-            }
-        }
-    }
-
     fun quit() {
         pause()
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-        isForeground = false
+        stopForeground(true)
         notificationManager?.cancel(PlayingNotification.NOTIFICATION_ID)
-
+        closeAudioEffectSession()
+        audioManager?.abandonAudioFocus(audioFocusListener)
         stopSelf()
     }
 
-    private fun releaseWakeLock() {
+    fun releaseWakeLock() {
         if (wakeLock!!.isHeld) {
             wakeLock?.release()
         }
@@ -919,47 +1013,34 @@ class MusicService : MediaBrowserServiceCompat(),
         }
     }
 
-    private suspend fun restoreQueuesAndPositionIfNecessary() {
+    @Synchronized
+    fun restoreQueuesAndPositionIfNecessary() {
         if (!queuesRestored && playingQueue.isEmpty()) {
-            withContext(IO) {
-                val restoredQueue =
-                    MusicPlaybackQueueStore.getInstance(this@MusicService).savedPlayingQueue
-                val restoredOriginalQueue =
-                    MusicPlaybackQueueStore.getInstance(this@MusicService).savedOriginalPlayingQueue
-                val restoredPosition =
-                    PreferenceManager.getDefaultSharedPreferences(this@MusicService).getInt(
-                        SAVED_POSITION, -1
-                    )
-                val restoredPositionInTrack =
-                    PreferenceManager.getDefaultSharedPreferences(this@MusicService).getInt(
-                        SAVED_POSITION_IN_TRACK, -1
-                    )
-                if (restoredQueue.size > 0 && restoredQueue.size == restoredOriginalQueue.size && restoredPosition != -1) {
-                    originalPlayingQueue = ArrayList(restoredOriginalQueue)
-                    playingQueue = ArrayList(restoredQueue)
-                    position = restoredPosition
-                    withContext(Main) {
-                        openCurrent {
-                            prepareNext()
-                            if (restoredPositionInTrack > 0) {
-                                seek(restoredPositionInTrack)
-                            }
-                            notHandledMetaChangedForCurrentTrack = true
-                            sendChangeInternal(META_CHANGED)
-                        }
-                        if (receivedHeadsetConnected) {
-                            play()
-                            receivedHeadsetConnected = false
-                        }
-                    }
-
-                    sendChangeInternal(QUEUE_CHANGED)
-                    mediaSession?.setQueueTitle(getString(R.string.now_playing_queue))
-                    mediaSession?.setQueue(playingQueue.toMediaSessionQueue())
+            val restoredQueue = MusicPlaybackQueueStore.getInstance(this).savedPlayingQueue
+            val restoredOriginalQueue =
+                MusicPlaybackQueueStore.getInstance(this).savedOriginalPlayingQueue
+            val restoredPosition = PreferenceManager.getDefaultSharedPreferences(this).getInt(
+                SAVED_POSITION, -1
+            )
+            val restoredPositionInTrack =
+                PreferenceManager.getDefaultSharedPreferences(this).getInt(
+                    SAVED_POSITION_IN_TRACK, -1
+                )
+            if (restoredQueue.size > 0 && restoredQueue.size == restoredOriginalQueue.size && restoredPosition != -1) {
+                originalPlayingQueue = ArrayList(restoredOriginalQueue)
+                playingQueue = ArrayList(restoredQueue)
+                position = restoredPosition
+                openCurrent()
+                prepareNext()
+                if (restoredPositionInTrack > 0) {
+                    seek(restoredPositionInTrack)
                 }
+                notHandledMetaChangedForCurrentTrack = true
+                sendChangeInternal(META_CHANGED)
+                sendChangeInternal(QUEUE_CHANGED)
             }
-            queuesRestored = true
         }
+        queuesRestored = true
     }
 
     fun runOnUiThread(runnable: Runnable?) {
@@ -972,10 +1053,23 @@ class MusicService : MediaBrowserServiceCompat(),
         }
     }
 
+    fun saveQueuesImpl() {
+        MusicPlaybackQueueStore.getInstance(this).saveQueues(playingQueue, originalPlayingQueue)
+    }
+
+    fun saveState() {
+        saveQueues()
+        savePosition()
+        savePositionInTrack()
+    }
+
     @Synchronized
-    fun seek(millis: Int, force: Boolean = true): Int {
+    fun seek(millis: Int): Int {
         return try {
-            val newPosition = playbackManager.seek(millis, force)
+            var newPosition = 0
+            if (playback != null) {
+                newPosition = playback!!.seek(millis)
+            }
             throttledSeekHandler?.notifySeek()
             newPosition
         } catch (e: Exception) {
@@ -983,7 +1077,7 @@ class MusicService : MediaBrowserServiceCompat(),
         }
     }
 
-    // to let other apps know whats playing. i.e. last.fm (scrobbling) or musixmatch
+    // to let other apps know whats playing. i.E. last.fm (scrobbling) or musixmatch
     fun sendPublicIntent(what: String) {
         val intent = Intent(what.replace(RETRO_MUSIC_PACKAGE_NAME, MUSIC_PACKAGE_NAME))
         val song = currentSong
@@ -995,7 +1089,6 @@ class MusicService : MediaBrowserServiceCompat(),
         intent.putExtra("position", songProgressMillis.toLong())
         intent.putExtra("playing", isPlaying)
         intent.putExtra("scrobbling_source", RETRO_MUSIC_PACKAGE_NAME)
-        @Suppress("Deprecation")
         sendStickyBroadcast(intent)
     }
 
@@ -1027,7 +1120,7 @@ class MusicService : MediaBrowserServiceCompat(),
     }
 
     @SuppressLint("CheckResult")
-    fun updateMediaSessionMetaData(onCompletion: () -> Unit) {
+    fun updateMediaSessionMetaData() {
         Log.i(TAG, "onResourceReady: ")
         val song = currentSong
         if (song.id == -1L) {
@@ -1040,61 +1133,60 @@ class MusicService : MediaBrowserServiceCompat(),
             .putString(MediaMetadataCompat.METADATA_KEY_ALBUM, song.albumName)
             .putString(MediaMetadataCompat.METADATA_KEY_TITLE, song.title)
             .putLong(MediaMetadataCompat.METADATA_KEY_DURATION, song.duration)
-            .putLong(
-                MediaMetadataCompat.METADATA_KEY_TRACK_NUMBER,
-                (getPosition() + 1).toLong()
-            )
+            .putLong(MediaMetadataCompat.METADATA_KEY_TRACK_NUMBER, (getPosition() + 1).toLong())
             .putLong(MediaMetadataCompat.METADATA_KEY_YEAR, song.year.toLong())
             .putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, null)
             .putLong(MediaMetadataCompat.METADATA_KEY_NUM_TRACKS, playingQueue.size.toLong())
 
-        // We must send the album art in METADATA_KEY_ALBUM_ART key on A13+ or
-        // else album art is blurry in notification
-        if (isAlbumArtOnLockScreen || VersionUtils.hasT()) {
+        if (isAlbumArtOnLockScreen) {
             // val screenSize: Point = RetroUtil.getScreenSize(this)
-            val request = Glide.with(this)
+            val request = GlideApp.with(this)
                 .asBitmap()
                 .songCoverOptions(song)
                 .load(getSongModel(song))
+                .transition(getDefaultTransition())
 
             if (isBlurredAlbumArt) {
                 request.transform(BlurTransformation.Builder(this@MusicService).build())
             }
-            request.into(object :
-                CustomTarget<Bitmap?>(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL) {
-                override fun onLoadFailed(errorDrawable: Drawable?) {
-                    super.onLoadFailed(errorDrawable)
-                    metaData.putBitmap(
-                        MediaMetadataCompat.METADATA_KEY_ALBUM_ART,
-                        BitmapFactory.decodeResource(
-                            resources,
-                            R.drawable.default_audio_art
+            runOnUiThread {
+                request.into(object :
+                    CustomTarget<Bitmap?>(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL) {
+                    override fun onLoadFailed(errorDrawable: Drawable?) {
+                        super.onLoadFailed(errorDrawable)
+                        mediaSession?.setMetadata(metaData.build())
+                    }
+
+                    override fun onResourceReady(
+                        resource: Bitmap,
+                        transition: Transition<in Bitmap?>?,
+                    ) {
+                        metaData.putBitmap(
+                            MediaMetadataCompat.METADATA_KEY_ALBUM_ART,
+                            copy(resource)
                         )
-                    )
-                    mediaSession?.setMetadata(metaData.build())
-                    onCompletion()
-                }
+                        mediaSession?.setMetadata(metaData.build())
+                    }
 
-                override fun onResourceReady(
-                    resource: Bitmap,
-                    transition: Transition<in Bitmap?>?,
-                ) {
-                    metaData.putBitmap(
-                        MediaMetadataCompat.METADATA_KEY_ALBUM_ART,
-                        resource
-                    )
-                    mediaSession?.setMetadata(metaData.build())
-                    onCompletion()
-                }
-
-                override fun onLoadCleared(placeholder: Drawable?) {}
-            })
+                    override fun onLoadCleared(placeholder: Drawable?) {
+                        mediaSession?.setMetadata(metaData.build())
+                    }
+                })
+            }
         } else {
             mediaSession?.setMetadata(metaData.build())
-            onCompletion()
         }
     }
 
+    private fun closeAudioEffectSession() {
+        val audioEffectsIntent = Intent(AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION)
+        if (playback != null) {
+            audioEffectsIntent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, playback!!.audioSessionId)
+        }
+        audioEffectsIntent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, packageName)
+        sendBroadcast(audioEffectsIntent)
+    }
+
     private fun handleChangeInternal(what: String) {
         when (what) {
             PLAY_STATE_CHANGED -> {
@@ -1107,43 +1199,41 @@ class MusicService : MediaBrowserServiceCompat(),
                 playingNotification?.setPlaying(isPlaying)
                 startForegroundOrNotify()
             }
-
             FAVORITE_STATE_CHANGED -> {
-                isCurrentFavorite { isFavorite ->
-                    playingNotification?.updateFavorite(isFavorite)
-                    startForegroundOrNotify()
-                }
-            }
-
-            META_CHANGED -> {
-                playingNotification?.updateMetadata(currentSong) { startForegroundOrNotify() }
-                isCurrentFavorite { isFavorite ->
-                    playingNotification?.updateFavorite(isFavorite)
+                playingNotification?.updateFavorite(currentSong) {
                     startForegroundOrNotify()
                 }
 
-                // We must call updateMediaSessionPlaybackState after the load of album art is completed
-                // if we are loading it or it won't be updated in the notification
-                updateMediaSessionMetaData(::updateMediaSessionPlaybackState)
+                updateMediaSessionMetaData()
+                updateMediaSessionPlaybackState()
                 savePosition()
                 savePositionInTrack()
-                serviceScope.launch(IO) {
-                    val currentSong = currentSong
-                    HistoryStore.getInstance(this@MusicService).addSongId(currentSong.id)
-                    if (songPlayCountHelper.shouldBumpPlayCount()) {
-                        SongPlayCountStore.getInstance(this@MusicService)
-                            .bumpPlayCount(songPlayCountHelper.song.id)
-                    }
-                    songPlayCountHelper.notifySongChanged(currentSong)
-                    storage.saveSong(currentSong)
+                val currentSong = currentSong
+                HistoryStore.getInstance(this).addSongId(currentSong.id)
+                if (songPlayCountHelper.shouldBumpPlayCount()) {
+                    SongPlayCountStore.getInstance(this).bumpPlayCount(songPlayCountHelper.song.id)
                 }
+                songPlayCountHelper.notifySongChanged(currentSong)
+            }
+            META_CHANGED -> {
+                playingNotification?.updateMetadata(currentSong) { startForegroundOrNotify() }
+                playingNotification?.updateFavorite(currentSong) { startForegroundOrNotify() }
+                updateMediaSessionMetaData()
+                updateMediaSessionPlaybackState()
+                savePosition()
+                savePositionInTrack()
+                val currentSong = currentSong
+                HistoryStore.getInstance(this).addSongId(currentSong.id)
+                if (songPlayCountHelper.shouldBumpPlayCount()) {
+                    SongPlayCountStore.getInstance(this).bumpPlayCount(songPlayCountHelper.song.id)
+                }
+                songPlayCountHelper.notifySongChanged(currentSong)
             }
-
             QUEUE_CHANGED -> {
                 mediaSession?.setQueueTitle(getString(R.string.now_playing_queue))
                 mediaSession?.setQueue(playingQueue.toMediaSessionQueue())
-                updateMediaSessionMetaData(::updateMediaSessionPlaybackState) // because playing queue size might have changed
-                saveQueues()
+                updateMediaSessionMetaData() // because playing queue size might have changed
+                saveState()
                 if (playingQueue.size > 0) {
                     prepareNext()
                 } else {
@@ -1160,7 +1250,7 @@ class MusicService : MediaBrowserServiceCompat(),
                 // We can't call stopForeground(false) on A12 though, which may result in crashes
                 // when we call startForeground after that e.g. when Alarm goes off,
                 if (!VersionUtils.hasS()) {
-                    ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_DETACH)
+                    stopForeground(false)
                     isForeground = false
                 }
             }
@@ -1188,51 +1278,31 @@ class MusicService : MediaBrowserServiceCompat(),
     }
 
     private fun stopForegroundAndNotification() {
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+        stopForeground(true)
         notificationManager?.cancel(PlayingNotification.NOTIFICATION_ID)
         isForeground = false
     }
 
     @Synchronized
-    private fun openCurrent(completion: (success: Boolean) -> Unit) {
+    private fun openCurrent(): Boolean {
         val force = if (!trackEndedByCrossfade) {
             true
         } else {
             trackEndedByCrossfade = false
             false
         }
-        playbackManager.setDataSource(currentSong, force) { success ->
-            completion(success)
+        return try {
+            if (playback != null) {
+                return playback!!.setDataSource(getTrackUri(currentSong), force)
+            } else false
+        } catch (e: Exception) {
+            e.printStackTrace()
+            false
         }
     }
 
-    fun switchToLocalPlayback() {
-        playbackManager.switchToLocalPlayback(this::restorePlaybackState)
-    }
-
-    private fun restorePlaybackState(wasPlaying: Boolean, progress: Int) {
-        playbackManager.setCallbacks(this)
-        openTrackAndPrepareNextAt(position) { success ->
-            if (success) {
-                seek(progress)
-                if (wasPlaying) {
-                    play()
-                } else {
-                    pause()
-                }
-            }
-        }
-        playbackManager.setCrossFadeDuration(crossFadeDuration)
-    }
-
     private fun playFromPlaylist(intent: Intent) {
-        val playlist: AbsSmartPlaylist? = intent.extras?.let {
-            BundleCompat.getParcelable(
-                it,
-                INTENT_EXTRA_PLAYLIST,
-                AbsSmartPlaylist::class.java
-            )
-        }
+        val playlist: AbsSmartPlaylist? = intent.getParcelableExtra(INTENT_EXTRA_PLAYLIST)
         val shuffleMode = intent.getIntExtra(INTENT_EXTRA_SHUFFLE_MODE, getShuffleMode())
         if (playlist != null) {
             val playlistSongs = playlist.songs()
@@ -1245,19 +1315,16 @@ class MusicService : MediaBrowserServiceCompat(),
                     openQueue(playlistSongs, 0, true)
                 }
             } else {
-                runOnUiThread {
-                    showToast(R.string.playlist_is_empty, Toast.LENGTH_LONG)
-                }
-            }
-        } else {
-            runOnUiThread {
                 showToast(R.string.playlist_is_empty, Toast.LENGTH_LONG)
             }
+        } else {
+            showToast(R.string.playlist_is_empty, Toast.LENGTH_LONG)
         }
     }
 
     private fun prepareNext() {
-        prepareNextImpl()
+        playerHandler?.removeMessages(PREPARE_NEXT)
+        playerHandler?.obtainMessage(PREPARE_NEXT)?.sendToTarget()
     }
 
     private fun registerBluetoothConnected() {
@@ -1278,11 +1345,27 @@ class MusicService : MediaBrowserServiceCompat(),
     private fun releaseResources() {
         playerHandler?.removeCallbacksAndMessages(null)
         musicPlayerHandlerThread?.quitSafely()
-        playbackManager.release()
+        queueSaveHandler?.removeCallbacksAndMessages(null)
+        queueSaveHandlerThread?.quitSafely()
+        if (playback != null) {
+            playback?.release()
+        }
+        playback = null
         mediaSession?.release()
     }
 
-    fun restoreState(completion: () -> Unit = {}) {
+    private fun requestFocus(): Boolean {
+        return AudioManagerCompat.requestAudioFocus(
+            audioManager!!,
+            AudioFocusRequestCompat.Builder(AudioManagerCompat.AUDIOFOCUS_GAIN)
+                .setOnAudioFocusChangeListener(audioFocusListener)
+                .setAudioAttributes(
+                    AudioAttributesCompat.Builder().setContentType(CONTENT_TYPE_MUSIC).build()
+                ).build()
+        ) == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
+    }
+
+    private fun restoreState() {
         shuffleMode = PreferenceManager.getDefaultSharedPreferences(this).getInt(
             SAVED_SHUFFLE_MODE, 0
         )
@@ -1291,10 +1374,8 @@ class MusicService : MediaBrowserServiceCompat(),
         )
         handleAndSendChangeInternal(SHUFFLE_MODE_CHANGED)
         handleAndSendChangeInternal(REPEAT_MODE_CHANGED)
-        serviceScope.launch {
-            restoreQueuesAndPositionIfNecessary()
-            completion()
-        }
+        playerHandler?.removeMessages(RESTORE_QUEUES)
+        playerHandler?.sendEmptyMessage(RESTORE_QUEUES)
     }
 
     private fun savePosition() {
@@ -1304,10 +1385,8 @@ class MusicService : MediaBrowserServiceCompat(),
     }
 
     private fun saveQueues() {
-        serviceScope.launch(IO) {
-            MusicPlaybackQueueStore.getInstance(this@MusicService)
-                .saveQueues(playingQueue, originalPlayingQueue)
-        }
+        queueSaveHandler?.removeMessages(SAVE_QUEUES)
+        queueSaveHandler?.sendEmptyMessage(SAVE_QUEUES)
     }
 
     private fun sendChangeInternal(what: String) {
@@ -1345,27 +1424,13 @@ class MusicService : MediaBrowserServiceCompat(),
     }
 
     private fun setupMediaSession() {
-        val mediaButtonReceiverComponentName = ComponentName(
-            applicationContext,
-            MediaButtonIntentReceiver::class.java
-        )
-
-        val mediaButtonIntent = Intent(Intent.ACTION_MEDIA_BUTTON)
-        mediaButtonIntent.component = mediaButtonReceiverComponentName
-        val mediaButtonReceiverPendingIntent = PendingIntent.getBroadcast(
-            applicationContext, 0, mediaButtonIntent,
-            if (VersionUtils.hasMarshmallow()) PendingIntent.FLAG_IMMUTABLE else 0
-        )
         mediaSession = MediaSessionCompat(
             this,
-            BuildConfig.APPLICATION_ID,
-            mediaButtonReceiverComponentName,
-            mediaButtonReceiverPendingIntent
+            "RetroMusicPlayer"
         )
-        val mediaSessionCallback = MediaSessionCallback(this)
-        mediaSession?.setCallback(mediaSessionCallback)
+        val mediasessionCallback = MediaSessionCallback(applicationContext, this)
+        mediaSession?.setCallback(mediasessionCallback)
         mediaSession?.isActive = true
-        mediaSession?.setMediaButtonReceiver(mediaButtonReceiverPendingIntent)
     }
 
     inner class MusicBinder : Binder() {
@@ -1387,9 +1452,8 @@ class MusicService : MediaBrowserServiceCompat(),
         const val ACTION_QUIT = "$RETRO_MUSIC_PACKAGE_NAME.quitservice"
         const val ACTION_PENDING_QUIT = "$RETRO_MUSIC_PACKAGE_NAME.pendingquitservice"
         const val INTENT_EXTRA_PLAYLIST = RETRO_MUSIC_PACKAGE_NAME + "intentextra.playlist"
-        const val INTENT_EXTRA_SHUFFLE_MODE =
-            "$RETRO_MUSIC_PACKAGE_NAME.intentextra.shufflemode"
-        const val APP_WIDGET_UPDATE = "$RETRO_MUSIC_PACKAGE_NAME.appwidgetupdate"
+        const val INTENT_EXTRA_SHUFFLE_MODE = "$RETRO_MUSIC_PACKAGE_NAME.intentextra.shufflemode"
+        const val APP_WIDGET_UPDATE = "$RETRO_MUSIC_PACKAGE_NAME.appreciate"
         const val EXTRA_APP_WIDGET_NAME = RETRO_MUSIC_PACKAGE_NAME + "app_widget_name"
 
         // Do not change these three strings as it will break support with other apps (e.g. last.fm
@@ -1408,11 +1472,22 @@ class MusicService : MediaBrowserServiceCompat(),
         const val SAVED_POSITION_IN_TRACK = "POSITION_IN_TRACK"
         const val SAVED_SHUFFLE_MODE = "SHUFFLE_MODE"
         const val SAVED_REPEAT_MODE = "REPEAT_MODE"
+        const val RELEASE_WAKELOCK = 0
+        const val TRACK_ENDED = 1
+        const val TRACK_WENT_TO_NEXT = 2
+        const val PLAY_SONG = 3
+        const val PREPARE_NEXT = 4
+        const val SET_POSITION = 5
+        const val FOCUS_CHANGE = 6
+        const val DUCK = 7
+        const val UNDUCK = 8
+        const val RESTORE_QUEUES = 9
         const val SHUFFLE_MODE_NONE = 0
         const val SHUFFLE_MODE_SHUFFLE = 1
         const val REPEAT_MODE_NONE = 0
         const val REPEAT_MODE_ALL = 1
         const val REPEAT_MODE_THIS = 2
+        const val SAVE_QUEUES = 0
         private const val MEDIA_SESSION_ACTIONS = (PlaybackStateCompat.ACTION_PLAY
                 or PlaybackStateCompat.ACTION_PAUSE
                 or PlaybackStateCompat.ACTION_PLAY_PAUSE
@@ -1420,5 +1495,22 @@ class MusicService : MediaBrowserServiceCompat(),
                 or PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS
                 or PlaybackStateCompat.ACTION_STOP
                 or PlaybackStateCompat.ACTION_SEEK_TO)
+
+        private fun copy(bitmap: Bitmap): Bitmap? {
+            var config = bitmap.config
+            if (config == null) {
+                config = Bitmap.Config.RGB_565
+            }
+            return try {
+                bitmap.copy(config, false)
+            } catch (e: OutOfMemoryError) {
+                e.printStackTrace()
+                null
+            }
+        }
+
+        private fun getTrackUri(song: Song): String {
+            return getSongFileUri(song.id).toString()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/github/muntashirakon/music/service/PlaybackHandler.java b/app/src/main/java/io/github/muntashirakon/music/service/PlaybackHandler.java
new file mode 100644
index 000000000..a999d8c9c
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/service/PlaybackHandler.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package io.github.muntashirakon.music.service;
+
+import static io.github.muntashirakon.music.service.MusicService.DUCK;
+import static io.github.muntashirakon.music.service.MusicService.META_CHANGED;
+import static io.github.muntashirakon.music.service.MusicService.PLAY_STATE_CHANGED;
+import static io.github.muntashirakon.music.service.MusicService.REPEAT_MODE_NONE;
+import static io.github.muntashirakon.music.service.MusicService.TRACK_ENDED;
+import static io.github.muntashirakon.music.service.MusicService.TRACK_WENT_TO_NEXT;
+
+import android.media.AudioManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+
+import androidx.annotation.NonNull;
+
+import java.lang.ref.WeakReference;
+
+import io.github.muntashirakon.music.util.PreferenceUtil;
+
+class PlaybackHandler extends Handler {
+
+  @NonNull private final WeakReference<MusicService> mService;
+  private float currentDuckVolume = 1.0f;
+
+
+  PlaybackHandler(final MusicService service, @NonNull final Looper looper) {
+    super(looper);
+    mService = new WeakReference<>(service);
+  }
+
+  @Override
+  public void handleMessage(@NonNull final Message msg) {
+    final MusicService service = mService.get();
+    if (service == null) {
+      return;
+    }
+
+    switch (msg.what) {
+      case MusicService.DUCK:
+        if (PreferenceUtil.INSTANCE.isAudioDucking()) {
+          currentDuckVolume -= .05f;
+          if (currentDuckVolume > .2f) {
+            sendEmptyMessageDelayed(DUCK, 10);
+          } else {
+            currentDuckVolume = .2f;
+          }
+        } else {
+          currentDuckVolume = 1f;
+        }
+        service.playback.setVolume(currentDuckVolume);
+        break;
+
+      case MusicService.UNDUCK:
+        if (PreferenceUtil.INSTANCE.isAudioDucking()) {
+          currentDuckVolume += .03f;
+          if (currentDuckVolume < 1f) {
+            sendEmptyMessageDelayed(MusicService.UNDUCK, 10);
+          } else {
+            currentDuckVolume = 1f;
+          }
+        } else {
+          currentDuckVolume = 1f;
+        }
+        service.playback.setVolume(currentDuckVolume);
+        break;
+
+      case TRACK_WENT_TO_NEXT:
+        if (service.pendingQuit
+                || service.getRepeatMode() == REPEAT_MODE_NONE && service.isLastTrack()) {
+          service.pause();
+          service.seek(0);
+          if (service.pendingQuit) {
+            service.pendingQuit = false;
+            service.quit();
+            break;
+          }
+        } else {
+          service.position = service.nextPosition;
+          service.prepareNextImpl();
+          service.notifyChange(META_CHANGED);
+        }
+        break;
+
+      case TRACK_ENDED:
+        // if there is a timer finished, don't continue
+        if (service.pendingQuit
+                || service.getRepeatMode() == REPEAT_MODE_NONE && service.isLastTrack()) {
+          service.notifyChange(PLAY_STATE_CHANGED);
+          service.seek(0);
+          if (service.pendingQuit) {
+            service.pendingQuit = false;
+            service.quit();
+            break;
+          }
+        } else {
+          service.playNextSong(false);
+        }
+        sendEmptyMessage(MusicService.RELEASE_WAKELOCK);
+        break;
+
+      case MusicService.RELEASE_WAKELOCK:
+        service.releaseWakeLock();
+        break;
+
+      case MusicService.PLAY_SONG:
+        service.playSongAtImpl(msg.arg1);
+        break;
+
+      case MusicService.SET_POSITION:
+        service.openTrackAndPrepareNextAt(msg.arg1);
+        service.notifyChange(PLAY_STATE_CHANGED);
+        break;
+
+      case MusicService.PREPARE_NEXT:
+        service.prepareNextImpl();
+        break;
+
+      case MusicService.RESTORE_QUEUES:
+        service.restoreQueuesAndPositionIfNecessary();
+        break;
+
+      case MusicService.FOCUS_CHANGE:
+        switch (msg.arg1) {
+          case AudioManager.AUDIOFOCUS_GAIN:
+            if (!service.isPlaying() && service.isPausedByTransientLossOfFocus()) {
+              service.play();
+              service.setPausedByTransientLossOfFocus(false);
+            }
+            removeMessages(DUCK);
+            sendEmptyMessage(MusicService.UNDUCK);
+            break;
+
+          case AudioManager.AUDIOFOCUS_LOSS:
+            // Lost focus for an unbounded amount of time: stop playback and release media playback
+            boolean isAudioFocusEnabled = PreferenceUtil.INSTANCE.isAudioFocusEnabled();
+            if (!isAudioFocusEnabled) {
+              service.forcePause();
+            }
+            break;
+
+          case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
+            // Lost focus for a short time, but we have to stop
+            // playback. We don't release the media playback because playback
+            // is likely to resume
+            boolean wasPlaying = service.isPlaying();
+            service.forcePause();
+            service.setPausedByTransientLossOfFocus(wasPlaying);
+            break;
+
+          case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
+            // Lost focus for a short time, but it's ok to keep playing
+            // at an attenuated level
+            removeMessages(MusicService.UNDUCK);
+            sendEmptyMessage(DUCK);
+            break;
+        }
+        break;
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/muntashirakon/music/service/QueueSaveHandler.kt b/app/src/main/java/io/github/muntashirakon/music/service/QueueSaveHandler.kt
new file mode 100644
index 000000000..d31432282
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/service/QueueSaveHandler.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package io.github.muntashirakon.music.service
+
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import io.github.muntashirakon.music.service.MusicService.Companion.SAVE_QUEUES
+import java.lang.ref.WeakReference
+
+internal class QueueSaveHandler(
+    musicService: MusicService,
+    looper: Looper
+) : Handler(looper) {
+    private val service: WeakReference<MusicService> = WeakReference(musicService)
+
+    override fun handleMessage(msg: Message) {
+        val service: MusicService? = service.get()
+        if (msg.what == SAVE_QUEUES) {
+            service?.saveQueuesImpl()
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/SongPlayCountHelper.kt b/app/src/main/java/io/github/muntashirakon/music/service/SongPlayCountHelper.kt
similarity index 89%
rename from app/src/main/java/code/name/monkey/retromusic/service/SongPlayCountHelper.kt
rename to app/src/main/java/io/github/muntashirakon/music/service/SongPlayCountHelper.kt
index 612b166aa..fb6091404 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/SongPlayCountHelper.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/service/SongPlayCountHelper.kt
@@ -12,10 +12,10 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.service
+package io.github.muntashirakon.music.service
 
-import code.name.monkey.retromusic.helper.StopWatch
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.helper.StopWatch
+import io.github.muntashirakon.music.model.Song
 
 class SongPlayCountHelper {
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/ThrottledSeekHandler.kt b/app/src/main/java/io/github/muntashirakon/music/service/ThrottledSeekHandler.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/service/ThrottledSeekHandler.kt
rename to app/src/main/java/io/github/muntashirakon/music/service/ThrottledSeekHandler.kt
index 9fcda73cb..4baef32c1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/ThrottledSeekHandler.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/service/ThrottledSeekHandler.kt
@@ -12,11 +12,11 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.service
+package io.github.muntashirakon.music.service
 
 
 import android.os.Handler
-import code.name.monkey.retromusic.service.MusicService.Companion.PLAY_STATE_CHANGED
+import io.github.muntashirakon.music.service.MusicService.Companion.PLAY_STATE_CHANGED
 
 class ThrottledSeekHandler(
     private val musicService: MusicService,
@@ -25,6 +25,7 @@ class ThrottledSeekHandler(
 
     fun notifySeek() {
         musicService.updateMediaSessionPlaybackState()
+        musicService.updateMediaSessionMetaData()
         handler.removeCallbacks(this)
         handler.postDelayed(this, THROTTLE)
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotification.kt b/app/src/main/java/io/github/muntashirakon/music/service/notification/PlayingNotification.kt
similarity index 91%
rename from app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotification.kt
rename to app/src/main/java/io/github/muntashirakon/music/service/notification/PlayingNotification.kt
index 110677115..8e7cc0c85 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotification.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/service/notification/PlayingNotification.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.service.notification
+package io.github.muntashirakon.music.service.notification
 
 
 import android.app.NotificationChannel
@@ -20,8 +20,8 @@ import android.app.NotificationManager
 import android.content.Context
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.model.Song
 
 
 abstract class PlayingNotification(context: Context) :
@@ -31,7 +31,7 @@ abstract class PlayingNotification(context: Context) :
 
     abstract fun setPlaying(isPlaying: Boolean)
 
-    abstract fun updateFavorite(isFavorite: Boolean)
+    abstract fun updateFavorite(song: Song, onUpdate: () -> Unit)
 
     companion object {
         const val NOTIFICATION_CONTROLS_SIZE_MULTIPLIER = 1.0f
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt b/app/src/main/java/io/github/muntashirakon/music/service/notification/PlayingNotificationClassic.kt
similarity index 83%
rename from app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt
rename to app/src/main/java/io/github/muntashirakon/music/service/notification/PlayingNotificationClassic.kt
index 9da412d9b..512ee6f6c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/service/notification/PlayingNotificationClassic.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.service.notification
+package io.github.muntashirakon.music.service.notification
 
 import android.annotation.SuppressLint
 import android.app.NotificationManager
@@ -26,29 +26,28 @@ import android.graphics.drawable.Drawable
 import android.widget.RemoteViews
 import androidx.core.app.NotificationCompat
 import androidx.core.graphics.drawable.toBitmap
+import androidx.media.app.NotificationCompat.DecoratedMediaCustomViewStyle
 import code.name.monkey.appthemehelper.util.ATHUtil.resolveColor
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.extensions.isColorLight
-import code.name.monkey.retromusic.extensions.isSystemDarkModeEnabled
-import code.name.monkey.retromusic.extensions.toBitmap
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_QUIT
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.extensions.getTintedDrawable
+import io.github.muntashirakon.music.extensions.isColorLight
+import io.github.muntashirakon.music.extensions.isSystemDarkModeEnabled
+import io.github.muntashirakon.music.extensions.toBitmap
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_QUIT
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.transition.Transition
 
@@ -77,7 +76,6 @@ class PlayingNotificationClassic(
     }
 
     override fun updateMetadata(song: Song, onUpdate: () -> Unit) {
-        if (song == Song.emptySong) return
         val notificationLayout = getCombinedRemoteViews(true, song)
         val notificationLayoutBig = getCombinedRemoteViews(false, song)
 
@@ -104,12 +102,11 @@ class PlayingNotificationClassic(
         setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
         setCustomContentView(notificationLayout)
         setCustomBigContentView(notificationLayoutBig)
+        setStyle(DecoratedMediaCustomViewStyle())
         setOngoing(true)
         val bigNotificationImageSize = context.resources
             .getDimensionPixelSize(R.dimen.notification_big_image_size)
-        Glide.with(context)
-            .asBitmapPalette()
-            .songCoverOptions(song)
+        GlideApp.with(context).asBitmapPalette().songCoverOptions(song)
             .load(RetroGlideExtension.getSongModel(song))
             .centerCrop()
             .into(object : CustomTarget<BitmapPaletteWrapper>(
@@ -128,22 +125,14 @@ class PlayingNotificationClassic(
                     super.onLoadFailed(errorDrawable)
                     update(
                         null,
-                        resolveColor(
-                            context,
-                            com.google.android.material.R.attr.colorSurface,
-                            Color.WHITE
-                        )
+                        resolveColor(context, R.attr.colorSurface, Color.WHITE)
                     )
                 }
 
                 override fun onLoadCleared(placeholder: Drawable?) {
                     update(
                         null,
-                        resolveColor(
-                            context,
-                            com.google.android.material.R.attr.colorSurface,
-                            Color.WHITE
-                        )
+                        resolveColor(context, R.attr.colorSurface, Color.WHITE)
                     )
                 }
 
@@ -169,11 +158,7 @@ class PlayingNotificationClassic(
                     if (!VersionUtils.hasS()) {
                         if (!PreferenceUtil.isColoredNotification) {
                             bgColorFinal =
-                                resolveColor(
-                                    context,
-                                    com.google.android.material.R.attr.colorSurface,
-                                    Color.WHITE
-                                )
+                                resolveColor(context, R.attr.colorSurface, Color.WHITE)
                         }
                         setBackgroundColor(bgColorFinal)
                         setNotificationContent(ColorUtil.isColorLight(bgColorFinal))
@@ -205,12 +190,12 @@ class PlayingNotificationClassic(
                     ).toBitmap()
                     val prev =
                         context.getTintedDrawable(
-                            R.drawable.ic_skip_previous,
+                            R.drawable.ic_skip_previous_round_white_32dp,
                             primary
                         ).toBitmap()
                     val next =
                         context.getTintedDrawable(
-                            R.drawable.ic_skip_next,
+                            R.drawable.ic_skip_next_round_white_32dp,
                             primary
                         ).toBitmap()
                     val playPause = getPlayPauseBitmap(true)
@@ -266,7 +251,8 @@ class PlayingNotificationClassic(
         }
     }
 
-    override fun updateFavorite(isFavorite: Boolean) {}
+    override fun updateFavorite(song: Song, onUpdate: () -> Unit) {
+    }
 
     private fun buildPendingIntent(
         context: Context, action: String,
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt b/app/src/main/java/io/github/muntashirakon/music/service/notification/PlayingNotificationImpl24.kt
similarity index 78%
rename from app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt
rename to app/src/main/java/io/github/muntashirakon/music/service/notification/PlayingNotificationImpl24.kt
index 55dbb9ade..a855c3054 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/service/notification/PlayingNotificationImpl24.kt
@@ -12,40 +12,46 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.service.notification
+package io.github.muntashirakon.music.service.notification
 
 import android.annotation.SuppressLint
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.ComponentName
+import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.drawable.Drawable
 import android.support.v4.media.session.MediaSessionCompat
 import androidx.core.app.NotificationCompat
+import androidx.core.text.parseAsHtml
 import androidx.media.app.NotificationCompat.MediaStyle
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_QUIT
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.service.MusicService.Companion.TOGGLE_FAVORITE
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.MainActivity
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.glide.RetroGlideExtension
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.service.MusicService
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_QUIT
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
+import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import io.github.muntashirakon.music.service.MusicService.Companion.TOGGLE_FAVORITE
+import io.github.muntashirakon.music.util.MusicUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.transition.Transition
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @SuppressLint("RestrictedApi")
 class PlayingNotificationImpl24(
-    val context: MusicService,
-    mediaSessionToken: MediaSessionCompat.Token,
+    val context: Context,
+    mediaSessionToken: MediaSessionCompat.Token
 ) : PlayingNotification(context) {
 
     init {
@@ -76,12 +82,12 @@ class PlayingNotificationImpl24(
         val toggleFavorite = buildFavoriteAction(false)
         val playPauseAction = buildPlayAction(true)
         val previousAction = NotificationCompat.Action(
-            R.drawable.ic_skip_previous,
+            R.drawable.ic_skip_previous_round_white_32dp,
             context.getString(R.string.action_previous),
             retrievePlaybackAction(ACTION_REWIND)
         )
         val nextAction = NotificationCompat.Action(
-            R.drawable.ic_skip_next,
+            R.drawable.ic_skip_next_round_white_32dp,
             context.getString(R.string.action_next),
             retrievePlaybackAction(ACTION_SKIP)
         )
@@ -111,13 +117,12 @@ class PlayingNotificationImpl24(
     }
 
     override fun updateMetadata(song: Song, onUpdate: () -> Unit) {
-        if (song == Song.emptySong) return
-        setContentTitle(song.title)
+        setContentTitle(("<b>" + song.title + "</b>").parseAsHtml())
         setContentText(song.artistName)
-        setSubText(song.albumName)
+        setSubText(("<b>" + song.albumName + "</b>").parseAsHtml())
         val bigNotificationImageSize = context.resources
             .getDimensionPixelSize(R.dimen.notification_big_image_size)
-        Glide.with(context)
+        GlideApp.with(context)
             .asBitmap()
             .songCoverOptions(song)
             .load(RetroGlideExtension.getSongModel(song))
@@ -179,8 +184,14 @@ class PlayingNotificationImpl24(
         mActions[2] = buildPlayAction(isPlaying)
     }
 
-    override fun updateFavorite(isFavorite: Boolean) {
-        mActions[0] = buildFavoriteAction(isFavorite)
+    override fun updateFavorite(song: Song, onUpdate: () -> Unit) {
+        GlobalScope.launch(Dispatchers.IO) {
+            val isFavorite = MusicUtil.repository.isSongFavorite(song.id)
+            withContext(Dispatchers.Main) {
+                mActions[0] = buildFavoriteAction(isFavorite)
+                onUpdate()
+            }
+        }
     }
 
     private fun retrievePlaybackAction(action: String): PendingIntent {
@@ -197,9 +208,9 @@ class PlayingNotificationImpl24(
     companion object {
 
         fun from(
-            context: MusicService,
+            context: Context,
             notificationManager: NotificationManager,
-            mediaSession: MediaSessionCompat,
+            mediaSession: MediaSessionCompat
         ): PlayingNotification {
             if (VersionUtils.hasOreo()) {
                 createNotificationChannel(context, notificationManager)
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.kt b/app/src/main/java/io/github/muntashirakon/music/service/playback/Playback.kt
similarity index 79%
rename from app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.kt
rename to app/src/main/java/io/github/muntashirakon/music/service/playback/Playback.kt
index fdcae6b55..9ffbc3f02 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/service/playback/Playback.kt
@@ -12,9 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.service.playback
-
-import code.name.monkey.retromusic.model.Song
+package io.github.muntashirakon.music.service.playback
 
 
 interface Playback {
@@ -25,13 +23,11 @@ interface Playback {
 
     val audioSessionId: Int
 
-    fun setDataSource(
-        song: Song, force: Boolean, completion: (success: Boolean) -> Unit,
-    )
+    fun setDataSource(path: String, force: Boolean): Boolean
 
     fun setNextDataSource(path: String?)
 
-    var callbacks: PlaybackCallbacks?
+    fun setCallbacks(callbacks: PlaybackCallbacks)
 
     fun start(): Boolean
 
@@ -45,7 +41,7 @@ interface Playback {
 
     fun position(): Int
 
-    fun seek(whereto: Int, force: Boolean): Int
+    fun seek(whereto: Int): Int
 
     fun setVolume(vol: Float): Boolean
 
@@ -61,7 +57,5 @@ interface Playback {
         fun onTrackEnded()
 
         fun onTrackEndedWithCrossfade()
-
-        fun onPlayStateChanged()
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/CarousalPagerTransformer.kt b/app/src/main/java/io/github/muntashirakon/music/transform/CarousalPagerTransformer.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/transform/CarousalPagerTransformer.kt
rename to app/src/main/java/io/github/muntashirakon/music/transform/CarousalPagerTransformer.kt
index 6ce985bb5..8cc0b0db4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/CarousalPagerTransformer.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/transform/CarousalPagerTransformer.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.transform
+package io.github.muntashirakon.music.transform
 
 import android.content.Context
 import android.view.View
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/CascadingPageTransformer.kt b/app/src/main/java/io/github/muntashirakon/music/transform/CascadingPageTransformer.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/transform/CascadingPageTransformer.kt
rename to app/src/main/java/io/github/muntashirakon/music/transform/CascadingPageTransformer.kt
index 2f256e9d0..fd1d5f43e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/CascadingPageTransformer.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/transform/CascadingPageTransformer.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.transform
+package io.github.muntashirakon.music.transform
 
 import android.view.View
 import androidx.viewpager.widget.ViewPager
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/DefaultTransformer.kt b/app/src/main/java/io/github/muntashirakon/music/transform/DefaultTransformer.kt
similarity index 79%
rename from app/src/main/java/code/name/monkey/retromusic/transform/DefaultTransformer.kt
rename to app/src/main/java/io/github/muntashirakon/music/transform/DefaultTransformer.kt
index c16c2649c..c1362f4f0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/DefaultTransformer.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/transform/DefaultTransformer.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.transform
+package io.github.muntashirakon.music.transform
 
 import android.view.View
 import androidx.viewpager.widget.ViewPager
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/DepthTransformation.kt b/app/src/main/java/io/github/muntashirakon/music/transform/DepthTransformation.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/transform/DepthTransformation.kt
rename to app/src/main/java/io/github/muntashirakon/music/transform/DepthTransformation.kt
index 7abd4f15d..35af57ca1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/DepthTransformation.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/transform/DepthTransformation.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.transform
+package io.github.muntashirakon.music.transform
 
 import android.view.View
 import androidx.viewpager.widget.ViewPager
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/HingeTransformation.kt b/app/src/main/java/io/github/muntashirakon/music/transform/HingeTransformation.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/transform/HingeTransformation.kt
rename to app/src/main/java/io/github/muntashirakon/music/transform/HingeTransformation.kt
index f4a13ae5c..beffad0cf 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/HingeTransformation.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/transform/HingeTransformation.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.transform
+package io.github.muntashirakon.music.transform
 
 import android.view.View
 import androidx.core.view.isVisible
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/HorizontalFlipTransformation.kt b/app/src/main/java/io/github/muntashirakon/music/transform/HorizontalFlipTransformation.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/transform/HorizontalFlipTransformation.kt
rename to app/src/main/java/io/github/muntashirakon/music/transform/HorizontalFlipTransformation.kt
index 1b0084162..79fbca4fb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/HorizontalFlipTransformation.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/transform/HorizontalFlipTransformation.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.transform
+package io.github.muntashirakon.music.transform
 
 import android.view.View
 import androidx.core.view.isInvisible
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/NormalPageTransformer.kt b/app/src/main/java/io/github/muntashirakon/music/transform/NormalPageTransformer.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/transform/NormalPageTransformer.kt
rename to app/src/main/java/io/github/muntashirakon/music/transform/NormalPageTransformer.kt
index d0049e5a6..4f7f3f45d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/NormalPageTransformer.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/transform/NormalPageTransformer.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.transform
+package io.github.muntashirakon.music.transform
 
 import android.view.View
 import androidx.viewpager.widget.ViewPager
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/ParallaxPagerTransformer.kt b/app/src/main/java/io/github/muntashirakon/music/transform/ParallaxPagerTransformer.kt
similarity index 75%
rename from app/src/main/java/code/name/monkey/retromusic/transform/ParallaxPagerTransformer.kt
rename to app/src/main/java/io/github/muntashirakon/music/transform/ParallaxPagerTransformer.kt
index 0a7d40faf..86914ab1d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/ParallaxPagerTransformer.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/transform/ParallaxPagerTransformer.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.transform
+package io.github.muntashirakon.music.transform
 
 import android.view.View
 import androidx.viewpager.widget.ViewPager
@@ -22,6 +22,7 @@ import androidx.viewpager.widget.ViewPager
  */
 
 class ParallaxPagerTransformer(private val id: Int) : ViewPager.PageTransformer {
+    private var border = 0
     private var speed = 0.2f
 
     override fun transformPage(page: View, position: Float) {
@@ -31,13 +32,23 @@ class ParallaxPagerTransformer(private val id: Int) : ViewPager.PageTransformer
                 if (position > -1 && position < 1) {
                     val width = parallaxView.width.toFloat()
                     parallaxView.translationX = -(position * width * speed)
-                    scaleX = 1f
-                    scaleY = 1f
+                    val sc = (width - border) / width
+                    if (position == 0f) {
+                        scaleX = 1f
+                        scaleY = 1f
+                    } else {
+                        scaleX = sc
+                        scaleY = sc
+                    }
                 }
             }
         }
     }
 
+    fun setBorder(px: Int) {
+        border = px
+    }
+
     fun setSpeed(speed: Float) {
         this.speed = speed
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/VerticalFlipTransformation.kt b/app/src/main/java/io/github/muntashirakon/music/transform/VerticalFlipTransformation.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/transform/VerticalFlipTransformation.kt
rename to app/src/main/java/io/github/muntashirakon/music/transform/VerticalFlipTransformation.kt
index d73674820..455e28fa5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/VerticalFlipTransformation.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/transform/VerticalFlipTransformation.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.transform
+package io.github.muntashirakon.music.transform
 
 import android.view.View
 import androidx.core.view.isInvisible
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/VerticalStackTransformer.kt b/app/src/main/java/io/github/muntashirakon/music/transform/VerticalStackTransformer.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/transform/VerticalStackTransformer.kt
rename to app/src/main/java/io/github/muntashirakon/music/transform/VerticalStackTransformer.kt
index bb1b95973..ec9ae9b68 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/VerticalStackTransformer.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/transform/VerticalStackTransformer.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.transform
+package io.github.muntashirakon.music.transform
 
 import android.view.View
 import androidx.viewpager.widget.ViewPager
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ArtistSignatureUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/ArtistSignatureUtil.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/util/ArtistSignatureUtil.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/ArtistSignatureUtil.kt
index 94a5b0b58..60da83e10 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/ArtistSignatureUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/ArtistSignatureUtil.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.content.Context
 import android.content.SharedPreferences
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/AutoGeneratedPlaylistBitmap.kt b/app/src/main/java/io/github/muntashirakon/music/util/AutoGeneratedPlaylistBitmap.kt
similarity index 79%
rename from app/src/main/java/code/name/monkey/retromusic/util/AutoGeneratedPlaylistBitmap.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/AutoGeneratedPlaylistBitmap.kt
index 8c5fa078c..831755452 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/AutoGeneratedPlaylistBitmap.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/AutoGeneratedPlaylistBitmap.kt
@@ -1,13 +1,13 @@
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MergedImageUtils.joinImages
-import code.name.monkey.retromusic.util.MusicUtil.getMediaStoreAlbumCoverUri
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MergedImageUtils.joinImages
+import io.github.muntashirakon.music.util.MusicUtil.getMediaStoreAlbumCoverUri
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 
 object AutoGeneratedPlaylistBitmap {
@@ -31,7 +31,7 @@ object AutoGeneratedPlaylistBitmap {
 
     private fun getBitmapWithAlbumId(context: Context, id: Long): Bitmap? {
         return try {
-            Glide.with(context)
+            GlideApp.with(context)
                 .asBitmap()
                 .transform(RoundedCorners(20))
                 .load(getMediaStoreAlbumCoverUri(id))
diff --git a/app/src/main/java/io/github/muntashirakon/music/util/BackupUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/BackupUtil.kt
new file mode 100644
index 000000000..25136b953
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/util/BackupUtil.kt
@@ -0,0 +1,28 @@
+package io.github.muntashirakon.music.util
+
+import android.content.Context
+import android.content.Intent
+import androidx.core.content.FileProvider
+import io.github.muntashirakon.music.extensions.showToast
+import java.io.File
+
+object BackupUtil {
+    fun createShareFileIntent(file: File, context: Context): Intent? {
+        return try {
+            Intent().setAction(Intent.ACTION_SEND).putExtra(
+                Intent.EXTRA_STREAM,
+                FileProvider.getUriForFile(
+                    context,
+                    context.applicationContext.packageName,
+                    file
+                )
+            ).addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION).setType("*/*")
+        } catch (e: IllegalArgumentException) {
+            e.printStackTrace()
+            context.showToast(
+                "Could not share this file."
+            )
+            Intent()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/CalendarUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/CalendarUtil.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/util/CalendarUtil.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/CalendarUtil.kt
index 777b63842..881bf542f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/CalendarUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/CalendarUtil.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import java.util.*
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ColorUtil.java b/app/src/main/java/io/github/muntashirakon/music/util/ColorUtil.java
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/util/ColorUtil.java
rename to app/src/main/java/io/github/muntashirakon/music/util/ColorUtil.java
index e8f91f5dc..91565b362 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/ColorUtil.java
+++ b/app/src/main/java/io/github/muntashirakon/music/util/ColorUtil.java
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.util;
+package io.github.muntashirakon.music.util;
 
 import android.graphics.Bitmap;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/CustomArtistImageUtil.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/CustomArtistImageUtil.kt
index 3c0cb02d7..57577eda0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/CustomArtistImageUtil.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -21,11 +21,11 @@ import android.net.Uri
 import android.provider.MediaStore
 import android.widget.Toast
 import androidx.core.content.edit
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.model.Artist
-import com.bumptech.glide.Glide
+import io.github.muntashirakon.music.App
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.glide.GlideApp
+import io.github.muntashirakon.music.model.Artist
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.withContext
@@ -45,7 +45,7 @@ class CustomArtistImageUtil private constructor(context: Context) {
         val context = App.getContext()
         withContext(IO) {
             runCatching {
-                Glide.with(context)
+                GlideApp.with(context)
                     .asBitmap()
                     .load(uri)
                     .diskCacheStrategy(DiskCacheStrategy.NONE)
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/DensityUtil.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/DensityUtil.kt
index 51a7cc420..72d721bdd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/DensityUtil.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.content.Context
 import android.util.TypedValue
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/FilePathUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/FilePathUtil.kt
similarity index 91%
rename from app/src/main/java/code/name/monkey/retromusic/util/FilePathUtil.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/FilePathUtil.kt
index b0abc8af5..a520b772b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/FilePathUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/FilePathUtil.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.os.Environment
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java b/app/src/main/java/io/github/muntashirakon/music/util/FileUtil.java
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java
rename to app/src/main/java/io/github/muntashirakon/music/util/FileUtil.java
index 6fa658bb4..a0b3d7390 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java
+++ b/app/src/main/java/io/github/muntashirakon/music/util/FileUtil.java
@@ -12,9 +12,9 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.util;
+package io.github.muntashirakon.music.util;
 
-import static code.name.monkey.retromusic.util.FileUtilsKt.getExternalStorageDirectory;
+import static io.github.muntashirakon.music.util.FileUtilsKt.getExternalStorageDirectory;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -39,14 +39,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 import java.util.StringTokenizer;
 
-import code.name.monkey.retromusic.Constants;
-import code.name.monkey.retromusic.adapter.Storage;
-import code.name.monkey.retromusic.model.Song;
-import code.name.monkey.retromusic.repository.RealSongRepository;
-import code.name.monkey.retromusic.repository.SortedCursor;
+import io.github.muntashirakon.music.Constants;
+import io.github.muntashirakon.music.adapter.Storage;
+import io.github.muntashirakon.music.model.Song;
+import io.github.muntashirakon.music.repository.RealSongRepository;
+import io.github.muntashirakon.music.repository.SortedCursor;
 
 public final class FileUtil {
 
@@ -179,7 +178,7 @@ public final class FileUtil {
       if (dotPos == -1) {
         return false;
       }
-      String fileExtension = filename.substring(dotPos + 1).toLowerCase(Locale.ROOT);
+      String fileExtension = filename.substring(dotPos + 1).toLowerCase();
       String fileType = mimeTypeMap.getMimeTypeFromExtension(fileExtension);
       if (fileType == null) {
         return false;
@@ -305,7 +304,7 @@ public final class FileUtil {
               paths.add(path);
               try {
                 Storage item = new Storage();
-                if (path.toLowerCase(Locale.ROOT).contains("sd")) {
+                if (path.toLowerCase().contains("sd")) {
                   item.title = "SD Card";
                 } else {
                   item.title = "External Storage";
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/FileUtils.kt b/app/src/main/java/io/github/muntashirakon/music/util/FileUtils.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/util/FileUtils.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/FileUtils.kt
index 8a06bf62b..f1d77bad9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/FileUtils.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/FileUtils.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.content.Context
 import android.net.Uri
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ImageUtil.java b/app/src/main/java/io/github/muntashirakon/music/util/ImageUtil.java
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/util/ImageUtil.java
rename to app/src/main/java/io/github/muntashirakon/music/util/ImageUtil.java
index b87eceab9..3090501e4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/ImageUtil.java
+++ b/app/src/main/java/io/github/muntashirakon/music/util/ImageUtil.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.util;
+package io.github.muntashirakon.music.util;
 
 import android.graphics.Bitmap;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/LyricUtil.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/LyricUtil.kt
index 2f7aff94c..81519d176 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/LyricUtil.kt
@@ -11,11 +11,11 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.util.Log
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.model.lyrics.AbsSynchronizedLyrics
 import org.jaudiotagger.audio.AudioFileIO
 import org.jaudiotagger.tag.FieldKey
 import java.io.*
@@ -117,7 +117,7 @@ object LyricUtil {
         return "$lrcRootPath$title - $artist.lrc"
     }
 
-    private fun getLrcOriginalPath(filePath: String): String {
+     fun getLrcOriginalPath(filePath: String): String {
         return filePath.replace(filePath.substring(filePath.lastIndexOf(".") + 1), "lrc")
     }
 
@@ -160,9 +160,9 @@ object LyricUtil {
     }
 
     fun getEmbeddedSyncedLyrics(data: String): String? {
-        val embeddedLyrics = try {
-            AudioFileIO.read(File(data)).tagOrCreateDefault.getFirst(FieldKey.LYRICS)
-        } catch (e: Exception) {
+        val embeddedLyrics = try{
+           AudioFileIO.read(File(data)).tagOrCreateDefault.getFirst(FieldKey.LYRICS)
+        } catch(e: Exception){
             return null
         }
         return if (AbsSynchronizedLyrics.isSynchronized(embeddedLyrics)) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/MergedImageUtils.kt b/app/src/main/java/io/github/muntashirakon/music/util/MergedImageUtils.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/util/MergedImageUtils.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/MergedImageUtils.kt
index 8026c98f7..b4a88221c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/MergedImageUtils.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/MergedImageUtils.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.graphics.Bitmap
 import android.graphics.Canvas
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/MusicUtil.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/MusicUtil.kt
index ae3af5939..c9be4f277 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/MusicUtil.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.content.ContentUris
 import android.content.Context
@@ -13,21 +13,23 @@ import androidx.core.content.contentValuesOf
 import androidx.core.net.toUri
 import androidx.fragment.app.FragmentActivity
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.Constants
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.SongEntity
-import code.name.monkey.retromusic.db.toSongEntity
-import code.name.monkey.retromusic.extensions.getLong
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.helper.MusicPlayerRemote.removeFromQueue
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics
-import code.name.monkey.retromusic.repository.Repository
-import code.name.monkey.retromusic.repository.SongRepository
+import io.github.muntashirakon.music.Constants
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.PlaylistEntity
+import io.github.muntashirakon.music.db.SongEntity
+import io.github.muntashirakon.music.db.toSongEntity
+import io.github.muntashirakon.music.extensions.getLong
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.helper.MusicPlayerRemote.removeFromQueue
+import io.github.muntashirakon.music.model.Artist
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.model.lyrics.AbsSynchronizedLyrics
+import io.github.muntashirakon.music.repository.Repository
+import io.github.muntashirakon.music.repository.SongRepository
+import io.github.muntashirakon.music.service.MusicService
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.jaudiotagger.audio.AudioFileIO
 import org.jaudiotagger.tag.FieldKey
@@ -41,46 +43,21 @@ import java.util.regex.Pattern
 
 
 object MusicUtil : KoinComponent {
-    fun createShareSongFileIntent(context: Context, song: Song): Intent {
-        return Intent().apply {
-            action = Intent.ACTION_SEND
-            putExtra(
-                Intent.EXTRA_STREAM, try {
-                    FileProvider.getUriForFile(
-                        context,
-                        context.applicationContext.packageName,
-                        File(song.data)
-                    )
-                } catch (e: IllegalArgumentException) {
-                    getSongFileUri(song.id)
-                }
-            )
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            type = "audio/*"
-        }
-    }
-
-    fun createShareMultipleSongIntent(context: Context, songs: List<Song>): Intent {
-        return Intent().apply {
-            action = Intent.ACTION_SEND_MULTIPLE
-            type = "audio/*"
-
-            val files = ArrayList<Uri>()
-
-            for (song in songs) {
-                files.add(
-                    try {
-                        FileProvider.getUriForFile(
-                            context,
-                            context.applicationContext.packageName,
-                            File(song.data)
-                        )
-                    } catch (e: IllegalArgumentException) {
-                        getSongFileUri(song.id)
-                    }
+    fun createShareSongFileIntent(song: Song, context: Context): Intent? {
+        return try {
+            Intent().setAction(Intent.ACTION_SEND).putExtra(
+                Intent.EXTRA_STREAM,
+                FileProvider.getUriForFile(
+                    context,
+                    context.applicationContext.packageName,
+                    File(song.data)
                 )
-            }
-            putParcelableArrayListExtra(Intent.EXTRA_STREAM, files)
+            ).addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION).setType("audio/*")
+        } catch (e: IllegalArgumentException) {
+            Intent().setAction(Intent.ACTION_SEND).putExtra(
+                Intent.EXTRA_STREAM,
+                getSongFileUri(song.id)
+            ).addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION).setType("audio/*")
         }
     }
 
@@ -123,7 +100,7 @@ object MusicUtil : KoinComponent {
 
     fun getArtistInfoString(
         context: Context,
-        artist: Artist,
+        artist: Artist
     ): String {
         val albumCount = artist.albumCount
         val songCount = artist.songCount
@@ -213,7 +190,7 @@ object MusicUtil : KoinComponent {
 
     fun getPlaylistInfoString(
         context: Context,
-        songs: List<Song>,
+        songs: List<Song>
     ): String {
         val duration = getTotalDuration(songs)
         return buildInfoString(
@@ -224,7 +201,7 @@ object MusicUtil : KoinComponent {
 
     fun playlistInfoString(
         context: Context,
-        songs: List<SongEntity>,
+        songs: List<SongEntity>
     ): String {
         return getSongCountString(context, songs.size)
     }
@@ -252,21 +229,18 @@ object MusicUtil : KoinComponent {
         }
     }
 
-    fun getSectionName(mediaTitle: String?, stripPrefix: Boolean = false): String {
+    fun getSectionName(mediaTitle: String?): String {
         var musicMediaTitle = mediaTitle
         return try {
             if (musicMediaTitle.isNullOrEmpty()) {
                 return "-"
             }
             musicMediaTitle = musicMediaTitle.trim { it <= ' ' }.lowercase()
-            if (stripPrefix) {
-                if (musicMediaTitle.startsWith("the ")) {
-                    musicMediaTitle = musicMediaTitle.substring(4)
-                } else if (musicMediaTitle.startsWith("a ")) {
-                    musicMediaTitle = musicMediaTitle.substring(2)
-                }
+            if (musicMediaTitle.startsWith("the ")) {
+                musicMediaTitle = musicMediaTitle.substring(4)
+            } else if (musicMediaTitle.startsWith("a ")) {
+                musicMediaTitle = musicMediaTitle.substring(2)
             }
-
             if (musicMediaTitle.isEmpty()) {
                 ""
             } else musicMediaTitle.substring(0, 1).uppercase()
@@ -325,7 +299,7 @@ object MusicUtil : KoinComponent {
     fun insertAlbumArt(
         context: Context,
         albumId: Long,
-        path: String?,
+        path: String?
     ) {
         val contentResolver = context.contentResolver
         val artworkUri = "content://media/external/audio/albumart".toUri()
@@ -359,9 +333,9 @@ object MusicUtil : KoinComponent {
         return false
     }
 
-    private val repository = get<Repository>()
-    suspend fun toggleFavorite(song: Song) {
-        withContext(IO) {
+    val repository = get<Repository>()
+    fun toggleFavorite(context: Context, song: Song) {
+        GlobalScope.launch {
             val playlist: PlaylistEntity = repository.favoritePlaylist()
             val songEntity = song.toSongEntity(playlist.playListId)
             val isFavorite = repository.isFavoriteSong(songEntity).isNotEmpty()
@@ -370,16 +344,15 @@ object MusicUtil : KoinComponent {
             } else {
                 repository.insertSongs(listOf(song.toSongEntity(playlist.playListId)))
             }
+            context.sendBroadcast(Intent(MusicService.FAVORITE_STATE_CHANGED))
         }
     }
 
-    suspend fun isFavorite(song: Song) = repository.isSongFavorite(song.id)
-
     fun deleteTracks(
         activity: FragmentActivity,
         songs: List<Song>,
         safUris: List<Uri>?,
-        callback: Runnable?,
+        callback: Runnable?
     ) {
         val songRepository: SongRepository = get()
         val projection = arrayOf(
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/NavigationUtil.kt
similarity index 86%
rename from app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/NavigationUtil.kt
index 8c0aa60aa..86b35c146 100755
--- a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/NavigationUtil.kt
@@ -11,19 +11,20 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.app.Activity
 import android.content.ActivityNotFoundException
+import android.content.Context
 import android.content.Intent
 import android.media.audiofx.AudioEffect
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.*
-import code.name.monkey.retromusic.activities.bugreport.BugReportActivity
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.helper.MusicPlayerRemote.audioSessionId
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.activities.*
+import io.github.muntashirakon.music.activities.bugreport.BugReportActivity
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.helper.MusicPlayerRemote.audioSessionId
 
 object NavigationUtil {
     fun bugReport(activity: Activity) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PackageValidator.kt b/app/src/main/java/io/github/muntashirakon/music/util/PackageValidator.kt
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/util/PackageValidator.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/PackageValidator.kt
index 012dfc85a..961a70403 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PackageValidator.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/PackageValidator.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 
 import android.Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE
@@ -29,7 +29,7 @@ import android.util.Base64
 import android.util.Log
 import androidx.annotation.XmlRes
 import androidx.media.MediaBrowserServiceCompat
-import code.name.monkey.retromusic.BuildConfig
+import io.github.muntashirakon.music.BuildConfig
 import org.xmlpull.v1.XmlPullParserException
 import java.io.IOException
 import java.security.MessageDigest
@@ -205,7 +205,6 @@ class PackageValidator(
      * If the app is not found, or if the app does not have exactly one signature, this method
      * returns `null` as the signature.
      */
-    @Suppress("deprecation")
     private fun getSignature(packageInfo: PackageInfo): String? {
         // Security best practices dictate that an app should be signed with exactly one (1)
         // signature. Because of this, if there are multiple signatures, reject it.
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/PlaylistsUtil.kt
similarity index 84%
rename from app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/PlaylistsUtil.kt
index d8e3003ab..6939f513b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/PlaylistsUtil.kt
@@ -11,10 +11,10 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.helper.M3UWriter.writeIO
+import io.github.muntashirakon.music.db.PlaylistWithSongs
+import io.github.muntashirakon.music.helper.M3UWriter.writeIO
 import java.io.File
 import java.io.IOException
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/PreferenceUtil.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/PreferenceUtil.kt
index 13f4f3948..5db00ffcf 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/PreferenceUtil.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import androidx.core.content.edit
@@ -7,18 +7,18 @@ import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import androidx.viewpager.widget.ViewPager
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.extensions.getIntRes
-import code.name.monkey.retromusic.extensions.getStringOrDefault
-import code.name.monkey.retromusic.fragments.AlbumCoverStyle
-import code.name.monkey.retromusic.fragments.GridStyle
-import code.name.monkey.retromusic.fragments.NowPlayingScreen
-import code.name.monkey.retromusic.fragments.folder.FoldersFragment
-import code.name.monkey.retromusic.helper.SortOrder.*
-import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.transform.*
-import code.name.monkey.retromusic.util.theme.ThemeMode
-import code.name.monkey.retromusic.views.TopAppBarLayout
+import io.github.muntashirakon.music.*
+import io.github.muntashirakon.music.extensions.getIntRes
+import io.github.muntashirakon.music.extensions.getStringOrDefault
+import io.github.muntashirakon.music.fragments.AlbumCoverStyle
+import io.github.muntashirakon.music.fragments.GridStyle
+import io.github.muntashirakon.music.fragments.NowPlayingScreen
+import io.github.muntashirakon.music.fragments.folder.FoldersFragment
+import io.github.muntashirakon.music.helper.SortOrder.*
+import io.github.muntashirakon.music.model.CategoryInfo
+import io.github.muntashirakon.music.transform.*
+import io.github.muntashirakon.music.util.theme.ThemeMode
+import io.github.muntashirakon.music.views.TopAppBarLayout
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.gson.Gson
 import com.google.gson.JsonSyntaxException
@@ -94,20 +94,7 @@ object PreferenceUtil {
         }
     }
 
-    var languageCode: String
-        get() = sharedPreferences.getString(LANGUAGE_NAME, "auto") ?: "auto"
-        set(value) = sharedPreferences.edit {
-            putString(LANGUAGE_NAME, value)
-        }
-
-    var isLocaleAutoStorageEnabled: Boolean
-        get() = sharedPreferences.getBoolean(
-            LOCALE_AUTO_STORE_ENABLED,
-            false
-        )
-        set(value) = sharedPreferences.edit {
-            putBoolean(LOCALE_AUTO_STORE_ENABLED, value)
-        }
+    val languageCode: String get() = sharedPreferences.getString(LANGUAGE_NAME, "auto") ?: "auto"
 
     var Fragment.userName
         get() = sharedPreferences.getString(
@@ -245,6 +232,8 @@ object PreferenceUtil {
 
     val isScreenOnEnabled get() = sharedPreferences.getBoolean(KEEP_SCREEN_ON, false)
 
+    val isShuffleModeOn get() = sharedPreferences.getBoolean(TOGGLE_SHUFFLE, false)
+
     val isSongInfo get() = sharedPreferences.getBoolean(EXTRA_SONG_INFO, false)
 
     val isPauseOnZeroVolume get() = sharedPreferences.getBoolean(PAUSE_ON_ZERO_VOLUME, false)
@@ -266,7 +255,12 @@ object PreferenceUtil {
 
     val isAlbumArtOnLockScreen
         get() = sharedPreferences.getBoolean(
-            ALBUM_ART_ON_LOCK_SCREEN, true
+            ALBUM_ART_ON_LOCK_SCREEN, false
+        )
+
+    val isAudioDucking
+        get() = sharedPreferences.getBoolean(
+            AUDIO_DUCKING, true
         )
 
     val isBluetoothSpeaker
@@ -277,7 +271,7 @@ object PreferenceUtil {
     val isBlurredAlbumArt
         get() = sharedPreferences.getBoolean(
             BLURRED_ALBUM_ART, false
-        ) && !VersionUtils.hasR()
+        )
 
     val blurAmount get() = sharedPreferences.getInt(NEW_BLUR_AMOUNT, 25)
 
@@ -447,10 +441,10 @@ object PreferenceUtil {
     val tabTitleMode: Int
         get() {
             return when (sharedPreferences.getStringOrDefault(
-                TAB_TEXT_MODE, "0"
+                TAB_TEXT_MODE, "1"
             ).toInt()) {
-                0 -> BottomNavigationView.LABEL_VISIBILITY_AUTO
                 1 -> BottomNavigationView.LABEL_VISIBILITY_LABELED
+                0 -> BottomNavigationView.LABEL_VISIBILITY_AUTO
                 2 -> BottomNavigationView.LABEL_VISIBILITY_SELECTED
                 3 -> BottomNavigationView.LABEL_VISIBILITY_UNLABELED
                 else -> BottomNavigationView.LABEL_VISIBILITY_LABELED
@@ -672,11 +666,11 @@ object PreferenceUtil {
     val isSnowFalling
         get() = sharedPreferences.getBoolean(SNOWFALL, false)
 
-    val lyricsType: CoverLyricsType
+    val lyricsType: LyricsType
         get() = if (sharedPreferences.getString(LYRICS_TYPE, "0") == "0") {
-            CoverLyricsType.REPLACE_COVER
+            LyricsType.REPLACE_COVER
         } else {
-            CoverLyricsType.OVER_COVER
+            LyricsType.OVER_COVER
         }
 
     var playbackSpeed
@@ -715,6 +709,6 @@ object PreferenceUtil {
         get() = sharedPreferences.getBoolean(SWIPE_DOWN_DISMISS, true)
 }
 
-enum class CoverLyricsType {
+enum class LyricsType {
     REPLACE_COVER, OVER_COVER
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java b/app/src/main/java/io/github/muntashirakon/music/util/RetroColorUtil.java
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
rename to app/src/main/java/io/github/muntashirakon/music/util/RetroColorUtil.java
index 22d1127c1..2a75b173f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
+++ b/app/src/main/java/io/github/muntashirakon/music/util/RetroColorUtil.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.util;
+package io.github.muntashirakon.music.util;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -35,6 +35,7 @@ import java.util.List;
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.appthemehelper.util.VersionUtils;
+import io.github.muntashirakon.music.R;
 
 public class RetroColorUtil {
   public static int desaturateColor(int color, float ratio) {
@@ -223,7 +224,7 @@ public class RetroColorUtil {
 
   public static int getMD3AccentColor(@NotNull Context context) {
     if (VersionUtils.hasS()) {
-      return ContextCompat.getColor(context, code.name.monkey.appthemehelper.R.color.m3_accent_color);
+      return ContextCompat.getColor(context, R.color.m3_accent_color);
     } else {
       return ThemeStore.Companion.accentColor(context);
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/RetroUtil.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/RetroUtil.kt
index 60f4f5823..b666073cb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/RetroUtil.kt
@@ -11,12 +11,12 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Point
-import code.name.monkey.retromusic.App.Companion.getContext
+import io.github.muntashirakon.music.App.Companion.getContext
 import java.net.InetAddress
 import java.net.NetworkInterface
 import java.text.DecimalFormat
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt b/app/src/main/java/io/github/muntashirakon/music/util/RingtoneManager.kt
similarity index 91%
rename from app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/RingtoneManager.kt
index 98be17699..d0d6bb4f6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/RingtoneManager.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.content.Context
 import android.content.Intent
@@ -21,10 +21,10 @@ import android.provider.MediaStore
 import android.provider.Settings
 import androidx.core.net.toUri
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil.getSongFileUri
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.showToast
+import io.github.muntashirakon.music.model.Song
+import io.github.muntashirakon.music.util.MusicUtil.getSongFileUri
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 object RingtoneManager {
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java b/app/src/main/java/io/github/muntashirakon/music/util/SAFUtil.java
similarity index 88%
rename from app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java
rename to app/src/main/java/io/github/muntashirakon/music/util/SAFUtil.java
index 223f0d8da..b95bcf6c0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java
+++ b/app/src/main/java/io/github/muntashirakon/music/util/SAFUtil.java
@@ -12,13 +12,15 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.util;
+package io.github.muntashirakon.music.util;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.UriPermission;
 import android.net.Uri;
+import android.os.Build;
 import android.os.ParcelFileDescriptor;
 import android.provider.DocumentsContract;
 import android.text.TextUtils;
@@ -40,8 +42,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import code.name.monkey.retromusic.R;
-import code.name.monkey.retromusic.model.Song;
+import io.github.muntashirakon.music.R;
+import io.github.muntashirakon.music.activities.saf.SAFRequestActivity;
+import io.github.muntashirakon.music.model.Song;
 
 public class SAFUtil {
 
@@ -81,6 +84,7 @@ public class SAFUtil {
     return false;
   }
 
+  @TargetApi(Build.VERSION_CODES.KITKAT)
   public static void openFilePicker(Activity activity) {
     Intent i = new Intent(Intent.ACTION_CREATE_DOCUMENT);
     i.addCategory(Intent.CATEGORY_OPENABLE);
@@ -89,6 +93,7 @@ public class SAFUtil {
     activity.startActivityForResult(i, SAFUtil.REQUEST_SAF_PICK_FILE);
   }
 
+  @TargetApi(Build.VERSION_CODES.KITKAT)
   public static void openFilePicker(Fragment fragment) {
     Intent i = new Intent(Intent.ACTION_CREATE_DOCUMENT);
     i.addCategory(Intent.CATEGORY_OPENABLE);
@@ -97,18 +102,21 @@ public class SAFUtil {
     fragment.startActivityForResult(i, SAFUtil.REQUEST_SAF_PICK_FILE);
   }
 
+  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
   public static void openTreePicker(Activity activity) {
     Intent i = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
     i.putExtra("android.content.extra.SHOW_ADVANCED", true);
     activity.startActivityForResult(i, SAFUtil.REQUEST_SAF_PICK_TREE);
   }
 
+  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
   public static void openTreePicker(Fragment fragment) {
     Intent i = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
     i.putExtra("android.content.extra.SHOW_ADVANCED", true);
     fragment.startActivityForResult(i, SAFUtil.REQUEST_SAF_PICK_TREE);
   }
 
+  @TargetApi(Build.VERSION_CODES.KITKAT)
   public static void saveTreeUri(Context context, Intent data) {
     Uri uri = data.getData();
     if (uri != null) {
@@ -118,10 +126,12 @@ public class SAFUtil {
     }
   }
 
+  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
   public static boolean isTreeUriSaved() {
     return !TextUtils.isEmpty(PreferenceUtil.INSTANCE.getSafSdCardUri());
   }
 
+  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
   public static boolean isSDCardAccessGranted(Context context) {
     if (!isTreeUriSaved()) return false;
 
@@ -246,10 +256,10 @@ public class SAFUtil {
 
   public static boolean delete(Context context, String path, Uri safUri) {
     if (isSAFRequired(path)) {
-      return deleteSAF(context, path, safUri);
+      return deleteUsingSAF(context, path, safUri);
     } else {
       try {
-        return deleteFile(path);
+        deleteFile(path);
       } catch (NullPointerException e) {
         Log.e("MusicUtils", "Failed to find file " + path);
       } catch (Exception e) {
@@ -259,13 +269,12 @@ public class SAFUtil {
     return false;
   }
 
-  public static boolean deleteFile(String path) {
-    return new File(path).delete();
+  public static void deleteFile(String path) {
+    new File(path).delete();
   }
 
-  public static boolean deleteSAF(Context context, String path, Uri safUri) {
-    Uri uri = null;
-
+  @TargetApi(Build.VERSION_CODES.KITKAT)
+  private static boolean deleteUsingSAF(Context context, String path, Uri safUri) {
     if (context == null) {
       Log.e(TAG, "deleteSAF: context == null");
       return false;
@@ -274,21 +283,17 @@ public class SAFUtil {
     if (safUri == null && isTreeUriSaved()) {
       List<String> pathSegments = new ArrayList<>(Arrays.asList(path.split("/")));
       Uri sdcard = Uri.parse(PreferenceUtil.INSTANCE.getSafSdCardUri());
-      uri = findDocument(DocumentFile.fromTreeUri(context, sdcard), pathSegments);
+      safUri = findDocument(DocumentFile.fromTreeUri(context, sdcard), pathSegments);
     }
 
-    if (uri == null) {
-      uri = safUri;
-    }
-
-    if (uri == null) {
-      Log.e(TAG, "deleteSAF: Can't get SAF URI");
+    if (safUri == null) {
+      requestSAF(context);
       toast(context, context.getString(R.string.saf_error_uri));
       return false;
     }
 
     try {
-      DocumentsContract.deleteDocument(context.getContentResolver(), uri);
+      DocumentsContract.deleteDocument(context.getContentResolver(), safUri);
     } catch (final Exception e) {
       Log.e(TAG, "deleteSAF: Failed to delete a file descriptor provided by SAF", e);
 
@@ -300,6 +305,11 @@ public class SAFUtil {
     return true;
   }
 
+  private static void requestSAF(Context context) {
+    Intent intent = new Intent(context, SAFRequestActivity.class);
+    context.startActivity(intent);
+  }
+
   private static void toast(final Context context, final String message) {
     if (context instanceof Activity) {
       ((Activity) context)
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/Share.kt b/app/src/main/java/io/github/muntashirakon/music/util/Share.kt
similarity index 68%
rename from app/src/main/java/code/name/monkey/retromusic/util/Share.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/Share.kt
index 5994419bf..6cf05ae23 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/Share.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/Share.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.content.Context
 import android.content.Intent
@@ -32,15 +32,15 @@ object Share {
         context.startActivity(feedIntent, null)
     }
 
-    fun shareFile(context: Context, file: File, mimeType: String) {
-        Intent(Intent.ACTION_SEND).apply {
-            type = mimeType
-            putExtra(Intent.EXTRA_STREAM, FileProvider.getUriForFile(
-                context,
-                context.applicationContext.packageName,
-                file
-            ))
-            context.startActivity(Intent.createChooser(this, null))
-        }
+    fun shareFile(context: Context, file: File) {
+        val attachmentUri = FileProvider.getUriForFile(
+            context,
+            context.applicationContext.packageName,
+            file
+        )
+        val sharingIntent = Intent(Intent.ACTION_SEND)
+        sharingIntent.type = "text/*"
+        sharingIntent.putExtra(Intent.EXTRA_STREAM, attachmentUri)
+        context.startActivity(Intent.createChooser(sharingIntent, "send bug report"))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/SwipeAndDragHelper.java b/app/src/main/java/io/github/muntashirakon/music/util/SwipeAndDragHelper.java
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/util/SwipeAndDragHelper.java
rename to app/src/main/java/io/github/muntashirakon/music/util/SwipeAndDragHelper.java
index 92c8be038..571c47c85 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/SwipeAndDragHelper.java
+++ b/app/src/main/java/io/github/muntashirakon/music/util/SwipeAndDragHelper.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.util;
+package io.github.muntashirakon.music.util;
 
 import android.graphics.Canvas;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/TempUtils.java b/app/src/main/java/io/github/muntashirakon/music/util/TempUtils.java
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/util/TempUtils.java
rename to app/src/main/java/io/github/muntashirakon/music/util/TempUtils.java
index 1f5f1e2b6..582eb176a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/TempUtils.java
+++ b/app/src/main/java/io/github/muntashirakon/music/util/TempUtils.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.util;
+package io.github.muntashirakon.music.util;
 
 /** @author Hemanth S (h4h13). */
 public class TempUtils {
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ThemedFastScroller.kt b/app/src/main/java/io/github/muntashirakon/music/util/ThemedFastScroller.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/util/ThemedFastScroller.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/ThemedFastScroller.kt
index 2019fa6a0..b88d32135 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/ThemedFastScroller.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/ThemedFastScroller.kt
@@ -11,14 +11,14 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.view.ViewGroup
 import code.name.monkey.appthemehelper.ThemeStore.Companion.accentColor
 import code.name.monkey.appthemehelper.util.ColorUtil.isColorLight
 import code.name.monkey.appthemehelper.util.MaterialValueHelper.getPrimaryTextColor
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.views.PopupBackground
+import io.github.muntashirakon.music.views.PopupBackground
 import me.zhanghai.android.fastscroll.FastScroller
 import me.zhanghai.android.fastscroll.FastScrollerBuilder
 import me.zhanghai.android.fastscroll.PopupStyles
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/UriUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/UriUtil.kt
similarity index 89%
rename from app/src/main/java/code/name/monkey/retromusic/util/UriUtil.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/UriUtil.kt
index 923e5dac4..498d2b747 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/UriUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/UriUtil.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.content.ContentUris
 import android.content.Context
@@ -6,7 +6,7 @@ import android.net.Uri
 import android.os.Build
 import android.provider.MediaStore
 import androidx.annotation.RequiresApi
-import code.name.monkey.retromusic.Constants
+import io.github.muntashirakon.music.Constants
 
 object UriUtil {
     @RequiresApi(Build.VERSION_CODES.Q)
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt b/app/src/main/java/io/github/muntashirakon/music/util/ViewUtil.kt
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/ViewUtil.kt
index fdc23c380..be10249d7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/ViewUtil.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.util
+package io.github.muntashirakon.music.util
 
 import android.content.res.ColorStateList
 import android.content.res.Resources
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/color/ImageUtils.java b/app/src/main/java/io/github/muntashirakon/music/util/color/ImageUtils.java
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/util/color/ImageUtils.java
rename to app/src/main/java/io/github/muntashirakon/music/util/color/ImageUtils.java
index 53dfc3e5d..a2595cf8a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/color/ImageUtils.java
+++ b/app/src/main/java/io/github/muntashirakon/music/util/color/ImageUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package code.name.monkey.retromusic.util.color;
+package io.github.muntashirakon.music.util.color;
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java b/app/src/main/java/io/github/muntashirakon/music/util/color/MediaNotificationProcessor.java
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java
rename to app/src/main/java/io/github/muntashirakon/music/util/color/MediaNotificationProcessor.java
index 693e7134c..b9d8863c3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java
+++ b/app/src/main/java/io/github/muntashirakon/music/util/color/MediaNotificationProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package code.name.monkey.retromusic.util.color;
+package io.github.muntashirakon.music.util.color;
 
 import static androidx.core.graphics.ColorUtils.RGBToXYZ;
 
@@ -35,6 +35,7 @@ import java.util.List;
 
 import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ColorUtil;
+import io.github.muntashirakon.music.R;
 
 /** A class the processes media notifications and extracts the right text and background colors. */
 public class MediaNotificationProcessor {
@@ -453,7 +454,7 @@ public class MediaNotificationProcessor {
   public int getMightyColor() {
     boolean isDarkBg =
         ColorUtil.INSTANCE.isColorLight(
-            ATHUtil.INSTANCE.resolveColor(context, com.google.android.material.R.attr.colorSurface));
+            ATHUtil.INSTANCE.resolveColor(context, R.attr.colorSurface));
     if (isDarkBg) {
       if (isColorLight(backgroundColor)) {
         return primaryTextColor;
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/color/NotificationColorUtil.java b/app/src/main/java/io/github/muntashirakon/music/util/color/NotificationColorUtil.java
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/util/color/NotificationColorUtil.java
rename to app/src/main/java/io/github/muntashirakon/music/util/color/NotificationColorUtil.java
index f23b643f0..588aa1984 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/color/NotificationColorUtil.java
+++ b/app/src/main/java/io/github/muntashirakon/music/util/color/NotificationColorUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package code.name.monkey.retromusic.util.color;
+package io.github.muntashirakon.music.util.color;
 
 import android.app.Notification;
 import android.content.Context;
@@ -35,9 +35,10 @@ import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 
-import java.util.Locale;
 import java.util.WeakHashMap;
 
+import io.github.muntashirakon.music.R;
+
 /**
  * Helper class to process legacy (Holo) notifications to make them look like material
  * notifications.
@@ -60,7 +61,7 @@ public class NotificationColorUtil {
 
   private NotificationColorUtil(Context context) {
     mGrayscaleIconMaxSize =
-        context.getResources().getDimensionPixelSize(androidx.core.R.dimen.notification_large_icon_width);
+        context.getResources().getDimensionPixelSize(R.dimen.notification_large_icon_width);
   }
 
   public static NotificationColorUtil getInstance(Context context) {
@@ -328,7 +329,7 @@ public class NotificationColorUtil {
   }
 
   private static String contrastChange(int colorOld, int colorNew, int bg) {
-    return String.format(Locale.ROOT,
+    return String.format(
         "from %.2f:1 to %.2f:1",
         ColorUtilsFromCompat.calculateContrast(colorOld, bg),
         ColorUtilsFromCompat.calculateContrast(colorNew, bg));
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt b/app/src/main/java/io/github/muntashirakon/music/util/theme/ThemeManager.kt
similarity index 74%
rename from app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/theme/ThemeManager.kt
index c1a8283df..6865def7a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/theme/ThemeManager.kt
@@ -1,12 +1,12 @@
-package code.name.monkey.retromusic.util.theme
+package io.github.muntashirakon.music.util.theme
 
 import android.content.Context
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatDelegate
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.generalThemeValue
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.theme.ThemeMode.*
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.extensions.generalThemeValue
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.theme.ThemeMode.*
 
 @StyleRes
 fun Context.getThemeResValue(): Int =
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeMode.kt b/app/src/main/java/io/github/muntashirakon/music/util/theme/ThemeMode.kt
similarity index 57%
rename from app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeMode.kt
rename to app/src/main/java/io/github/muntashirakon/music/util/theme/ThemeMode.kt
index 88086741c..e38518a86 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeMode.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/util/theme/ThemeMode.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.util.theme
+package io.github.muntashirakon.music.util.theme
 
 enum class ThemeMode {
     LIGHT,
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt b/app/src/main/java/io/github/muntashirakon/music/views/AccentIcon.kt
similarity index 91%
rename from app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/AccentIcon.kt
index 74a08e830..153b372ce 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/AccentIcon.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.content.res.ColorStateList
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java b/app/src/main/java/io/github/muntashirakon/music/views/BaselineGridTextView.java
similarity index 98%
rename from app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java
rename to app/src/main/java/io/github/muntashirakon/music/views/BaselineGridTextView.java
index 87d4487f3..0dec80b19 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java
+++ b/app/src/main/java/io/github/muntashirakon/music/views/BaselineGridTextView.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.views;
+package io.github.muntashirakon.music.views;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -24,7 +24,7 @@ import androidx.annotation.FontRes;
 
 import com.google.android.material.textview.MaterialTextView;
 
-import code.name.monkey.retromusic.R;
+import io.github.muntashirakon.music.R;
 
 public class BaselineGridTextView extends MaterialTextView {
 
diff --git a/app/src/main/java/io/github/muntashirakon/music/views/BottomNavigationBarTinted.kt b/app/src/main/java/io/github/muntashirakon/music/views/BottomNavigationBarTinted.kt
new file mode 100644
index 000000000..f6250f188
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/views/BottomNavigationBarTinted.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package io.github.muntashirakon.music.views
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.util.AttributeSet
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.NavigationViewUtil
+import io.github.muntashirakon.music.util.PreferenceUtil
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import dev.chrisbanes.insetter.applyInsetter
+
+class BottomNavigationBarTinted @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : BottomNavigationView(context, attrs, defStyleAttr) {
+
+    init {
+        // If we are in Immersive mode we have to just set empty OnApplyWindowInsetsListener as
+        // bottom, start, and end padding is always applied (with the help of OnApplyWindowInsetsListener) to
+        // BottomNavigationView to dodge the system navigation bar (so we basically clear that listener).
+        if (PreferenceUtil.isFullScreenMode) {
+            setOnApplyWindowInsetsListener { _, insets ->
+                insets
+            }
+        } else {
+            applyInsetter {
+                type(navigationBars = true) {
+                    padding(vertical = true)
+                    margin(horizontal = true)
+                }
+            }
+        }
+
+        labelVisibilityMode = PreferenceUtil.tabTitleMode
+
+        if (!PreferenceUtil.materialYou) {
+            val iconColor = ATHUtil.resolveColor(context, android.R.attr.colorControlNormal)
+            val accentColor = ThemeStore.accentColor(context)
+            NavigationViewUtil.setItemIconColors(
+                this,
+                ColorUtil.withAlpha(iconColor, 0.5f),
+                accentColor
+            )
+            NavigationViewUtil.setItemTextColors(
+                this,
+                ColorUtil.withAlpha(iconColor, 0.5f),
+                accentColor
+            )
+            itemRippleColor = ColorStateList.valueOf(accentColor.addAlpha(0.08F))
+            itemActiveIndicatorColor = ColorStateList.valueOf(accentColor.addAlpha(0.12F))
+        }
+    }
+}
+
+fun Int.addAlpha(alpha: Float): Int {
+    return ColorUtil.withAlpha(this, alpha)
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java b/app/src/main/java/io/github/muntashirakon/music/views/BreadCrumbLayout.java
similarity index 99%
rename from app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java
rename to app/src/main/java/io/github/muntashirakon/music/views/BreadCrumbLayout.java
index 4b492a854..bd122d053 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java
+++ b/app/src/main/java/io/github/muntashirakon/music/views/BreadCrumbLayout.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.views;
+package io.github.muntashirakon.music.views;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -37,7 +37,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import code.name.monkey.appthemehelper.util.ATHUtil;
-import code.name.monkey.retromusic.R;
+import io.github.muntashirakon.music.R;
 
 /** @author Aidan Follestad (afollestad), modified for Phonograph by Karim Abou Zeid (kabouzeid) */
 public class BreadCrumbLayout extends HorizontalScrollView implements View.OnClickListener {
diff --git a/app/src/main/java/io/github/muntashirakon/music/views/CircularImageView.java b/app/src/main/java/io/github/muntashirakon/music/views/CircularImageView.java
new file mode 100644
index 000000000..ca1d59d26
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/views/CircularImageView.java
@@ -0,0 +1,337 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package io.github.muntashirakon.music.views;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Shader;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.util.Log;
+
+import androidx.appcompat.widget.AppCompatImageView;
+
+import io.github.muntashirakon.music.R;
+
+public class CircularImageView extends AppCompatImageView {
+
+  private static final ScaleType SCALE_TYPE = ScaleType.CENTER_CROP;
+
+  // Default Values
+  private static final float DEFAULT_BORDER_WIDTH = 4;
+  private static final float DEFAULT_SHADOW_RADIUS = 8.0f;
+
+  // Properties
+  private float borderWidth;
+  private int canvasSize;
+  private float shadowRadius;
+  private int shadowColor = Color.BLACK;
+
+  // Object used to draw
+  private Bitmap image;
+  private Drawable drawable;
+  private Paint paint;
+  private Paint paintBorder;
+
+  // region Constructor & Init Method
+  public CircularImageView(final Context context) {
+    this(context, null);
+  }
+
+  public CircularImageView(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public CircularImageView(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+    init(context, attrs, defStyleAttr);
+  }
+
+  private void init(Context context, AttributeSet attrs, int defStyleAttr) {
+    // Init paint
+    paint = new Paint();
+    paint.setAntiAlias(true);
+
+    paintBorder = new Paint();
+    paintBorder.setAntiAlias(true);
+
+    // Load the styled attributes and set their properties
+    TypedArray attributes =
+        context.obtainStyledAttributes(attrs, R.styleable.CircularImageView, defStyleAttr, 0);
+
+    // Init Border
+    if (attributes.getBoolean(R.styleable.CircularImageView_civ_border, true)) {
+      float defaultBorderSize =
+          DEFAULT_BORDER_WIDTH * getContext().getResources().getDisplayMetrics().density;
+      setBorderWidth(
+          attributes.getDimension(
+              R.styleable.CircularImageView_civ_border_width, defaultBorderSize));
+      setBorderColor(
+          attributes.getColor(R.styleable.CircularImageView_civ_border_color, Color.WHITE));
+    }
+
+    // Init Shadow
+    if (attributes.getBoolean(R.styleable.CircularImageView_civ_shadow, false)) {
+      shadowRadius = DEFAULT_SHADOW_RADIUS;
+      drawShadow(
+          attributes.getFloat(R.styleable.CircularImageView_civ_shadow_radius, shadowRadius),
+          attributes.getColor(R.styleable.CircularImageView_civ_shadow_color, shadowColor));
+    }
+    attributes.recycle();
+  }
+  // endregion
+
+  // region Set Attr Method
+  public void setBorderWidth(float borderWidth) {
+    this.borderWidth = borderWidth;
+    requestLayout();
+    invalidate();
+  }
+
+  public void setBorderColor(int borderColor) {
+    if (paintBorder != null) {
+      paintBorder.setColor(borderColor);
+    }
+    invalidate();
+  }
+
+  public void addShadow() {
+    if (shadowRadius == 0) {
+      shadowRadius = DEFAULT_SHADOW_RADIUS;
+    }
+    drawShadow(shadowRadius, shadowColor);
+    invalidate();
+  }
+
+  public void setShadowRadius(float shadowRadius) {
+    drawShadow(shadowRadius, shadowColor);
+    invalidate();
+  }
+
+  public void setShadowColor(int shadowColor) {
+    drawShadow(shadowRadius, shadowColor);
+    invalidate();
+  }
+
+  @Override
+  public ScaleType getScaleType() {
+    return SCALE_TYPE;
+  }
+
+  @Override
+  public void setScaleType(ScaleType scaleType) {
+    if (scaleType != SCALE_TYPE) {
+      throw new IllegalArgumentException(
+          String.format(
+              "ScaleType %s not supported. ScaleType.CENTER_CROP is used by default. So you don't need to use ScaleType.",
+              scaleType));
+    }
+  }
+  // endregion
+
+  // region Draw Method
+  @Override
+  public void onDraw(Canvas canvas) {
+    // Load the bitmap
+    loadBitmap();
+
+    // Check if image isn't null
+    if (image == null) {
+      return;
+    }
+
+    if (!isInEditMode()) {
+      canvasSize = canvas.getWidth();
+      if (canvas.getHeight() < canvasSize) {
+        canvasSize = canvas.getHeight();
+      }
+    }
+
+    // circleCenter is the x or y of the view's center
+    // radius is the radius in pixels of the cirle to be drawn
+    // paint contains the shader that will texture the shape
+    int circleCenter = (int) (canvasSize - (borderWidth * 2)) / 2;
+    // Draw Border
+    canvas.drawCircle(
+        circleCenter + borderWidth,
+        circleCenter + borderWidth,
+        circleCenter + borderWidth - (shadowRadius + shadowRadius / 2),
+        paintBorder);
+    // Draw CircularImageView
+    canvas.drawCircle(
+        circleCenter + borderWidth,
+        circleCenter + borderWidth,
+        circleCenter - (shadowRadius + shadowRadius / 2),
+        paint);
+  }
+
+  private void loadBitmap() {
+    if (this.drawable == getDrawable()) {
+      return;
+    }
+
+    this.drawable = getDrawable();
+    this.image = drawableToBitmap(this.drawable);
+    updateShader();
+  }
+
+  @Override
+  protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+    super.onSizeChanged(w, h, oldw, oldh);
+    canvasSize = w;
+    if (h < canvasSize) {
+      canvasSize = h;
+    }
+    if (image != null) {
+      updateShader();
+    }
+  }
+
+  private void drawShadow(float shadowRadius, int shadowColor) {
+    this.shadowRadius = shadowRadius;
+    this.shadowColor = shadowColor;
+      setLayerType(LAYER_TYPE_SOFTWARE, paintBorder);
+      paintBorder.setShadowLayer(shadowRadius, 0.0f, shadowRadius / 2, shadowColor);
+  }
+
+  private void updateShader() {
+    if (image == null) {
+      return;
+    }
+
+    // Crop Center Image
+    image = cropBitmap(image);
+
+    // Create Shader
+    BitmapShader shader = new BitmapShader(image, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
+
+    // Center Image in Shader
+    Matrix matrix = new Matrix();
+    matrix.setScale(
+        (float) canvasSize / (float) image.getWidth(),
+        (float) canvasSize / (float) image.getHeight());
+    shader.setLocalMatrix(matrix);
+
+    // Set Shader in Paint
+    paint.setShader(shader);
+  }
+
+  private Bitmap cropBitmap(Bitmap bitmap) {
+    Bitmap bmp;
+    if (bitmap.getWidth() >= bitmap.getHeight()) {
+      bmp =
+          Bitmap.createBitmap(
+              bitmap,
+              bitmap.getWidth() / 2 - bitmap.getHeight() / 2,
+              0,
+              bitmap.getHeight(),
+              bitmap.getHeight());
+    } else {
+      bmp =
+          Bitmap.createBitmap(
+              bitmap,
+              0,
+              bitmap.getHeight() / 2 - bitmap.getWidth() / 2,
+              bitmap.getWidth(),
+              bitmap.getWidth());
+    }
+    return bmp;
+  }
+
+  private Bitmap drawableToBitmap(Drawable drawable) {
+    if (drawable == null) {
+      return null;
+    } else if (drawable instanceof BitmapDrawable) {
+      return ((BitmapDrawable) drawable).getBitmap();
+    }
+
+    int intrinsicWidth = drawable.getIntrinsicWidth();
+    int intrinsicHeight = drawable.getIntrinsicHeight();
+
+    if (!(intrinsicWidth > 0 && intrinsicHeight > 0)) {
+      return null;
+    }
+
+    try {
+      // Create Bitmap object out of the drawable
+      Bitmap bitmap = Bitmap.createBitmap(intrinsicWidth, intrinsicHeight, Bitmap.Config.ARGB_8888);
+      Canvas canvas = new Canvas(bitmap);
+      drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+      drawable.draw(canvas);
+      return bitmap;
+    } catch (OutOfMemoryError e) {
+      // Simply return null of failed bitmap creations
+      Log.e(getClass().toString(), "Encountered OutOfMemoryError while generating bitmap!");
+      return null;
+    }
+  }
+  // endregion
+
+  // region Mesure Method
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    int width = measureWidth(widthMeasureSpec);
+    int height = measureHeight(heightMeasureSpec);
+    /*int imageSize = (width < height) ? width : height;
+    setMeasuredDimension(imageSize, imageSize);*/
+    setMeasuredDimension(width, height);
+  }
+
+  private int measureWidth(int measureSpec) {
+    int result;
+    int specMode = MeasureSpec.getMode(measureSpec);
+    int specSize = MeasureSpec.getSize(measureSpec);
+
+    if (specMode == MeasureSpec.EXACTLY) {
+      // The parent has determined an exact size for the child.
+      result = specSize;
+    } else if (specMode == MeasureSpec.AT_MOST) {
+      // The child can be as large as it wants up to the specified size.
+      result = specSize;
+    } else {
+      // The parent has not imposed any constraint on the child.
+      result = canvasSize;
+    }
+
+    return result;
+  }
+
+  private int measureHeight(int measureSpecHeight) {
+    int result;
+    int specMode = MeasureSpec.getMode(measureSpecHeight);
+    int specSize = MeasureSpec.getSize(measureSpecHeight);
+
+    if (specMode == MeasureSpec.EXACTLY) {
+      // We were told how big to be
+      result = specSize;
+    } else if (specMode == MeasureSpec.AT_MOST) {
+      // The child can be as large as it wants up to the specified size.
+      result = specSize;
+    } else {
+      // Measure the text (beware: ascent is a negative number)
+      result = canvasSize;
+    }
+
+    return (result + 2);
+  }
+  // endregion
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/ColorIconsImageView.kt b/app/src/main/java/io/github/muntashirakon/music/views/ColorIconsImageView.kt
similarity index 91%
rename from app/src/main/java/code/name/monkey/retromusic/views/ColorIconsImageView.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/ColorIconsImageView.kt
index c9d4dba9e..3fef9bbee 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/ColorIconsImageView.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/ColorIconsImageView.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.content.res.ColorStateList
@@ -24,9 +24,9 @@ import androidx.core.content.withStyledAttributes
 import code.name.monkey.appthemehelper.ThemeStore
 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.util.RetroColorUtil
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.util.PreferenceUtil
+import io.github.muntashirakon.music.util.RetroColorUtil
 import com.google.android.material.color.MaterialColors
 
 
@@ -51,7 +51,7 @@ class ColorIconsImageView @JvmOverloads constructor(
             val desaturatedColor = RetroColorUtil.desaturateColor(color, 0.4f)
             backgroundTintList = ColorStateList.valueOf(desaturatedColor)
             imageTintList =
-                ColorStateList.valueOf(ATHUtil.resolveColor(context, com.google.android.material.R.attr.colorSurface))
+                ColorStateList.valueOf(ATHUtil.resolveColor(context, R.attr.colorSurface))
         } else {
             val finalColor = MaterialColors.harmonize(
                 color,
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/DrawableGradient.java b/app/src/main/java/io/github/muntashirakon/music/views/DrawableGradient.java
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/views/DrawableGradient.java
rename to app/src/main/java/io/github/muntashirakon/music/views/DrawableGradient.java
index e2a5daa5b..a7c1bd840 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/DrawableGradient.java
+++ b/app/src/main/java/io/github/muntashirakon/music/views/DrawableGradient.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.views;
+package io.github.muntashirakon.music.views;
 
 import android.graphics.drawable.GradientDrawable;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/HeightFitSquareLayout.kt b/app/src/main/java/io/github/muntashirakon/music/views/HeightFitSquareLayout.kt
similarity index 94%
rename from app/src/main/java/code/name/monkey/retromusic/views/HeightFitSquareLayout.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/HeightFitSquareLayout.kt
index 8ac6172bb..87703b2ed 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/HeightFitSquareLayout.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/HeightFitSquareLayout.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.util.AttributeSet
@@ -20,7 +20,7 @@ import android.widget.FrameLayout
 class HeightFitSquareLayout  @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
+    defStyleAttr: Int = -1
 ) : FrameLayout(context, attrs, defStyleAttr){
     private var forceSquare = true
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/HomeImageLayout.kt b/app/src/main/java/io/github/muntashirakon/music/views/HomeImageLayout.kt
similarity index 82%
rename from app/src/main/java/code/name/monkey/retromusic/views/HomeImageLayout.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/HomeImageLayout.kt
index 015bf3951..f1154ba6b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/HomeImageLayout.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/HomeImageLayout.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.util.AttributeSet
@@ -6,9 +6,9 @@ import android.view.LayoutInflater
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
-import code.name.monkey.retromusic.databinding.BannerImageLayoutBinding
-import code.name.monkey.retromusic.databinding.UserImageLayoutBinding
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.databinding.BannerImageLayoutBinding
+import io.github.muntashirakon.music.databinding.UserImageLayoutBinding
+import io.github.muntashirakon.music.util.PreferenceUtil
 
 class HomeImageLayout @JvmOverloads constructor(
     context: Context,
@@ -20,7 +20,7 @@ class HomeImageLayout @JvmOverloads constructor(
     private var bannerImageBinding: BannerImageLayoutBinding? = null
 
     init {
-        if (isInEditMode || PreferenceUtil.isHomeBanner) {
+        if (PreferenceUtil.isHomeBanner) {
             bannerImageBinding = BannerImageLayoutBinding.inflate(LayoutInflater.from(context), this, true)
         } else {
             userImageBinding = UserImageLayoutBinding.inflate(LayoutInflater.from(context), this, true)
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt b/app/src/main/java/io/github/muntashirakon/music/views/ListItemView.kt
similarity index 87%
rename from app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/ListItemView.kt
index 37924d275..9a90fe325 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/ListItemView.kt
@@ -12,17 +12,17 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.core.content.withStyledAttributes
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ListItemViewNoCardBinding
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.extensions.show
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.ListItemViewNoCardBinding
+import io.github.muntashirakon.music.extensions.hide
+import io.github.muntashirakon.music.extensions.show
 
 /**
  * Created by hemanths on 2019-10-02.
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/LollipopFixedWebView.kt b/app/src/main/java/io/github/muntashirakon/music/views/LollipopFixedWebView.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/views/LollipopFixedWebView.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/LollipopFixedWebView.kt
index d49092ee0..4af954c48 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/LollipopFixedWebView.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/LollipopFixedWebView.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.content.res.Configuration
diff --git a/app/src/main/java/io/github/muntashirakon/music/views/NetworkImageView.kt b/app/src/main/java/io/github/muntashirakon/music/views/NetworkImageView.kt
new file mode 100644
index 000000000..8835f0a42
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/views/NetworkImageView.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+package io.github.muntashirakon.music.views
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.core.content.withStyledAttributes
+import io.github.muntashirakon.music.R
+import com.bumptech.glide.Glide
+
+/** @author Hemanth S (h4h13).
+ */
+class NetworkImageView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) :
+    CircularImageView(context, attrs, defStyleAttr) {
+
+    init {
+        context.withStyledAttributes(attrs, R.styleable.NetworkImageView, 0, 0) {
+            val url = getString(R.styleable.NetworkImageView_url_link)
+            setImageUrl(context, url!!)
+        }
+    }
+
+    fun setImageUrl(imageUrl: String) {
+        setImageUrl(context, imageUrl)
+    }
+
+    private fun setImageUrl(context: Context, imageUrl: String) {
+        Glide.with(context)
+            .load(imageUrl)
+            .error(R.drawable.ic_account)
+            .placeholder(R.drawable.ic_account)
+            .into(this)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt b/app/src/main/java/io/github/muntashirakon/music/views/PermissionItem.kt
similarity index 85%
rename from app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/PermissionItem.kt
index da21fe2dd..fe8f07f0f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/PermissionItem.kt
@@ -1,4 +1,4 @@
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.content.res.ColorStateList
@@ -8,9 +8,9 @@ import android.widget.FrameLayout
 import androidx.core.content.withStyledAttributes
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ItemPermissionBinding
-import code.name.monkey.retromusic.extensions.accentOutlineColor
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.ItemPermissionBinding
+import io.github.muntashirakon.music.extensions.accentOutlineColor
 
 class PermissionItem @JvmOverloads constructor(
     context: Context,
@@ -46,8 +46,4 @@ class PermissionItem @JvmOverloads constructor(
     fun setButtonClick(callBack: () -> Unit) {
         binding.button.setOnClickListener { callBack() }
     }
-
-    fun setNumber(number: String) {
-        binding.number.text = number
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/PopupBackground.java b/app/src/main/java/io/github/muntashirakon/music/views/PopupBackground.java
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/views/PopupBackground.java
rename to app/src/main/java/io/github/muntashirakon/music/views/PopupBackground.java
index 73c2dbd39..b740392bb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/PopupBackground.java
+++ b/app/src/main/java/io/github/muntashirakon/music/views/PopupBackground.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.views;
+package io.github.muntashirakon.music.views;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -32,6 +32,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.graphics.drawable.DrawableCompat;
 
+import io.github.muntashirakon.music.R;
+
 public class PopupBackground extends Drawable {
 
   private final int mPaddingEnd;
@@ -50,8 +52,8 @@ public class PopupBackground extends Drawable {
     mPaint.setColor(color);
     mPaint.setStyle(Paint.Style.FILL);
     Resources resources = context.getResources();
-    mPaddingStart = resources.getDimensionPixelOffset(me.zhanghai.android.fastscroll.R.dimen.afs_md2_popup_padding_start);
-    mPaddingEnd = resources.getDimensionPixelOffset(me.zhanghai.android.fastscroll.R.dimen.afs_md2_popup_padding_end);
+    mPaddingStart = resources.getDimensionPixelOffset(R.dimen.afs_md2_popup_padding_start);
+    mPaddingEnd = resources.getDimensionPixelOffset(R.dimen.afs_md2_popup_padding_end);
   }
 
   private static void pathArcTo(
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/RetroShapeableImageView.kt b/app/src/main/java/io/github/muntashirakon/music/views/RetroShapeableImageView.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/views/RetroShapeableImageView.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/RetroShapeableImageView.kt
index de9d391b3..1bd459b69 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/RetroShapeableImageView.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/RetroShapeableImageView.kt
@@ -11,12 +11,12 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.util.AttributeSet
 import androidx.core.content.withStyledAttributes
-import code.name.monkey.retromusic.R
+import io.github.muntashirakon.music.R
 import com.google.android.material.imageview.ShapeableImageView
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.ShapeAppearanceModel
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/ScrollingViewOnApplyWindowInsetsListener.java b/app/src/main/java/io/github/muntashirakon/music/views/ScrollingViewOnApplyWindowInsetsListener.java
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/views/ScrollingViewOnApplyWindowInsetsListener.java
rename to app/src/main/java/io/github/muntashirakon/music/views/ScrollingViewOnApplyWindowInsetsListener.java
index a11950a54..9e8aa550f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/ScrollingViewOnApplyWindowInsetsListener.java
+++ b/app/src/main/java/io/github/muntashirakon/music/views/ScrollingViewOnApplyWindowInsetsListener.java
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.views;
+package io.github.muntashirakon.music.views;
 
 import android.graphics.Rect;
 import android.view.View;
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/SettingListItemView.kt b/app/src/main/java/io/github/muntashirakon/music/views/SettingListItemView.kt
similarity index 92%
rename from app/src/main/java/code/name/monkey/retromusic/views/SettingListItemView.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/SettingListItemView.kt
index 055ca002d..d8e179d06 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/SettingListItemView.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/SettingListItemView.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.graphics.Color
@@ -19,8 +19,8 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.core.content.withStyledAttributes
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ListSettingItemViewBinding
+import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.databinding.ListSettingItemViewBinding
 
 /**
  * Created by hemanths on 2019-12-10.
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/StatusBarView.kt b/app/src/main/java/io/github/muntashirakon/music/views/StatusBarView.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/views/StatusBarView.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/StatusBarView.kt
index 4fe57cf30..9c510d037 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/StatusBarView.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/StatusBarView.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.content.res.Resources
@@ -21,7 +21,7 @@ import android.view.View
 class StatusBarView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
+    defStyleAttr: Int = -1
 ) : View(context, attrs, defStyleAttr) {
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt b/app/src/main/java/io/github/muntashirakon/music/views/TopAppBarLayout.kt
similarity index 83%
rename from app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/TopAppBarLayout.kt
index 043915984..c8320e11e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/TopAppBarLayout.kt
@@ -1,16 +1,16 @@
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.content.res.Configuration
 import android.util.AttributeSet
 import android.view.LayoutInflater
+import androidx.appcompat.widget.Toolbar
 import androidx.core.view.updateLayoutParams
-import code.name.monkey.retromusic.databinding.CollapsingAppbarLayoutBinding
-import code.name.monkey.retromusic.databinding.SimpleAppbarLayoutBinding
-import code.name.monkey.retromusic.util.PreferenceUtil
+import io.github.muntashirakon.music.databinding.CollapsingAppbarLayoutBinding
+import io.github.muntashirakon.music.databinding.SimpleAppbarLayoutBinding
+import io.github.muntashirakon.music.util.PreferenceUtil
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL
-import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.shape.MaterialShapeDrawable
 import dev.chrisbanes.insetter.applyInsetter
 
@@ -52,24 +52,24 @@ class TopAppBarLayout @JvmOverloads constructor(
         }
     }
 
-    val toolbar: MaterialToolbar
+    val toolbar: Toolbar
         get() = if (mode == AppBarMode.COLLAPSING) {
             collapsingAppbarBinding?.toolbar!!
         } else {
             simpleAppbarBinding?.toolbar!!
         }
 
-    var title: CharSequence
+    var title: String
         get() = if (mode == AppBarMode.COLLAPSING) {
             collapsingAppbarBinding?.collapsingToolbarLayout?.title.toString()
         } else {
-            simpleAppbarBinding?.toolbar?.title.toString()
+            simpleAppbarBinding?.appNameText?.text.toString()
         }
         set(value) {
             if (mode == AppBarMode.COLLAPSING) {
                 collapsingAppbarBinding?.collapsingToolbarLayout?.title = value
             } else {
-                simpleAppbarBinding?.toolbar?.title = value
+                simpleAppbarBinding?.appNameText?.text = value
             }
         }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.kt b/app/src/main/java/io/github/muntashirakon/music/views/VerticalTextView.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/VerticalTextView.kt
index f3538e918..dc125d69a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/VerticalTextView.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.graphics.Canvas
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareCardView.kt b/app/src/main/java/io/github/muntashirakon/music/views/WidthFitSquareCardView.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareCardView.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/WidthFitSquareCardView.kt
index ea42d7ad2..d5c7e443c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareCardView.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/WidthFitSquareCardView.kt
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareLayout.kt b/app/src/main/java/io/github/muntashirakon/music/views/WidthFitSquareLayout.kt
similarity index 95%
rename from app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareLayout.kt
rename to app/src/main/java/io/github/muntashirakon/music/views/WidthFitSquareLayout.kt
index 01bd0da63..9fff3f96d 100755
--- a/app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareLayout.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/views/WidthFitSquareLayout.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.views
+package io.github.muntashirakon.music.views
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/io/github/muntashirakon/music/views/insets/InsetsConstraintLayout.kt b/app/src/main/java/io/github/muntashirakon/music/views/insets/InsetsConstraintLayout.kt
new file mode 100644
index 000000000..05be8d0f3
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/views/insets/InsetsConstraintLayout.kt
@@ -0,0 +1,18 @@
+package io.github.muntashirakon.music.views.insets
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.constraintlayout.widget.ConstraintLayout
+import io.github.muntashirakon.music.extensions.drawAboveSystemBarsWithPadding
+import io.github.muntashirakon.music.util.RetroUtil
+
+class InsetsConstraintLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+    init {
+        if (!RetroUtil.isLandscape)
+            drawAboveSystemBarsWithPadding()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/muntashirakon/music/views/insets/InsetsLinearLayout.kt b/app/src/main/java/io/github/muntashirakon/music/views/insets/InsetsLinearLayout.kt
new file mode 100644
index 000000000..9de66872a
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/views/insets/InsetsLinearLayout.kt
@@ -0,0 +1,18 @@
+package io.github.muntashirakon.music.views.insets
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.LinearLayout
+import io.github.muntashirakon.music.extensions.drawAboveSystemBarsWithPadding
+import io.github.muntashirakon.music.util.RetroUtil
+
+class InsetsLinearLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr) {
+    init {
+        if (!RetroUtil.isLandscape)
+            drawAboveSystemBarsWithPadding()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/muntashirakon/music/views/insets/InsetsRecyclerView.kt b/app/src/main/java/io/github/muntashirakon/music/views/insets/InsetsRecyclerView.kt
new file mode 100644
index 000000000..c9d1c34f2
--- /dev/null
+++ b/app/src/main/java/io/github/muntashirakon/music/views/insets/InsetsRecyclerView.kt
@@ -0,0 +1,27 @@
+package io.github.muntashirakon.music.views.insets
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.annotation.Px
+import androidx.recyclerview.widget.RecyclerView
+import io.github.muntashirakon.music.extensions.applyBottomInsets
+
+class InsetsRecyclerView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : RecyclerView(context, attrs, defStyleAttr) {
+    init {
+        applyBottomInsets()
+    }
+
+    fun updatePadding(
+        @Px left: Int = paddingLeft,
+        @Px top: Int = paddingTop,
+        @Px right: Int = paddingRight,
+        @Px bottom: Int = paddingBottom
+    ) {
+        setPadding(left, top, right, bottom)
+        applyBottomInsets()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeContentObserver.kt b/app/src/main/java/io/github/muntashirakon/music/volume/AudioVolumeContentObserver.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeContentObserver.kt
rename to app/src/main/java/io/github/muntashirakon/music/volume/AudioVolumeContentObserver.kt
index a0dde27e1..2a2757c6b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeContentObserver.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/volume/AudioVolumeContentObserver.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.volume
+package io.github.muntashirakon.music.volume
 
 import android.database.ContentObserver
 import android.media.AudioManager
diff --git a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.kt b/app/src/main/java/io/github/muntashirakon/music/volume/AudioVolumeObserver.kt
similarity index 97%
rename from app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.kt
rename to app/src/main/java/io/github/muntashirakon/music/volume/AudioVolumeObserver.kt
index 5b69f31b8..0f1a30318 100644
--- a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/volume/AudioVolumeObserver.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.volume
+package io.github.muntashirakon.music.volume
 
 import android.content.Context
 import android.media.AudioManager
diff --git a/app/src/main/java/code/name/monkey/retromusic/volume/OnAudioVolumeChangedListener.kt b/app/src/main/java/io/github/muntashirakon/music/volume/OnAudioVolumeChangedListener.kt
similarity index 93%
rename from app/src/main/java/code/name/monkey/retromusic/volume/OnAudioVolumeChangedListener.kt
rename to app/src/main/java/io/github/muntashirakon/music/volume/OnAudioVolumeChangedListener.kt
index 948cd7432..aac26e9b5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/volume/OnAudioVolumeChangedListener.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/volume/OnAudioVolumeChangedListener.kt
@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.volume
+package io.github.muntashirakon.music.volume
 
 interface OnAudioVolumeChangedListener {
     fun onAudioVolumeChanged(currentVolume: Int, maxVolume: Int)
diff --git a/app/src/main/res/anim/retro_fragment_open_enter.xml b/app/src/main/res/anim/retro_fragment_open_enter.xml
index c4521e843..648ca0840 100644
--- a/app/src/main/res/anim/retro_fragment_open_enter.xml
+++ b/app/src/main/res/anim/retro_fragment_open_enter.xml
@@ -14,6 +14,7 @@
   limitations under the License.
   -->
 <set xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:shareInterpolator="false">
     <alpha
         android:duration="50"
@@ -35,5 +36,6 @@
         android:pivotX="50%"
         android:pivotY="50%"
         android:toXScale="1"
-        android:toYScale="1" />
+        android:toYScale="1"
+        tools:targetApi="lollipop" />
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
index e73bc4fc7..65de32cff 100644
--- a/app/src/main/res/drawable/ic_account.xml
+++ b/app/src/main/res/drawable/ic_account.xml
@@ -1,10 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5.85,17.1Q7.125,16.125 8.7,15.562Q10.275,15 12,15Q13.725,15 15.3,15.562Q16.875,16.125 18.15,17.1Q19.025,16.075 19.513,14.775Q20,13.475 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,13.475 4.488,14.775Q4.975,16.075 5.85,17.1ZM12,13Q10.525,13 9.512,11.988Q8.5,10.975 8.5,9.5Q8.5,8.025 9.512,7.012Q10.525,6 12,6Q13.475,6 14.488,7.012Q15.5,8.025 15.5,9.5Q15.5,10.975 14.488,11.988Q13.475,13 12,13ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,20Q13.325,20 14.5,19.613Q15.675,19.225 16.65,18.5Q15.675,17.775 14.5,17.387Q13.325,17 12,17Q10.675,17 9.5,17.387Q8.325,17.775 7.35,18.5Q8.325,19.225 9.5,19.613Q10.675,20 12,20ZM12,11Q12.65,11 13.075,10.575Q13.5,10.15 13.5,9.5Q13.5,8.85 13.075,8.425Q12.65,8 12,8Q11.35,8 10.925,8.425Q10.5,8.85 10.5,9.5Q10.5,10.15 10.925,10.575Q11.35,11 12,11ZM12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5ZM12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20s-3.57,-0.64 -4.93,-1.72zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8s8,3.59 8,8c0,1.82 -0.62,3.49 -1.64,4.83zM12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13s3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
deleted file mode 100644
index d04be09ed..000000000
--- a/app/src/main/res/drawable/ic_arrow_back.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10.875,19.3 L4.275,12.7Q4.125,12.55 4.062,12.375Q4,12.2 4,12Q4,11.8 4.062,11.625Q4.125,11.45 4.275,11.3L10.875,4.7Q11.15,4.425 11.562,4.412Q11.975,4.4 12.275,4.7Q12.575,4.975 12.588,5.387Q12.6,5.8 12.3,6.1L7.4,11H18.575Q19,11 19.288,11.287Q19.575,11.575 19.575,12Q19.575,12.425 19.288,12.712Q19,13 18.575,13H7.4L12.3,17.9Q12.575,18.175 12.588,18.6Q12.6,19.025 12.3,19.3Q12.025,19.6 11.6,19.6Q11.175,19.6 10.875,19.3Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_forward.xml b/app/src/main/res/drawable/ic_arrow_forward.xml
index a8d3c6fe5..e75d8ab6b 100644
--- a/app/src/main/res/drawable/ic_arrow_forward.xml
+++ b/app/src/main/res/drawable/ic_arrow_forward.xml
@@ -1,10 +1,23 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11.3,19.3Q11.025,19.025 11.012,18.6Q11,18.175 11.275,17.9L16.175,13H5Q4.575,13 4.287,12.712Q4,12.425 4,12Q4,11.575 4.287,11.287Q4.575,11 5,11H16.175L11.275,6.1Q11,5.825 11.012,5.4Q11.025,4.975 11.3,4.7Q11.575,4.425 12,4.425Q12.425,4.425 12.7,4.7L19.3,11.3Q19.45,11.425 19.513,11.612Q19.575,11.8 19.575,12Q19.575,12.2 19.513,12.375Q19.45,12.55 19.3,12.7L12.7,19.3Q12.425,19.575 12,19.575Q11.575,19.575 11.3,19.3Z"/>
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_audio_file.xml b/app/src/main/res/drawable/ic_audio_file.xml
deleted file mode 100644
index 470795988..000000000
--- a/app/src/main/res/drawable/ic_audio_file.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10.75,19Q11.7,19 12.35,18.35Q13,17.7 13,16.75V13H15Q15.425,13 15.713,12.712Q16,12.425 16,12Q16,11.575 15.713,11.287Q15.425,11 15,11H13Q12.575,11 12.288,11.287Q12,11.575 12,12V14.875Q11.725,14.675 11.413,14.587Q11.1,14.5 10.75,14.5Q9.8,14.5 9.15,15.15Q8.5,15.8 8.5,16.75Q8.5,17.7 9.15,18.35Q9.8,19 10.75,19ZM6,22Q5.175,22 4.588,21.413Q4,20.825 4,20V4Q4,3.175 4.588,2.587Q5.175,2 6,2H13.175Q13.575,2 13.938,2.15Q14.3,2.3 14.575,2.575L19.425,7.425Q19.7,7.7 19.85,8.062Q20,8.425 20,8.825V20Q20,20.825 19.413,21.413Q18.825,22 18,22ZM13,4H6Q6,4 6,4Q6,4 6,4V20Q6,20 6,20Q6,20 6,20H18Q18,20 18,20Q18,20 18,20V9H14Q13.575,9 13.288,8.712Q13,8.425 13,8ZM6,4V8Q6,8.425 6,8.712Q6,9 6,9V4V8Q6,8.425 6,8.712Q6,9 6,9V20Q6,20 6,20Q6,20 6,20Q6,20 6,20Q6,20 6,20V4Q6,4 6,4Q6,4 6,4Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_audiotrack.xml b/app/src/main/res/drawable/ic_audiotrack.xml
index c6da49f3a..dc9696412 100644
--- a/app/src/main/res/drawable/ic_audiotrack.xml
+++ b/app/src/main/res/drawable/ic_audiotrack.xml
@@ -1,10 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,21Q8.35,21 7.175,19.825Q6,18.65 6,17Q6,15.35 7.175,14.175Q8.35,13 10,13Q10.575,13 11.062,13.137Q11.55,13.275 12,13.55V5Q12,4.175 12.588,3.587Q13.175,3 14,3H16Q16.825,3 17.413,3.587Q18,4.175 18,5Q18,5.825 17.413,6.412Q16.825,7 16,7H14V17Q14,18.65 12.825,19.825Q11.65,21 10,21Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M12 5v8.55c-0.94-0.54-2.1-0.75-3.33-0.32-1.34 0.48 -2.37 1.67-2.61 3.07-0.46 2.74 1.86 5.08 4.59 4.65 1.96-0.31 3.35-2.11 3.35-4.1V7h2c1.1 0 2-0.9 2-2s-0.9-2-2-2h-2c-1.1 0-2 0.9-2 2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_backup.xml b/app/src/main/res/drawable/ic_backup.xml
index 711f462d0..9faa168d2 100644
--- a/app/src/main/res/drawable/ic_backup.xml
+++ b/app/src/main/res/drawable/ic_backup.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6.5,20Q4.225,20 2.613,18.425Q1,16.85 1,14.575Q1,12.625 2.175,11.1Q3.35,9.575 5.25,9.15Q5.875,6.85 7.75,5.425Q9.625,4 12,4Q14.925,4 16.962,6.037Q19,8.075 19,11Q20.725,11.2 21.863,12.487Q23,13.775 23,15.5Q23,17.375 21.688,18.688Q20.375,20 18.5,20H13Q12.175,20 11.588,19.413Q11,18.825 11,18V12.8L10.1,13.7Q9.825,13.975 9.4,13.975Q8.975,13.975 8.7,13.7Q8.425,13.425 8.425,13Q8.425,12.575 8.7,12.3L11.3,9.7Q11.45,9.55 11.625,9.487Q11.8,9.425 12,9.425Q12.2,9.425 12.375,9.487Q12.55,9.55 12.7,9.7L15.3,12.3Q15.575,12.575 15.575,13Q15.575,13.425 15.3,13.7Q15.025,13.975 14.6,13.975Q14.175,13.975 13.9,13.7L13,12.8V18Q13,18 13,18Q13,18 13,18H18.5Q19.55,18 20.275,17.275Q21,16.55 21,15.5Q21,14.45 20.275,13.725Q19.55,13 18.5,13H17V11Q17,8.925 15.538,7.462Q14.075,6 12,6Q9.925,6 8.463,7.462Q7,8.925 7,11H6.5Q5.05,11 4.025,12.025Q3,13.05 3,14.5Q3,15.95 4.025,16.975Q5.05,18 6.5,18H8Q8.425,18 8.713,18.288Q9,18.575 9,19Q9,19.425 8.713,19.712Q8.425,20 8,20ZM12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline.xml b/app/src/main/res/drawable/ic_baseline.xml
new file mode 100644
index 000000000..1217c34b1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_beer.xml b/app/src/main/res/drawable/ic_beer.xml
new file mode 100644
index 000000000..a364706ab
--- /dev/null
+++ b/app/src/main/res/drawable/ic_beer.xml
@@ -0,0 +1,9 @@
+<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="M9.5 3C7.56 3 5.85 4.24 5.23 6.08C3.36 6.44 2 8.09 2 10C2 12.21 3.79 14 6 14V22H17V20H20C20.55 20 21 19.55 21 19V11C21 10.45 20.55 10 20 10H18V8C18 5.79 16.21 4 14 4H12.32C11.5 3.35 10.53 3 9.5 3M9.5 5C10.29 5 11.03 5.37 11.5 6H14C15.11 6 16 6.9 16 8H12C10 8 9.32 9.13 8.5 10.63C7.68 12.13 6 12 6 12C4.89 12 4 11.11 4 10C4 8.9 4.89 8 6 8H7V7.5C7 6.12 8.12 5 9.5 5M17 12H19V18H17Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_bluetooth_connect.xml b/app/src/main/res/drawable/ic_bluetooth_connect.xml
index af4f8ae32..7c1a6e322 100644
--- a/app/src/main/res/drawable/ic_bluetooth_connect.xml
+++ b/app/src/main/res/drawable/ic_bluetooth_connect.xml
@@ -1,10 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5,13.5Q4.375,13.5 3.938,13.062Q3.5,12.625 3.5,12Q3.5,11.375 3.938,10.938Q4.375,10.5 5,10.5Q5.625,10.5 6.062,10.938Q6.5,11.375 6.5,12Q6.5,12.625 6.062,13.062Q5.625,13.5 5,13.5ZM19,13.5Q18.375,13.5 17.938,13.062Q17.5,12.625 17.5,12Q17.5,11.375 17.938,10.938Q18.375,10.5 19,10.5Q19.625,10.5 20.062,10.938Q20.5,11.375 20.5,12Q20.5,12.625 20.062,13.062Q19.625,13.5 19,13.5ZM11,14.4 L7.1,18.3Q6.825,18.575 6.4,18.575Q5.975,18.575 5.7,18.3Q5.425,18.025 5.425,17.6Q5.425,17.175 5.7,16.9L10.6,12L5.7,7.1Q5.425,6.825 5.425,6.4Q5.425,5.975 5.7,5.7Q5.975,5.425 6.4,5.425Q6.825,5.425 7.1,5.7L11,9.6V3.425Q11,3 11.262,2.725Q11.525,2.45 11.925,2.45Q12.175,2.45 12.425,2.562Q12.675,2.675 12.875,2.875L17,7Q17.15,7.15 17.213,7.325Q17.275,7.5 17.275,7.7Q17.275,7.9 17.213,8.075Q17.15,8.25 17,8.4L13.4,12L17,15.6Q17.15,15.75 17.213,15.925Q17.275,16.1 17.275,16.3Q17.275,16.5 17.213,16.675Q17.15,16.85 17,17L12.875,21.125Q12.675,21.325 12.425,21.438Q12.175,21.55 11.925,21.55Q11.525,21.55 11.262,21.275Q11,21 11,20.575ZM13,9.6 L14.9,7.7 13,5.85ZM13,18.15 L14.9,16.3 13,14.4Z"/>
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,13c0.55,-0.55 0.55,-1.44 0,-1.99L6,11c-0.55,-0.55 -1.45,-0.55 -2,0s-0.55,1.45 0,2 1.45,0.55 2,0zM20,11c-0.56,-0.56 -1.45,-0.56 -2,-0.01L18,11c-0.55,0.55 -0.55,1.44 0,1.99L18,13c0.55,0.55 1.44,0.55 1.99,0L20,13c0.55,-0.55 0.55,-1.45 0,-2zM17,7l-4.29,-4.29c-0.63,-0.63 -1.71,-0.19 -1.71,0.7v6.18L7.11,5.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41L10.59,12 5.7,16.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L11,14.41v6.18c0,0.89 1.08,1.34 1.71,0.71L17,17c0.39,-0.39 0.39,-1.02 0,-1.42L13.41,12 17,8.42c0.39,-0.39 0.39,-1.03 0,-1.42zM14.88,16.29L13,18.17v-3.76l1.88,1.88zM13,9.59L13,5.83l1.88,1.88L13,9.59z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_blur_on.xml b/app/src/main/res/drawable/ic_blur_on.xml
index 1cb5afa66..d7123060a 100644
--- a/app/src/main/res/drawable/ic_blur_on.xml
+++ b/app/src/main/res/drawable/ic_blur_on.xml
@@ -1,10 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,14.5Q2.8,14.5 2.65,14.35Q2.5,14.2 2.5,14Q2.5,13.8 2.65,13.65Q2.8,13.5 3,13.5Q3.2,13.5 3.35,13.65Q3.5,13.8 3.5,14Q3.5,14.2 3.35,14.35Q3.2,14.5 3,14.5ZM3,10.5Q2.8,10.5 2.65,10.35Q2.5,10.2 2.5,10Q2.5,9.8 2.65,9.65Q2.8,9.5 3,9.5Q3.2,9.5 3.35,9.65Q3.5,9.8 3.5,10Q3.5,10.2 3.35,10.35Q3.2,10.5 3,10.5ZM6,19Q5.575,19 5.287,18.712Q5,18.425 5,18Q5,17.575 5.287,17.288Q5.575,17 6,17Q6.425,17 6.713,17.288Q7,17.575 7,18Q7,18.425 6.713,18.712Q6.425,19 6,19ZM6,15Q5.575,15 5.287,14.712Q5,14.425 5,14Q5,13.575 5.287,13.287Q5.575,13 6,13Q6.425,13 6.713,13.287Q7,13.575 7,14Q7,14.425 6.713,14.712Q6.425,15 6,15ZM6,11Q5.575,11 5.287,10.712Q5,10.425 5,10Q5,9.575 5.287,9.287Q5.575,9 6,9Q6.425,9 6.713,9.287Q7,9.575 7,10Q7,10.425 6.713,10.712Q6.425,11 6,11ZM6,7Q5.575,7 5.287,6.713Q5,6.425 5,6Q5,5.575 5.287,5.287Q5.575,5 6,5Q6.425,5 6.713,5.287Q7,5.575 7,6Q7,6.425 6.713,6.713Q6.425,7 6,7ZM10,15.5Q9.375,15.5 8.938,15.062Q8.5,14.625 8.5,14Q8.5,13.375 8.938,12.938Q9.375,12.5 10,12.5Q10.625,12.5 11.062,12.938Q11.5,13.375 11.5,14Q11.5,14.625 11.062,15.062Q10.625,15.5 10,15.5ZM10,11.5Q9.375,11.5 8.938,11.062Q8.5,10.625 8.5,10Q8.5,9.375 8.938,8.938Q9.375,8.5 10,8.5Q10.625,8.5 11.062,8.938Q11.5,9.375 11.5,10Q11.5,10.625 11.062,11.062Q10.625,11.5 10,11.5ZM10,19Q9.575,19 9.288,18.712Q9,18.425 9,18Q9,17.575 9.288,17.288Q9.575,17 10,17Q10.425,17 10.713,17.288Q11,17.575 11,18Q11,18.425 10.713,18.712Q10.425,19 10,19ZM10,7Q9.575,7 9.288,6.713Q9,6.425 9,6Q9,5.575 9.288,5.287Q9.575,5 10,5Q10.425,5 10.713,5.287Q11,5.575 11,6Q11,6.425 10.713,6.713Q10.425,7 10,7ZM10,21.5Q9.8,21.5 9.65,21.35Q9.5,21.2 9.5,21Q9.5,20.8 9.65,20.65Q9.8,20.5 10,20.5Q10.2,20.5 10.35,20.65Q10.5,20.8 10.5,21Q10.5,21.2 10.35,21.35Q10.2,21.5 10,21.5ZM10,3.5Q9.8,3.5 9.65,3.35Q9.5,3.2 9.5,3Q9.5,2.8 9.65,2.65Q9.8,2.5 10,2.5Q10.2,2.5 10.35,2.65Q10.5,2.8 10.5,3Q10.5,3.2 10.35,3.35Q10.2,3.5 10,3.5ZM14,15.5Q13.375,15.5 12.938,15.062Q12.5,14.625 12.5,14Q12.5,13.375 12.938,12.938Q13.375,12.5 14,12.5Q14.625,12.5 15.062,12.938Q15.5,13.375 15.5,14Q15.5,14.625 15.062,15.062Q14.625,15.5 14,15.5ZM14,11.5Q13.375,11.5 12.938,11.062Q12.5,10.625 12.5,10Q12.5,9.375 12.938,8.938Q13.375,8.5 14,8.5Q14.625,8.5 15.062,8.938Q15.5,9.375 15.5,10Q15.5,10.625 15.062,11.062Q14.625,11.5 14,11.5ZM14,19Q13.575,19 13.288,18.712Q13,18.425 13,18Q13,17.575 13.288,17.288Q13.575,17 14,17Q14.425,17 14.713,17.288Q15,17.575 15,18Q15,18.425 14.713,18.712Q14.425,19 14,19ZM14,7Q13.575,7 13.288,6.713Q13,6.425 13,6Q13,5.575 13.288,5.287Q13.575,5 14,5Q14.425,5 14.713,5.287Q15,5.575 15,6Q15,6.425 14.713,6.713Q14.425,7 14,7ZM14,21.5Q13.8,21.5 13.65,21.35Q13.5,21.2 13.5,21Q13.5,20.8 13.65,20.65Q13.8,20.5 14,20.5Q14.2,20.5 14.35,20.65Q14.5,20.8 14.5,21Q14.5,21.2 14.35,21.35Q14.2,21.5 14,21.5ZM14,3.5Q13.8,3.5 13.65,3.35Q13.5,3.2 13.5,3Q13.5,2.8 13.65,2.65Q13.8,2.5 14,2.5Q14.2,2.5 14.35,2.65Q14.5,2.8 14.5,3Q14.5,3.2 14.35,3.35Q14.2,3.5 14,3.5ZM18,19Q17.575,19 17.288,18.712Q17,18.425 17,18Q17,17.575 17.288,17.288Q17.575,17 18,17Q18.425,17 18.712,17.288Q19,17.575 19,18Q19,18.425 18.712,18.712Q18.425,19 18,19ZM18,15Q17.575,15 17.288,14.712Q17,14.425 17,14Q17,13.575 17.288,13.287Q17.575,13 18,13Q18.425,13 18.712,13.287Q19,13.575 19,14Q19,14.425 18.712,14.712Q18.425,15 18,15ZM18,11Q17.575,11 17.288,10.712Q17,10.425 17,10Q17,9.575 17.288,9.287Q17.575,9 18,9Q18.425,9 18.712,9.287Q19,9.575 19,10Q19,10.425 18.712,10.712Q18.425,11 18,11ZM18,7Q17.575,7 17.288,6.713Q17,6.425 17,6Q17,5.575 17.288,5.287Q17.575,5 18,5Q18.425,5 18.712,5.287Q19,5.575 19,6Q19,6.425 18.712,6.713Q18.425,7 18,7ZM21,14.5Q20.8,14.5 20.65,14.35Q20.5,14.2 20.5,14Q20.5,13.8 20.65,13.65Q20.8,13.5 21,13.5Q21.2,13.5 21.35,13.65Q21.5,13.8 21.5,14Q21.5,14.2 21.35,14.35Q21.2,14.5 21,14.5ZM21,10.5Q20.8,10.5 20.65,10.35Q20.5,10.2 20.5,10Q20.5,9.8 20.65,9.65Q20.8,9.5 21,9.5Q21.2,9.5 21.35,9.65Q21.5,9.8 21.5,10Q21.5,10.2 21.35,10.35Q21.2,10.5 21,10.5Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M6 13c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm0 4c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm0-8c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm-3 0.5c-0.28 0-0.5 0.22 -0.5 0.5 s0.22 0.5 0.5 0.5 0.5-0.22 0.5 -0.5-0.22-0.5-0.5-0.5zM6 5c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm15 5.5c0.28 0 0.5-0.22 0.5 -0.5s-0.22-0.5-0.5-0.5-0.5 0.22 -0.5 0.5 0.22 0.5 0.5 0.5 zM14 7c0.55 0 1-0.45 1-1s-0.45-1-1-1-1 0.45-1 1 0.45 1 1 1zm0-3.5c0.28 0 0.5-0.22 0.5 -0.5s-0.22-0.5-0.5-0.5-0.5 0.22 -0.5 0.5 0.22 0.5 0.5 0.5 zm-11 10c-0.28 0-0.5 0.22 -0.5 0.5 s0.22 0.5 0.5 0.5 0.5-0.22 0.5 -0.5-0.22-0.5-0.5-0.5zm7 7c-0.28 0-0.5 0.22 -0.5 0.5 s0.22 0.5 0.5 0.5 0.5-0.22 0.5 -0.5-0.22-0.5-0.5-0.5zm0-17c0.28 0 0.5-0.22 0.5 -0.5s-0.22-0.5-0.5-0.5-0.5 0.22 -0.5 0.5 0.22 0.5 0.5 0.5 zM10 7c0.55 0 1-0.45 1-1s-0.45-1-1-1-1 0.45-1 1 0.45 1 1 1zm0 5.5c-0.83 0-1.5 0.67 -1.5 1.5s0.67 1.5 1.5 1.5 1.5-0.67 1.5-1.5-0.67-1.5-1.5-1.5zm8 0.5c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm0 4c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm0-8c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm0-4c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm3 8.5c-0.28 0-0.5 0.22 -0.5 0.5 s0.22 0.5 0.5 0.5 0.5-0.22 0.5 -0.5-0.22-0.5-0.5-0.5zM14 17c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm0 3.5c-0.28 0-0.5 0.22 -0.5 0.5 s0.22 0.5 0.5 0.5 0.5-0.22 0.5 -0.5-0.22-0.5-0.5-0.5zm-4-12c-0.83 0-1.5 0.67 -1.5 1.5s0.67 1.5 1.5 1.5 1.5-0.67 1.5-1.5-0.67-1.5-1.5-1.5zm0 8.5c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm4-4.5c-0.83 0-1.5 0.67 -1.5 1.5s0.67 1.5 1.5 1.5 1.5-0.67 1.5-1.5-0.67-1.5-1.5-1.5zm0-4c-0.83 0-1.5 0.67 -1.5 1.5s0.67 1.5 1.5 1.5 1.5-0.67 1.5-1.5-0.67-1.5-1.5-1.5z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_bug_report.xml b/app/src/main/res/drawable/ic_bug_report.xml
index 91cc94a4c..e3b7a77ef 100644
--- a/app/src/main/res/drawable/ic_bug_report.xml
+++ b/app/src/main/res/drawable/ic_bug_report.xml
@@ -1,10 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,21Q10.375,21 8.988,20.2Q7.6,19.4 6.8,18H4.975Q4.55,18 4.275,17.712Q4,17.425 4,17Q4,16.575 4.287,16.288Q4.575,16 5,16H6.1Q6.025,15.5 6.013,15Q6,14.5 6,14H4.975Q4.55,14 4.275,13.712Q4,13.425 4,13Q4,12.575 4.287,12.287Q4.575,12 5,12H6Q6,11.5 6.013,11Q6.025,10.5 6.1,10H4.975Q4.55,10 4.275,9.712Q4,9.425 4,9Q4,8.575 4.287,8.287Q4.575,8 5,8H6.8Q7.15,7.425 7.588,6.925Q8.025,6.425 8.6,6.05L7.675,5.1Q7.4,4.8 7.413,4.387Q7.425,3.975 7.7,3.7Q7.975,3.425 8.4,3.425Q8.825,3.425 9.1,3.7L10.55,5.15Q11.25,4.925 11.975,4.925Q12.7,4.925 13.4,5.15L14.9,3.675Q15.2,3.4 15.613,3.412Q16.025,3.425 16.3,3.7Q16.575,3.975 16.575,4.4Q16.575,4.825 16.3,5.1L15.35,6.05Q15.925,6.425 16.388,6.912Q16.85,7.4 17.2,8H19.025Q19.45,8 19.725,8.287Q20,8.575 20,9Q20,9.425 19.712,9.712Q19.425,10 19,10H17.9Q17.975,10.5 17.988,11Q18,11.5 18,12H19.025Q19.45,12 19.725,12.287Q20,12.575 20,13Q20,13.425 19.712,13.712Q19.425,14 19,14H18Q18,14.5 17.988,15Q17.975,15.5 17.9,16H19.025Q19.45,16 19.725,16.288Q20,16.575 20,17Q20,17.425 19.712,17.712Q19.425,18 19,18H17.2Q16.4,19.4 15.013,20.2Q13.625,21 12,21ZM12,19Q13.65,19 14.825,17.825Q16,16.65 16,15V11Q16,9.35 14.825,8.175Q13.65,7 12,7Q10.35,7 9.175,8.175Q8,9.35 8,11V15Q8,16.65 9.175,17.825Q10.35,19 12,19ZM11,16H13.025Q13.45,16 13.725,15.712Q14,15.425 14,15Q14,14.575 13.713,14.287Q13.425,14 13,14H10.975Q10.55,14 10.275,14.287Q10,14.575 10,15Q10,15.425 10.288,15.712Q10.575,16 11,16ZM11,12H13.025Q13.45,12 13.725,11.712Q14,11.425 14,11Q14,10.575 13.713,10.287Q13.425,10 13,10H10.975Q10.55,10 10.275,10.287Q10,10.575 10,11Q10,11.425 10.288,11.712Q10.575,12 11,12ZM12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Z"/>
-</vector>
+    android:viewportHeight="24">
+
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M20 8h-2.81c-0.45-0.78-1.07-1.45-1.82-1.96L17 4.41 15.59 3l-2.17 2.17C12.96 5.06 12.49 5 12 5s-0.96 0.06 -1.41 0.17 L8.41 3 7 4.41l1.62 1.63C7.88 6.55 7.26 7.22 6.81 8H4v2h2.09c-0.05 0.33 -0.09 0.66 -0.09 1v1H4v2h2v1c0 0.34 0.04 0.67 0.09 1H4v2h2.81c1.04 1.79 2.97 3 5.19 3s4.15-1.21 5.19-3H20v-2h-2.09c0.05-0.33 0.09 -0.66 0.09 -1v-1h2v-2h-2v-1c0-0.34-0.04-0.67-0.09-1H20V8zm-4 4v3c0 0.22-0.03 0.47 -0.07 0.7 l-0.1 0.65 -0.37 0.65 c-0.72 1.24-2.04 2-3.46 2s-2.74-0.77-3.46-2l-0.37-0.64-0.1-0.65C8.03 15.48 8 15.23 8 15v-4c0-0.23 0.03 -0.48 0.07 -0.7l0.1-0.65 0.37 -0.65c0.3-0.52 0.72 -0.97 1.21-1.31l0.57-0.39 0.74 -0.18c0.31-0.08 0.63 -0.12 0.94 -0.12 0.32 0 0.63 0.04 0.95 0.12 l0.68 0.16 0.61 0.42 c0.5 0.34 0.91 0.78 1.21 1.31l0.38 0.65 0.1 0.65 c0.04 0.22 0.07 0.47 0.07 0.69 v1zm-6 2h4v2h-4zm0-4h4v2h-4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_car.xml b/app/src/main/res/drawable/ic_car.xml
index 9c3860c1b..c928b80b0 100644
--- a/app/src/main/res/drawable/ic_car.xml
+++ b/app/src/main/res/drawable/ic_car.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="#FFFFFF"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,19V19.525Q6,20.15 5.575,20.575Q5.15,21 4.5,21Q3.875,21 3.438,20.562Q3,20.125 3,19.5V12L5.1,6Q5.25,5.55 5.638,5.275Q6.025,5 6.5,5H17.5Q17.975,5 18.363,5.275Q18.75,5.55 18.9,6L21,12V19.525Q21,20.15 20.575,20.575Q20.15,21 19.5,21Q18.875,21 18.438,20.562Q18,20.125 18,19.5V19ZM5.8,10H18.2L17.15,7H6.85ZM7.5,16Q8.125,16 8.562,15.562Q9,15.125 9,14.5Q9,13.875 8.562,13.438Q8.125,13 7.5,13Q6.875,13 6.438,13.438Q6,13.875 6,14.5Q6,15.125 6.438,15.562Q6.875,16 7.5,16ZM16.5,16Q17.125,16 17.562,15.562Q18,15.125 18,14.5Q18,13.875 17.562,13.438Q17.125,13 16.5,13Q15.875,13 15.438,13.438Q15,13.875 15,14.5Q15,15.125 15.438,15.562Q15.875,16 16.5,16Z"/>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18.92,6.01C18.72,5.42 18.16,5 17.5,5h-11c-0.66,0 -1.21,0.42 -1.42,1.01L3,12v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,13 6.5,13s1.5,0.67 1.5,1.5S7.33,16 6.5,16zM17.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,11l1.5,-4.5h11L19,11L5,11z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_card_giftcard.xml b/app/src/main/res/drawable/ic_card_giftcard.xml
new file mode 100644
index 000000000..7063383b0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_card_giftcard.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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="M20 6h-2.18c0.11-0.31 0.18 -0.65 0.18 -1 0-1.66-1.34-3-3-3-1.05 0-1.96 0.54 -2.5 1.35l-0.5 0.67 -0.5-0.68C10.96 2.54 10.05 2 9 2 7.34 2 6 3.34 6 5c0 0.35 0.07 0.69 0.18 1H4c-1.11 0-1.99 0.89 -1.99 2L2 19c0 1.11 0.89 2 2 2h16c1.11 0 2-0.89 2-2V8c0-1.11-0.89-2-2-2zm-5-2c0.55 0 1 0.45 1 1s-0.45 1-1 1-1-0.45-1-1 0.45-1 1-1zM9 4c0.55 0 1 0.45 1 1s-0.45 1-1 1-1-0.45-1-1 0.45-1 1-1zm11 15H4v-2h16v2zm0-5H4V8h5.08L7 10.83 8.62 12 12 7.4l3.38 4.6L17 10.83 14.92 8H20v6z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_cellphone.xml b/app/src/main/res/drawable/ic_cellphone.xml
new file mode 100644
index 000000000..af68ec029
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cellphone.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<!-- drawable/cellphone.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="M17,19H7V5H17M17,1H7C5.89,1 5,1.89 5,3V21A2,2 0 0,0 7,23H17A2,2 0 0,0 19,21V3C19,1.89 18.1,1 17,1Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_cellphone_lock.xml b/app/src/main/res/drawable/ic_cellphone_lock.xml
new file mode 100644
index 000000000..727f837d0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cellphone_lock.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<!-- drawable/cellphone_lock.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="M17,1H7A2,2 0 0,0 5,3V6H7V4H17V20H7V18H5V21A2,2 0 0,0 7,23H17A2,2 0 0,0 19,21V3A2,2 0 0,0 17,1M8.8,11V9.5C8.8,8.1 7.4,7 6,7C4.6,7 3.2,8.1 3.2,9.5V11C2.6,11 2,11.6 2,12.2V15.7C2,16.4 2.6,17 3.2,17H8.7C9.4,17 10,16.4 10,15.8V12.3C10,11.6 9.4,11 8.8,11M7.5,11H4.5V9.5C4.5,8.7 5.2,8.2 6,8.2C6.8,8.2 7.5,8.7 7.5,9.5V11Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_check_circle.xml b/app/src/main/res/drawable/ic_check_circle.xml
index 8b58daa37..5ab22cc67 100644
--- a/app/src/main/res/drawable/ic_check_circle.xml
+++ b/app/src/main/res/drawable/ic_check_circle.xml
@@ -1,10 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
     android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10.6,13.8 L8.425,11.625Q8.15,11.35 7.75,11.35Q7.35,11.35 7.05,11.65Q6.775,11.925 6.775,12.35Q6.775,12.775 7.05,13.05L9.9,15.9Q10.175,16.175 10.6,16.175Q11.025,16.175 11.3,15.9L16.975,10.225Q17.25,9.95 17.25,9.55Q17.25,9.15 16.95,8.85Q16.675,8.575 16.25,8.575Q15.825,8.575 15.55,8.85ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22Z"/>
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_clear_all.xml b/app/src/main/res/drawable/ic_clear_all.xml
index c55888ce5..ae3a69c32 100644
--- a/app/src/main/res/drawable/ic_clear_all.xml
+++ b/app/src/main/res/drawable/ic_clear_all.xml
@@ -1,10 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M18,13H6Q5.575,13 5.287,12.712Q5,12.425 5,12Q5,11.575 5.287,11.287Q5.575,11 6,11H18Q18.425,11 18.712,11.287Q19,11.575 19,12Q19,12.425 18.712,12.712Q18.425,13 18,13ZM16,17H4Q3.575,17 3.288,16.712Q3,16.425 3,16Q3,15.575 3.288,15.287Q3.575,15 4,15H16Q16.425,15 16.712,15.287Q17,15.575 17,16Q17,16.425 16.712,16.712Q16.425,17 16,17ZM20,9H8Q7.575,9 7.287,8.712Q7,8.425 7,8Q7,7.575 7.287,7.287Q7.575,7 8,7H20Q20.425,7 20.712,7.287Q21,7.575 21,8Q21,8.425 20.712,8.712Q20.425,9 20,9Z"/>
-</vector>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M6 13h12c0.55 0 1-0.45 1-1s-0.45-1-1-1H6c-0.55 0-1 0.45-1 1s0.45 1 1 1zm-2 4h12c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1zm3-9c0 0.55 0.45 1 1 1h12c0.55 0 1-0.45 1-1s-0.45-1-1-1H8c-0.55 0-1 0.45-1 1z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index c4bfd46b4..97b8899f3 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -1,10 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,13.4 L7.1,18.3Q6.825,18.575 6.4,18.575Q5.975,18.575 5.7,18.3Q5.425,18.025 5.425,17.6Q5.425,17.175 5.7,16.9L10.6,12L5.7,7.1Q5.425,6.825 5.425,6.4Q5.425,5.975 5.7,5.7Q5.975,5.425 6.4,5.425Q6.825,5.425 7.1,5.7L12,10.6L16.9,5.7Q17.175,5.425 17.6,5.425Q18.025,5.425 18.3,5.7Q18.575,5.975 18.575,6.4Q18.575,6.825 18.3,7.1L13.4,12L18.3,16.9Q18.575,17.175 18.575,17.6Q18.575,18.025 18.3,18.3Q18.025,18.575 17.6,18.575Q17.175,18.575 16.9,18.3Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M18.3 5.71c-0.39-0.39-1.02-0.39-1.41 0L12 10.59 7.11 5.7c-0.39-0.39-1.02-0.39-1.41 0-0.39 0.39 -0.39 1.02 0 1.41L10.59 12 5.7 16.89c-0.39 0.39 -0.39 1.02 0 1.41 0.39 0.39 1.02 0.39 1.41 0L12 13.41l4.89 4.89c0.39 0.39 1.02 0.39 1.41 0 0.39-0.39 0.39 -1.02 0-1.41L13.41 12l4.89-4.89c0.38-0.38 0.38 -1.02 0-1.4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_color_lens.xml b/app/src/main/res/drawable/ic_color_lens.xml
new file mode 100644
index 000000000..31e47f8f5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_color_lens.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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="M12 22C6.49 22 2 17.51 2 12S6.49 2 12 2s10 4.04 10 9c0 3.31-2.69 6-6 6h-1.77c-0.28 0-0.5 0.22 -0.5 0.5 0 0.12 0.05 0.23 0.13 0.33 0.41 0.47 0.64 1.06 0.64 1.67 0 1.38-1.12 2.5-2.5 2.5zm0-18c-4.41 0-8 3.59-8 8s3.59 8 8 8c0.28 0 0.5-0.22 0.5 -0.5 0-0.16-0.08-0.28-0.14-0.35-0.41-0.46-0.63-1.05-0.63-1.65 0-1.38 1.12-2.5 2.5-2.5H16c2.21 0 4-1.79 4-4 0-3.86-3.59-7-8-7z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 6.5 10 C 7.32842712475 10 8 10.6715728753 8 11.5 C 8 12.3284271247 7.32842712475 13 6.5 13 C 5.67157287525 13 5 12.3284271247 5 11.5 C 5 10.6715728753 5.67157287525 10 6.5 10 Z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 9.5 6 C 10.3284271247 6 11 6.67157287525 11 7.5 C 11 8.32842712475 10.3284271247 9 9.5 9 C 8.67157287525 9 8 8.32842712475 8 7.5 C 8 6.67157287525 8.67157287525 6 9.5 6 Z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 14.5 6 C 15.3284271247 6 16 6.67157287525 16 7.5 C 16 8.32842712475 15.3284271247 9 14.5 9 C 13.6715728753 9 13 8.32842712475 13 7.5 C 13 6.67157287525 13.6715728753 6 14.5 6 Z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 17.5 10 C 18.3284271247 10 19 10.6715728753 19 11.5 C 19 12.3284271247 18.3284271247 13 17.5 13 C 16.6715728753 13 16 12.3284271247 16 11.5 C 16 10.6715728753 16.6715728753 10 17.5 10 Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_colorize.xml b/app/src/main/res/drawable/ic_colorize.xml
index 6d47bd368..a2c2b5b60 100644
--- a/app/src/main/res/drawable/ic_colorize.xml
+++ b/app/src/main/res/drawable/ic_colorize.xml
@@ -1,10 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,21Q3.575,21 3.288,20.712Q3,20.425 3,20V16.675Q3,16.475 3.075,16.288Q3.15,16.1 3.3,15.95L11.95,7.3L11.2,6.55Q10.925,6.275 10.925,5.85Q10.925,5.425 11.225,5.125Q11.5,4.85 11.925,4.85Q12.35,4.85 12.65,5.125L13.825,6.325L16.9,3.25Q17.175,2.975 17.6,2.975Q18.025,2.975 18.3,3.25L20.7,5.65Q20.975,5.925 20.975,6.35Q20.975,6.775 20.7,7.05L17.625,10.125L18.875,11.375Q19.15,11.65 19.15,12.075Q19.15,12.5 18.875,12.775Q18.575,13.075 18.15,13.075Q17.725,13.075 17.45,12.775L16.7,12.05L8.05,20.7Q7.9,20.85 7.713,20.925Q7.525,21 7.325,21ZM5,19H6.95L15.25,10.65L13.35,8.75L5,17.05Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path android:pathData="M0 0h24v24H0V0z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M17.66 5.41l0.92 0.92 -2.69 2.69-0.92-0.92 2.69-2.69M17.67 3c-0.26 0-0.51 0.1 -0.71 0.29 l-3.12 3.12-1.93-1.91-1.41 1.41 1.42 1.42L3 16.25V21h4.75l8.92-8.92 1.42 1.42 1.41-1.41-1.92-1.92 3.12-3.12c0.4-0.4 0.4 -1.03 0.01 -1.42l-2.34-2.34c-0.2-0.19-0.45-0.29-0.7-0.29zM6.92 19L5 17.08l8.06-8.06 1.92 1.92L6.92 19z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_cookie.xml b/app/src/main/res/drawable/ic_cookie.xml
new file mode 100644
index 000000000..0a9c20176
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cookie.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,3A9,9 0,0 0,3 12A9,9 0,0 0,12 21A9,9 0,0 0,21 12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0,0 1,11 7.5A1.5,1.5 0,0 1,9.5 9A1.5,1.5 0,0 1,8 7.5A1.5,1.5 0,0 1,9.5 6M6.5,10A1.5,1.5 0,0 1,8 11.5A1.5,1.5 0,0 1,6.5 13A1.5,1.5 0,0 1,5 11.5A1.5,1.5 0,0 1,6.5 10M11.5,11A1.5,1.5 0,0 1,13 12.5A1.5,1.5 0,0 1,11.5 14A1.5,1.5 0,0 1,10 12.5A1.5,1.5 0,0 1,11.5 11M16.5,13A1.5,1.5 0,0 1,18 14.5A1.5,1.5 0,0 1,16.5 16H16.5A1.5,1.5 0,0 1,15 14.5H15A1.5,1.5 0,0 1,16.5 13M11,16A1.5,1.5 0,0 1,12.5 17.5A1.5,1.5 0,0 1,11 19A1.5,1.5 0,0 1,9.5 17.5A1.5,1.5 0,0 1,11 16Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index bde670523..d0d191df3 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,10 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M7,21Q6.175,21 5.588,20.413Q5,19.825 5,19V6Q4.575,6 4.287,5.713Q4,5.425 4,5Q4,4.575 4.287,4.287Q4.575,4 5,4H9Q9,3.575 9.288,3.287Q9.575,3 10,3H14Q14.425,3 14.713,3.287Q15,3.575 15,4H19Q19.425,4 19.712,4.287Q20,4.575 20,5Q20,5.425 19.712,5.713Q19.425,6 19,6V19Q19,19.825 18.413,20.413Q17.825,21 17,21ZM7,6V19Q7,19 7,19Q7,19 7,19H17Q17,19 17,19Q17,19 17,19V6ZM9,16Q9,16.425 9.288,16.712Q9.575,17 10,17Q10.425,17 10.713,16.712Q11,16.425 11,16V9Q11,8.575 10.713,8.287Q10.425,8 10,8Q9.575,8 9.288,8.287Q9,8.575 9,9ZM13,16Q13,16.425 13.288,16.712Q13.575,17 14,17Q14.425,17 14.713,16.712Q15,16.425 15,16V9Q15,8.575 14.713,8.287Q14.425,8 14,8Q13.575,8 13.288,8.287Q13,8.575 13,9ZM7,6V19Q7,19 7,19Q7,19 7,19Q7,19 7,19Q7,19 7,19V6Z"/>
-</vector>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M15 4V3H9v1H4v2h1v13c0 1.1 0.9 2 2 2h10c1.1 0 2-0.9 2-2V6h1V4h-5zm2 15H7V6h10v13z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M9 8h2v9H9zm4 0h2v9h-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_diamond.xml b/app/src/main/res/drawable/ic_diamond.xml
deleted file mode 100644
index 3bfd732ee..000000000
--- a/app/src/main/res/drawable/ic_diamond.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,19.875Q11.575,19.875 11.175,19.688Q10.775,19.5 10.475,19.15L2.825,10Q2.45,9.55 2.375,8.95Q2.3,8.35 2.575,7.825L4.45,4.1Q4.725,3.6 5.188,3.3Q5.65,3 6.225,3H17.775Q18.35,3 18.812,3.3Q19.275,3.6 19.55,4.1L21.425,7.825Q21.7,8.35 21.625,8.95Q21.55,9.55 21.175,10L13.525,19.15Q13.225,19.5 12.825,19.688Q12.425,19.875 12,19.875ZM9.625,8H14.375L12.875,5H11.125ZM11,16.675V10H5.45ZM13,16.675 L18.55,10H13ZM16.6,8H19.25L17.75,5Q17.75,5 17.75,5Q17.75,5 17.75,5H15.1ZM4.75,8H7.4L8.9,5H6.25Q6.25,5 6.25,5Q6.25,5 6.25,5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_diamond_stone.xml b/app/src/main/res/drawable/ic_diamond_stone.xml
new file mode 100644
index 000000000..7a27f6716
--- /dev/null
+++ b/app/src/main/res/drawable/ic_diamond_stone.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<!-- drawable/diamond_stone.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="M16,9H19L14,16M10,9H14L12,17M5,9H8L10,16M15,4H17L19,7H16M11,4H13L14,7H10M7,4H9L8,7H5M6,2L2,8L12,22L22,8L18,2H6Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_drag_handle.xml b/app/src/main/res/drawable/ic_drag_handle.xml
index f14867890..88fe5b407 100644
--- a/app/src/main/res/drawable/ic_drag_handle.xml
+++ b/app/src/main/res/drawable/ic_drag_handle.xml
@@ -6,5 +6,5 @@
     android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
-      android:pathData="M5,11Q4.575,11 4.287,10.712Q4,10.425 4,10Q4,9.575 4.287,9.287Q4.575,9 5,9H19Q19.425,9 19.712,9.287Q20,9.575 20,10Q20,10.425 19.712,10.712Q19.425,11 19,11ZM5,15Q4.575,15 4.287,14.712Q4,14.425 4,14Q4,13.575 4.287,13.287Q4.575,13 5,13H19Q19.425,13 19.712,13.287Q20,13.575 20,14Q20,14.425 19.712,14.712Q19.425,15 19,15Z"/>
+      android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_drag_vertical.xml b/app/src/main/res/drawable/ic_drag_vertical.xml
index 3f8e5c7d9..1b9e7c300 100755
--- a/app/src/main/res/drawable/ic_drag_vertical.xml
+++ b/app/src/main/res/drawable/ic_drag_vertical.xml
@@ -1,10 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M9,20Q8.175,20 7.588,19.413Q7,18.825 7,18Q7,17.175 7.588,16.587Q8.175,16 9,16Q9.825,16 10.413,16.587Q11,17.175 11,18Q11,18.825 10.413,19.413Q9.825,20 9,20ZM15,20Q14.175,20 13.588,19.413Q13,18.825 13,18Q13,17.175 13.588,16.587Q14.175,16 15,16Q15.825,16 16.413,16.587Q17,17.175 17,18Q17,18.825 16.413,19.413Q15.825,20 15,20ZM9,14Q8.175,14 7.588,13.412Q7,12.825 7,12Q7,11.175 7.588,10.587Q8.175,10 9,10Q9.825,10 10.413,10.587Q11,11.175 11,12Q11,12.825 10.413,13.412Q9.825,14 9,14ZM15,14Q14.175,14 13.588,13.412Q13,12.825 13,12Q13,11.175 13.588,10.587Q14.175,10 15,10Q15.825,10 16.413,10.587Q17,11.175 17,12Q17,12.825 16.413,13.412Q15.825,14 15,14ZM9,8Q8.175,8 7.588,7.412Q7,6.825 7,6Q7,5.175 7.588,4.588Q8.175,4 9,4Q9.825,4 10.413,4.588Q11,5.175 11,6Q11,6.825 10.413,7.412Q9.825,8 9,8ZM15,8Q14.175,8 13.588,7.412Q13,6.825 13,6Q13,5.175 13.588,4.588Q14.175,4 15,4Q15.825,4 16.413,4.588Q17,5.175 17,6Q17,6.825 16.413,7.412Q15.825,8 15,8Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path android:pathData="M0,0h24v24H0V0z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M11,18c0,1.1-0.9,2-2,2s-2-0.9-2-2s0.9-2,2-2S11,16.9,11,18z M9,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S10.1,10,9,10z M9,4C7.9,4,7,4.9,7,6s0.9,2,2,2s2-0.9,2-2S10.1,4,9,4z M15,8c1.1,0,2-0.9,2-2s-0.9-2-2-2s-2,0.9-2,2S13.9,8,15,8z M15,10 c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,10,15,10z M15,16c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,16,15,16z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M11,18c0,1.1-0.9,2-2,2s-2-0.9-2-2s0.9-2,2-2S11,16.9,11,18z M9,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2 S10.1,10,9,10z M9,4C7.9,4,7,4.9,7,6s0.9,2,2,2s2-0.9,2-2S10.1,4,9,4z M15,8c1.1,0,2-0.9,2-2s-0.9-2-2-2s-2,0.9-2,2S13.9,8,15,8z M15,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,10,15,10z M15,16c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,16,15,16z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M11,18c0,1.1-0.9,2-2,2s-2-0.9-2-2s0.9-2,2-2S11,16.9,11,18z M9,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2 S10.1,10,9,10z M9,4C7.9,4,7,4.9,7,6s0.9,2,2,2s2-0.9,2-2S10.1,4,9,4z M15,8c1.1,0,2-0.9,2-2s-0.9-2-2-2s-2,0.9-2,2S13.9,8,15,8z M15,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,10,15,10z M15,16c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,16,15,16z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M11,18c0,1.1-0.9,2-2,2s-2-0.9-2-2s0.9-2,2-2S11,16.9,11,18z M9,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2 S10.1,10,9,10z M9,4C7.9,4,7,4.9,7,6s0.9,2,2,2s2-0.9,2-2S10.1,4,9,4z M15,8c1.1,0,2-0.9,2-2s-0.9-2-2-2s-2,0.9-2,2S13.9,8,15,8z M15,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,10,15,10z M15,16c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,16,15,16z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M11,18c0,1.1-0.9,2-2,2s-2-0.9-2-2s0.9-2,2-2S11,16.9,11,18z M9,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2 S10.1,10,9,10z M9,4C7.9,4,7,4.9,7,6s0.9,2,2,2s2-0.9,2-2S10.1,4,9,4z M15,8c1.1,0,2-0.9,2-2s-0.9-2-2-2s-2,0.9-2,2S13.9,8,15,8z M15,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,10,15,10z M15,16c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,16,15,16z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_drive_eta.xml b/app/src/main/res/drawable/ic_drive_eta.xml
new file mode 100644
index 000000000..664a47ecb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_drive_eta.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18.92,5.01C18.72,4.42 18.16,4 17.5,4h-11c-0.66,0 -1.21,0.42 -1.42,1.01L3,11v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,15c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,12 6.5,12s1.5,0.67 1.5,1.5S7.33,15 6.5,15zM17.5,15c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,10l1.5,-4.5h11L19,10L5,10z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
index 81f9752c9..3804d9f9f 100644
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -1,10 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19.3,8.925 L15.05,4.725 16.45,3.325Q17.025,2.75 17.863,2.75Q18.7,2.75 19.275,3.325L20.675,4.725Q21.25,5.3 21.275,6.113Q21.3,6.925 20.725,7.5ZM4,21Q3.575,21 3.288,20.712Q3,20.425 3,20V17.175Q3,16.975 3.075,16.788Q3.15,16.6 3.3,16.45L13.6,6.15L17.85,10.4L7.55,20.7Q7.4,20.85 7.213,20.925Q7.025,21 6.825,21Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M3 17.46v3.04c0 0.28 0.22 0.5 0.5 0.5h3.04c0.13 0 0.26-0.05 0.35 -0.15L17.81 9.94l-3.75-3.75L3.15 17.1c-0.1 0.1 -0.15 0.22 -0.15 0.36 zM20.71 7.04c0.39-0.39 0.39 -1.02 0-1.41l-2.34-2.34c-0.39-0.39-1.02-0.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_equalizer.xml b/app/src/main/res/drawable/ic_equalizer.xml
index 4f469b67c..0f939e872 100644
--- a/app/src/main/res/drawable/ic_equalizer.xml
+++ b/app/src/main/res/drawable/ic_equalizer.xml
@@ -1,10 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,20Q5.175,20 4.588,19.413Q4,18.825 4,18V14Q4,13.175 4.588,12.587Q5.175,12 6,12Q6.825,12 7.412,12.587Q8,13.175 8,14V18Q8,18.825 7.412,19.413Q6.825,20 6,20ZM12,20Q11.175,20 10.588,19.413Q10,18.825 10,18V6Q10,5.175 10.588,4.588Q11.175,4 12,4Q12.825,4 13.413,4.588Q14,5.175 14,6V18Q14,18.825 13.413,19.413Q12.825,20 12,20ZM18,20Q17.175,20 16.587,19.413Q16,18.825 16,18V11Q16,10.175 16.587,9.587Q17.175,9 18,9Q18.825,9 19.413,9.587Q20,10.175 20,11V18Q20,18.825 19.413,19.413Q18.825,20 18,20Z"/>
-</vector>
+    android:viewportHeight="24">
+
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M12 20c1.1 0 2-0.9 2-2V6c0-1.1-0.9-2-2-2s-2 0.9-2 2v12c0 1.1 0.9 2 2 2zm-6 0c1.1 0 2-0.9 2-2v-4c0-1.1-0.9-2-2-2s-2 0.9-2 2v4c0 1.1 0.9 2 2 2zm10-9v7c0 1.1 0.9 2 2 2s2-0.9 2-2v-7c0-1.1-0.9-2-2-2s-2 0.9-2 2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_expand_less.xml b/app/src/main/res/drawable/ic_expand_less.xml
index 5d1cffedd..076afd8b5 100644
--- a/app/src/main/res/drawable/ic_expand_less.xml
+++ b/app/src/main/res/drawable/ic_expand_less.xml
@@ -1,10 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
     android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6.7,14.675Q6.425,14.4 6.425,13.975Q6.425,13.55 6.7,13.275L11.3,8.675Q11.45,8.525 11.625,8.462Q11.8,8.4 12,8.4Q12.2,8.4 12.375,8.462Q12.55,8.525 12.7,8.675L17.325,13.3Q17.6,13.575 17.6,13.975Q17.6,14.375 17.3,14.675Q17.025,14.95 16.6,14.95Q16.175,14.95 15.9,14.675L12,10.775L8.075,14.7Q7.8,14.975 7.4,14.975Q7,14.975 6.7,14.675Z"/>
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_file_music.xml b/app/src/main/res/drawable/ic_file_music.xml
new file mode 100644
index 000000000..1cc66b8da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_file_music.xml
@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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="#FFFFFFFF"
+        android:pathData="M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M9,16A2,2 0 0,0 7,18A2,2 0 0,0 9,20A2,2 0 0,0 11,18V13H14V11H10V16.27C9.71,16.1 9.36,16 9,16Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_flag.xml b/app/src/main/res/drawable/ic_flag.xml
index 8081859dc..7f1f10d5c 100644
--- a/app/src/main/res/drawable/ic_flag.xml
+++ b/app/src/main/res/drawable/ic_flag.xml
@@ -1,10 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,21Q5.575,21 5.287,20.712Q5,20.425 5,20V5Q5,4.575 5.287,4.287Q5.575,4 6,4H13.175Q13.525,4 13.8,4.225Q14.075,4.45 14.15,4.8L14.4,6H19Q19.425,6 19.712,6.287Q20,6.575 20,7V15Q20,15.425 19.712,15.712Q19.425,16 19,16H13.825Q13.475,16 13.2,15.775Q12.925,15.55 12.85,15.2L12.6,14H7V20Q7,20.425 6.713,20.712Q6.425,21 6,21ZM12.5,10ZM14.65,14H18V8H12.75L12.35,6H7V12H14.25Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M14 6l-0.72-1.45c-0.17-0.34-0.52-0.55-0.9-0.55H6c-0.55 0-1 0.45-1 1v15c0 0.55 0.45 1 1 1s1-0.45 1-1v-6h5l0.72 1.45c0.17 0.34 0.52 0.55 0.89 0.55 H19c0.55 0 1-0.45 1-1V7c0-0.55-0.45-1-1-1h-5zm4 8h-4l-1-2H7V6h5l1 2h5v6z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_folder.xml b/app/src/main/res/drawable/ic_folder.xml
index f40bb0561..660b261ee 100644
--- a/app/src/main/res/drawable/ic_folder.xml
+++ b/app/src/main/res/drawable/ic_folder.xml
@@ -1,10 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,20Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.175 2.588,4.588Q3.175,4 4,4H9.175Q9.575,4 9.938,4.15Q10.3,4.3 10.575,4.575L12,6H20Q20.825,6 21.413,6.588Q22,7.175 22,8V18Q22,18.825 21.413,19.413Q20.825,20 20,20Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M10.59 4.59C10.21 4.21 9.7 4 9.17 4H4c-1.1 0-1.99 0.9 -1.99 2L2 18c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V8c0-1.1-0.9-2-2-2h-8l-1.41-1.41z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_food_croissant.xml b/app/src/main/res/drawable/ic_food_croissant.xml
new file mode 100644
index 000000000..5428c56a9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_food_croissant.xml
@@ -0,0 +1,10 @@
+<!-- drawable/food_croissant.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="M22,19L19,17L22,15V19M15,15L19,9L22,13L18,16L15,15M5,17L2,19V15L5,17M9,15L6,16L2,13L5,9L9,15M14,6L18,8L13,15H11L6,8L10,6H14Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_fullscreen.xml b/app/src/main/res/drawable/ic_fullscreen.xml
deleted file mode 100644
index 65fde109c..000000000
--- a/app/src/main/res/drawable/ic_fullscreen.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,19Q5.575,19 5.287,18.712Q5,18.425 5,18V15Q5,14.575 5.287,14.287Q5.575,14 6,14Q6.425,14 6.713,14.287Q7,14.575 7,15V17H9Q9.425,17 9.713,17.288Q10,17.575 10,18Q10,18.425 9.713,18.712Q9.425,19 9,19ZM6,10Q5.575,10 5.287,9.712Q5,9.425 5,9V6Q5,5.575 5.287,5.287Q5.575,5 6,5H9Q9.425,5 9.713,5.287Q10,5.575 10,6Q10,6.425 9.713,6.713Q9.425,7 9,7H7V9Q7,9.425 6.713,9.712Q6.425,10 6,10ZM15,19Q14.575,19 14.288,18.712Q14,18.425 14,18Q14,17.575 14.288,17.288Q14.575,17 15,17H17V15Q17,14.575 17.288,14.287Q17.575,14 18,14Q18.425,14 18.712,14.287Q19,14.575 19,15V18Q19,18.425 18.712,18.712Q18.425,19 18,19ZM18,10Q17.575,10 17.288,9.712Q17,9.425 17,9V7H15Q14.575,7 14.288,6.713Q14,6.425 14,6Q14,5.575 14.288,5.287Q14.575,5 15,5H18Q18.425,5 18.712,5.287Q19,5.575 19,6V9Q19,9.425 18.712,9.712Q18.425,10 18,10Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_gift.xml b/app/src/main/res/drawable/ic_gift.xml
deleted file mode 100644
index df8a20c73..000000000
--- a/app/src/main/res/drawable/ic_gift.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,17V19Q4,19 4,19Q4,19 4,19H20Q20,19 20,19Q20,19 20,19V17ZM4,21Q3.175,21 2.588,20.413Q2,19.825 2,19V8Q2,7.175 2.588,6.588Q3.175,6 4,6H6.2Q6.075,5.775 6.037,5.525Q6,5.275 6,5Q6,3.75 6.875,2.875Q7.75,2 9,2Q9.75,2 10.387,2.387Q11.025,2.775 11.5,3.35L12,4L12.5,3.35Q12.95,2.75 13.6,2.375Q14.25,2 15,2Q16.25,2 17.125,2.875Q18,3.75 18,5Q18,5.275 17.962,5.525Q17.925,5.775 17.8,6H20Q20.825,6 21.413,6.588Q22,7.175 22,8V19Q22,19.825 21.413,20.413Q20.825,21 20,21ZM4,14H20V8Q20,8 20,8Q20,8 20,8H14.9L16.425,10.075Q16.65,10.375 16.562,10.762Q16.475,11.15 16.2,11.425Q15.875,11.675 15.475,11.6Q15.075,11.525 14.825,11.2L12,7.4L9.175,11.225Q8.9,11.575 8.488,11.637Q8.075,11.7 7.8,11.425Q7.45,11.175 7.388,10.775Q7.325,10.375 7.575,10.05L9.05,8H4Q4,8 4,8Q4,8 4,8ZM9,6Q9.425,6 9.713,5.713Q10,5.425 10,5Q10,4.575 9.713,4.287Q9.425,4 9,4Q8.575,4 8.288,4.287Q8,4.575 8,5Q8,5.425 8.288,5.713Q8.575,6 9,6ZM15,6Q15.425,6 15.713,5.713Q16,5.425 16,5Q16,4.575 15.713,4.287Q15.425,4 15,4Q14.575,4 14.288,4.287Q14,4.575 14,5Q14,5.425 14.288,5.713Q14.575,6 15,6Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
index af70fc3af..a9b9d6408 100644
--- a/app/src/main/res/drawable/ic_help.xml
+++ b/app/src/main/res/drawable/ic_help.xml
@@ -1,10 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11.95,18Q12.475,18 12.838,17.637Q13.2,17.275 13.2,16.75Q13.2,16.225 12.838,15.863Q12.475,15.5 11.95,15.5Q11.425,15.5 11.062,15.863Q10.7,16.225 10.7,16.75Q10.7,17.275 11.062,17.637Q11.425,18 11.95,18ZM12.1,7.7Q12.8,7.7 13.225,8.087Q13.65,8.475 13.65,9.1Q13.65,9.525 13.363,9.962Q13.075,10.4 12.55,10.875Q11.8,11.525 11.45,12.125Q11.1,12.725 11.1,13.325Q11.1,13.675 11.363,13.912Q11.625,14.15 11.975,14.15Q12.325,14.15 12.6,13.9Q12.875,13.65 12.95,13.275Q13.025,12.85 13.288,12.488Q13.55,12.125 14.15,11.55Q14.925,10.825 15.238,10.225Q15.55,9.625 15.55,8.9Q15.55,7.625 14.588,6.812Q13.625,6 12.1,6Q11.05,6 10.238,6.4Q9.425,6.8 8.975,7.625Q8.8,7.95 8.85,8.262Q8.9,8.575 9.2,8.775Q9.525,8.975 9.913,8.9Q10.3,8.825 10.55,8.475Q10.825,8.1 11.213,7.9Q11.6,7.7 12.1,7.7ZM12,22Q9.95,22 8.125,21.212Q6.3,20.425 4.938,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.938,4.925Q6.3,3.575 8.125,2.787Q9.95,2 12,2Q14.1,2 15.925,2.787Q17.75,3.575 19.1,4.925Q20.45,6.275 21.225,8.1Q22,9.925 22,12Q22,14.075 21.225,15.9Q20.45,17.725 19.1,19.075Q17.75,20.425 15.925,21.212Q14.1,22 12,22Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 17h-2v-2h2v2zm2.07-7.75l-0.9 0.92 c-0.5 0.51 -0.86 0.97 -1.04 1.69-0.08 0.32 -0.13 0.68 -0.13 1.14h-2v-0.5c0-0.46 0.08 -0.9 0.22 -1.31 0.2 -0.58 0.53 -1.1 0.95 -1.52l1.24-1.26c0.46-0.44 0.68 -1.1 0.55 -1.8-0.13-0.72-0.69-1.33-1.39-1.53-1.11-0.31-2.14 0.32 -2.47 1.27-0.12 0.37 -0.43 0.65 -0.82 0.65 h-0.3C8.4 9 8 8.44 8.16 7.88c0.43-1.47 1.68-2.59 3.23-2.83 1.52-0.24 2.97 0.55 3.87 1.8 1.18 1.63 0.83 3.38-0.19 4.4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
index f27568cca..0fbf82b5d 100644
--- a/app/src/main/res/drawable/ic_history.xml
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -1,10 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
+<vector android:height="24dp"
+    android:tint="#FFFFFF"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M13,11.6 L15.5,14.1Q15.775,14.375 15.775,14.8Q15.775,15.225 15.5,15.5Q15.225,15.775 14.8,15.775Q14.375,15.775 14.1,15.5L11.3,12.7Q11.15,12.55 11.075,12.362Q11,12.175 11,11.975V8Q11,7.575 11.288,7.287Q11.575,7 12,7Q12.425,7 12.713,7.287Q13,7.575 13,8ZM12,21Q8.975,21 6.575,19.212Q4.175,17.425 3.35,14.55Q3.225,14.1 3.438,13.7Q3.65,13.3 4.1,13.2Q4.525,13.1 4.863,13.387Q5.2,13.675 5.325,14.1Q5.975,16.3 7.838,17.65Q9.7,19 12,19Q14.925,19 16.962,16.962Q19,14.925 19,12Q19,9.075 16.962,7.037Q14.925,5 12,5Q10.275,5 8.775,5.8Q7.275,6.6 6.25,8H8Q8.425,8 8.713,8.287Q9,8.575 9,9Q9,9.425 8.713,9.712Q8.425,10 8,10H4Q3.575,10 3.288,9.712Q3,9.425 3,9V5Q3,4.575 3.288,4.287Q3.575,4 4,4Q4.425,4 4.713,4.287Q5,4.575 5,5V6.35Q6.275,4.75 8.113,3.875Q9.95,3 12,3Q13.875,3 15.513,3.712Q17.15,4.425 18.363,5.637Q19.575,6.85 20.288,8.487Q21,10.125 21,12Q21,13.875 20.288,15.512Q19.575,17.15 18.363,18.362Q17.15,19.575 15.513,20.288Q13.875,21 12,21Z"/>
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index 3ef75679a..49bb4eea4 100644
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -1,10 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,21Q5.175,21 4.588,20.413Q4,19.825 4,19V10Q4,9.525 4.213,9.1Q4.425,8.675 4.8,8.4L10.8,3.9Q11.075,3.7 11.375,3.6Q11.675,3.5 12,3.5Q12.325,3.5 12.625,3.6Q12.925,3.7 13.2,3.9L19.2,8.4Q19.575,8.675 19.788,9.1Q20,9.525 20,10V19Q20,19.825 19.413,20.413Q18.825,21 18,21H14V14H10V21Z"/>
-</vector>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M10 19v-5h4v5c0 0.55 0.45 1 1 1h3c0.55 0 1-0.45 1-1v-7h1.7c0.46 0 0.68-0.57 0.33 -0.87L12.67 3.6c-0.38-0.34-0.96-0.34-1.34 0l-8.36 7.53c-0.34 0.3 -0.13 0.87 0.33 0.87 H5v7c0 0.55 0.45 1 1 1h3c0.55 0 1-0.45 1-1z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_image.xml b/app/src/main/res/drawable/ic_image.xml
index 69331d946..ae7e18080 100644
--- a/app/src/main/res/drawable/ic_image.xml
+++ b/app/src/main/res/drawable/ic_image.xml
@@ -1,10 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M7,17H17Q17.3,17 17.45,16.725Q17.6,16.45 17.4,16.2L14.65,12.525Q14.5,12.325 14.25,12.325Q14,12.325 13.85,12.525L11.25,16L9.4,13.525Q9.25,13.325 9,13.325Q8.75,13.325 8.6,13.525L6.6,16.2Q6.4,16.45 6.55,16.725Q6.7,17 7,17ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM5,19H19Q19,19 19,19Q19,19 19,19V5Q19,5 19,5Q19,5 19,5H5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19ZM5,5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19Q5,19 5,19Q5,19 5,19V5Q5,5 5,5Q5,5 5,5Z"/>
-</vector>
+    android:viewportHeight="24">
+
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M19 5v14H5V5h14m0-2H5c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm-4.86 8.86l-3 3.87L9 13.14 6 17h12l-3.86-5.14z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_info_outline.xml b/app/src/main/res/drawable/ic_info_outline.xml
index 8f9a9042a..194cfc1f3 100644
--- a/app/src/main/res/drawable/ic_info_outline.xml
+++ b/app/src/main/res/drawable/ic_info_outline.xml
@@ -1,10 +1,23 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,17Q12.425,17 12.713,16.712Q13,16.425 13,16V11.975Q13,11.55 12.713,11.275Q12.425,11 12,11Q11.575,11 11.288,11.287Q11,11.575 11,12V16.025Q11,16.45 11.288,16.725Q11.575,17 12,17ZM12,9Q12.425,9 12.713,8.712Q13,8.425 13,8Q13,7.575 12.713,7.287Q12.425,7 12,7Q11.575,7 11.288,7.287Q11,7.575 11,8Q11,8.425 11.288,8.712Q11.575,9 12,9ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM12,20Q15.325,20 17.663,17.663Q20,15.325 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_keyboard.xml b/app/src/main/res/drawable/ic_keyboard.xml
index eceeb7d22..f9e899abb 100644
--- a/app/src/main/res/drawable/ic_keyboard.xml
+++ b/app/src/main/res/drawable/ic_keyboard.xml
@@ -1,10 +1,23 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,21Q2.175,21 1.588,20.413Q1,19.825 1,19V6Q1,5.175 1.588,4.588Q2.175,4 3,4H21Q21.825,4 22.413,4.588Q23,5.175 23,6V19Q23,19.825 22.413,20.413Q21.825,21 21,21ZM9,10H11V8H9ZM5,10H7V8H5ZM8.5,17H15.5Q15.7,17 15.85,16.85Q16,16.7 16,16.5Q16,16.3 15.85,16.15Q15.7,16 15.5,16H8.5Q8.3,16 8.15,16.15Q8,16.3 8,16.5Q8,16.7 8.15,16.85Q8.3,17 8.5,17ZM13,10H15V8H13ZM9,14H11V12H9ZM5,14H7V12H5ZM13,14H15V12H13ZM17,10H19V8H17ZM17,14H19V12H17Z"/>
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M20,5L4,5c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2L11,8zM11,11h2v2h-2v-2zM8,8h2v2L8,10L8,8zM8,11h2v2L8,13v-2zM7,13L5,13v-2h2v2zM7,10L5,10L5,8h2v2zM16,17L8,17v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2L14,8h2v2zM19,13h-2v-2h2v2zM19,10h-2L17,8h2v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down.xml
deleted file mode 100644
index ddbc0306d..000000000
--- a/app/src/main/res/drawable/ic_keyboard_arrow_down.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,14.975Q11.8,14.975 11.613,14.9Q11.425,14.825 11.3,14.7L6.7,10.1Q6.425,9.825 6.425,9.4Q6.425,8.975 6.7,8.7Q6.975,8.425 7.4,8.425Q7.825,8.425 8.1,8.7L12,12.6L15.9,8.7Q16.175,8.425 16.6,8.425Q17.025,8.425 17.3,8.7Q17.575,8.975 17.575,9.4Q17.575,9.825 17.3,10.1L12.7,14.7Q12.55,14.85 12.375,14.912Q12.2,14.975 12,14.975Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down_black.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down_black.xml
new file mode 100644
index 000000000..69a6c3019
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_down_black.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M8.12 9.29L12 13.17l3.88-3.88c0.39-0.39 1.02-0.39 1.41 0 0.39 0.39 0.39 1.02 0 1.41l-4.59 4.59c-0.39 0.39 -1.02 0.39 -1.41 0L6.7 10.7c-0.39-0.39-0.39-1.02 0-1.41 0.39 -0.38 1.03-0.39 1.42 0z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right.xml
index 0811dc2c2..b283c52dd 100644
--- a/app/src/main/res/drawable/ic_keyboard_arrow_right.xml
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_right.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_keyboard_arrow_down"
+    android:drawable="@drawable/ic_keyboard_arrow_down_black"
     android:fromDegrees="270" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_up.xml b/app/src/main/res/drawable/ic_keyboard_arrow_up.xml
index 0f7f5ae32..a1d8ff1a9 100755
--- a/app/src/main/res/drawable/ic_keyboard_arrow_up.xml
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_up.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_keyboard_arrow_down"
+    android:drawable="@drawable/ic_keyboard_arrow_down_black"
     android:fromDegrees="180" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_keyboard_backspace_black.xml b/app/src/main/res/drawable/ic_keyboard_backspace_black.xml
new file mode 100644
index 000000000..95abfbb50
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_backspace_black.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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 11H7.83l4.88-4.88c0.39-0.39 0.39 -1.03 0-1.42-0.39-0.39-1.02-0.39-1.41 0l-6.59 6.59c-0.39 0.39 -0.39 1.02 0 1.41l6.59 6.59c0.39 0.39 1.02 0.39 1.41 0 0.39-0.39 0.39 -1.02 0-1.41L7.83 13H19c0.55 0 1-0.45 1-1s-0.45-1-1-1z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_kofi.xml b/app/src/main/res/drawable/ic_kofi.xml
deleted file mode 100644
index 715f0341d..000000000
--- a/app/src/main/res/drawable/ic_kofi.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?colorControlNormal">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M23.881,8.948c-0.773,-4.085 -4.859,-4.593 -4.859,-4.593L0.723,4.355c-0.604,0 -0.679,0.798 -0.679,0.798s-0.082,7.324 -0.022,11.822c0.164,2.424 2.586,2.672 2.586,2.672s8.267,-0.023 11.966,-0.049c2.438,-0.426 2.683,-2.566 2.658,-3.734 4.352,0.24 7.422,-2.831 6.649,-6.916zM12.819,12.459c-1.246,1.453 -4.011,3.976 -4.011,3.976s-0.121,0.119 -0.31,0.023c-0.076,-0.057 -0.108,-0.09 -0.108,-0.09 -0.443,-0.441 -3.368,-3.049 -4.034,-3.954 -0.709,-0.965 -1.041,-2.7 -0.091,-3.71 0.951,-1.01 3.005,-1.086 4.363,0.407 0,0 1.565,-1.782 3.468,-0.963 1.904,0.82 1.832,3.011 0.723,4.311zM18.992,12.937c-0.928,0.116 -1.682,0.028 -1.682,0.028L17.31,7.284h1.77s1.971,0.551 1.971,2.638c0,1.913 -0.985,2.667 -2.059,3.015z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
index bcce6eeac..f8d23d595 100644
--- a/app/src/main/res/drawable/ic_language.xml
+++ b/app/src/main/res/drawable/ic_language.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M13.35,22Q12.75,22 12.488,21.613Q12.225,21.225 12.425,20.65L16.075,10.975Q16.225,10.575 16.638,10.287Q17.05,10 17.5,10Q17.925,10 18.35,10.287Q18.775,10.575 18.925,10.975L22.575,20.65Q22.775,21.225 22.513,21.613Q22.25,22 21.625,22Q21.35,22 21.125,21.825Q20.9,21.65 20.8,21.4L19.95,18.95H15.1L14.225,21.4Q14.125,21.65 13.875,21.825Q13.625,22 13.35,22ZM15.7,17.2H19.3L17.55,12.25H17.45ZM7.15,8.55Q7.55,9.275 8,9.887Q8.45,10.5 9.05,11.15Q10.15,9.95 10.875,8.688Q11.6,7.425 12.1,6H2Q1.575,6 1.288,5.713Q1,5.425 1,5Q1,4.575 1.288,4.287Q1.575,4 2,4H8V3Q8,2.575 8.288,2.287Q8.575,2 9,2Q9.425,2 9.713,2.287Q10,2.575 10,3V4H16Q16.425,4 16.712,4.287Q17,4.575 17,5Q17,5.425 16.712,5.713Q16.425,6 16,6H14.1Q13.575,7.775 12.675,9.45Q11.775,11.125 10.45,12.6L12.85,15.05L12.1,17.1L9,14L4.7,18.3Q4.425,18.575 4,18.575Q3.575,18.575 3.3,18.3Q3.025,18.025 3.025,17.6Q3.025,17.175 3.3,16.9L7.65,12.55Q6.975,11.775 6.4,10.987Q5.825,10.2 5.375,9.325Q5.1,8.8 5.35,8.4Q5.6,8 6.225,8Q6.475,8 6.75,8.162Q7.025,8.325 7.15,8.55Z"/>
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12.65 15.67c0.14-0.36 0.05 -0.77-0.23-1.05l-2.09-2.06 0.03 -0.03c1.74-1.94 2.98-4.17 3.71-6.53h1.94c0.54 0 0.99-0.45 0.99 -0.99v-0.02c0-0.54-0.45-0.99-0.99-0.99H10V3c0-0.55-0.45-1-1-1s-1 0.45-1 1v1H1.99c-0.54 0-0.99 0.45 -0.99 0.99 0 0.55 0.45 0.99 0.99 0.99h10.18C11.5 7.92 10.44 9.75 9 11.35c-0.81-0.89-1.49-1.86-2.06-2.88-0.16-0.29-0.45-0.47-0.78-0.47-0.69 0-1.13 0.75 -0.79 1.35 0.63 1.13 1.4 2.21 2.3 3.21L3.3 16.87c-0.4 0.39 -0.4 1.03 0 1.42 0.39 0.39 1.02 0.39 1.42 0L9 14l2.02 2.02c0.51 0.51 1.38 0.32 1.63-0.35zM17.5 10c-0.6 0-1.14 0.37 -1.35 0.94 l-3.67 9.8c-0.24 0.61 0.22 1.26 0.87 1.26 0.39 0 0.74-0.24 0.88 -0.61l0.89-2.39h4.75l0.9 2.39c0.14 0.36 0.49 0.61 0.88 0.61 0.65 0 1.11-0.65 0.88 -1.26l-3.67-9.8c-0.22-0.57-0.76-0.94-1.36-0.94zm-1.62 7l1.62-4.33L19.12 17h-3.24z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml
deleted file mode 100644
index f6615115b..000000000
--- a/app/src/main/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="192dp"
-    android:height="192dp"
-    android:viewportWidth="192"
-    android:viewportHeight="192">
-  <path
-      android:pathData="M127.54,102.2l-47.91,27.67c-4.78,2.76 -10.75,-0.69 -10.75,-6.21v-55.33c0,-5.52 5.97,-8.97 10.74,-6.21l47.92,27.67c4.78,2.76 4.78,9.66 0,12.41Z"
-      android:strokeWidth="8"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M90.83,107.35l-15.96,-27.8h11.2c7.86,0 14.23,6.41 14.23,14.31h0c-0,6.06 -3.8,11.46 -9.47,13.49Z"
-      android:strokeAlpha="0.2"
-      android:fillAlpha="0.2"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M86.82,108.23c1.73,-0 3.46,-0.3 5.09,-0.88l5.3,9.2 1.37,2.38 -18.95,10.95c-4.78,2.76 -10.75,-0.69 -10.75,-6.21v-15.44h17.94Z"
-      android:strokeAlpha="0.2"
-      android:fillAlpha="0.2"/>
-  <path
-      android:pathData="M69.02,80.43h17.38c7.67,0 13.9,6.23 13.9,13.9v0c0,7.67 -6.23,13.9 -13.9,13.9h-17.38v-27.8h0Z"
-      android:strokeWidth="8"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-  <path
-      android:pathData="M97.45,116.96L93.04,109.31"
-      android:strokeWidth="8"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_layout.xml b/app/src/main/res/drawable/ic_layout.xml
new file mode 100644
index 000000000..731165200
--- /dev/null
+++ b/app/src/main/res/drawable/ic_layout.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M4,11h5L9,5L4,5v6zM4,18h5v-6L4,12v6zM10,18h5v-6h-5v6zM16,18h5v-6h-5v6zM10,11h5L15,5h-5v6zM16,5v6h5L21,5h-5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_library_add.xml b/app/src/main/res/drawable/ic_library_add.xml
index 4b95cf651..edacf1b8e 100644
--- a/app/src/main/res/drawable/ic_library_add.xml
+++ b/app/src/main/res/drawable/ic_library_add.xml
@@ -1,10 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M14,14Q14.425,14 14.713,13.712Q15,13.425 15,13V11H17Q17.425,11 17.712,10.712Q18,10.425 18,10Q18,9.575 17.712,9.287Q17.425,9 17,9H15V7Q15,6.575 14.713,6.287Q14.425,6 14,6Q13.575,6 13.288,6.287Q13,6.575 13,7V9H11Q10.575,9 10.288,9.287Q10,9.575 10,10Q10,10.425 10.288,10.712Q10.575,11 11,11H13V13Q13,13.425 13.288,13.712Q13.575,14 14,14ZM8,18Q7.175,18 6.588,17.413Q6,16.825 6,16V4Q6,3.175 6.588,2.587Q7.175,2 8,2H20Q20.825,2 21.413,2.587Q22,3.175 22,4V16Q22,16.825 21.413,17.413Q20.825,18 20,18ZM4,22Q3.175,22 2.588,21.413Q2,20.825 2,20V7Q2,6.575 2.288,6.287Q2.575,6 3,6Q3.425,6 3.713,6.287Q4,6.575 4,7V20Q4,20 4,20Q4,20 4,20H17Q17.425,20 17.712,20.288Q18,20.575 18,21Q18,21.425 17.712,21.712Q17.425,22 17,22Z"/>
-</vector>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M3 6c-0.55 0-1 0.45-1 1v13c0 1.1 0.9 2 2 2h13c0.55 0 1-0.45 1-1s-0.45-1-1-1H5c-0.55 0-1-0.45-1-1V7c0-0.55-0.45-1-1-1zm17-4H8c-1.1 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm-2 9h-3v3c0 0.55-0.45 1-1 1s-1-0.45-1-1v-3h-3c-0.55 0-1-0.45-1-1s0.45-1 1-1h3V6c0-0.55 0.45 -1 1-1s1 0.45 1 1v3h3c0.55 0 1 0.45 1 1s-0.45 1-1 1z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lyrics.xml b/app/src/main/res/drawable/ic_lyrics.xml
index 2064cc4a6..6a2a3a724 100644
--- a/app/src/main/res/drawable/ic_lyrics.xml
+++ b/app/src/main/res/drawable/ic_lyrics.xml
@@ -5,5 +5,6 @@
     android:viewportHeight="24">
   <path
       android:fillColor="#fff"
-      android:pathData="M2,22V4Q2,3.175 2.588,2.587Q3.175,2 4,2H15Q15.825,2 16.413,2.587Q17,3.175 17,4V4.425Q15.625,5.025 14.812,6.262Q14,7.5 14,9Q14,10.5 14.812,11.738Q15.625,12.975 17,13.575V16Q17,16.825 16.413,17.413Q15.825,18 15,18H6ZM6,14H10V12H6ZM19,12Q17.75,12 16.875,11.125Q16,10.25 16,9Q16,7.725 16.875,6.862Q17.75,6 19,6Q19.275,6 19.525,6.05Q19.775,6.1 20,6.175V1H24V3H22V9Q22,10.25 21.125,11.125Q20.25,12 19,12ZM6,11H13V9H6ZM6,8H13V6H6Z"/>
-</vector>
+      android:fillType="evenOdd"
+      android:pathData="M5,3C3.8954,3 3,3.8954 3,5V19C3,20.1046 3.8954,21 5,21H19C20.1046,21 21,20.1046 21,19V5C21,3.8954 20.1046,3 19,3H5ZM6,7C6,6.4477 6.4477,6 7,6H17C17.5523,6 18,6.4477 18,7C18,7.5523 17.5523,8 17,8H7C6.4477,8 6,7.5523 6,7ZM6,12C6,11.4477 6.4477,11 7,11H17C17.5523,11 18,11.4477 18,12C18,12.5523 17.5523,13 17,13H7C6.4477,13 6,12.5523 6,12ZM7,16C6.4477,16 6,16.4477 6,17C6,17.5523 6.4477,18 7,18H11C11.5523,18 12,17.5523 12,17C12,16.4477 11.5523,16 11,16H7Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lyrics_outline.xml b/app/src/main/res/drawable/ic_lyrics_outline.xml
index 4a37173ef..f1d5843af 100644
--- a/app/src/main/res/drawable/ic_lyrics_outline.xml
+++ b/app/src/main/res/drawable/ic_lyrics_outline.xml
@@ -3,7 +3,18 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M2,22V4Q2,3.175 2.588,2.587Q3.175,2 4,2H15Q15.825,2 16.413,2.587Q17,3.175 17,4V4.425Q16.4,4.7 15.9,5.1Q15.4,5.5 15,6V4Q15,4 15,4Q15,4 15,4H4Q4,4 4,4Q4,4 4,4V16.175L4.175,16H15Q15,16 15,16Q15,16 15,16V12Q15.4,12.5 15.9,12.9Q16.4,13.3 17,13.575V16Q17,16.825 16.413,17.413Q15.825,18 15,18H6ZM6,14H10V12H6ZM19,12Q17.75,12 16.875,11.125Q16,10.25 16,9Q16,7.75 16.875,6.875Q17.75,6 19,6Q19.275,6 19.525,6.05Q19.775,6.1 20,6.175V1H24V3H22V9Q22,10.25 21.125,11.125Q20.25,12 19,12ZM6,11H13V9H6ZM6,8H13V6H6ZM4,16.175V4Q4,4 4,4Q4,4 4,4Q4,4 4,4Q4,4 4,4V6Q4,6.625 4,7.387Q4,8.15 4,9Q4,9.85 4,10.613Q4,11.375 4,12V16Q4,16 4,16Q4,16 4,16Z" />
+  <path
+      android:pathData="M5,3L19,3A2,2 0,0 1,21 5L21,19A2,2 0,0 1,19 21L5,21A2,2 0,0 1,3 19L3,5A2,2 0,0 1,5 3z"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#fff"/>
+  <path
+      android:pathData="M7,6L17,6A1,1 0,0 1,18 7L18,7A1,1 0,0 1,17 8L7,8A1,1 0,0 1,6 7L6,7A1,1 0,0 1,7 6z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M7,11L17,11A1,1 0,0 1,18 12L18,12A1,1 0,0 1,17 13L7,13A1,1 0,0 1,6 12L6,12A1,1 0,0 1,7 11z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M7,16L11,16A1,1 0,0 1,12 17L12,17A1,1 0,0 1,11 18L7,18A1,1 0,0 1,6 17L6,17A1,1 0,0 1,7 16z"
+      android:fillColor="#fff"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_mic.xml b/app/src/main/res/drawable/ic_mic.xml
index 038fb4db7..36e338606 100644
--- a/app/src/main/res/drawable/ic_mic.xml
+++ b/app/src/main/res/drawable/ic_mic.xml
@@ -1,10 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,14Q10.75,14 9.875,13.125Q9,12.25 9,11V5Q9,3.75 9.875,2.875Q10.75,2 12,2Q13.25,2 14.125,2.875Q15,3.75 15,5V11Q15,12.25 14.125,13.125Q13.25,14 12,14ZM12,21Q11.575,21 11.288,20.712Q11,20.425 11,20V17.9Q8.675,17.6 7.05,15.975Q5.425,14.35 5.075,12.075Q5,11.65 5.3,11.325Q5.6,11 6.1,11Q6.45,11 6.725,11.262Q7,11.525 7.075,11.9Q7.4,13.65 8.775,14.825Q10.15,16 12,16Q13.85,16 15.225,14.825Q16.6,13.65 16.925,11.9Q17,11.525 17.288,11.262Q17.575,11 17.925,11Q18.4,11 18.7,11.325Q19,11.65 18.925,12.075Q18.575,14.35 16.95,15.975Q15.325,17.6 13,17.9V20Q13,20.425 12.713,20.712Q12.425,21 12,21Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M12 14c1.66 0 3-1.34 3-3V5c0-1.66-1.34-3-3-3S9 3.34 9 5v6c0 1.66 1.34 3 3 3zm5.91-3c-0.49 0-0.9 0.36 -0.98 0.85 C16.52 14.2 14.47 16 12 16s-4.52-1.8-4.93-4.15c-0.08-0.49-0.49-0.85-0.98-0.85-0.61 0-1.09 0.54 -1 1.14 0.49 3 2.89 5.35 5.91 5.78V20c0 0.55 0.45 1 1 1s1-0.45 1-1v-2.08c3.02-0.43 5.42-2.78 5.91-5.78 0.1 -0.6-0.39-1.14-1-1.14z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_notification_classic.xml b/app/src/main/res/drawable/ic_notification_classic.xml
deleted file mode 100644
index a4b7167b0..000000000
--- a/app/src/main/res/drawable/ic_notification_classic.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5,19Q4.575,19 4.287,18.712Q4,18.425 4,18Q4,17.575 4.287,17.288Q4.575,17 5,17H6V10Q6,7.925 7.25,6.312Q8.5,4.7 10.5,4.2V3.5Q10.5,2.875 10.938,2.438Q11.375,2 12,2Q12.625,2 13.062,2.438Q13.5,2.875 13.5,3.5V4.2Q15.5,4.7 16.75,6.312Q18,7.925 18,10V17H19Q19.425,17 19.712,17.288Q20,17.575 20,18Q20,18.425 19.712,18.712Q19.425,19 19,19ZM12,11.5Q12,11.5 12,11.5Q12,11.5 12,11.5Q12,11.5 12,11.5Q12,11.5 12,11.5ZM12,22Q11.175,22 10.588,21.413Q10,20.825 10,20H14Q14,20.825 13.413,21.413Q12.825,22 12,22ZM8,17H16V10Q16,8.35 14.825,7.175Q13.65,6 12,6Q10.35,6 9.175,7.175Q8,8.35 8,10Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_open_in_browser.xml b/app/src/main/res/drawable/ic_open_in_browser.xml
index 280cdca67..eeff055db 100644
--- a/app/src/main/res/drawable/ic_open_in_browser.xml
+++ b/app/src/main/res/drawable/ic_open_in_browser.xml
@@ -1,10 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,21Q11.575,21 11.288,20.712Q11,20.425 11,20V14.85L10.1,15.75Q9.825,16.025 9.413,16.025Q9,16.025 8.7,15.725Q8.4,15.425 8.413,15Q8.425,14.575 8.725,14.275L11.3,11.7Q11.45,11.55 11.625,11.487Q11.8,11.425 12,11.425Q12.2,11.425 12.375,11.487Q12.55,11.55 12.7,11.7L15.3,14.3Q15.6,14.6 15.6,15.012Q15.6,15.425 15.3,15.725Q15,16.025 14.588,16.025Q14.175,16.025 13.875,15.725L13,14.85V20Q13,20.425 12.713,20.712Q12.425,21 12,21ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21H16Q15.575,21 15.288,20.712Q15,20.425 15,20Q15,19.575 15.288,19.288Q15.575,19 16,19H19Q19,19 19,19Q19,19 19,19V7H5V19Q5,19 5,19Q5,19 5,19H8Q8.425,19 8.713,19.288Q9,19.575 9,20Q9,20.425 8.713,20.712Q8.425,21 8,21Z"/>
-</vector>
+    android:viewportHeight="24">
+
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M19 4H5c-1.11 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h3c0.55 0 1-0.45 1-1s-0.45-1-1-1H5V8h14v10h-3c-0.55 0-1 0.45-1 1s0.45 1 1 1h3c1.1 0 2-0.9 2-2V6c0-1.1-0.89-2-2-2zm-7.35 6.35l-2.79 2.79c-0.32 0.32 -0.1 0.86 0.35 0.86 H11v5c0 0.55 0.45 1 1 1s1-0.45 1-1v-5h1.79c0.45 0 0.67-0.54 0.35 -0.85l-2.79-2.79c-0.19-0.2-0.51-0.2-0.7-0.01z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_palette.xml b/app/src/main/res/drawable/ic_palette.xml
deleted file mode 100644
index 4bd082e6d..000000000
--- a/app/src/main/res/drawable/ic_palette.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,22Q9.95,22 8.125,21.212Q6.3,20.425 4.938,19.062Q3.575,17.7 2.788,15.875Q2,14.05 2,12Q2,9.925 2.812,8.1Q3.625,6.275 5.013,4.925Q6.4,3.575 8.25,2.787Q10.1,2 12.2,2Q14.2,2 15.975,2.688Q17.75,3.375 19.087,4.588Q20.425,5.8 21.212,7.463Q22,9.125 22,11.05Q22,13.925 20.25,15.462Q18.5,17 16,17H14.15Q13.925,17 13.838,17.125Q13.75,17.25 13.75,17.4Q13.75,17.7 14.125,18.262Q14.5,18.825 14.5,19.55Q14.5,20.8 13.812,21.4Q13.125,22 12,22ZM6.5,13Q7.15,13 7.575,12.575Q8,12.15 8,11.5Q8,10.85 7.575,10.425Q7.15,10 6.5,10Q5.85,10 5.425,10.425Q5,10.85 5,11.5Q5,12.15 5.425,12.575Q5.85,13 6.5,13ZM9.5,9Q10.15,9 10.575,8.575Q11,8.15 11,7.5Q11,6.85 10.575,6.425Q10.15,6 9.5,6Q8.85,6 8.425,6.425Q8,6.85 8,7.5Q8,8.15 8.425,8.575Q8.85,9 9.5,9ZM14.5,9Q15.15,9 15.575,8.575Q16,8.15 16,7.5Q16,6.85 15.575,6.425Q15.15,6 14.5,6Q13.85,6 13.425,6.425Q13,6.85 13,7.5Q13,8.15 13.425,8.575Q13.85,9 14.5,9ZM17.5,13Q18.15,13 18.575,12.575Q19,12.15 19,11.5Q19,10.85 18.575,10.425Q18.15,10 17.5,10Q16.85,10 16.425,10.425Q16,10.85 16,11.5Q16,12.15 16.425,12.575Q16.85,13 17.5,13Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_palette_outline.xml b/app/src/main/res/drawable/ic_palette_outline.xml
deleted file mode 100644
index 57909b62f..000000000
--- a/app/src/main/res/drawable/ic_palette_outline.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,22Q9.95,22 8.125,21.212Q6.3,20.425 4.938,19.062Q3.575,17.7 2.788,15.875Q2,14.05 2,12Q2,9.925 2.812,8.1Q3.625,6.275 5.013,4.925Q6.4,3.575 8.25,2.787Q10.1,2 12.2,2Q14.2,2 15.975,2.688Q17.75,3.375 19.087,4.588Q20.425,5.8 21.212,7.463Q22,9.125 22,11.05Q22,13.925 20.25,15.462Q18.5,17 16,17H14.15Q13.925,17 13.838,17.125Q13.75,17.25 13.75,17.4Q13.75,17.7 14.125,18.262Q14.5,18.825 14.5,19.55Q14.5,20.8 13.812,21.4Q13.125,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM6.5,13Q7.15,13 7.575,12.575Q8,12.15 8,11.5Q8,10.85 7.575,10.425Q7.15,10 6.5,10Q5.85,10 5.425,10.425Q5,10.85 5,11.5Q5,12.15 5.425,12.575Q5.85,13 6.5,13ZM9.5,9Q10.15,9 10.575,8.575Q11,8.15 11,7.5Q11,6.85 10.575,6.425Q10.15,6 9.5,6Q8.85,6 8.425,6.425Q8,6.85 8,7.5Q8,8.15 8.425,8.575Q8.85,9 9.5,9ZM14.5,9Q15.15,9 15.575,8.575Q16,8.15 16,7.5Q16,6.85 15.575,6.425Q15.15,6 14.5,6Q13.85,6 13.425,6.425Q13,6.85 13,7.5Q13,8.15 13.425,8.575Q13.85,9 14.5,9ZM17.5,13Q18.15,13 18.575,12.575Q19,12.15 19,11.5Q19,10.85 18.575,10.425Q18.15,10 17.5,10Q16.85,10 16.425,10.425Q16,10.85 16,11.5Q16,12.15 16.425,12.575Q16.85,13 17.5,13ZM12,20Q12.225,20 12.363,19.875Q12.5,19.75 12.5,19.55Q12.5,19.2 12.125,18.725Q11.75,18.25 11.75,17.3Q11.75,16.25 12.475,15.625Q13.2,15 14.25,15H16Q17.65,15 18.825,14.037Q20,13.075 20,11.05Q20,8.025 17.688,6.012Q15.375,4 12.2,4Q8.8,4 6.4,6.325Q4,8.65 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_paypal.xml b/app/src/main/res/drawable/ic_paypal.xml
deleted file mode 100644
index f3f437ff5..000000000
--- a/app/src/main/res/drawable/ic_paypal.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="50dp"
-    android:height="50dp"
-    android:viewportWidth="54.009"
-    android:viewportHeight="54.009"
-    android:tint="?colorControlNormal">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M45.269,17.21c-0.038,-0.029 -0.083,-0.038 -0.123,-0.061c0.058,-0.542 0.09,-1.092 0.09,-1.649c0,-8.547 -6.954,-15.5 -15.502,-15.5H11.237c-0.498,0 -0.921,0.367 -0.99,0.86L3.781,46.865c-0.04,0.287 0.046,0.577 0.235,0.796c0.19,0.219 0.466,0.344 0.755,0.344h10.326c-0.424,2.77 -0.836,4.78 -0.84,4.803c-0.061,0.294 0.015,0.601 0.204,0.833c0.19,0.233 0.475,0.368 0.775,0.368h10.32c0.497,0 0.919,-0.365 0.99,-0.857l1.878,-13.04h8.668c7.247,0 13.144,-5.758 13.144,-12.835C50.237,23.332 48.427,19.663 45.269,17.21zM12.106,2h17.629c7.445,0 13.502,6.056 13.502,13.503C43.237,22.945 37.181,29 29.735,29H18.661c-0.498,0 -0.921,0.367 -0.99,0.861l-2.269,16.144h-9.48L12.106,2zM37.094,38.111H27.56c-0.497,0 -0.919,0.365 -0.99,0.857l-1.878,13.04h-8.243c0.199,-1.067 0.496,-2.76 0.779,-4.721c0.002,-0.012 -0.003,-0.023 -0.002,-0.035c0.01,-0.037 0.031,-0.07 0.036,-0.109L19.53,31h10.205c7.205,0 13.259,-4.946 14.99,-11.616c2.236,2.046 3.512,4.87 3.512,7.893C48.237,33.251 43.238,38.111 37.094,38.111z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_phonelink_ring.xml b/app/src/main/res/drawable/ic_phonelink_ring.xml
index 1f73e85d2..b2c8313e0 100644
--- a/app/src/main/res/drawable/ic_phonelink_ring.xml
+++ b/app/src/main/res/drawable/ic_phonelink_ring.xml
@@ -1,10 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20,16.5Q19.775,16.275 19.763,15.912Q19.75,15.55 19.95,15.275Q20.475,14.575 20.75,13.737Q21.025,12.9 21.025,12Q21.025,11.1 20.75,10.262Q20.475,9.425 19.95,8.725Q19.75,8.45 19.75,8.1Q19.75,7.75 20,7.5Q20.35,7.15 20.812,7.175Q21.275,7.2 21.55,7.55Q22.275,8.5 22.65,9.637Q23.025,10.775 23.025,12Q23.025,13.225 22.65,14.363Q22.275,15.5 21.55,16.45Q21.275,16.8 20.812,16.825Q20.35,16.85 20,16.5ZM17.475,13.975Q17.275,13.775 17.238,13.45Q17.2,13.125 17.35,12.775Q17.425,12.575 17.475,12.387Q17.525,12.2 17.525,12Q17.525,11.8 17.475,11.612Q17.425,11.425 17.35,11.225Q17.2,10.875 17.238,10.55Q17.275,10.225 17.475,10.025Q17.875,9.625 18.363,9.688Q18.85,9.75 19.075,10.175Q19.3,10.6 19.413,11.05Q19.525,11.5 19.525,12Q19.525,12.5 19.413,12.95Q19.3,13.4 19.075,13.825Q18.85,14.25 18.363,14.312Q17.875,14.375 17.475,13.975ZM7,23Q6.175,23 5.588,22.413Q5,21.825 5,21V3Q5,2.175 5.588,1.587Q6.175,1 7,1H17Q17.825,1 18.413,1.587Q19,2.175 19,3V7H17V6H7V18H17V17H19V21Q19,21.825 18.413,22.413Q17.825,23 17,23Z"/>
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M14,1L4,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L16,3c0,-1.1 -0.9,-2 -2,-2zM14,20L4,20L4,4h10v16zM20.63,8.26c-0.26,-0.32 -0.74,-0.36 -1.04,-0.06l-0.03,0.03c-0.25,0.25 -0.26,0.65 -0.05,0.93 1.26,1.64 1.25,3.87 -0.02,5.57 -0.21,0.28 -0.19,0.67 0.05,0.92l0.05,0.05c0.29,0.29 0.76,0.26 1.03,-0.05 1.8,-2.13 1.8,-5.19 0.01,-7.39zM17.42,10.37l-0.06,0.06c-0.2,0.2 -0.26,0.5 -0.15,0.76 0.21,0.49 0.21,1.03 0,1.52 -0.11,0.26 -0.05,0.56 0.15,0.76l0.08,0.08c0.32,0.32 0.87,0.25 1.09,-0.15 0.49,-0.89 0.49,-1.94 -0.01,-2.86 -0.22,-0.42 -0.77,-0.5 -1.1,-0.17z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_play_circle.xml b/app/src/main/res/drawable/ic_play_circle.xml
deleted file mode 100644
index 9badfb8a3..000000000
--- a/app/src/main/res/drawable/ic_play_circle.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M9.5,9.325V14.675Q9.5,15.275 10.025,15.55Q10.55,15.825 11.05,15.5L15.2,12.85Q15.675,12.575 15.675,12Q15.675,11.425 15.2,11.15L11.05,8.5Q10.55,8.175 10.025,8.45Q9.5,8.725 9.5,9.325ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM12,20Q15.325,20 17.663,17.663Q20,15.325 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_play_circle_filled.xml b/app/src/main/res/drawable/ic_play_circle_filled.xml
index 4613121b9..87619b256 100644
--- a/app/src/main/res/drawable/ic_play_circle_filled.xml
+++ b/app/src/main/res/drawable/ic_play_circle_filled.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
+
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M9.5,9.325V14.675Q9.5,15.275 10.025,15.55Q10.55,15.825 11.05,15.5L15.2,12.85Q15.675,12.575 15.675,12Q15.675,11.425 15.2,11.15L11.05,8.5Q10.55,8.175 10.025,8.45Q9.5,8.725 9.5,9.325ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM12,20Q15.325,20 17.663,17.663Q20,15.325 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm-2-3.5l6-4.5-6-4.5z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_playback_speed.xml b/app/src/main/res/drawable/ic_playback_speed.xml
index b2a3b1f80..39b481679 100644
--- a/app/src/main/res/drawable/ic_playback_speed.xml
+++ b/app/src/main/res/drawable/ic_playback_speed.xml
@@ -2,9 +2,11 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
   <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11.025,15.5Q10.525,15.825 10,15.55Q9.475,15.275 9.475,14.675V9.325Q9.475,8.725 10,8.45Q10.525,8.175 11.025,8.5L15.175,11.15Q15.4,11.3 15.512,11.525Q15.625,11.75 15.625,12Q15.625,12.25 15.512,12.475Q15.4,12.7 15.175,12.85ZM9.825,21.775Q8.95,21.575 8.138,21.25Q7.325,20.925 6.55,20.425Q6.15,20.175 6.113,19.725Q6.075,19.275 6.425,18.925Q6.675,18.675 7.062,18.638Q7.45,18.6 7.775,18.8Q8.325,19.15 8.913,19.387Q9.5,19.625 10.125,19.775Q10.475,19.875 10.713,20.163Q10.95,20.45 10.95,20.8Q10.95,21.3 10.613,21.587Q10.275,21.875 9.825,21.775ZM5,17.5Q4.65,17.85 4.213,17.812Q3.775,17.775 3.525,17.4Q3.025,16.675 2.688,15.863Q2.35,15.05 2.15,14.15Q2.025,13.7 2.312,13.35Q2.6,13 3.1,13Q3.45,13 3.75,13.25Q4.05,13.5 4.15,13.85Q4.3,14.5 4.55,15.075Q4.8,15.65 5.125,16.2Q5.325,16.5 5.287,16.875Q5.25,17.25 5,17.5ZM3.125,11Q2.625,11 2.325,10.65Q2.025,10.3 2.125,9.85Q2.325,8.975 2.675,8.137Q3.025,7.3 3.525,6.575Q3.775,6.2 4.213,6.175Q4.65,6.15 5,6.5Q5.25,6.75 5.287,7.125Q5.325,7.5 5.125,7.8Q4.8,8.325 4.55,8.912Q4.3,9.5 4.15,10.15Q4.05,10.5 3.763,10.75Q3.475,11 3.125,11ZM14.05,21.75Q13.6,21.85 13.275,21.575Q12.95,21.3 12.95,20.825Q12.95,20.475 13.188,20.175Q13.425,19.875 13.775,19.775Q16.45,19.075 18.175,16.938Q19.9,14.8 19.9,12Q19.9,9.2 18.175,7.025Q16.45,4.85 13.775,4.2Q13.425,4.1 13.188,3.812Q12.95,3.525 12.95,3.175Q12.95,2.7 13.288,2.412Q13.625,2.125 14.075,2.225Q17.5,2.975 19.7,5.7Q21.9,8.425 21.9,12Q21.9,15.55 19.688,18.25Q17.475,20.95 14.05,21.75ZM7.7,5.225Q7.375,5.425 7.013,5.375Q6.65,5.325 6.4,5.075Q6.05,4.725 6.088,4.275Q6.125,3.825 6.525,3.575Q7.3,3.075 8.125,2.75Q8.95,2.425 9.825,2.225Q10.275,2.125 10.613,2.412Q10.95,2.7 10.95,3.175Q10.95,3.525 10.7,3.812Q10.45,4.1 10.1,4.2Q9.475,4.35 8.875,4.612Q8.275,4.875 7.7,5.225Z"/>
+      android:pathData="M4.027,13.011H2.014C2.201,14.887 2.914,16.672 4.071,18.158L5.504,16.718C4.706,15.628 4.197,14.352 4.027,13.011ZM22,12.002C21.996,9.511 21.073,7.111 19.407,5.264C17.741,3.417 15.451,2.254 12.98,2V4.035C15.581,4.366 17.856,5.953 19.071,8.283C20.285,10.613 20.285,13.391 19.071,15.72C17.856,18.05 15.581,19.637 12.98,19.968V21.986C15.448,21.733 17.736,20.573 19.402,18.73C21.067,16.886 21.993,14.49 22,12.002ZM6.869,18.192L5.447,19.618C6.999,20.964 8.925,21.796 10.966,22V19.981C9.458,19.789 8.036,19.168 6.869,18.192ZM5.49,7.282L4.057,5.846C2.9,7.332 2.187,9.117 2,10.993H4.014C4.184,9.65 4.692,8.373 5.49,7.282ZM10.966,4.036V2C8.926,2.206 6.998,3.038 5.446,4.382L6.869,5.808C8.038,4.838 9.46,4.223 10.966,4.036Z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M15.6432,11.152C16.2699,11.5437 16.2699,12.4563 15.6432,12.848L10.53,16.0438C9.8639,16.46 9,15.9812 9,15.1958V8.8042C9,8.0188 9.8639,7.54 10.53,7.9563L15.6432,11.152Z"
+      android:fillColor="#fff"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_popcorn.xml b/app/src/main/res/drawable/ic_popcorn.xml
new file mode 100644
index 000000000..1dcf7c62b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_popcorn.xml
@@ -0,0 +1,9 @@
+<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="M7,22H4.75C4.75,22 4,22 3.81,20.65L2.04,3.81L2,3.5C2,2.67 2.9,2 4,2C5.1,2 6,2.67 6,3.5C6,2.67 6.9,2 8,2C9.1,2 10,2.67 10,3.5C10,2.67 10.9,2 12,2C13.09,2 14,2.66 14,3.5V3.5C14,2.67 14.9,2 16,2C17.1,2 18,2.67 18,3.5C18,2.67 18.9,2 20,2C21.1,2 22,2.67 22,3.5L21.96,3.81L20.19,20.65C20,22 19.25,22 19.25,22H17L16.5,22H13.75L10.25,22H7.5L7,22M17.85,4.93C17.55,4.39 16.84,4 16,4C15.19,4 14.36,4.36 14,4.87L13.78,20H16.66L17.85,4.93M10,4.87C9.64,4.36 8.81,4 8,4C7.16,4 6.45,4.39 6.15,4.93L7.34,20H10.22L10,4.87Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_queue_music.xml b/app/src/main/res/drawable/ic_queue_music.xml
index 7751c8f35..94de4470c 100644
--- a/app/src/main/res/drawable/ic_queue_music.xml
+++ b/app/src/main/res/drawable/ic_queue_music.xml
@@ -1,10 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M16,20Q14.75,20 13.875,19.125Q13,18.25 13,17Q13,15.75 13.875,14.875Q14.75,14 16,14Q16.275,14 16.525,14.037Q16.775,14.075 17,14.2V7Q17,6.575 17.288,6.287Q17.575,6 18,6H21Q21.425,6 21.712,6.287Q22,6.575 22,7Q22,7.425 21.712,7.713Q21.425,8 21,8H19V17Q19,18.25 18.125,19.125Q17.25,20 16,20ZM4,8Q3.575,8 3.288,7.713Q3,7.425 3,7Q3,6.575 3.288,6.287Q3.575,6 4,6H14Q14.425,6 14.713,6.287Q15,6.575 15,7Q15,7.425 14.713,7.713Q14.425,8 14,8ZM4,12Q3.575,12 3.288,11.712Q3,11.425 3,11Q3,10.575 3.288,10.287Q3.575,10 4,10H14Q14.425,10 14.713,10.287Q15,10.575 15,11Q15,11.425 14.713,11.712Q14.425,12 14,12ZM4,16Q3.575,16 3.288,15.712Q3,15.425 3,15Q3,14.575 3.288,14.287Q3.575,14 4,14H10Q10.425,14 10.713,14.287Q11,14.575 11,15Q11,15.425 10.713,15.712Q10.425,16 10,16Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M14 6H4c-0.55 0-1 0.45-1 1s0.45 1 1 1h10c0.55 0 1-0.45 1-1s-0.45-1-1-1zm0 4H4c-0.55 0-1 0.45-1 1s0.45 1 1 1h10c0.55 0 1-0.45 1-1s-0.45-1-1-1zM4 16h6c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1zM19 6c-1.1 0-2 0.9-2 2v6.18c-0.31-0.11-0.65-0.18-1-0.18-1.84 0-3.28 1.64-2.95 3.54 0.21 1.21 1.2 2.2 2.41 2.41 1.9 0.33 3.54-1.11 3.54-2.95V8h2c0.55 0 1-0.45 1-1s-0.45-1-1-1h-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_redo.xml b/app/src/main/res/drawable/ic_redo.xml
index 4f852a86f..14462f542 100644
--- a/app/src/main/res/drawable/ic_redo.xml
+++ b/app/src/main/res/drawable/ic_redo.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
+
     <path
         android:fillColor="@color/md_white_1000"
         android:pathData="M18.4 10.6C16.55 8.99 14.15 8 11.5 8c-4.65 0-8.58 3.03-9.96 7.22L3.9 16c1.05-3.19 4.05-5.5 7.6-5.5 1.95 0 3.73 0.72 5.12 1.88L13 16h9V7l-3.6 3.6z" />
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
index 66a1e9b6a..5cdbeb077 100644
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -6,5 +6,5 @@
     android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
-      android:pathData="M12,20Q8.65,20 6.325,17.675Q4,15.35 4,12Q4,8.65 6.325,6.325Q8.65,4 12,4Q13.725,4 15.3,4.713Q16.875,5.425 18,6.75V5Q18,4.575 18.288,4.287Q18.575,4 19,4Q19.425,4 19.712,4.287Q20,4.575 20,5V10Q20,10.425 19.712,10.712Q19.425,11 19,11H14Q13.575,11 13.288,10.712Q13,10.425 13,10Q13,9.575 13.288,9.287Q13.575,9 14,9H17.2Q16.4,7.6 15.013,6.8Q13.625,6 12,6Q9.5,6 7.75,7.75Q6,9.5 6,12Q6,14.5 7.75,16.25Q9.5,18 12,18Q13.725,18 15.188,17.087Q16.65,16.175 17.375,14.65Q17.5,14.375 17.788,14.188Q18.075,14 18.375,14Q18.95,14 19.238,14.4Q19.525,14.8 19.3,15.3Q18.35,17.425 16.375,18.712Q14.4,20 12,20Z"/>
+      android:pathData="M17.65,6.35c-1.63,-1.63 -3.94,-2.57 -6.48,-2.31 -3.67,0.37 -6.69,3.35 -7.1,7.02C3.52,15.91 7.27,20 12,20c3.19,0 5.93,-1.87 7.21,-4.56 0.32,-0.67 -0.16,-1.44 -0.9,-1.44 -0.37,0 -0.72,0.2 -0.88,0.53 -1.13,2.43 -3.84,3.97 -6.8,3.31 -2.22,-0.49 -4.01,-2.3 -4.48,-4.52C5.31,9.44 8.26,6 12,6c1.66,0 3.14,0.69 4.22,1.78l-1.51,1.51c-0.63,0.63 -0.19,1.71 0.7,1.71H19c0.55,0 1,-0.45 1,-1V6.41c0,-0.89 -1.08,-1.34 -1.71,-0.71l-0.64,0.65z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_repeat.xml b/app/src/main/res/drawable/ic_repeat.xml
index 53fed2aa4..57a847355 100644
--- a/app/src/main/res/drawable/ic_repeat.xml
+++ b/app/src/main/res/drawable/ic_repeat.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M17,17V14Q17,13.575 17.288,13.287Q17.575,13 18,13Q18.425,13 18.712,13.275Q19,13.55 19,13.975V18Q19,18.425 18.712,18.712Q18.425,19 18,19H6.85L7.675,19.825Q7.975,20.125 7.988,20.55Q8,20.975 7.7,21.275Q7.4,21.575 6.988,21.575Q6.575,21.575 6.3,21.3L3.7,18.7Q3.425,18.425 3.425,18Q3.425,17.575 3.7,17.3L6.275,14.725Q6.575,14.425 6.988,14.425Q7.4,14.425 7.7,14.725Q8,15.025 8,15.438Q8,15.85 7.7,16.15L6.85,17ZM7,7V10Q7,10.425 6.713,10.712Q6.425,11 6,11Q5.575,11 5.287,10.725Q5,10.45 5,10.025V6Q5,5.575 5.287,5.287Q5.575,5 6,5H17.15L16.325,4.175Q16.025,3.875 16.013,3.45Q16,3.025 16.3,2.725Q16.6,2.425 17.013,2.425Q17.425,2.425 17.7,2.7L20.3,5.3Q20.575,5.575 20.575,6Q20.575,6.425 20.3,6.7L17.725,9.275Q17.425,9.575 17.013,9.575Q16.6,9.575 16.3,9.275Q16,8.975 16,8.562Q16,8.15 16.3,7.85L17.15,7Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M7 7h10v1.79c0 0.45 0.54 0.67 0.85 0.35l2.79-2.79c0.2-0.2 0.2 -0.51 0-0.71l-2.79-2.79c-0.31-0.31-0.85-0.09-0.85 0.36 V5H6c-0.55 0-1 0.45-1 1v4c0 0.55 0.45 1 1 1s1-0.45 1-1V7zm10 10H7v-1.79c0-0.45-0.54-0.67-0.85-0.35l-2.79 2.79c-0.2 0.2 -0.2 0.51 0 0.71l2.79 2.79c0.31 0.31 0.85 0.09 0.85-0.36V19h11c0.55 0 1-0.45 1-1v-4c0-0.55-0.45-1-1-1s-1 0.45-1 1v3z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_repeat_one.xml b/app/src/main/res/drawable/ic_repeat_one.xml
index b4afbe32b..8c04a4b91 100644
--- a/app/src/main/res/drawable/ic_repeat_one.xml
+++ b/app/src/main/res/drawable/ic_repeat_one.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11.5,10.5H10.725Q10.425,10.5 10.213,10.287Q10,10.075 10,9.75Q10,9.425 10.213,9.212Q10.425,9 10.75,9H12.25Q12.575,9 12.788,9.212Q13,9.425 13,9.75V14.275Q13,14.575 12.788,14.787Q12.575,15 12.25,15Q11.925,15 11.713,14.787Q11.5,14.575 11.5,14.25ZM17,17V14Q17,13.575 17.288,13.287Q17.575,13 18,13Q18.425,13 18.712,13.275Q19,13.55 19,13.975V18Q19,18.425 18.712,18.712Q18.425,19 18,19H6.85L7.675,19.825Q7.975,20.125 7.988,20.55Q8,20.975 7.7,21.275Q7.4,21.575 6.988,21.575Q6.575,21.575 6.3,21.3L3.7,18.7Q3.425,18.425 3.425,18Q3.425,17.575 3.7,17.3L6.275,14.725Q6.575,14.425 6.988,14.425Q7.4,14.425 7.7,14.725Q8,15.025 8,15.438Q8,15.85 7.7,16.15L6.85,17ZM7,7V10Q7,10.425 6.713,10.712Q6.425,11 6,11Q5.575,11 5.287,10.725Q5,10.45 5,10.025V6Q5,5.575 5.287,5.287Q5.575,5 6,5H17.15L16.325,4.175Q16.025,3.875 16.013,3.45Q16,3.025 16.3,2.725Q16.6,2.425 17.013,2.425Q17.425,2.425 17.7,2.7L20.3,5.3Q20.575,5.575 20.575,6Q20.575,6.425 20.3,6.7L17.725,9.275Q17.425,9.575 17.013,9.575Q16.6,9.575 16.3,9.275Q16,8.975 16,8.562Q16,8.15 16.3,7.85L17.15,7Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M7 7h10v1.79c0 0.45 0.54 0.67 0.85 0.35l2.79-2.79c0.2-0.2 0.2 -0.51 0-0.71l-2.79-2.79c-0.31-0.31-0.85-0.09-0.85 0.36 V5H6c-0.55 0-1 0.45-1 1v4c0 0.55 0.45 1 1 1s1-0.45 1-1V7zm10 10H7v-1.79c0-0.45-0.54-0.67-0.85-0.35l-2.79 2.79c-0.2 0.2 -0.2 0.51 0 0.71l2.79 2.79c0.31 0.31 0.85 0.09 0.85-0.36V19h11c0.55 0 1-0.45 1-1v-4c0-0.55-0.45-1-1-1s-1 0.45-1 1v3zm-4-2.75V9.81c0-0.45-0.36-0.81-0.81-0.81-0.13 0-0.25 0.03 -0.36 0.09 l-1.49 0.74 c-0.21 0.1 -0.34 0.32 -0.34 0.55 0 0.34 0.28 0.62 0.62 0.62h0.88v3.25c0 0.41 0.34 0.75 0.75 0.75s0.75-0.34 0.75 -0.75z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_repeat_one_sharp.xml b/app/src/main/res/drawable/ic_repeat_one_sharp.xml
new file mode 100644
index 000000000..a0dbdbaea
--- /dev/null
+++ b/app/src/main/res/drawable/ic_repeat_one_sharp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M7 7h10v3l4-4-4-4v3H5v6h2V7zm10 10H7v-3l-4 4 4 4v-3h12v-6h-2v4zm-4-2V9h-1l-2 1v1h1.5v4H13z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_repeat_sharp.xml b/app/src/main/res/drawable/ic_repeat_sharp.xml
new file mode 100644
index 000000000..771cddf56
--- /dev/null
+++ b/app/src/main/res/drawable/ic_repeat_sharp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M7 7h10v3l4-4-4-4v3H5v6h2V7zm10 10H7v-3l-4 4 4 4v-3h12v-6h-2v4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_save.xml b/app/src/main/res/drawable/ic_save.xml
index ceaaba2e4..3093228f3 100644
--- a/app/src/main/res/drawable/ic_save.xml
+++ b/app/src/main/res/drawable/ic_save.xml
@@ -1,10 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H16.175Q16.575,3 16.938,3.15Q17.3,3.3 17.575,3.575L20.425,6.425Q20.7,6.7 20.85,7.062Q21,7.425 21,7.825V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM12,18Q13.25,18 14.125,17.125Q15,16.25 15,15Q15,13.75 14.125,12.875Q13.25,12 12,12Q10.75,12 9.875,12.875Q9,13.75 9,15Q9,16.25 9.875,17.125Q10.75,18 12,18ZM7,10H14Q14.425,10 14.713,9.712Q15,9.425 15,9V7Q15,6.575 14.713,6.287Q14.425,6 14,6H7Q6.575,6 6.287,6.287Q6,6.575 6,7V9Q6,9.425 6.287,9.712Q6.575,10 7,10Z"/>
-</vector>
+    android:viewportHeight="24">
+
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M17.59 3.59c-0.38-0.38-0.89-0.59-1.42-0.59H5c-1.11 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V7.83c0-0.53-0.21-1.04-0.59-1.41l-2.82-2.83zM12 19c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zm1-10H7c-1.1 0-2-0.9-2-2s0.9-2 2-2h6c1.1 0 2 0.9 2 2s-0.9 2-2 2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_sd_card.xml b/app/src/main/res/drawable/ic_sd_card.xml
deleted file mode 100644
index 3bf143f65..000000000
--- a/app/src/main/res/drawable/ic_sd_card.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,11Q10.425,11 10.713,10.712Q11,10.425 11,10V8Q11,7.575 10.713,7.287Q10.425,7 10,7Q9.575,7 9.288,7.287Q9,7.575 9,8V10Q9,10.425 9.288,10.712Q9.575,11 10,11ZM13,11Q13.425,11 13.713,10.712Q14,10.425 14,10V8Q14,7.575 13.713,7.287Q13.425,7 13,7Q12.575,7 12.288,7.287Q12,7.575 12,8V10Q12,10.425 12.288,10.712Q12.575,11 13,11ZM16,11Q16.425,11 16.712,10.712Q17,10.425 17,10V8Q17,7.575 16.712,7.287Q16.425,7 16,7Q15.575,7 15.288,7.287Q15,7.575 15,8V10Q15,10.425 15.288,10.712Q15.575,11 16,11ZM6,22Q5.175,22 4.588,21.413Q4,20.825 4,20V8.825Q4,8.425 4.15,8.062Q4.3,7.7 4.575,7.425L9.425,2.575Q9.7,2.3 10.062,2.15Q10.425,2 10.825,2H18Q18.825,2 19.413,2.587Q20,3.175 20,4V20Q20,20.825 19.413,21.413Q18.825,22 18,22ZM6,20H18Q18,20 18,20Q18,20 18,20V4Q18,4 18,4Q18,4 18,4H10.85L6,8.85V20Q6,20 6,20Q6,20 6,20ZM6,20Q6,20 6,20Q6,20 6,20H10.85H18Q18,20 18,20Q18,20 18,20Q18,20 18,20Q18,20 18,20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_sd_storage.xml b/app/src/main/res/drawable/ic_sd_storage.xml
index 3bf143f65..839b9fb22 100644
--- a/app/src/main/res/drawable/ic_sd_storage.xml
+++ b/app/src/main/res/drawable/ic_sd_storage.xml
@@ -1,10 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,11Q10.425,11 10.713,10.712Q11,10.425 11,10V8Q11,7.575 10.713,7.287Q10.425,7 10,7Q9.575,7 9.288,7.287Q9,7.575 9,8V10Q9,10.425 9.288,10.712Q9.575,11 10,11ZM13,11Q13.425,11 13.713,10.712Q14,10.425 14,10V8Q14,7.575 13.713,7.287Q13.425,7 13,7Q12.575,7 12.288,7.287Q12,7.575 12,8V10Q12,10.425 12.288,10.712Q12.575,11 13,11ZM16,11Q16.425,11 16.712,10.712Q17,10.425 17,10V8Q17,7.575 16.712,7.287Q16.425,7 16,7Q15.575,7 15.288,7.287Q15,7.575 15,8V10Q15,10.425 15.288,10.712Q15.575,11 16,11ZM6,22Q5.175,22 4.588,21.413Q4,20.825 4,20V8.825Q4,8.425 4.15,8.062Q4.3,7.7 4.575,7.425L9.425,2.575Q9.7,2.3 10.062,2.15Q10.425,2 10.825,2H18Q18.825,2 19.413,2.587Q20,3.175 20,4V20Q20,20.825 19.413,21.413Q18.825,22 18,22ZM6,20H18Q18,20 18,20Q18,20 18,20V4Q18,4 18,4Q18,4 18,4H10.85L6,8.85V20Q6,20 6,20Q6,20 6,20ZM6,20Q6,20 6,20Q6,20 6,20H10.85H18Q18,20 18,20Q18,20 18,20Q18,20 18,20Q18,20 18,20Z"/>
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,2h-7.17c-0.53,0 -1.04,0.21 -1.42,0.59L4.6,7.42c-0.37,0.37 -0.6,0.88 -0.6,1.4L4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM11,8c-0.55,0 -1,-0.45 -1,-1L10,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2c0,0.55 -0.45,1 -1,1zM14,8c-0.55,0 -1,-0.45 -1,-1L13,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2c0,0.55 -0.45,1 -1,1zM17,8c-0.55,0 -1,-0.45 -1,-1L16,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2c0,0.55 -0.45,1 -1,1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index c31bac9ce..4d0f18584 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M18.9,20.3 L13.3,14.7Q12.55,15.3 11.575,15.65Q10.6,16 9.5,16Q6.775,16 4.888,14.113Q3,12.225 3,9.5Q3,6.775 4.888,4.887Q6.775,3 9.5,3Q12.225,3 14.113,4.887Q16,6.775 16,9.5Q16,10.6 15.65,11.575Q15.3,12.55 14.7,13.3L20.325,18.925Q20.6,19.2 20.6,19.6Q20.6,20 20.3,20.3Q20.025,20.575 19.6,20.575Q19.175,20.575 18.9,20.3ZM9.5,14Q11.375,14 12.688,12.688Q14,11.375 14,9.5Q14,7.625 12.688,6.312Q11.375,5 9.5,5Q7.625,5 6.312,6.312Q5,7.625 5,9.5Q5,11.375 6.312,12.688Q7.625,14 9.5,14Z"/>
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_select_all.xml b/app/src/main/res/drawable/ic_select_all.xml
index 28347abcf..a7029a97f 100644
--- a/app/src/main/res/drawable/ic_select_all.xml
+++ b/app/src/main/res/drawable/ic_select_all.xml
@@ -1 +1 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="@android:color/white"
      android:pathData="M3,5Q3,4.175 3.587,3.587Q4.175,3 5,3V5ZM3,13V11H5V13ZM7,21V19H9V21ZM3,9V7H5V9ZM11,5V3H13V5ZM19,5V3Q19.825,3 20.413,3.587Q21,4.175 21,5ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19H5ZM3,17V15H5V17ZM7,5V3H9V5ZM11,21V19H13V21ZM19,13V11H21V13ZM19,21V19H21Q21,19.825 20.413,20.413Q19.825,21 19,21ZM19,9V7H21V9ZM19,17V15H21V17ZM15,21V19H17V21ZM15,5V3H17V5ZM8,17Q7.575,17 7.287,16.712Q7,16.425 7,16V8Q7,7.575 7.287,7.287Q7.575,7 8,7H16Q16.425,7 16.712,7.287Q17,7.575 17,8V16Q17,16.425 16.712,16.712Q16.425,17 16,17ZM9,15H15V9H9Z"/>
</vector>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24.0"
    android:viewportHeight="24.0">
    <path
        android:fillColor="#FFFFFF"
        android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z" />
</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml
index ed8a26465..f2e8eff4d 100644
--- a/app/src/main/res/drawable/ic_send.xml
+++ b/app/src/main/res/drawable/ic_send.xml
@@ -1,10 +1,23 @@
+<!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4.4,19.425Q3.9,19.625 3.45,19.337Q3,19.05 3,18.5V14.775Q3,14.425 3.2,14.15Q3.4,13.875 3.75,13.8L11,12L3.75,10.2Q3.4,10.125 3.2,9.85Q3,9.575 3,9.225V5.5Q3,4.95 3.45,4.662Q3.9,4.375 4.4,4.575L19.8,11.075Q20.425,11.35 20.425,12Q20.425,12.65 19.8,12.925Z"/>
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M3.4 20.4l17.45-7.48c0.81-0.35 0.81 -1.49 0-1.84L3.4 3.6c-0.66-0.29-1.39 0.2 -1.39 0.91 L2 9.12c0 0.5 0.37 0.93 0.87 0.99L17 12 2.87 13.88c-0.5 0.07 -0.87 0.5 -0.87 1l0.01 4.61c0 0.71 0.73 1.2 1.39 0.91 z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 43c1ad20c..da3e202a3 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,10 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M13.875,22H10.125Q9.75,22 9.475,21.75Q9.2,21.5 9.15,21.125L8.85,18.8Q8.525,18.675 8.238,18.5Q7.95,18.325 7.675,18.125L5.5,19.025Q5.15,19.15 4.8,19.05Q4.45,18.95 4.25,18.625L2.4,15.4Q2.2,15.075 2.275,14.7Q2.35,14.325 2.65,14.1L4.525,12.675Q4.5,12.5 4.5,12.337Q4.5,12.175 4.5,12Q4.5,11.825 4.5,11.662Q4.5,11.5 4.525,11.325L2.65,9.9Q2.35,9.675 2.275,9.3Q2.2,8.925 2.4,8.6L4.25,5.375Q4.425,5.025 4.787,4.937Q5.15,4.85 5.5,4.975L7.675,5.875Q7.95,5.675 8.25,5.5Q8.55,5.325 8.85,5.2L9.15,2.875Q9.2,2.5 9.475,2.25Q9.75,2 10.125,2H13.875Q14.25,2 14.525,2.25Q14.8,2.5 14.85,2.875L15.15,5.2Q15.475,5.325 15.763,5.5Q16.05,5.675 16.325,5.875L18.5,4.975Q18.85,4.85 19.2,4.95Q19.55,5.05 19.75,5.375L21.6,8.6Q21.8,8.925 21.725,9.3Q21.65,9.675 21.35,9.9L19.475,11.325Q19.5,11.5 19.5,11.662Q19.5,11.825 19.5,12Q19.5,12.175 19.5,12.337Q19.5,12.5 19.45,12.675L21.325,14.1Q21.625,14.325 21.7,14.7Q21.775,15.075 21.575,15.4L19.725,18.6Q19.525,18.925 19.163,19.038Q18.8,19.15 18.45,19.025L16.325,18.125Q16.05,18.325 15.75,18.5Q15.45,18.675 15.15,18.8L14.85,21.125Q14.8,21.5 14.525,21.75Q14.25,22 13.875,22ZM12.05,15.5Q13.5,15.5 14.525,14.475Q15.55,13.45 15.55,12Q15.55,10.55 14.525,9.525Q13.5,8.5 12.05,8.5Q10.575,8.5 9.562,9.525Q8.55,10.55 8.55,12Q8.55,13.45 9.562,14.475Q10.575,15.5 12.05,15.5ZM12.05,13.5Q11.425,13.5 10.988,13.062Q10.55,12.625 10.55,12Q10.55,11.375 10.988,10.938Q11.425,10.5 12.05,10.5Q12.675,10.5 13.113,10.938Q13.55,11.375 13.55,12Q13.55,12.625 13.113,13.062Q12.675,13.5 12.05,13.5ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM11,20H12.975L13.325,17.35Q14.1,17.15 14.763,16.762Q15.425,16.375 15.975,15.825L18.45,16.85L19.425,15.15L17.275,13.525Q17.4,13.175 17.45,12.787Q17.5,12.4 17.5,12Q17.5,11.6 17.45,11.212Q17.4,10.825 17.275,10.475L19.425,8.85L18.45,7.15L15.975,8.2Q15.425,7.625 14.763,7.237Q14.1,6.85 13.325,6.65L13,4H11.025L10.675,6.65Q9.9,6.85 9.238,7.237Q8.575,7.625 8.025,8.175L5.55,7.15L4.575,8.85L6.725,10.45Q6.6,10.825 6.55,11.2Q6.5,11.575 6.5,12Q6.5,12.4 6.55,12.775Q6.6,13.15 6.725,13.525L4.575,15.15L5.55,16.85L8.025,15.8Q8.575,16.375 9.238,16.762Q9.9,17.15 10.675,17.35Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M13.85 22.25h-3.7c-0.74 0-1.36-0.54-1.45-1.27l-0.27-1.89c-0.27-0.14-0.53-0.29-0.79-0.46l-1.8 0.72 c-0.7 0.26 -1.47-0.03-1.81-0.65L2.2 15.53c-0.35-0.66-0.2-1.44 0.36 -1.88l1.53-1.19c-0.01-0.15-0.02-0.3-0.02-0.46 0-0.15 0.01 -0.31 0.02 -0.46l-1.52-1.19c-0.59-0.45-0.74-1.26-0.37-1.88l1.85-3.19c0.34-0.62 1.11-0.9 1.79-0.63l1.81 0.73 c0.26-0.17 0.52 -0.32 0.78 -0.46l0.27-1.91c0.09-0.7 0.71 -1.25 1.44-1.25h3.7c0.74 0 1.36 0.54 1.45 1.27l0.27 1.89c0.27 0.14 0.53 0.29 0.79 0.46 l1.8-0.72c0.71-0.26 1.48 0.03 1.82 0.65 l1.84 3.18c0.36 0.66 0.2 1.44-0.36 1.88l-1.52 1.19c0.01 0.15 0.02 0.3 0.02 0.46 s-0.01 0.31 -0.02 0.46 l1.52 1.19c0.56 0.45 0.72 1.23 0.37 1.86l-1.86 3.22c-0.34 0.62 -1.11 0.9 -1.8 0.63 l-1.8-0.72c-0.26 0.17 -0.52 0.32 -0.78 0.46 l-0.27 1.91c-0.1 0.68 -0.72 1.22-1.46 1.22zm-3.23-2h2.76l0.37-2.55 0.53 -0.22c0.44-0.18 0.88 -0.44 1.34-0.78l0.45-0.34 2.38 0.96 1.38-2.4-2.03-1.58 0.07 -0.56c0.03-0.26 0.06 -0.51 0.06 -0.78s-0.03-0.53-0.06-0.78l-0.07-0.56 2.03-1.58-1.39-2.4-2.39 0.96 -0.45-0.35c-0.42-0.32-0.87-0.58-1.33-0.77l-0.52-0.22-0.37-2.55h-2.76l-0.37 2.55-0.53 0.21 c-0.44 0.19 -0.88 0.44 -1.34 0.79 l-0.45 0.33 -2.38-0.95-1.39 2.39 2.03 1.58-0.07 0.56 a7 7 0 0 0-0.06 0.79 c0 0.26 0.02 0.53 0.06 0.78l0.07 0.56 -2.03 1.58 1.38 2.4 2.39-0.96 0.45 0.35c0.43 0.33 0.86 0.58 1.33 0.77 l0.53 0.22 0.38 2.55z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 12 8.5 C 13.9329966244 8.5 15.5 10.0670033756 15.5 12 C 15.5 13.9329966244 13.9329966244 15.5 12 15.5 C 10.0670033756 15.5 8.5 13.9329966244 8.5 12 C 8.5 10.0670033756 10.0670033756 8.5 12 8.5 Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_brightness.xml b/app/src/main/res/drawable/ic_settings_brightness.xml
deleted file mode 100644
index 03567d15a..000000000
--- a/app/src/main/res/drawable/ic_settings_brightness.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10.5,16 L11.3,16.8Q11.6,17.1 12,17.1Q12.4,17.1 12.7,16.8L13.5,16H15Q15.425,16 15.713,15.712Q16,15.425 16,15V13.5L16.8,12.7Q17.1,12.4 17.1,12Q17.1,11.6 16.8,11.3L16,10.5V9Q16,8.575 15.713,8.287Q15.425,8 15,8H13.5L12.7,7.2Q12.4,6.9 12,6.9Q11.6,6.9 11.3,7.2L10.5,8H9Q8.575,8 8.288,8.287Q8,8.575 8,9V10.5L7.2,11.3Q6.9,11.6 6.9,12Q6.9,12.4 7.2,12.7L8,13.5V15Q8,15.425 8.288,15.712Q8.575,16 9,16ZM12,15V9Q13.25,9 14.125,9.875Q15,10.75 15,12Q15,13.25 14.125,14.125Q13.25,15 12,15ZM4,20Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.175 2.588,4.588Q3.175,4 4,4H20Q20.825,4 21.413,4.588Q22,5.175 22,6V18Q22,18.825 21.413,19.413Q20.825,20 20,20ZM4,18Q4,18 4,18Q4,18 4,18V6Q4,6 4,6Q4,6 4,6Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18ZM4,18H20Q20,18 20,18Q20,18 20,18V6Q20,6 20,6Q20,6 20,6H4Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_settings_brigntness.xml b/app/src/main/res/drawable/ic_settings_brigntness.xml
new file mode 100644
index 000000000..09e353364
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_brigntness.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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="M21 3H3c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h18c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm-1 16.01H4c-0.55 0-1-0.45-1-1V5.99c0-0.55 0.45 -1 1-1h16c0.55 0 1 0.45 1 1v12.02c0 0.55-0.45 1-1 1zM8.5 16h2l1.15 1.15c0.2 0.2 0.51 0.2 0.71 0L13.5 16h2c0.28 0 0.5-0.22 0.5 -0.5v-2l1.15-1.15c0.2-0.2 0.2 -0.51 0-0.71L16 10.5v-2c0-0.28-0.22-0.5-0.5-0.5h-2l-1.15-1.15c-0.2-0.2-0.51-0.2-0.71 0L10.5 8h-2c-0.28 0-0.5 0.22 -0.5 0.5 v2l-1.15 1.15c-0.2 0.2 -0.2 0.51 0 0.71L8 13.5v2c0 0.28 0.22 0.5 0.5 0.5zM12 9c1.66 0 3 1.34 3 3s-1.34 3-3 3V9z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index a7404b279..f06ac6957 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
+
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,22Q16.75,22 15.875,21.125Q15,20.25 15,19Q15,18.825 15.025,18.637Q15.05,18.45 15.1,18.3L8.05,14.2Q7.625,14.575 7.1,14.787Q6.575,15 6,15Q4.75,15 3.875,14.125Q3,13.25 3,12Q3,10.75 3.875,9.875Q4.75,9 6,9Q6.575,9 7.1,9.212Q7.625,9.425 8.05,9.8L15.1,5.7Q15.05,5.55 15.025,5.363Q15,5.175 15,5Q15,3.75 15.875,2.875Q16.75,2 18,2Q19.25,2 20.125,2.875Q21,3.75 21,5Q21,6.25 20.125,7.125Q19.25,8 18,8Q17.425,8 16.9,7.787Q16.375,7.575 15.95,7.2L8.9,11.3Q8.95,11.45 8.975,11.637Q9,11.825 9,12Q9,12.175 8.975,12.362Q8.95,12.55 8.9,12.7L15.95,16.8Q16.375,16.425 16.9,16.212Q17.425,16 18,16Q19.25,16 20.125,16.875Q21,17.75 21,19Q21,20.25 20.125,21.125Q19.25,22 18,22Z" />
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M18 16.08c-0.76 0-1.44 0.3 -1.96 0.77 L8.91 12.7c0.05-0.23 0.09 -0.46 0.09 -0.7s-0.04-0.47-0.09-0.7l7.05-4.11c0.54 0.5 1.25 0.81 2.04 0.81 1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 0.24 0.04 0.47 0.09 0.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c0.79 0 1.5-0.31 2.04-0.81l7.12 4.16c-0.05 0.21 -0.08 0.43 -0.08 0.65 0 1.61 1.31 2.92 2.92 2.92s2.92-1.31 2.92-2.92-1.31-2.92-2.92-2.92z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shuffle.xml b/app/src/main/res/drawable/ic_shuffle.xml
index 35a4fd033..025d9fd15 100644
--- a/app/src/main/res/drawable/ic_shuffle.xml
+++ b/app/src/main/res/drawable/ic_shuffle.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M9.175,10.575 L4.7,6.1Q4.425,5.825 4.425,5.4Q4.425,4.975 4.7,4.7Q4.975,4.425 5.4,4.425Q5.825,4.425 6.1,4.7L10.575,9.175ZM15,20Q14.575,20 14.288,19.712Q14,19.425 14,19Q14,18.575 14.288,18.288Q14.575,18 15,18H16.6L13.4,14.8L14.825,13.375L18,16.55V15Q18,14.575 18.288,14.287Q18.575,14 19,14Q19.425,14 19.712,14.287Q20,14.575 20,15V19Q20,19.425 19.712,19.712Q19.425,20 19,20ZM4.7,19.3Q4.425,19.025 4.425,18.6Q4.425,18.175 4.7,17.9L16.6,6H15Q14.575,6 14.288,5.713Q14,5.425 14,5Q14,4.575 14.288,4.287Q14.575,4 15,4H19Q19.425,4 19.712,4.287Q20,4.575 20,5V9Q20,9.425 19.712,9.712Q19.425,10 19,10Q18.575,10 18.288,9.712Q18,9.425 18,9V7.4L6.1,19.3Q5.825,19.575 5.4,19.575Q4.975,19.575 4.7,19.3Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M10.59 9.17L6.12 4.7c-0.39-0.39-1.02-0.39-1.41 0-0.39 0.39 -0.39 1.02 0 1.41l4.46 4.46 1.42-1.4zm4.76-4.32l1.19 1.19L4.7 17.88c-0.39 0.39 -0.39 1.02 0 1.41 0.39 0.39 1.02 0.39 1.41 0L17.96 7.46l1.19 1.19c0.31 0.31 0.85 0.09 0.85-0.36V4.5c0-0.28-0.22-0.5-0.5-0.5h-3.79c-0.45 0-0.67 0.54 -0.36 0.85 zm-0.52 8.56l-1.41 1.41 3.13 3.13-1.2 1.2c-0.31 0.31 -0.09 0.85 0.36 0.85 h3.79c0.28 0 0.5-0.22 0.5 -0.5v-3.79c0-0.45-0.54-0.67-0.85-0.35l-1.19 1.19-3.13-3.14z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shuffle_sharp.xml b/app/src/main/res/drawable/ic_shuffle_sharp.xml
new file mode 100644
index 000000000..e56b2e366
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shuffle_sharp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M10.59 9.17L5.41 4 4 5.41l5.17 5.17 1.42-1.41zM14.5 4l2.04 2.04L4 18.59 5.41 20 17.96 7.46 20 9.5V4h-5.5zm0.33 9.41l-1.41 1.41 3.13 3.13L14.5 20H20v-5.5l-2.04 2.04-3.13-3.13z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_skip_next.xml b/app/src/main/res/drawable/ic_skip_next.xml
index 1d850e6eb..36b7c9532 100644
--- a/app/src/main/res/drawable/ic_skip_next.xml
+++ b/app/src/main/res/drawable/ic_skip_next.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="@dimen/icon_notification_dimen"
     android:height="@dimen/icon_notification_dimen"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M17.5,18Q17.075,18 16.788,17.712Q16.5,17.425 16.5,17V7Q16.5,6.575 16.788,6.287Q17.075,6 17.5,6Q17.925,6 18.212,6.287Q18.5,6.575 18.5,7V17Q18.5,17.425 18.212,17.712Q17.925,18 17.5,18ZM7.05,16.975Q6.55,17.325 6.025,17.025Q5.5,16.725 5.5,16.125V7.875Q5.5,7.275 6.025,6.987Q6.55,6.7 7.05,7.025L13.25,11.175Q13.7,11.475 13.7,12Q13.7,12.525 13.25,12.825Z"/>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M7.58 16.89l5.77-4.07c0.56-0.4 0.56 -1.24 0-1.63L7.58 7.11C6.91 6.65 6 7.12 6 7.93v8.14c0 0.81 0.91 1.28 1.58 0.82 zM16 7v10c0 0.55 0.45 1 1 1s1-0.45 1-1V7c0-0.55-0.45-1-1-1s-1 0.45-1 1z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_skip_next_outline.xml b/app/src/main/res/drawable/ic_skip_next_outline.xml
index 13c191470..0c9da3b11 100644
--- a/app/src/main/res/drawable/ic_skip_next_outline.xml
+++ b/app/src/main/res/drawable/ic_skip_next_outline.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="@dimen/icon_notification_dimen"
+    android:height="@dimen/icon_notification_dimen"
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M16.5,18V6H18.5V18ZM5.5,18V6L14.5,12ZM7.5,12ZM7.5,14.25 L10.9,12 7.5,9.75Z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,18l8.5,-6L6,6v12zM8,9.86L11.03,12 8,14.14L8,9.86zM16,6h2v12h-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_skip_next_round_white_32dp.xml b/app/src/main/res/drawable/ic_skip_next_round_white_32dp.xml
new file mode 100644
index 000000000..dab715299
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_next_round_white_32dp.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/icon_notification_dimen"
+    android:height="@dimen/icon_notification_dimen"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M7.58 16.89l5.77-4.07c0.56-0.4 0.56 -1.24 0-1.63L7.58 7.11C6.91 6.65 6 7.12 6 7.93v8.14c0 0.81 0.91 1.28 1.58 0.82 zM16 7v10c0 0.55 0.45 1 1 1s1-0.45 1-1V7c0-0.55-0.45-1-1-1s-1 0.45-1 1z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_skip_next_sharp.xml b/app/src/main/res/drawable/ic_skip_next_sharp.xml
index 2bae0aaaf..967225648 100644
--- a/app/src/main/res/drawable/ic_skip_next_sharp.xml
+++ b/app/src/main/res/drawable/ic_skip_next_sharp.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="@dimen/icon_notification_dimen"
+    android:height="@dimen/icon_notification_dimen"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M16.5,18V6H18.5V18ZM5.5,18V6L14.5,12Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_skip_previous.xml b/app/src/main/res/drawable/ic_skip_previous.xml
index 4178e0bd5..992260c03 100644
--- a/app/src/main/res/drawable/ic_skip_previous.xml
+++ b/app/src/main/res/drawable/ic_skip_previous.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="@dimen/icon_notification_dimen"
     android:height="@dimen/icon_notification_dimen"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6.5,18Q6.075,18 5.787,17.712Q5.5,17.425 5.5,17V7Q5.5,6.575 5.787,6.287Q6.075,6 6.5,6Q6.925,6 7.213,6.287Q7.5,6.575 7.5,7V17Q7.5,17.425 7.213,17.712Q6.925,18 6.5,18ZM16.95,16.975 L10.75,12.825Q10.3,12.525 10.3,12Q10.3,11.475 10.75,11.175L16.95,7.025Q17.45,6.7 17.975,6.987Q18.5,7.275 18.5,7.875V16.125Q18.5,16.725 17.975,17.025Q17.45,17.325 16.95,16.975Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M7 6c0.55 0 1 0.45 1 1v10c0 0.55-0.45 1-1 1s-1-0.45-1-1V7c0-0.55 0.45 -1 1-1zm3.66 6.82l5.77 4.07c0.66 0.47 1.58-0.01 1.58-0.82V7.93c0-0.81-0.91-1.28-1.58-0.82l-5.77 4.07c-0.57 0.4 -0.57 1.24 0 1.64z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_skip_previous_outline.xml b/app/src/main/res/drawable/ic_skip_previous_outline.xml
index 56b487065..cbfdf33c6 100644
--- a/app/src/main/res/drawable/ic_skip_previous_outline.xml
+++ b/app/src/main/res/drawable/ic_skip_previous_outline.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="@dimen/icon_notification_dimen"
+    android:height="@dimen/icon_notification_dimen"
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5.5,18V6H7.5V18ZM18.5,18 L9.5,12 18.5,6ZM16.5,12ZM16.5,14.25V9.75L13.1,12Z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6l-8.5,6zM16,14.14L12.97,12 16,9.86v4.28z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_skip_previous_round_white_32dp.xml b/app/src/main/res/drawable/ic_skip_previous_round_white_32dp.xml
new file mode 100644
index 000000000..2869b150d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_previous_round_white_32dp.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/icon_notification_dimen"
+    android:height="@dimen/icon_notification_dimen"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M7 6c0.55 0 1 0.45 1 1v10c0 0.55-0.45 1-1 1s-1-0.45-1-1V7c0-0.55 0.45 -1 1-1zm3.66 6.82l5.77 4.07c0.66 0.47 1.58-0.01 1.58-0.82V7.93c0-0.81-0.91-1.28-1.58-0.82l-5.77 4.07c-0.57 0.4 -0.57 1.24 0 1.64z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_skip_previous_sharp.xml b/app/src/main/res/drawable/ic_skip_previous_sharp.xml
index 9de2a4131..503c81ad0 100644
--- a/app/src/main/res/drawable/ic_skip_previous_sharp.xml
+++ b/app/src/main/res/drawable/ic_skip_previous_sharp.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="@dimen/icon_notification_dimen"
+    android:height="@dimen/icon_notification_dimen"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5.5,18V6H7.5V18ZM18.5,18 L9.5,12 18.5,6Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M6 6h2v12H6V6zm3.5 6l8.5 6V6l-8.5 6z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_sleep_timer.xml b/app/src/main/res/drawable/ic_sleep_timer.xml
deleted file mode 100644
index be7095163..000000000
--- a/app/src/main/res/drawable/ic_sleep_timer.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,20Q13.35,20 14.613,19.562Q15.875,19.125 16.925,18.3Q15.475,17.775 13.863,16.612Q12.25,15.45 11.025,13.7Q9.8,11.95 9.238,9.637Q8.675,7.325 9.275,4.5Q6.95,5.325 5.475,7.362Q4,9.4 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,8.325 4.312,5.525Q6.625,2.725 10.5,2.125Q11.225,2 11.538,2.462Q11.85,2.925 11.575,3.675Q10.825,5.775 11.05,7.912Q11.275,10.05 12.275,11.85Q13.275,13.65 14.963,14.962Q16.65,16.275 18.825,16.75Q19.625,16.925 19.837,17.425Q20.05,17.925 19.575,18.475Q18.2,20.1 16.238,21.05Q14.275,22 12,22ZM10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sort.xml b/app/src/main/res/drawable/ic_sort.xml
index 0408aeeac..68e09061a 100644
--- a/app/src/main/res/drawable/ic_sort.xml
+++ b/app/src/main/res/drawable/ic_sort.xml
@@ -1,10 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M8,18H4Q3.575,18 3.288,17.712Q3,17.425 3,17Q3,16.575 3.288,16.288Q3.575,16 4,16H8Q8.425,16 8.713,16.288Q9,16.575 9,17Q9,17.425 8.713,17.712Q8.425,18 8,18ZM20,8H4Q3.575,8 3.288,7.713Q3,7.425 3,7Q3,6.575 3.288,6.287Q3.575,6 4,6H20Q20.425,6 20.712,6.287Q21,6.575 21,7Q21,7.425 20.712,7.713Q20.425,8 20,8ZM14,13H4Q3.575,13 3.288,12.712Q3,12.425 3,12Q3,11.575 3.288,11.287Q3.575,11 4,11H14Q14.425,11 14.713,11.287Q15,11.575 15,12Q15,12.425 14.713,12.712Q14.425,13 14,13Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M4 18h4c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1zM3 7c0 0.55 0.45 1 1 1h16c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1zm1 6h10c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/avd_splash.xml b/app/src/main/res/drawable/ic_splash_anim.xml
similarity index 100%
rename from app/src/main/res/drawable/avd_splash.xml
rename to app/src/main/res/drawable/ic_splash_anim.xml
diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml
index 8cc89371f..0337872ff 100644
--- a/app/src/main/res/drawable/ic_star.xml
+++ b/app/src/main/res/drawable/ic_star.xml
@@ -1,10 +1,24 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M8.3,20.125Q7.725,20.575 7.125,20.15Q6.525,19.725 6.725,19.025L8.15,14.4L4.525,11.825Q3.925,11.4 4.163,10.7Q4.4,10 5.125,10H9.6L11.05,5.2Q11.175,4.85 11.438,4.662Q11.7,4.475 12,4.475Q12.3,4.475 12.562,4.662Q12.825,4.85 12.95,5.2L14.4,10H18.875Q19.6,10 19.838,10.7Q20.075,11.4 19.475,11.825L15.85,14.4L17.275,19.025Q17.475,19.725 16.875,20.15Q16.275,20.575 15.7,20.125L12,17.3Z"/>
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M12,17.27l4.15,2.51c0.76,0.46,1.69-0.22,1.49-1.08l-1.1-4.72l3.67-3.18c0.67-0.58,0.31-1.68-0.57-1.75l-4.83-0.41 l-1.89-4.46c-0.34-0.81-1.5-0.81-1.84,0L9.19,8.63L4.36,9.04c-0.88,0.07-1.24,1.17-0.57,1.75l3.67,3.18l-1.1,4.72 c-0.2,0.86,0.73,1.54,1.49,1.08L12,17.27z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
index 1633e252e..a4a57c40f 100644
--- a/app/src/main/res/drawable/ic_storage.xml
+++ b/app/src/main/res/drawable/ic_storage.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,20Q3.175,20 2.588,19.413Q2,18.825 2,18Q2,17.175 2.588,16.587Q3.175,16 4,16H20Q20.825,16 21.413,16.587Q22,17.175 22,18Q22,18.825 21.413,19.413Q20.825,20 20,20ZM5,19H7V17H5ZM4,8Q3.175,8 2.588,7.412Q2,6.825 2,6Q2,5.175 2.588,4.588Q3.175,4 4,4H20Q20.825,4 21.413,4.588Q22,5.175 22,6Q22,6.825 21.413,7.412Q20.825,8 20,8ZM5,7H7V5H5ZM4,14Q3.175,14 2.588,13.412Q2,12.825 2,12Q2,11.175 2.588,10.587Q3.175,10 4,10H20Q20.825,10 21.413,10.587Q22,11.175 22,12Q22,12.825 21.413,13.412Q20.825,14 20,14ZM5,13H7V11H5Z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M2,20h20v-4L2,16v4zM4,17h2v2L4,19v-2zM2,4v4h20L22,4L2,4zM6,7L4,7L4,5h2v2zM2,14h20v-4L2,10v4zM4,11h2v2L4,13v-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_take_away.xml b/app/src/main/res/drawable/ic_take_away.xml
new file mode 100644
index 000000000..67318ebf3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_take_away.xml
@@ -0,0 +1,9 @@
+<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="M15 11V20A2 2 0 0 1 13 22H11A2 2 0 0 1 9 20V11A2 2 0 0 1 9.6 9.58C11.1 7.89 11 4 11 4H10V2H14V4H13S12.9 7.89 14.4 9.58A2 2 0 0 1 15 11Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_take_away_coffe.xml b/app/src/main/res/drawable/ic_take_away_coffe.xml
new file mode 100644
index 000000000..67ae9d911
--- /dev/null
+++ b/app/src/main/res/drawable/ic_take_away_coffe.xml
@@ -0,0 +1,9 @@
+<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="M3 3V11A4 4 0 0 0 7 15H11A4 4 0 0 0 15 11V10H17C18.11 10 19 9.11 19 8V5C19 3.9 18.11 3 17 3H3M5 5H13V11A2 2 0 0 1 11 13H7A2 2 0 0 1 5 11V5M15 5H17V8H15V5M16.67 13.83L15.26 15.24L17 17H3V19H17L15.26 20.76L16.67 22.17L20.84 18L16.67 13.83Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_testing.xml b/app/src/main/res/drawable/ic_testing.xml
index c95029ded..1a8e3e283 100644
--- a/app/src/main/res/drawable/ic_testing.xml
+++ b/app/src/main/res/drawable/ic_testing.xml
@@ -1,10 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M8.275,11Q7.7,11 7.4,10.488Q7.1,9.975 7.425,9.475L11.15,3.4Q11.45,2.925 12,2.925Q12.55,2.925 12.85,3.4L16.575,9.475Q16.9,9.975 16.6,10.488Q16.3,11 15.725,11ZM17.5,22Q15.625,22 14.312,20.688Q13,19.375 13,17.5Q13,15.625 14.312,14.312Q15.625,13 17.5,13Q19.375,13 20.688,14.312Q22,15.625 22,17.5Q22,19.375 20.688,20.688Q19.375,22 17.5,22ZM4,21.5Q3.575,21.5 3.288,21.212Q3,20.925 3,20.5V14.5Q3,14.075 3.288,13.787Q3.575,13.5 4,13.5H10Q10.425,13.5 10.713,13.787Q11,14.075 11,14.5V20.5Q11,20.925 10.713,21.212Q10.425,21.5 10,21.5ZM17.5,20Q18.55,20 19.275,19.275Q20,18.55 20,17.5Q20,16.45 19.275,15.725Q18.55,15 17.5,15Q16.45,15 15.725,15.725Q15,16.45 15,17.5Q15,18.55 15.725,19.275Q16.45,20 17.5,20ZM5,19.5H9V15.5H5ZM10.05,9H13.95L12,5.85ZM12,9ZM9,15.5ZM17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M12 2l-5.5 9h11L12 2zm0 3.84L13.93 9h-3.87L12 5.84zM17.5 13c-2.49 0-4.5 2.01-4.5 4.5s2.01 4.5 4.5 4.5 4.5-2.01 4.5-4.5-2.01-4.5-4.5-4.5zm0 7c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5zM3 21.5h8v-8H3v8zm2-6h4v4H5v-4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_theme_palette.xml b/app/src/main/res/drawable/ic_theme_palette.xml
new file mode 100644
index 000000000..489e9fed9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_theme_palette.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M12 3c-4.97 0-9 4.03-9 9s4.03 9 9 9c0.83 0 1.5-0.67 1.5-1.5 0-0.39-0.15-0.74-0.39-1.01-0.23-0.26-0.38-0.61-0.38-0.99 0-0.83 0.67 -1.5 1.5-1.5H16c2.76 0 5-2.24 5-5 0-4.42-4.03-8-9-8zm-5.5 9c-0.83 0-1.5-0.67-1.5-1.5S5.67 9 6.5 9 8 9.67 8 10.5 7.33 12 6.5 12zm3-4C8.67 8 8 7.33 8 6.5S8.67 5 9.5 5s1.5 0.67 1.5 1.5S10.33 8 9.5 8zm5 0c-0.83 0-1.5-0.67-1.5-1.5S13.67 5 14.5 5s1.5 0.67 1.5 1.5S15.33 8 14.5 8zm3 4c-0.83 0-1.5-0.67-1.5-1.5S16.67 9 17.5 9s1.5 0.67 1.5 1.5-0.67 1.5-1.5 1.5z" />
+
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_trending_up.xml b/app/src/main/res/drawable/ic_trending_up.xml
index e384a28b9..56049b11d 100644
--- a/app/src/main/res/drawable/ic_trending_up.xml
+++ b/app/src/main/res/drawable/ic_trending_up.xml
@@ -1,10 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M2.7,17.3Q2.425,17.025 2.425,16.612Q2.425,16.2 2.7,15.9L8.7,9.85Q8.85,9.725 9.025,9.65Q9.2,9.575 9.4,9.575Q9.6,9.575 9.788,9.65Q9.975,9.725 10.1,9.85L13.4,13.15L18.6,8H17Q16.575,8 16.288,7.713Q16,7.425 16,7Q16,6.575 16.288,6.287Q16.575,6 17,6H21Q21.425,6 21.712,6.287Q22,6.575 22,7V11Q22,11.425 21.712,11.712Q21.425,12 21,12Q20.575,12 20.288,11.712Q20,11.425 20,11V9.4L14.1,15.3Q13.95,15.45 13.775,15.512Q13.6,15.575 13.4,15.575Q13.2,15.575 13.025,15.512Q12.85,15.45 12.7,15.3L9.4,12L4.075,17.325Q3.8,17.6 3.4,17.6Q3,17.6 2.7,17.3Z"/>
-</vector>
+    android:viewportHeight="24">
+
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M16.85 6.85l1.44 1.44-4.88 4.88-3.29-3.29c-0.39-0.39-1.02-0.39-1.41 0l-6 6.01c-0.39 0.39 -0.39 1.02 0 1.41 0.39 0.39 1.02 0.39 1.41 0L9.41 12l3.29 3.29c0.39 0.39 1.02 0.39 1.41 0l5.59-5.58 1.44 1.44c0.31 0.31 0.85 0.09 0.85-0.35V6.5c0.01-0.28-0.21-0.5-0.49-0.5h-4.29c-0.45 0-0.67 0.54 -0.36 0.85 z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_view_carousel.xml b/app/src/main/res/drawable/ic_view_carousel.xml
index 2eb0d411f..61de4b178 100644
--- a/app/src/main/res/drawable/ic_view_carousel.xml
+++ b/app/src/main/res/drawable/ic_view_carousel.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,17Q2.575,17 2.288,16.712Q2,16.425 2,16V8Q2,7.575 2.288,7.287Q2.575,7 3,7H5Q5.425,7 5.713,7.287Q6,7.575 6,8V16Q6,16.425 5.713,16.712Q5.425,17 5,17ZM8,19Q7.575,19 7.287,18.712Q7,18.425 7,18V6Q7,5.575 7.287,5.287Q7.575,5 8,5H16Q16.425,5 16.712,5.287Q17,5.575 17,6V18Q17,18.425 16.712,18.712Q16.425,19 16,19ZM19,17Q18.575,17 18.288,16.712Q18,16.425 18,16V8Q18,7.575 18.288,7.287Q18.575,7 19,7H21Q21.425,7 21.712,7.287Q22,7.575 22,8V16Q22,16.425 21.712,16.712Q21.425,17 21,17Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M8 19h8c0.55 0 1-0.45 1-1V5c0-0.55-0.45-1-1-1H8c-0.55 0-1 0.45-1 1v13c0 0.55 0.45 1 1 1zm-5-2h2c0.55 0 1-0.45 1-1V7c0-0.55-0.45-1-1-1H3c-0.55 0-1 0.45-1 1v9c0 0.55 0.45 1 1 1zM18 7v9c0 0.55 0.45 1 1 1h2c0.55 0 1-0.45 1-1V7c0-0.55-0.45-1-1-1h-2c-0.55 0-1 0.45-1 1z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_volume_down.xml b/app/src/main/res/drawable/ic_volume_down.xml
index 668e16491..040371ab5 100644
--- a/app/src/main/res/drawable/ic_volume_down.xml
+++ b/app/src/main/res/drawable/ic_volume_down.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,15Q5.575,15 5.287,14.712Q5,14.425 5,14V10Q5,9.575 5.287,9.287Q5.575,9 6,9H9L12.3,5.7Q12.775,5.225 13.387,5.487Q14,5.75 14,6.425V17.575Q14,18.25 13.387,18.512Q12.775,18.775 12.3,18.3L9,15ZM16,16V7.95Q17.125,8.475 17.812,9.575Q18.5,10.675 18.5,12Q18.5,13.325 17.812,14.4Q17.125,15.475 16,16Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M18.5 12c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-0.73 2.5-2.25 2.5-4.02zM5 10v4c0 0.55 0.45 1 1 1h3l3.29 3.29c0.63 0.63 1.71 0.18 1.71-0.71V6.41c0-0.89-1.08-1.34-1.71-0.71L9 9H6c-0.55 0-1 0.45-1 1z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_volume_off.xml b/app/src/main/res/drawable/ic_volume_off.xml
index de83f4243..ac1440d29 100644
--- a/app/src/main/res/drawable/ic_volume_off.xml
+++ b/app/src/main/res/drawable/ic_volume_off.xml
@@ -1,10 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19.1,21.9 L16.775,19.575Q16.425,19.775 16.075,19.962Q15.725,20.15 15.35,20.3Q14.85,20.5 14.425,20.175Q14,19.85 14,19.275Q14,19 14.163,18.788Q14.325,18.575 14.575,18.475Q14.775,18.4 14.963,18.312Q15.15,18.225 15.325,18.125L12,14.8V17.575Q12,18.25 11.387,18.512Q10.775,18.775 10.3,18.3L7,15H4Q3.575,15 3.288,14.712Q3,14.425 3,14V10Q3,9.575 3.288,9.287Q3.575,9 4,9H6.2L2.1,4.9Q1.825,4.625 1.825,4.2Q1.825,3.775 2.1,3.5Q2.375,3.225 2.8,3.225Q3.225,3.225 3.5,3.5L20.5,20.5Q20.775,20.775 20.775,21.2Q20.775,21.625 20.5,21.9Q20.225,22.175 19.8,22.175Q19.375,22.175 19.1,21.9ZM15.35,3.65Q17.9,4.675 19.45,6.925Q21,9.175 21,11.975Q21,13.3 20.638,14.525Q20.275,15.75 19.6,16.8L18.15,15.35Q18.575,14.575 18.788,13.725Q19,12.875 19,11.975Q19,9.775 17.788,8.025Q16.575,6.275 14.575,5.475Q14.3,5.375 14.15,5.15Q14,4.925 14,4.65Q14,4.1 14.425,3.775Q14.85,3.45 15.35,3.65ZM16.25,13.45 L14,11.2V7.95Q15.175,8.5 15.838,9.6Q16.5,10.7 16.5,12Q16.5,12.375 16.438,12.738Q16.375,13.1 16.25,13.45ZM12,9.2 L9.4,6.6 10.3,5.7Q10.775,5.225 11.387,5.487Q12,5.75 12,6.425Z"/>
-</vector>
+    android:viewportHeight="24">
+
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M3.63 3.63c-0.39 0.39 -0.39 1.02 0 1.41L7.29 8.7 7 9H4c-0.55 0-1 0.45-1 1v4c0 0.55 0.45 1 1 1h3l3.29 3.29c0.63 0.63 1.71 0.18 1.71-0.71v-4.17l4.18 4.18c-0.49 0.37 -1.02 0.68 -1.6 0.91 -0.36 0.15 -0.58 0.53 -0.58 0.92 0 0.72 0.73 1.18 1.39 0.91 0.8-0.33 1.55-0.77 2.22-1.31l1.34 1.34c0.39 0.39 1.02 0.39 1.41 0 0.39-0.39 0.39 -1.02 0-1.41L5.05 3.63c-0.39-0.39-1.02-0.39-1.42 0zM19 12c0 0.82-0.15 1.61-0.41 2.34l1.53 1.53c0.56-1.17 0.88 -2.48 0.88 -3.87 0-3.83-2.4-7.11-5.78-8.4-0.59-0.23-1.22 0.23 -1.22 0.86 v0.19c0 0.38 0.25 0.71 0.61 0.85C17.18 6.54 19 9.06 19 12zm-8.71-6.29l-0.17 0.17 L12 7.76V6.41c0-0.89-1.08-1.33-1.71-0.7zM16.5 12c0-1.77-1.02-3.29-2.5-4.03v1.79l2.48 2.48c0.01-0.08 0.02 -0.16 0.02 -0.24z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_volume_up.xml b/app/src/main/res/drawable/ic_volume_up.xml
index 97b63ed9b..70a126ced 100644
--- a/app/src/main/res/drawable/ic_volume_up.xml
+++ b/app/src/main/res/drawable/ic_volume_up.xml
@@ -1,10 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M15.35,20.3Q14.85,20.5 14.425,20.175Q14,19.85 14,19.275Q14,19 14.163,18.788Q14.325,18.575 14.575,18.475Q16.575,17.675 17.788,15.925Q19,14.175 19,11.975Q19,9.775 17.788,8.025Q16.575,6.275 14.575,5.475Q14.3,5.375 14.15,5.15Q14,4.925 14,4.65Q14,4.1 14.425,3.775Q14.85,3.45 15.35,3.65Q17.9,4.675 19.45,6.925Q21,9.175 21,11.975Q21,14.775 19.45,17.025Q17.9,19.275 15.35,20.3ZM4,15Q3.575,15 3.288,14.712Q3,14.425 3,14V10Q3,9.575 3.288,9.287Q3.575,9 4,9H7L10.3,5.7Q10.775,5.225 11.387,5.487Q12,5.75 12,6.425V17.575Q12,18.25 11.387,18.512Q10.775,18.775 10.3,18.3L7,15ZM14,16V7.95Q15.125,8.475 15.812,9.575Q16.5,10.675 16.5,12Q16.5,13.325 15.812,14.4Q15.125,15.475 14,16Z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M3 10v4c0 0.55 0.45 1 1 1h3l3.29 3.29c0.63 0.63 1.71 0.18 1.71-0.71V6.41c0-0.89-1.08-1.34-1.71-0.71L7 9H4c-0.55 0-1 0.45-1 1zm13.5 2c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-0.73 2.5-2.25 2.5-4.02zM14 4.45v0.2c0 0.38 0.25 0.71 0.6 0.85C17.18 6.53 19 9.06 19 12s-1.82 5.47-4.4 6.5c-0.36 0.14 -0.6 0.47 -0.6 0.85 v0.2c0 0.63 0.63 1.07 1.21 0.85 C18.6 19.11 21 15.84 21 12s-2.4-7.11-5.79-8.4c-0.58-0.23-1.21 0.22 -1.21 0.85 z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_watch_later.xml b/app/src/main/res/drawable/ic_watch_later.xml
new file mode 100644
index 000000000..097395347
--- /dev/null
+++ b/app/src/main/res/drawable/ic_watch_later.xml
@@ -0,0 +1,9 @@
+<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="M4.27 3L3 4.27L12 13.27V13.55C11.41 13.21 10.73 13 10 13C7.79 13 6 14.79 6 17S7.79 21 10 21 14 19.21 14 17V15.27L19.73 21L21 19.73L4.27 3M14 7H18V3H12V8.18L14 10.18Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_website.xml b/app/src/main/res/drawable/ic_website.xml
deleted file mode 100644
index 5671992a7..000000000
--- a/app/src/main/res/drawable/ic_website.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,20Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.175 2.588,4.588Q3.175,4 4,4H20Q20.825,4 21.413,4.588Q22,5.175 22,6V18Q22,18.825 21.413,19.413Q20.825,20 20,20ZM4,18H14.5V14.5H4V18Q4,18 4,18Q4,18 4,18ZM16.5,18H20Q20,18 20,18Q20,18 20,18V9H16.5ZM4,12.5H14.5V9H4Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/retro_you_icon.xml b/app/src/main/res/drawable/retro_you_icon.xml
new file mode 100644
index 000000000..0e59bc17d
--- /dev/null
+++ b/app/src/main/res/drawable/retro_you_icon.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M15.5039,11.3173 L10.2372,8.2765a0.7872,0.7872 0,0 0,-1.1809 0.6824V15.04a0.7879,0.7879 0,0 0,1.1819 0.6823l5.2657,-3.0408A0.7876,0.7876 0,0 0,15.5039 11.3173Z"
+        android:strokeWidth="0.85"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.51,11.7653h0a1.5687,1.5687 0,0 0,-1.5639 -1.5734H9.715l1.7539,3.0559A1.5729,1.5729 0,0 0,12.51 11.7653Z"
+        android:strokeAlpha="0.19"
+        android:fillAlpha="0.19"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9.0563,13.3445v1.6966a0.788,0.788 0,0 0,1.1819 0.6824L12.321,14.52l-0.15,-0.2617 -0.583,-1.0107a1.6715,1.6715 0,0 1,-0.5594 0.0967Z"
+        android:strokeWidth="0.85"
+        android:strokeColor="#000"
+        android:fillAlpha="0.2"/>
+    <path
+        android:pathData="M9.0714,10.2888h1.9108A1.5279,1.5279 0,0 1,12.51 11.8167v0a1.5279,1.5279 0,0 1,-1.5279 1.5279H9.0714a0,0 0,0 1,0 0V10.2888A0,0 0,0 1,9.0714 10.2888Z"
+        android:strokeWidth="0.85"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+</vector>
\ No newline at end of file
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 0213d957d..8db003e24 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
@@ -14,12 +14,7 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:navigationIcon="@drawable/ic_arrow_back"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/action_tag_editor" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout-land/activity_drive_mode.xml b/app/src/main/res/layout-land/activity_drive_mode.xml
index 90f895cef..7017579c3 100644
--- a/app/src/main/res/layout-land/activity_drive_mode.xml
+++ b/app/src/main/res/layout-land/activity_drive_mode.xml
@@ -20,7 +20,7 @@
     android:orientation="vertical">
 
 
-    <code.name.monkey.retromusic.views.StatusBarView
+    <io.github.muntashirakon.music.views.StatusBarView
         android:id="@+id/status_bar"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -172,12 +172,14 @@
     </LinearLayout>
 
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
+        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_weight="8"
         android:maxHeight="3dp"
-        style="@style/Widget.Retro.Slider"
+        android:paddingVertical="@dimen/seekbar_padding"
         android:progressDrawable="@drawable/color_progress_seek"
         android:progressTint="@color/md_white_1000"
         android:splitTrack="false"
@@ -197,6 +199,7 @@
         android:textColor="@color/md_white_1000"
         app:layout_constraintBottom_toTopOf="@id/playPauseButton"
         app:layout_constraintStart_toStartOf="@id/repeatButton"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -208,6 +211,7 @@
         android:textColor="@color/md_white_1000"
         app:layout_constraintBottom_toTopOf="@id/playPauseButton"
         app:layout_constraintEnd_toEndOf="@id/shuffleButton"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_lock_screen.xml b/app/src/main/res/layout-land/activity_lock_screen.xml
deleted file mode 100644
index b36873a8c..000000000
--- a/app/src/main/res/layout-land/activity_lock_screen.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/iv_blurred_album_art"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#80000000"
-        android:orientation="vertical">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/status_bar" />
-        </FrameLayout>
-
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <code.name.monkey.retromusic.views.HeightFitSquareLayout
-                android:id="@+id/albumCoverContainer"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent">
-
-                <com.google.android.material.card.MaterialCardView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_margin="16dp"
-                    app:cardCornerRadius="@dimen/m3_card_corner_radius"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintDimensionRatio="1:1"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/image"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop"
-                        tools:ignore="ContentDescription,UnusedAttribute"
-                        tools:srcCompat="@tools:sample/backgrounds/scenic" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/slide"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal|bottom"
-                        android:elevation="3dp"
-                        android:fitsSystemWindows="true"
-                        android:gravity="center"
-                        android:padding="16dp"
-                        android:text="@string/swipe_to_unlock"
-                        android:textColor="?android:attr/textColorPrimary" />
-                </com.google.android.material.card.MaterialCardView>
-            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:orientation="vertical"
-                tools:ignore="UselessParent">
-
-                <androidx.fragment.app.FragmentContainerView
-                    android:id="@+id/playback_controls_fragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    tools:layout="@layout/fragment_lock_screen_playback_controls" />
-
-            </LinearLayout>
-
-        </androidx.appcompat.widget.LinearLayoutCompat>
-
-    </LinearLayout>
-</RelativeLayout>
diff --git a/app/src/main/res/layout-land/activity_song_tag_editor.xml b/app/src/main/res/layout-land/activity_song_tag_editor.xml
index d19eea69c..482f18305 100644
--- a/app/src/main/res/layout-land/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout-land/activity_song_tag_editor.xml
@@ -1,8 +1,8 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:fitsSystemWindows="true"
     android:focusable="true"
     android:focusableInTouchMode="true">
@@ -16,9 +16,7 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/action_tag_editor" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout-land/fragment_adaptive_player.xml b/app/src/main/res/layout-land/fragment_adaptive_player.xml
deleted file mode 100644
index 651d26d58..000000000
--- a/app/src/main/res/layout-land/fragment_adaptive_player.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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="match_parent"
-    android:background="?colorSurface"
-    android:clickable="true"
-    android:focusable="true">
-
-    <include layout="@layout/shadow_statusbar_toolbar" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include layout="@layout/status_bar" />
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/playerToolbar"
-            style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:contentInsetLeft="0dp"
-            app:contentInsetStart="0dp"
-            app:contentInsetStartWithNavigation="0dp"
-            app:navigationIcon="@drawable/ic_keyboard_arrow_down"
-            app:subtitleTextAppearance="@style/TextViewCaption"
-            app:titleMargin="0dp"
-            app:titleMarginStart="0dp"
-            app:titleTextAppearance="@style/TextViewSubtitle1"
-            tools:subtitle="@tools:sample/full_names"
-            tools:title="@tools:sample/full_names" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal">
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <androidx.fragment.app.FragmentContainerView
-                    android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    tools:layout="@layout/fragment_album_full_card_cover" />
-
-                <androidx.fragment.app.FragmentContainerView
-                    android:id="@+id/cover_lyrics"
-                    android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:elevation="20dp" />
-            </FrameLayout>
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/playbackControlsFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                tools:layout="@layout/fragment_adaptive_player_playback_controls" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_album_details.xml b/app/src/main/res/layout-land/fragment_album_details.xml
index f51fe717a..497171eb7 100644
--- a/app/src/main/res/layout-land/fragment_album_details.xml
+++ b/app/src/main/res/layout-land/fragment_album_details.xml
@@ -6,18 +6,23 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
-    android:transitionGroup="true"
-    android:transitionName="@string/transition_album_art">
+    android:transitionName="@string/transition_album_art"
+    tools:ignore="UnusedAttribute"
+    android:transitionGroup="true">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
-        style="@style/Toolbar"
+    <FrameLayout
+        android:id="@+id/toolbar_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_back" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black" />
+    </FrameLayout>
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/albumCoverContainer"
@@ -30,7 +35,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
+        app:layout_constraintTop_toBottomOf="@id/toolbar_container">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
@@ -54,7 +59,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/albumCoverContainer"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
+        app:layout_constraintTop_toBottomOf="@id/toolbar_container">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -67,7 +72,7 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
-                <code.name.monkey.retromusic.views.RetroShapeableImageView
+                <io.github.muntashirakon.music.views.RetroShapeableImageView
                     android:id="@+id/artistImage"
                     android:layout_width="52dp"
                     android:layout_height="52dp"
@@ -86,7 +91,7 @@
                     android:paddingEnd="12dp"
                     android:paddingBottom="8dp">
 
-                    <code.name.monkey.retromusic.views.BaselineGridTextView
+                    <io.github.muntashirakon.music.views.BaselineGridTextView
                         android:id="@+id/albumTitle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -97,7 +102,7 @@
                         tools:ignore="MissingPrefix"
                         tools:text="Album name" />
 
-                    <code.name.monkey.retromusic.views.BaselineGridTextView
+                    <io.github.muntashirakon.music.views.BaselineGridTextView
                         android:id="@+id/albumText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout-land/fragment_artist_details.xml b/app/src/main/res/layout-land/fragment_artist_details.xml
index 38458b1ab..0870dc59b 100644
--- a/app/src/main/res/layout-land/fragment_artist_details.xml
+++ b/app/src/main/res/layout-land/fragment_artist_details.xml
@@ -5,17 +5,23 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:ignore="UnusedAttribute">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
-        style="@style/Toolbar"
+    <FrameLayout
+        android:id="@+id/toolbar_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_back" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black" />
+    </FrameLayout>
+
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/artistCoverContainer"
@@ -29,7 +35,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
+        app:layout_constraintTop_toBottomOf="@id/toolbar_container">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
@@ -53,7 +59,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/artistCoverContainer"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
+        app:layout_constraintTop_toBottomOf="@id/toolbar_container">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -66,7 +72,7 @@
                 android:orientation="vertical"
                 android:padding="16dp">
 
-                <code.name.monkey.retromusic.views.BaselineGridTextView
+                <io.github.muntashirakon.music.views.BaselineGridTextView
                     android:id="@+id/artistTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -77,7 +83,7 @@
                     tools:ignore="MissingPrefix"
                     tools:text="Title" />
 
-                <code.name.monkey.retromusic.views.BaselineGridTextView
+                <io.github.muntashirakon.music.views.BaselineGridTextView
                     android:id="@+id/text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout-land/fragment_blur.xml b/app/src/main/res/layout-land/fragment_blur.xml
index 3c14baf8a..b065ad982 100644
--- a/app/src/main/res/layout-land/fragment_blur.xml
+++ b/app/src/main/res/layout-land/fragment_blur.xml
@@ -14,6 +14,13 @@
         android:scaleType="centerCrop"
         app:srcCompat="@color/black_color" />
 
+    <View
+        android:id="@+id/mask"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/md_black_1000"
+        android:visibility="gone" />
+
     <View
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -38,18 +45,18 @@
             android:layout_height="match_parent"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.HeightFitSquareLayout
+            <io.github.muntashirakon.music.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_gravity="center_horizontal">
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     tools:layout="@layout/fragment_album_cover" />
-            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
+            </io.github.muntashirakon.music.views.HeightFitSquareLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -58,18 +65,23 @@
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.blur.BlurPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1" />
 
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
+                <FrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:layout_weight="0"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0">
+
+                    <com.google.android.material.appbar.MaterialToolbar
+                        android:id="@+id/playerToolbar"
+                        style="@style/Toolbar"
+                        android:layout_height="48dp"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
+                </FrameLayout>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
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
new file mode 100644
index 000000000..97eb51fa7
--- /dev/null
+++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml
@@ -0,0 +1,90 @@
+<?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="match_parent"
+    android:clickable="true"
+    android:focusable="true">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/colorBackground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        app:srcCompat="@color/black_color" />
+
+    <View
+        android:id="@+id/mask"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shadow_up_strong" />
+
+    <include layout="@layout/shadow_statusbar_toolbar" />
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                app:contentInsetLeft="0dp"
+                app:contentInsetStart="0dp"
+                app:contentInsetStartWithNavigation="0dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
+                app:titleMargin="0dp"
+                app:titleMarginStart="0dp"
+                app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
+        </FrameLayout>
+
+        <FrameLayout
+
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="64dp"
+            android:layout_marginEnd="64dp"
+            android:layout_weight="1">
+
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:layout="@layout/fragment_album_card_cover" />
+        </FrameLayout>
+
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_marginStart="96dp"
+        android:layout_marginEnd="96dp">
+
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/playbackControlsFragment"
+            android:name="io.github.muntashirakon.music.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:layout="@layout/fragment_card_blur_player_playback_controls" />
+    </FrameLayout>
+
+</FrameLayout>
\ No newline at end of file
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 d4294d937..4c724abff 100644
--- a/app/src/main/res/layout-land/fragment_card_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_player.xml
@@ -15,7 +15,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:layout="@layout/fragment_album_full_cover" />
@@ -31,17 +31,15 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <code.name.monkey.retromusic.views.StatusBarView
+            <io.github.muntashirakon.music.views.StatusBarView
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/status_bar_padding" />
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/playerToolbar"
                 style="@style/Toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:background="@android:color/transparent"
-                app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
         </LinearLayout>
     </FrameLayout>
 
@@ -57,7 +55,7 @@
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playbackControlsFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.card.CardPlaybackControlsFragment"
+            android:name="io.github.muntashirakon.music.fragments.player.card.CardPlaybackControlsFragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:layout="@layout/fragment_card_player_playback_controls" />
diff --git a/app/src/main/res/layout-land/fragment_circle_player.xml b/app/src/main/res/layout-land/fragment_circle_player.xml
index d8c7dd01f..153790333 100644
--- a/app/src/main/res/layout-land/fragment_circle_player.xml
+++ b/app/src/main/res/layout-land/fragment_circle_player.xml
@@ -47,12 +47,11 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/statusBarContainer"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down"
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         tools:layout_editor_absoluteY="24dp" />
 
     <FrameLayout
@@ -64,14 +63,14 @@
         app:layout_constraintStart_toStartOf="@id/volumeSeekBar"
         app:layout_constraintTop_toTopOf="@id/volumeSeekBar">
 
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
+        <io.github.muntashirakon.music.views.RetroShapeableImageView
             android:id="@+id/album_cover"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
             tools:srcCompat="@tools:sample/backgrounds/scenic[6]" />
 
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
+        <io.github.muntashirakon.music.views.RetroShapeableImageView
             android:id="@+id/album_cover_overlay"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -112,13 +111,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:background="?attr/roundSelector"
         android:padding="16dp"
-        android:scaleType="fitCenter"
         app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
         app:layout_constraintStart_toEndOf="@+id/playPauseButton"
         app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
+        app:srcCompat="@drawable/ic_skip_next_round_white_32dp"
         app:tint="@color/md_green_500" />
 
     <ImageButton
@@ -126,13 +123,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:background="?attr/roundSelector"
         android:padding="16dp"
-        android:scaleType="fitCenter"
         app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
         app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
         app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
+        app:srcCompat="@drawable/ic_skip_previous_round_white_32dp"
         app:tint="@color/md_green_500" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -183,11 +178,11 @@
         app:layout_constraintTop_toBottomOf="@+id/titleContainer"
         tools:text="@tools:sample/lorem/random" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
-        style="@style/Widget.Retro.Slider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/seekbar_padding"
         app:layout_constraintBottom_toTopOf="@id/songInfo"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
@@ -199,7 +194,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
-        android:gravity="center_vertical|end"
+        android:gravity="center_vertical|right|end"
         android:singleLine="true"
         android:textColor="?android:attr/textColorSecondary"
         android:textSize="12sp"
@@ -207,17 +202,16 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/progressSlider"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/songCurrentProgress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_marginStart="16dp"
-        android:gravity="center_vertical|start"
-        android:paddingStart="8dp"
-        android:paddingEnd="0dp"
+        android:layout_alignParentLeft="true"
+        android:gravity="center_vertical|left|end"
+        android:paddingLeft="8dp"
         android:singleLine="true"
         android:textColor="?android:attr/textColorSecondary"
         android:textSize="12sp"
@@ -225,6 +219,7 @@
         app:layout_constraintEnd_toStartOf="@id/progressSlider"
         app:layout_constraintStart_toEndOf="@id/guideline"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
 
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 d79d3ae9b..2f3ff83bb 100644
--- a/app/src/main/res/layout-land/fragment_color_player.xml
+++ b/app/src/main/res/layout-land/fragment_color_player.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?colorSurface">
+    android:background="?android:attr/windowBackground">
 
     <View
         android:id="@+id/colorGradientBackground"
@@ -13,50 +13,65 @@
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <include layout="@layout/status_bar" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.HeightFitSquareLayout
+            <io.github.muntashirakon.music.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_album_cover" />
-            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
+            </io.github.muntashirakon.music.views.HeightFitSquareLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <androidx.fragment.app.FragmentContainerView
-                    android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    tools:layout="@layout/fragment_player_playback_controls" />
-
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                    android:layout_weight="1">
+
+                    <androidx.fragment.app.FragmentContainerView
+                        android:id="@+id/playbackControlsFragment"
+                        android:name="io.github.muntashirakon.music.fragments.player.color.ColorPlaybackControlsFragment"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        tools:layout="@layout/fragment_player_playback_controls" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0">
+
+                    <com.google.android.material.appbar.MaterialToolbar
+                        android:id="@+id/playerToolbar"
+                        style="@style/Toolbar"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
+                </FrameLayout>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
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 6cd52e1d6..010840530 100644
--- a/app/src/main/res/layout-land/fragment_flat_player.xml
+++ b/app/src/main/res/layout-land/fragment_flat_player.xml
@@ -4,11 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <View
         android:id="@+id/colorGradientBackground"
         android:layout_width="match_parent"
@@ -16,46 +20,57 @@
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <include layout="@layout/status_bar" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.HeightFitSquareLayout
+            <io.github.muntashirakon.music.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     tools:layout="@layout/fragment_album_flat_cover" />
-            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
+            </io.github.muntashirakon.music.views.HeightFitSquareLayout>
+
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                    android:layout_weight="0">
+
+                    <com.google.android.material.appbar.MaterialToolbar
+                        android:id="@+id/playerToolbar"
+                        style="@style/Toolbar"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
+                </FrameLayout>
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.flat.FlatPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_gravity="bottom"
diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml
index c18e49710..d2a665453 100644
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@@ -13,16 +13,47 @@
   -->
 <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:fitsSystemWindows="true">
 
-    <code.name.monkey.retromusic.views.TopAppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
-        style="?appBarLayoutStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true" />
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_scrollFlags="scroll|enterAlways">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:navigationIcon="@drawable/ic_search"
+                app:popupTheme="?attr/toolbarPopupTheme"
+                app:title="@null"
+                tools:ignore="UnusedAttribute">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/appNameText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:textAppearance="@style/TextViewHeadline6"
+                    android:textStyle="bold" />
+            </androidx.appcompat.widget.Toolbar>
+
+            <ViewStub
+                android:id="@+id/cab_stub"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/toolbar_height" />
+        </FrameLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/container"
@@ -34,13 +65,13 @@
         android:transitionGroup="true"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <io.github.muntashirakon.music.views.insets.InsetsConstraintLayout
             android:id="@+id/contentContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:transitionGroup="true">
 
-            <code.name.monkey.retromusic.views.HomeImageLayout
+            <io.github.muntashirakon.music.views.HomeImageLayout
                 android:id="@+id/imageLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -56,6 +87,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/imageLayout" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </io.github.muntashirakon.music.views.insets.InsetsConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_material.xml b/app/src/main/res/layout-land/fragment_material.xml
index 31085532c..f9c69ed18 100644
--- a/app/src/main/res/layout-land/fragment_material.xml
+++ b/app/src/main/res/layout-land/fragment_material.xml
@@ -40,17 +40,17 @@
             android:layout_height="match_parent"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.HeightFitSquareLayout
+            <io.github.muntashirakon.music.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_album_cover" />
-            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
+            </io.github.muntashirakon.music.views.HeightFitSquareLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -64,7 +64,7 @@
 
                     <androidx.fragment.app.FragmentContainerView
                         android:id="@+id/playbackControlsFragment"
-                        android:name="code.name.monkey.retromusic.fragments.player.material.MaterialControlsFragment"
+                        android:name="io.github.muntashirakon.music.fragments.player.material.MaterialControlsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         tools:layout="@layout/fragment_material_playback_controls" />
@@ -78,10 +78,9 @@
                     <com.google.android.material.appbar.MaterialToolbar
                         android:id="@+id/playerToolbar"
                         style="@style/Toolbar"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
                         android:layout_gravity="bottom"
-                        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
                 </FrameLayout>
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_md3_player.xml b/app/src/main/res/layout-land/fragment_md3_player.xml
index ca5b63f95..a79c73875 100644
--- a/app/src/main/res/layout-land/fragment_md3_player.xml
+++ b/app/src/main/res/layout-land/fragment_md3_player.xml
@@ -4,10 +4,20 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
+    <View
+        android:id="@+id/colorGradientBackground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
     <LinearLayout
@@ -15,24 +25,29 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <include layout="@layout/status_bar" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.HeightFitSquareLayout
+            <io.github.muntashirakon.music.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_album_cover" />
-            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
+            </io.github.muntashirakon.music.views.HeightFitSquareLayout>
 
             <LinearLayout
                 android:id="@+id/controlsContainer"
@@ -40,17 +55,21 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                    android:layout_weight="0">
+
+                    <com.google.android.material.appbar.MaterialToolbar
+                        android:id="@+id/playerToolbar"
+                        style="@style/Toolbar"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
+                </FrameLayout>
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.md3.MD3PlaybackControlsFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.md3.MD3PlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_gravity="bottom"
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 1b09c212d..27031feb7 100644
--- a/app/src/main/res/layout-land/fragment_plain_player.xml
+++ b/app/src/main/res/layout-land/fragment_plain_player.xml
@@ -4,35 +4,45 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <include layout="@layout/status_bar" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.HeightFitSquareLayout
+            <io.github.muntashirakon.music.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_album_cover" />
-            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
+            </io.github.muntashirakon.music.views.HeightFitSquareLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -78,21 +88,30 @@
                         tools:text="Text" />
                 </LinearLayout>
 
-                <androidx.fragment.app.FragmentContainerView
-                    android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    tools:layout="@layout/fragment_plain_controls_fragment" />
+                    android:layout_weight="1">
 
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
+                    <androidx.fragment.app.FragmentContainerView
+                        android:id="@+id/playbackControlsFragment"
+                        android:name="io.github.muntashirakon.music.fragments.player.plain.PlainPlaybackControlsFragment"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        tools:layout="@layout/fragment_plain_controls_fragment" />
+                </FrameLayout>
+
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                    android:layout_weight="0">
+
+                    <com.google.android.material.appbar.MaterialToolbar
+                        android:id="@+id/playerToolbar"
+                        style="@style/Toolbar"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
+                </FrameLayout>
             </LinearLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml
index 89db5dc00..060aea3b2 100755
--- a/app/src/main/res/layout-land/fragment_player.xml
+++ b/app/src/main/res/layout-land/fragment_player.xml
@@ -4,9 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
-    android:focusable="true">
+    android:focusable="true"
+    android:background="?attr/colorSurface">
 
     <View
         android:id="@+id/colorGradientBackground"
@@ -40,17 +40,17 @@
             android:layout_height="match_parent"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.HeightFitSquareLayout
+            <io.github.muntashirakon.music.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:layout="@layout/fragment_album_cover" />
-            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
+            </io.github.muntashirakon.music.views.HeightFitSquareLayout>
 
             <LinearLayout
                 android:id="@+id/controlsContainer"
@@ -66,14 +66,13 @@
                     <com.google.android.material.appbar.MaterialToolbar
                         android:id="@+id/playerToolbar"
                         style="@style/Toolbar"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
                 </FrameLayout>
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.normal.PlayerPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_gravity="bottom"
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 478da9ee3..3a2373f1f 100644
--- a/app/src/main/res/layout-land/fragment_simple_player.xml
+++ b/app/src/main/res/layout-land/fragment_simple_player.xml
@@ -4,11 +4,22 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
     <LinearLayout
@@ -16,24 +27,29 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <include layout="@layout/status_bar" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal">
 
-            <code.name.monkey.retromusic.views.HeightFitSquareLayout
+            <io.github.muntashirakon.music.views.HeightFitSquareLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     tools:layout="@layout/fragment_album_cover" />
-            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
+            </io.github.muntashirakon.music.views.HeightFitSquareLayout>
 
 
             <LinearLayout
@@ -44,19 +60,23 @@
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlaybackControlsFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.simple.SimplePlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     tools:layout="@layout/fragment_simple_controls_fragment" />
 
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                    android:layout_weight="0">
+
+                    <com.google.android.material.appbar.MaterialToolbar
+                        android:id="@+id/playerToolbar"
+                        style="@style/Toolbar"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
+                </FrameLayout>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_user_info.xml b/app/src/main/res/layout-land/fragment_user_info.xml
deleted file mode 100644
index 05adb87f8..000000000
--- a/app/src/main/res/layout-land/fragment_user_info.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
-            app:title="@string/profile"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-        android:paddingBottom="@dimen/mini_player_height">
-
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/bannerImage"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="16dp"
-            android:scaleType="centerCrop"
-            android:transitionName="banner_image"
-            app:layout_constraintBottom_toTopOf="@+id/nameContainer"
-            app:layout_constraintDimensionRatio="21:10"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/circleImageView"
-            app:srcCompat="@drawable/material_design_default" />
-
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
-            android:id="@+id/userImage"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_gravity="center"
-            android:layout_marginStart="16dp"
-            android:layout_marginBottom="16dp"
-            android:scaleType="centerCrop"
-            android:transitionName="user_image"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:retroCornerSize="36dp"
-            app:srcCompat="@drawable/ic_person_flat" />
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/nameContainer"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            app:hintAnimationEnabled="true"
-            app:hintEnabled="true"
-            app:layout_constraintBottom_toBottomOf="@+id/userImage"
-            app:layout_constraintEnd_toStartOf="@+id/next"
-            app:layout_constraintStart_toEndOf="@id/userImage"
-            app:layout_constraintTop_toTopOf="@id/userImage">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:autofillHints="name"
-                android:hint="@string/my_name"
-                android:importantForAutofill="yes"
-                android:inputType="textPersonName|textCapWords|text"
-                android:textAppearance="@style/TextViewSubtitle1"
-                tools:text="@tools:sample/full_names" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_margin="16dp"
-            android:gravity="center"
-            android:src="@drawable/ic_save"
-            android:text="@string/save"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/sliding_music_panel_layout.xml b/app/src/main/res/layout-land/sliding_music_panel_layout.xml
deleted file mode 100644
index 4d6074066..000000000
--- a/app/src/main/res/layout-land/sliding_music_panel_layout.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/mainContent"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <code.name.monkey.retromusic.views.TintedNavigationRailView
-            android:id="@+id/navigationView"
-            style="@style/Widget.Material3.NavigationRailView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            app:itemHorizontalTranslationEnabled="false"
-            app:menu="@menu/bottom_navigation_main"
-            tools:viewBindingType="com.google.android.material.navigation.NavigationBarView" />
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/fragment_container"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/colorSurface"
-            app:defaultNavHost="true"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:layout="@layout/fragment_home" />
-    </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/slidingPanel"
-        style="@style/BottomSheetStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:behavior_hideable="true"
-        app:behavior_peekHeight="@dimen/mini_player_height"
-        app:enableEdgeToEdge="true"
-        app:gestureInsetBottomIgnored="true"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-        tools:visibility="visible">
-
-        <FrameLayout
-            android:id="@+id/playerFragmentContainer"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <fragment
-            android:id="@+id/miniPlayerFragment"
-            android:name="code.name.monkey.retromusic.fragments.other.MiniPlayerFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/mini_player_height"
-            tools:layout="@layout/fragment_mini_player" />
-
-    </FrameLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/fragment_playing_queue.xml b/app/src/main/res/layout-sw600dp/fragment_playing_queue.xml
index b7e28dae5..78f4aca72 100644
--- a/app/src/main/res/layout-sw600dp/fragment_playing_queue.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_playing_queue.xml
@@ -18,7 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <code.name.monkey.retromusic.views.TopAppBarLayout
+        <io.github.muntashirakon.music.views.TopAppBarLayout
             android:id="@+id/appBarLayout"
             style="?appBarLayoutStyle"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-sw600dp/item_queue.xml b/app/src/main/res/layout-sw600dp/item_queue.xml
index 148b5d56a..a8587f9d6 100644
--- a/app/src/main/res/layout-sw600dp/item_queue.xml
+++ b/app/src/main/res/layout-sw600dp/item_queue.xml
@@ -44,19 +44,18 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="16dp"
-                app:cardCornerRadius="8dp"
+                app:cardCornerRadius="6dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@id/drag_view"
                 app:layout_constraintTop_toTopOf="parent">
 
-                <com.google.android.material.imageview.ShapeableImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/image"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:scaleType="centerCrop"
-                    app:shapeAppearance="@style/ShapeAppearance.Material3.Corner.Small"
                     tools:srcCompat="@tools:sample/backgrounds/scenic"
                     tools:visibility="visible" />
 
@@ -94,7 +93,6 @@
                 android:id="@+id/text"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:paddingHorizontal="16dp"
diff --git a/app/src/main/res/layout-v31/layout_notification_collapsed.xml b/app/src/main/res/layout-v31/layout_notification_collapsed.xml
index b87f6b18f..ae93ac013 100644
--- a/app/src/main/res/layout-v31/layout_notification_collapsed.xml
+++ b/app/src/main/res/layout-v31/layout_notification_collapsed.xml
@@ -75,7 +75,7 @@
             android:layout_height="38dp"
             android:background="@drawable/notification_selector"
             android:scaleType="centerInside"
-            android:src="@drawable/ic_skip_previous"
+            android:src="@drawable/ic_skip_previous_round_white_32dp"
             tools:tint="?colorOnPrimary" />
 
         <ImageButton
@@ -93,7 +93,7 @@
             android:layout_height="38dp"
             android:background="@drawable/notification_selector"
             android:scaleType="centerInside"
-            android:src="@drawable/ic_skip_next"
+            android:src="@drawable/ic_skip_next_round_white_32dp"
             tools:tint="?colorOnPrimary" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout-v31/layout_notification_expanded.xml b/app/src/main/res/layout-v31/layout_notification_expanded.xml
index cfa1e5205..95f1d7da9 100644
--- a/app/src/main/res/layout-v31/layout_notification_expanded.xml
+++ b/app/src/main/res/layout-v31/layout_notification_expanded.xml
@@ -68,7 +68,7 @@
                 android:layout_height="42dp"
                 android:background="@drawable/notification_selector"
                 android:scaleType="centerInside"
-                tools:src="@drawable/ic_skip_previous"
+                tools:src="@drawable/ic_skip_previous_round_white_32dp"
                 tools:tint="?colorOnPrimary" />
 
             <ImageButton
@@ -86,7 +86,7 @@
                 android:layout_height="42dp"
                 android:background="@drawable/notification_selector"
                 android:scaleType="centerInside"
-                tools:src="@drawable/ic_skip_next"
+                tools:src="@drawable/ic_skip_next_round_white_32dp"
                 tools:tint="?colorOnPrimary" />
 
             <ImageButton
diff --git a/app/src/main/res/layout-xlarge-land/fragment_blur.xml b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
new file mode 100644
index 000000000..e996f1f10
--- /dev/null
+++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/colorBackground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        app:srcCompat="@color/black_color" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/shadow_up" />
+
+    <FrameLayout
+        android:id="@+id/statusBarContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/albumCoverContainer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_weight="0"
+        app:layout_constraintBottom_toTopOf="@id/playerContent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/statusBarContainer">
+
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/playerAlbumCoverFragment"
+            android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:layout="@layout/fragment_album_cover" />
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/playerContent"
+        android:layout_width="400dp"
+        android:layout_height="0dp"
+        android:layout_above="@id/playerToolbar"
+        app:layout_constraintBottom_toTopOf="@+id/playerToolbar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/albumCoverContainer">
+
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/playbackControlsFragment"
+            android:name="io.github.muntashirakon.music.fragments.player.blur.BlurPlaybackControlsFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </FrameLayout>
+
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/playerToolbar"
+        style="@style/Toolbar"
+        android:layout_height="48dp"
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 b09649182..48f40ab39 100755
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -17,9 +17,7 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/action_tag_editor" />
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -28,15 +26,15 @@
         android:id="@+id/content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:overScrollMode="@integer/overScrollMode"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+        android:overScrollMode="@integer/overScrollMode">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <code.name.monkey.retromusic.views.WidthFitSquareCardView
+            <io.github.muntashirakon.music.views.WidthFitSquareCardView
                 android:id="@+id/imageContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -55,7 +53,7 @@
                     android:scaleType="centerCrop"
                     tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
 
-            </code.name.monkey.retromusic.views.WidthFitSquareCardView>
+            </io.github.muntashirakon.music.views.WidthFitSquareCardView>
 
 
             <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/activity_bug_report.xml b/app/src/main/res/layout/activity_bug_report.xml
index a43ab0115..ce2337e26 100644
--- a/app/src/main/res/layout/activity_bug_report.xml
+++ b/app/src/main/res/layout/activity_bug_report.xml
@@ -14,10 +14,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             app:layout_collapseMode="pin"
-            app:navigationIcon="@drawable/ic_arrow_back"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/report_bug"
             app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
 
diff --git a/app/src/main/res/layout/activity_drive_mode.xml b/app/src/main/res/layout/activity_drive_mode.xml
index 0ef554144..6f1d7ab50 100644
--- a/app/src/main/res/layout/activity_drive_mode.xml
+++ b/app/src/main/res/layout/activity_drive_mode.xml
@@ -18,7 +18,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <code.name.monkey.retromusic.views.StatusBarView
+    <io.github.muntashirakon.music.views.StatusBarView
         android:id="@+id/status_bar"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -177,12 +177,17 @@
             tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
+        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:maxHeight="3dp"
-        style="@style/Widget.Retro.Slider"
+        android:paddingVertical="@dimen/seekbar_padding"
+        android:progressDrawable="@drawable/color_progress_seek"
+        android:progressTint="@color/md_white_1000"
+        android:splitTrack="false"
+        android:thumb="@drawable/switch_thumb_material"
         app:layout_constraintBottom_toTopOf="@id/songCurrentProgress"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -197,6 +202,7 @@
         android:textColor="@color/md_white_1000"
         app:layout_constraintBottom_toTopOf="@id/playPauseButton"
         app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -208,6 +214,7 @@
         android:textColor="@color/md_white_1000"
         app:layout_constraintBottom_toTopOf="@id/playPauseButton"
         app:layout_constraintEnd_toEndOf="parent"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 5e5159686..08584cdec 100644
--- a/app/src/main/res/layout/activity_license.xml
+++ b/app/src/main/res/layout/activity_license.xml
@@ -16,10 +16,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             app:layout_collapseMode="pin"
-            app:navigationIcon="@drawable/ic_arrow_back"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/licenses"
             app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
 
@@ -31,7 +29,7 @@
         android:layout_height="match_parent"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-        <code.name.monkey.retromusic.views.LollipopFixedWebView
+        <io.github.muntashirakon.music.views.LollipopFixedWebView
             android:id="@+id/license"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_lock_screen.xml b/app/src/main/res/layout/activity_lock_screen.xml
index faf44a477..1fafe2b1a 100644
--- a/app/src/main/res/layout/activity_lock_screen.xml
+++ b/app/src/main/res/layout/activity_lock_screen.xml
@@ -1,77 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/iv_blurred_album_art"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
+        android:layout_height="wrap_content">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#80000000"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
         android:orientation="vertical"
-        android:paddingTop="24dp">
+        tools:ignore="UselessParent">
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/status_bar" />
-        </FrameLayout>
-
-        <code.name.monkey.retromusic.views.WidthFitSquareCardView
-            android:id="@+id/albumCoverContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="16dp"
-            android:transitionName="@string/transition_album_art"
-            app:cardCornerRadius="24dp"
-            app:cardElevation="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop"
-                tools:srcCompat="@tools:sample/backgrounds/scenic[0]" />
-
-        </code.name.monkey.retromusic.views.WidthFitSquareCardView>
-
-
-        <LinearLayout
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/playback_controls_fragment"
+            android:name="io.github.muntashirakon.music.fragments.player.lockscreen.LockScreenControlsFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:orientation="vertical"
-            tools:ignore="UselessParent">
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/playback_controls_fragment"
-                android:name="code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:layout="@layout/fragment_lock_screen_playback_controls" />
-        </LinearLayout>
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/slide"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:fitsSystemWindows="true"
-            android:gravity="center"
-            android:padding="16dp"
-            android:text="@string/swipe_to_unlock"
-            android:textColor="?android:attr/textColorPrimary" />
+            tools:layout="@layout/fragment_lock_screen_playback_controls" />
     </LinearLayout>
-</RelativeLayout>
+
+    <io.github.muntashirakon.music.views.WidthFitSquareCardView
+        android:id="@+id/albumCoverContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:transitionName="@string/transition_album_art"
+        app:cardCornerRadius="24dp"
+        app:cardElevation="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            tools:srcCompat="@tools:sample/backgrounds/scenic[0]" />
+
+    </io.github.muntashirakon.music.views.WidthFitSquareCardView>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/slide"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:fitsSystemWindows="true"
+        android:gravity="center"
+        android:padding="16dp"
+        android:text="@string/swipe_to_unlock"
+        android:textColor="?android:attr/textColorPrimary" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permission.xml b/app/src/main/res/layout/activity_permission.xml
index d25afeb41..1a0faa1b7 100644
--- a/app/src/main/res/layout/activity_permission.xml
+++ b/app/src/main/res/layout/activity_permission.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-    <code.name.monkey.retromusic.views.BaselineGridTextView
+    <io.github.muntashirakon.music.views.BaselineGridTextView
         android:id="@+id/appNameText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
             android:layout_height="wrap_content"
             android:orientation="@integer/permission_orientation">
 
-            <code.name.monkey.retromusic.views.PermissionItem
+            <io.github.muntashirakon.music.views.PermissionItem
                 android:id="@+id/storage_permission"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
                 app:permissionTitleNumber="1"
                 app:permissionTitleSubTitle="@string/permission_summary" />
 
-            <code.name.monkey.retromusic.views.PermissionItem
+            <io.github.muntashirakon.music.views.PermissionItem
                 android:id="@+id/bluetooth_permission"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -66,7 +66,7 @@
                 app:permissionTitleSubTitle="@string/bluetooth_summary"
                 tools:visibility="visible" />
 
-            <code.name.monkey.retromusic.views.PermissionItem
+            <io.github.muntashirakon.music.views.PermissionItem
                 android:id="@+id/audio_permission"
                 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
new file mode 100644
index 000000000..6a93de59d
--- /dev/null
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/contentFrame"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface"
+        app:defaultNavHost="true"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+        app:navGraph="@navigation/settings_graph" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsingToolbarLayout"
+            style="?attr/collapsingToolbarLayoutLargeStyle"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
+            app:collapsedTitleTextAppearance="@style/TextViewHeadline6"
+            app:expandedTitleMarginBottom="24dp"
+            app:expandedTitleMarginEnd="24dp"
+            app:expandedTitleMarginStart="24dp"
+            app:expandedTitleTextAppearance="@style/TextViewHeadline4"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlwaysCollapsed">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                android:layout_height="?actionBarSize"
+                app:layout_collapseMode="pin"
+                app:navigationIcon="@drawable/ic_keyboard_backspace_black"
+                app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
+                tools:title="@string/action_settings" />
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_share_instagram.xml b/app/src/main/res/layout/activity_share_instagram.xml
index d3854ea23..56297ee25 100644
--- a/app/src/main/res/layout/activity_share_instagram.xml
+++ b/app/src/main/res/layout/activity_share_instagram.xml
@@ -56,7 +56,7 @@
                 app:layout_constraintStart_toEndOf="@id/appIcon"
                 app:layout_constraintTop_toTopOf="@id/appIcon" />
 
-            <code.name.monkey.retromusic.views.WidthFitSquareCardView
+            <io.github.muntashirakon.music.views.WidthFitSquareCardView
                 android:id="@+id/imageContainerCard"
                 android:layout_width="290dp"
                 android:layout_height="wrap_content"
@@ -73,7 +73,7 @@
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop"
                     tools:src="@tools:sample/avatars" />
-            </code.name.monkey.retromusic.views.WidthFitSquareCardView>
+            </io.github.muntashirakon.music.views.WidthFitSquareCardView>
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/shareTitle"
@@ -132,7 +132,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/social_stories"
             app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
     </com.google.android.material.appbar.AppBarLayout>
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 d28c583bc..5b5a8ed2e 100755
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -17,9 +17,7 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/action_tag_editor"
             app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
     </com.google.android.material.appbar.AppBarLayout>
@@ -36,7 +34,7 @@
             android:orientation="vertical"
             android:padding="16dp">
 
-            <code.name.monkey.retromusic.views.WidthFitSquareCardView
+            <io.github.muntashirakon.music.views.WidthFitSquareCardView
                 android:id="@+id/imageContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -56,7 +54,7 @@
                     android:scaleType="centerCrop"
                     tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
 
-            </code.name.monkey.retromusic.views.WidthFitSquareCardView>
+            </io.github.muntashirakon.music.views.WidthFitSquareCardView>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/songTextContainer"
diff --git a/app/src/main/res/layout/banner_image_layout.xml b/app/src/main/res/layout/banner_image_layout.xml
index 23b32d5d4..c47da1b19 100644
--- a/app/src/main/res/layout/banner_image_layout.xml
+++ b/app/src/main/res/layout/banner_image_layout.xml
@@ -34,7 +34,7 @@
                 android:background="@drawable/shadow_up"
                 app:layout_constraintBottom_toBottomOf="parent" />
 
-            <code.name.monkey.retromusic.views.RetroShapeableImageView
+            <io.github.muntashirakon.music.views.RetroShapeableImageView
                 android:id="@+id/userImage"
                 android:layout_width="42dp"
                 android:layout_height="42dp"
diff --git a/app/src/main/res/layout/card_retro_info.xml b/app/src/main/res/layout/card_retro_info.xml
index b1d259c47..e5fbb4e35 100644
--- a/app/src/main/res/layout/card_retro_info.xml
+++ b/app/src/main/res/layout/card_retro_info.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+   xmlns:app="http://schemas.android.com/apk/res-auto"
+   android:layout_width="match_parent"
+   android:layout_height="wrap_content"
+   android:orientation="vertical">
 
-    <code.name.monkey.retromusic.views.ListItemView
+    <io.github.muntashirakon.music.views.ListItemView
         android:id="@+id/version"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -15,9 +15,9 @@
         app:layout_constraintStart_toStartOf="parent"
         app:listItemIcon="@drawable/ic_info_outline"
         app:listItemSummary="@string/pref_summary_open_source_licences"
-        app:listItemTitle="@string/version" />
+        app:listItemTitle="@string/version"/>
 
-    <code.name.monkey.retromusic.views.ListItemView
+    <io.github.muntashirakon.music.views.ListItemView
         android:id="@+id/changelog"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
         app:listItemSummary="@string/changelog_summary"
         app:listItemTitle="@string/changelog"/>
 
-    <code.name.monkey.retromusic.views.ListItemView
+    <io.github.muntashirakon.music.views.ListItemView
         android:id="@+id/appGithub"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -41,9 +41,9 @@
         app:layout_constraintTop_toBottomOf="@id/changelog"
         app:listItemIcon="@drawable/ic_github_circle"
         app:listItemSummary="@string/git_hub_summary"
-        app:listItemTitle="@string/git_hub" />
+        app:listItemTitle="@string/git_hub"/>
 
-    <code.name.monkey.retromusic.views.ListItemView
+    <io.github.muntashirakon.music.views.ListItemView
         android:id="@+id/appTranslation"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -54,9 +54,9 @@
         app:layout_constraintTop_toBottomOf="@id/appGithub"
         app:listItemIcon="@drawable/ic_flag"
         app:listItemSummary="@string/translate_community"
-        app:listItemTitle="@string/translate" />
+        app:listItemTitle="@string/translate"/>
 
-    <code.name.monkey.retromusic.views.ListItemView
+    <io.github.muntashirakon.music.views.ListItemView
         android:id="@+id/bugReportLink"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -67,9 +67,9 @@
         app:layout_constraintTop_toBottomOf="@id/appTranslation"
         app:listItemIcon="@drawable/ic_bug_report"
         app:listItemSummary="@string/bug_report_summary"
-        app:listItemTitle="@string/report_bug" />
+        app:listItemTitle="@string/report_bug"/>
 
-    <code.name.monkey.retromusic.views.ListItemView
+    <io.github.muntashirakon.music.views.ListItemView
         android:id="@+id/faqLink"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
         app:listItemSummary="@string/help_summary"
         app:listItemTitle="@string/faq"/>
 
-    <code.name.monkey.retromusic.views.ListItemView
+    <io.github.muntashirakon.music.views.ListItemView
         android:id="@+id/openSource"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/collapsing_appbar_layout.xml b/app/src/main/res/layout/collapsing_appbar_layout.xml
index 9c47c4f3e..82a06383c 100644
--- a/app/src/main/res/layout/collapsing_appbar_layout.xml
+++ b/app/src/main/res/layout/collapsing_appbar_layout.xml
@@ -16,10 +16,14 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
         style="@style/Toolbar"
-        android:layout_width="match_parent"
         android:layout_height="?actionBarSize"
         app:layout_collapseMode="pin"
         app:navigationIcon="@drawable/ic_search"
         app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
         tools:title="@string/songs" />
+
+    <FrameLayout
+        android:id="@+id/toolbar_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
 </com.google.android.material.appbar.CollapsingToolbarLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about_content.xml b/app/src/main/res/layout/fragment_about_content.xml
index 38b4d3c48..1f87f927e 100644
--- a/app/src/main/res/layout/fragment_about_content.xml
+++ b/app/src/main/res/layout/fragment_about_content.xml
@@ -2,8 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/mini_player_height">
+    android:orientation="vertical">
 
     <include
         android:id="@+id/card_retro_info"
diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml
index bb9143bd6..34afc8d82 100644
--- a/app/src/main/res/layout/fragment_adaptive_player.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player.xml
@@ -3,10 +3,12 @@
     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:background="?colorSurface"
-    android:clickable="true"
-    android:focusable="true">
+    android:layout_height="match_parent">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
@@ -22,23 +24,27 @@
             <include layout="@layout/status_bar" />
         </FrameLayout>
 
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/playerToolbar"
-            style="@style/Toolbar"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0"
-            app:contentInsetLeft="0dp"
-            app:contentInsetStart="0dp"
-            app:contentInsetStartWithNavigation="0dp"
-            app:navigationIcon="@drawable/ic_keyboard_arrow_down"
-            app:subtitleTextAppearance="@style/TextViewCaption"
-            app:titleMargin="0dp"
-            app:titleMarginStart="0dp"
-            app:titleTextAppearance="@style/TextViewSubtitle1"
-            tools:subtitle="@tools:sample/full_names"
-            tools:title="@tools:sample/full_names" />
+            android:layout_weight="0">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                app:contentInsetLeft="0dp"
+                app:contentInsetStart="0dp"
+                app:contentInsetStartWithNavigation="0dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                app:subtitleTextAppearance="@style/TextViewCaption"
+                app:titleMargin="0dp"
+                app:titleMarginStart="0dp"
+                app:titleTextAppearance="@style/TextViewSubtitle1"
+                tools:subtitle="@tools:sample/full_names"
+                tools:title="@tools:sample/full_names" />
+
+        </FrameLayout>
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -47,27 +53,32 @@
 
             <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/playerAlbumCoverFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 tools:layout="@layout/fragment_album_full_card_cover" />
 
             <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/cover_lyrics"
-                android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
+                android:name="io.github.muntashirakon.music.fragments.player.CoverLyricsFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
                 android:elevation="20dp" />
         </FrameLayout>
 
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/playbackControlsFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0"
-            tools:layout="@layout/fragment_adaptive_player_playback_controls" />
+            android:layout_weight="0">
+
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/playbackControlsFragment"
+                android:name="io.github.muntashirakon.music.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_adaptive_player_playback_controls" />
+        </FrameLayout>
 
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
index d758dbdca..c1bfa3b20 100644
--- a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:ignore="MissingPrefix">
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/songCurrentProgress"
@@ -18,14 +19,16 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
-        style="@style/Widget.Retro.Slider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:maxHeight="2dp"
+        android:paddingVertical="@dimen/seekbar_padding"
+        android:progressDrawable="@drawable/color_progress_seek"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
         app:layout_constraintTop_toTopOf="parent" />
@@ -42,6 +45,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <androidx.appcompat.widget.AppCompatImageButton
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 151807595..d4dd21b26 100644
--- a/app/src/main/res/layout/fragment_album_circle_cover.xml
+++ b/app/src/main/res/layout/fragment_album_circle_cover.xml
@@ -6,12 +6,13 @@
     android:layout_height="match_parent"
     android:padding="@dimen/padding_album_cover">
 
-    <com.google.android.material.imageview.ShapeableImageView
+    <io.github.muntashirakon.music.views.CircularImageView
         android:id="@+id/player_image"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:scaleType="centerCrop"
-        app:shapeAppearance="@style/ShapeAppearance.Material3.Circle"
+        app:civ_border="false"
+        app:civ_shadow="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_album_content.xml b/app/src/main/res/layout/fragment_album_content.xml
index 67144ea19..6aa56c367 100644
--- a/app/src/main/res/layout/fragment_album_content.xml
+++ b/app/src/main/res/layout/fragment_album_content.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<code.name.monkey.retromusic.views.insets.InsetsConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<io.github.muntashirakon.music.views.insets.InsetsConstraintLayout 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:paddingBottom="@dimen/mini_player_height">
+    android:orientation="vertical">
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/playAction"
@@ -48,7 +47,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp"
         android:text="@string/songs"
-        android:textAppearance="@style/TextViewHeadline6"
+        android:textAppearance="@style/TextViewOverline"
         android:textColor="?android:attr/textColorPrimary"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
@@ -73,7 +72,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp"
         android:text="@string/songs"
-        android:textAppearance="@style/TextViewHeadline6"
+        android:textAppearance="@style/TextViewOverline"
         android:textColor="?android:attr/textColorPrimary"
         android:textStyle="bold"
         android:visibility="gone"
@@ -104,4 +103,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/moreRecyclerView" />
-</code.name.monkey.retromusic.views.insets.InsetsConstraintLayout>
\ No newline at end of file
+</io.github.muntashirakon.music.views.insets.InsetsConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_details.xml b/app/src/main/res/layout/fragment_album_details.xml
index c36a4405b..ac7eeab42 100644
--- a/app/src/main/res/layout/fragment_album_details.xml
+++ b/app/src/main/res/layout/fragment_album_details.xml
@@ -11,15 +11,19 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:liftOnScroll="true">
+        app:liftOnScroll="true"
+        android:fitsSystemWindows="true">
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
+        <FrameLayout
+            android:id="@+id/toolbar_container"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back" />
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                app:navigationIcon="@drawable/ic_keyboard_backspace_black" />
+        </FrameLayout>
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -59,7 +63,7 @@
 
             </com.google.android.material.card.MaterialCardView>
 
-            <code.name.monkey.retromusic.views.RetroShapeableImageView
+            <io.github.muntashirakon.music.views.RetroShapeableImageView
                 android:id="@+id/artistImage"
                 android:layout_width="52dp"
                 android:layout_height="52dp"
@@ -71,7 +75,7 @@
                 app:retroCornerSize="26dp"
                 tools:srcCompat="@tools:sample/backgrounds/scenic[11]" />
 
-            <code.name.monkey.retromusic.views.BaselineGridTextView
+            <io.github.muntashirakon.music.views.BaselineGridTextView
                 android:id="@+id/albumTitle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -88,7 +92,7 @@
                 tools:ignore="MissingPrefix"
                 tools:text="@tools:sample/full_names" />
 
-            <code.name.monkey.retromusic.views.BaselineGridTextView
+            <io.github.muntashirakon.music.views.BaselineGridTextView
                 android:id="@+id/albumText"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_artist_content.xml b/app/src/main/res/layout/fragment_artist_content.xml
index 8ee8f6a34..5c1f9f8e6 100644
--- a/app/src/main/res/layout/fragment_artist_content.xml
+++ b/app/src/main/res/layout/fragment_artist_content.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<code.name.monkey.retromusic.views.insets.InsetsConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<io.github.muntashirakon.music.views.insets.InsetsConstraintLayout 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:paddingBottom="@dimen/mini_player_height">
+    android:orientation="vertical">
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/playAction"
@@ -48,7 +47,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp"
         android:text="@string/albums"
-        android:textAppearance="@style/TextViewHeadline6"
+        android:textAppearance="@style/TextViewOverline"
         android:textColor="?android:attr/textColorPrimary"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
@@ -76,24 +75,24 @@
         android:layout_height="wrap_content"
         android:padding="16dp"
         android:text="@string/songs"
-        android:textAppearance="@style/TextViewHeadline6"
+        android:textAppearance="@style/TextViewOverline"
         android:textColor="?android:attr/textColorPrimary"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toStartOf="@id/song_sort_order"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/albumRecyclerView" />
+        app:layout_constraintTop_toBottomOf="@id/albumRecyclerView"/>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/song_sort_order"
-        style="@style/Widget.Material3.Button.IconButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
+        style="@style/Widget.Material3.Button.IconButton"
+        app:iconTint="?colorControlNormal"
+        app:iconSize="24dp"
         android:background="?roundSelector"
         app:icon="@drawable/ic_sort"
-        app:iconSize="24dp"
-        app:iconTint="?colorControlNormal"
         app:layout_constraintBottom_toBottomOf="@+id/songTitle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/songTitle"
@@ -113,4 +112,4 @@
         android:layout_height="72dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/recyclerView" />
-</code.name.monkey.retromusic.views.insets.InsetsConstraintLayout>
\ No newline at end of file
+</io.github.muntashirakon.music.views.insets.InsetsConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_artist_details.xml b/app/src/main/res/layout/fragment_artist_details.xml
index 26cce597f..7c5e89b09 100644
--- a/app/src/main/res/layout/fragment_artist_details.xml
+++ b/app/src/main/res/layout/fragment_artist_details.xml
@@ -11,15 +11,19 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:liftOnScroll="true">
+        app:liftOnScroll="true"
+        android:fitsSystemWindows="true">
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
+        <FrameLayout
+            android:id="@+id/toolbar_container"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back" />
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                app:navigationIcon="@drawable/ic_keyboard_backspace_black" />
+        </FrameLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView
@@ -59,7 +63,7 @@
 
             </com.google.android.material.card.MaterialCardView>
 
-            <code.name.monkey.retromusic.views.BaselineGridTextView
+            <io.github.muntashirakon.music.views.BaselineGridTextView
                 android:id="@+id/artistTitle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -75,7 +79,7 @@
                 app:layout_constraintTop_toBottomOf="@id/artistCoverContainer"
                 tools:text="@tools:sample/full_names" />
 
-            <code.name.monkey.retromusic.views.BaselineGridTextView
+            <io.github.muntashirakon.music.views.BaselineGridTextView
                 android:id="@+id/text"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -98,6 +102,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/text" />
 
+
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_backup.xml b/app/src/main/res/layout/fragment_backup.xml
index 5bcb9b3e2..1f3f007ed 100644
--- a/app/src/main/res/layout/fragment_backup.xml
+++ b/app/src/main/res/layout/fragment_backup.xml
@@ -51,7 +51,7 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@id/create_backup" />
 
-    <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
+    <io.github.muntashirakon.music.views.insets.InsetsRecyclerView
         android:id="@+id/backup_recyclerview"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml
index d0b92400f..348bb4b08 100644
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@@ -42,7 +42,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -52,7 +52,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.blur.BlurPlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/playerToolbar"
@@ -65,13 +65,12 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
index 2d358cbc5..2ce6c3685 100644
--- a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
@@ -33,14 +33,15 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
+        android:paddingVertical="@dimen/seekbar_padding"
         android:progressDrawable="@drawable/color_progress_seek"
         android:splitTrack="false"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
@@ -59,6 +60,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <com.google.android.material.textview.MaterialTextView
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 01faf9e04..744c8a831 100644
--- a/app/src/main/res/layout/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player.xml
@@ -25,83 +25,78 @@
     <include layout="@layout/shadow_statusbar_toolbar" />
 
 
-    <LinearLayout
+    <FrameLayout
+        android:id="@+id/cardContainer"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <include layout="@layout/status_bar" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:clickable="true"
-            android:ellipsize="end"
-            android:focusable="true"
-            android:freezesText="true"
-            android:paddingHorizontal="24dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem" />
+            android:orientation="vertical">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:clickable="true"
-            android:ellipsize="end"
-            android:focusable="true"
-            android:freezesText="true"
-            android:paddingHorizontal="24dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewBody1"
-            android:textColor="?android:attr/textColorPrimary"
-            tools:text="@tools:sample/lorem" />
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <include layout="@layout/status_bar" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/playerToolbar"
+                    style="@style/Toolbar"
+                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                    app:contentInsetLeft="0dp"
+                    app:contentInsetStart="0dp"
+                    app:contentInsetStartWithNavigation="0dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                    app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
+                    app:titleMargin="0dp"
+                    app:titleMarginStart="0dp"
+                    app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_weight="1">
+
+                <androidx.fragment.app.FragmentContainerView
+                    android:id="@+id/playerAlbumCoverFragment"
+                    android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:layout="@layout/fragment_album_card_cover" />
+
+                <androidx.fragment.app.FragmentContainerView
+                    android:id="@+id/cover_lyrics"
+                    android:name="io.github.muntashirakon.music.fragments.player.CoverLyricsFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    tools:layout="@layout/fragment_cover_lyrics" />
+            </FrameLayout>
+
+        </LinearLayout>
 
         <FrameLayout
-            android:id="@+id/cardContainer"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/playerAlbumCoverFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:layout="@layout/fragment_album_full_card_cover" />
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/cover_lyrics"
-                android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                tools:layout="@layout/fragment_cover_lyrics" />
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom">
 
             <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/playbackControlsFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
+                android:name="io.github.muntashirakon.music.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
+                android:layout_height="match_parent"
                 tools:layout="@layout/fragment_card_blur_player_playback_controls" />
         </FrameLayout>
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/playerToolbar"
-            style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
-    </LinearLayout>
+    </FrameLayout>
 
 </FrameLayout>
\ No newline at end of file
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 3976d43c6..719c6dbd3 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
@@ -48,12 +48,12 @@
             tools:text="22.00" />
     </LinearLayout>
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
+        android:paddingVertical="@dimen/seekbar_padding"
         android:paddingStart="20dp"
         android:paddingEnd="20dp"
         android:progressDrawable="@drawable/color_progress_seek"
diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml
index 3800ed991..8cf3e8286 100644
--- a/app/src/main/res/layout/fragment_card_player.xml
+++ b/app/src/main/res/layout/fragment_card_player.xml
@@ -14,19 +14,18 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:layout="@layout/fragment_album_full_cover" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/cover_lyrics"
-        android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.CoverLyricsFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:elevation="20dp" />
-
     <include layout="@layout/shadow_statusbar_toolbar" />
 
     <FrameLayout
@@ -40,17 +39,15 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <code.name.monkey.retromusic.views.StatusBarView
+            <io.github.muntashirakon.music.views.StatusBarView
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/status_bar_padding" />
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/playerToolbar"
                 style="@style/Toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:background="@android:color/transparent"
-                app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
         </LinearLayout>
     </FrameLayout>
 
@@ -63,7 +60,7 @@
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playbackControlsFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.card.CardPlaybackControlsFragment"
+            android:name="io.github.muntashirakon.music.fragments.player.card.CardPlaybackControlsFragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:layout="@layout/fragment_card_player_playback_controls" />
diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
index 71c28a3be..6c019c1dc 100644
--- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
@@ -31,7 +31,8 @@
             style="@style/MusicProgressSlider"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1" />
+            android:layout_weight="1"
+            android:paddingVertical="@dimen/seekbar_padding" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/songTotalTime"
diff --git a/app/src/main/res/layout/fragment_circle_player.xml b/app/src/main/res/layout/fragment_circle_player.xml
index 8cb7803e2..29fda3f1f 100644
--- a/app/src/main/res/layout/fragment_circle_player.xml
+++ b/app/src/main/res/layout/fragment_circle_player.xml
@@ -22,18 +22,25 @@
     android:focusable="true"
     android:orientation="vertical">
 
-    <include layout="@layout/status_bar" />
+    <FrameLayout
+        android:id="@+id/statusBarContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down"
+        app:layout_constraintTop_toBottomOf="@id/statusBarContainer"
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         tools:layout_editor_absoluteY="24dp" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -78,14 +85,14 @@
         app:layout_constraintStart_toStartOf="@id/volumeSeekBar"
         app:layout_constraintTop_toTopOf="@id/volumeSeekBar">
 
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
+        <io.github.muntashirakon.music.views.RetroShapeableImageView
             android:id="@+id/album_cover"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
             tools:srcCompat="@tools:sample/backgrounds/scenic[6]" />
 
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
+        <io.github.muntashirakon.music.views.RetroShapeableImageView
             android:id="@+id/album_cover_overlay"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -114,13 +121,12 @@
         android:id="@+id/playPauseButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_pause"
         app:backgroundTint="?attr/colorSurface"
-        android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="@id/volumeSeekBar"
         app:layout_constraintEnd_toEndOf="@id/volumeSeekBar"
         app:layout_constraintStart_toStartOf="@id/volumeSeekBar"
         app:layout_constraintTop_toTopOf="@id/volumeSeekBar"
+        android:src="@drawable/ic_pause"
         tools:tint="@color/md_black_1000" />
 
     <ImageButton
@@ -134,7 +140,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
         app:layout_constraintStart_toEndOf="@+id/playPauseButton"
         app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
+        app:srcCompat="@drawable/ic_skip_next_round_white_32dp"
         tools:tint="@color/md_white_1000" />
 
     <ImageButton
@@ -148,7 +154,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
         app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
         app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
+        app:srcCompat="@drawable/ic_skip_previous_round_white_32dp"
         tools:tint="@color/md_white_1000" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -162,11 +168,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/volumeSeekBar" />
 
-    <com.google.android.material.slider.Slider
+
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
-        style="@style/Widget.Retro.Slider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/seekbar_padding"
         app:layout_constraintBottom_toTopOf="@+id/songInfo"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
@@ -176,28 +183,28 @@
         android:id="@+id/songCurrentProgress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical|start|end"
-        android:paddingStart="16dp"
-        android:paddingEnd="0dp"
+        android:gravity="center_vertical|left|end"
+        android:paddingLeft="16dp"
         android:singleLine="true"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/songTotalTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical|end"
-        android:paddingStart="0dp"
-        android:paddingEnd="16dp"
+        android:gravity="center_vertical|right|end"
+        android:paddingRight="16dp"
         android:singleLine="true"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml
index d88a2f85c..563b3ebcc 100644
--- a/app/src/main/res/layout/fragment_classic_player.xml
+++ b/app/src/main/res/layout/fragment_classic_player.xml
@@ -12,28 +12,43 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/playerAlbumCoverFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-            android:layout_width="match_parent"
+        <FrameLayout
+            android:id="@+id/albumCoverContainer"
+            android:layout_width="0dp"
             android:layout_height="0dp"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:layout="@layout/fragment_album_cover" />
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_album_cover" />
+        </FrameLayout>
+
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="@drawable/shadow_down_strong"
+            app:layout_constraintBottom_toBottomOf="@id/toolbarContainer"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/toolbarContainer" />
 
         <LinearLayout
             android:id="@+id/toolbarContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/shadow_down_strong"
             android:orientation="vertical"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <code.name.monkey.retromusic.views.StatusBarView
+            <io.github.muntashirakon.music.views.StatusBarView
                 android:id="@+id/status_bar"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/status_bar_padding" />
@@ -41,12 +56,12 @@
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/playerToolbar"
                 style="@style/Toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
-                        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
         </LinearLayout>
 
+
         <include
             android:id="@+id/playerControlsContainer"
             layout="@layout/fragment_classic_controls"
@@ -55,7 +70,7 @@
             android:elevation="24dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment" />
+            app:layout_constraintTop_toBottomOf="@id/albumCoverContainer" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.card.MaterialCardView
@@ -63,7 +78,8 @@
         style="@style/BottomSheetStyle"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:shapeAppearanceOverlay="@style/TopCornerCardView"
+        android:gravity="bottom"
+        android:theme="@style/TopCornerCardView"
         app:behavior_hideable="false"
         app:cardElevation="24dp"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml
index 1f9dbdb6d..f27baec27 100644
--- a/app/src/main/res/layout/fragment_color_player.xml
+++ b/app/src/main/res/layout/fragment_color_player.xml
@@ -19,21 +19,31 @@
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <include layout="@layout/status_bar" />
+    <FrameLayout
+        android:id="@+id/statusBarContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar" />
+        app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.color.ColorPlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/playerToolbar"
@@ -42,16 +52,16 @@
         app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
         tools:layout="@layout/fragment_player_playback_controls" />
 
+
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 6118d2b6f..207b52bf6 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
@@ -19,15 +19,16 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
+        android:paddingVertical="@dimen/seekbar_padding"
         android:progressDrawable="@drawable/color_progress_seek"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
@@ -47,6 +48,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/fragment_cover_lyrics.xml b/app/src/main/res/layout/fragment_cover_lyrics.xml
index b90205a95..50d442695 100644
--- a/app/src/main/res/layout/fragment_cover_lyrics.xml
+++ b/app/src/main/res/layout/fragment_cover_lyrics.xml
@@ -21,7 +21,7 @@
         android:layout_gravity="center_vertical"
         android:gravity="center"
         android:shadowColor="@color/md_black_1000"
-        android:shadowRadius="10"
+        android:shadowRadius="4"
         android:textAppearance="@style/TextViewHeadline5"
         android:textColor="@color/md_white_1000"
         android:visibility="gone"
@@ -34,7 +34,7 @@
         android:layout_gravity="center_vertical"
         android:gravity="center"
         android:shadowColor="@color/md_black_1000"
-        android:shadowRadius="10"
+        android:shadowRadius="4"
         android:textAppearance="@style/TextViewHeadline5"
         android:textColor="@color/md_white_1000"
         tools:text="@tools:sample/full_names[5]" />
diff --git a/app/src/main/res/layout/fragment_fit.xml b/app/src/main/res/layout/fragment_fit.xml
index 232573e8d..37194994d 100644
--- a/app/src/main/res/layout/fragment_fit.xml
+++ b/app/src/main/res/layout/fragment_fit.xml
@@ -4,10 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -20,15 +24,16 @@
 
             <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/playerAlbumCoverFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 tools:layout="@layout/fragment_album_full_cover" />
 
+            <include layout="@layout/shadow_statusbar_toolbar" />
 
             <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/cover_lyrics"
-                android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
+                android:name="io.github.muntashirakon.music.fragments.player.CoverLyricsFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
@@ -36,22 +41,33 @@
                 android:elevation="20dp" />
         </FrameLayout>
 
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/playbackControlsFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.fit.FitPlaybackControlsFragment"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0"
-            tools:layout="@layout/fragment_gradient_controls" />
+            android:layout_weight="0">
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/playerToolbar"
-            style="@style/Toolbar"
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/playbackControlsFragment"
+                android:name="io.github.muntashirakon.music.fragments.player.fit.FitPlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_gradient_controls" />
+
+        </FrameLayout>
+
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_weight="0"
-                app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+            android:layout_weight="0">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:layout_gravity="bottom"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
+
+        </FrameLayout>
     </LinearLayout>
 
     <include layout="@layout/shadow_statusbar_toolbar" />
diff --git a/app/src/main/res/layout/fragment_fit_playback_controls.xml b/app/src/main/res/layout/fragment_fit_playback_controls.xml
index 6359d8c53..e6db94cd0 100644
--- a/app/src/main/res/layout/fragment_fit_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_fit_playback_controls.xml
@@ -21,14 +21,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
+            android:gravity="center_vertical|left|end"
             android:paddingStart="8dp"
-            android:paddingEnd="0dp"
             android:singleLine="true"
             android:textColor="?android:attr/textColorSecondary"
             android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
             tools:text="@tools:sample/date/hhmmss" />
 
         <androidx.appcompat.widget.AppCompatSeekBar
@@ -36,21 +37,24 @@
             style="@style/MusicProgressSlider"
             android:layout_width="0dp"
             android:layout_height="match_parent"
+            android:paddingVertical="@dimen/seekbar_padding"
             app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-            app:layout_constraintStart_toEndOf="@id/songCurrentProgress" />
+            app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
+            tools:ignore="RtlHardcoded,UnusedAttribute" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/songTotalTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:gravity="center_vertical|right|end"
             android:paddingEnd="8dp"
-            android:paddingStart="0dp"
             android:singleLine="true"
             android:textColor="?android:attr/textColorSecondary"
             android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
             tools:text="@tools:sample/date/hhmmss" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -161,6 +165,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
+        android:background="?attr/roundSelector"
         app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
         app:layout_constraintEnd_toStartOf="@+id/nextButton"
         app:layout_constraintHorizontal_bias="0.5"
@@ -209,4 +214,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         tools:background="@color/md_red_400"
         tools:layout_height="52dp" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml
index 0b3a5a1c7..696a9f20b 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -18,24 +18,36 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <include layout="@layout/shadow_statusbar_toolbar" />
+    <include
+        android:id="@+id/include"
+        layout="@layout/shadow_statusbar_toolbar" />
 
-    <include layout="@layout/status_bar" />
+    <FrameLayout
+        android:id="@+id/statusBarContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/status_bar"
+        app:layout_constraintTop_toBottomOf="@+id/statusBarContainer"
         tools:layout="@layout/fragment_album_flat_cover" />
 
+
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.flat.FlatPlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@+id/playerToolbar"
@@ -48,11 +60,10 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 977cc3f5a..d75ebdf95 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
@@ -19,15 +19,14 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:maxHeight="2dp"
         android:paddingVertical="@dimen/seekbar_padding"
-        android:progressDrawable="@drawable/color_progress_seek"
         android:splitTrack="false"
         android:thumb="@drawable/switch_square"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
@@ -47,6 +46,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
 
@@ -197,4 +197,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         tools:backgroundTint="@color/md_red_400"
         tools:layout_height="52dp" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index f4b2e78c7..f253d6e25 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -7,31 +7,46 @@
     android:fitsSystemWindows="true"
     android:transitionGroup="true">
 
-    <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:overScrollMode="@integer/overScrollMode"
-        android:scrollbars="none"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
-
-    <code.name.monkey.retromusic.views.TopAppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:liftOnScroll="true"
-        style="?appBarLayoutStyle"
         android:fitsSystemWindows="true">
 
-        <code.name.monkey.retromusic.views.BreadCrumbLayout
+        <FrameLayout
+            android:id="@+id/toolbar_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_scrollFlags="scroll|enterAlways">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:navigationIcon="@drawable/ic_search"
+                app:popupTheme="?attr/toolbarPopupTheme"
+                app:title="@null"
+                tools:ignore="UnusedAttribute">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/appNameText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:textAppearance="@style/TextViewHeadline6"
+                    android:textStyle="bold" />
+            </androidx.appcompat.widget.Toolbar>
+        </FrameLayout>
+
+        <io.github.muntashirakon.music.views.BreadCrumbLayout
             android:id="@+id/breadCrumbs"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tab_height"
             android:paddingStart="60dp"
             android:paddingEnd="8dp"
             app:layout_collapseMode="pin" />
-    </code.name.monkey.retromusic.views.TopAppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
         android:id="@android:id/empty"
@@ -62,4 +77,12 @@
             tools:visibility="visible" />
     </LinearLayout>
 
+    <io.github.muntashirakon.music.views.insets.InsetsRecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:overScrollMode="@integer/overScrollMode"
+        android:scrollbars="none"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml
index 85389f556..61e08415f 100644
--- a/app/src/main/res/layout/fragment_full.xml
+++ b/app/src/main/res/layout/fragment_full.xml
@@ -7,11 +7,9 @@
     android:clickable="true"
     android:focusable="true">
 
-    <include layout="@layout/status_bar" />
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -31,9 +29,10 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.full.FullPlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.full.FullPlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_gravity="bottom"
@@ -50,20 +49,32 @@
         app:layout_constraintBottom_toBottomOf="@id/playerToolbar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/status_bar" />
+        app:layout_constraintTop_toTopOf="@id/statusBarContainer" />
+
+    <FrameLayout
+        android:id="@+id/statusBarContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         android:paddingBottom="24dp"
         app:contentInsetEndWithActions="0dp"
         app:contentInsetStart="0dp"
         app:contentInsetStartWithNavigation="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down"
+        app:layout_constraintTop_toBottomOf="@id/statusBarContainer"
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:titleMargin="0dp"
         app:titleMargins="0dp">
 
@@ -106,17 +117,18 @@
                 app:layout_constraintTop_toBottomOf="@+id/nextSongLabel"
                 tools:text="@tools:sample/lorem/random" />
 
-            <com.google.android.material.imageview.ShapeableImageView
+            <io.github.muntashirakon.music.views.CircularImageView
                 android:id="@+id/artistImage"
                 android:layout_width="36dp"
                 android:layout_height="36dp"
                 android:layout_gravity="end"
                 android:layout_marginEnd="8dp"
                 android:elevation="10dp"
+                app:civ_border="false"
+                app:civ_shadow="false"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:shapeAppearance="@style/ShapeAppearance.Material3.Circle"
                 app:srcCompat="@drawable/default_artist_art" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -124,12 +136,11 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/cover_lyrics"
-        android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.CoverLyricsFragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:elevation="20dp"
-        app:layout_constraintBottom_toTopOf="@+id/playbackControlsFragment"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        android:elevation="20dp"
+        app:layout_constraintTop_toBottomOf="@id/playerToolbar"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_full_player_controls.xml b/app/src/main/res/layout/fragment_full_player_controls.xml
index f5b4f017e..7e3828311 100644
--- a/app/src/main/res/layout/fragment_full_player_controls.xml
+++ b/app/src/main/res/layout/fragment_full_player_controls.xml
@@ -90,15 +90,16 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
+        android:paddingVertical="@dimen/seekbar_padding"
         android:progressDrawable="@drawable/color_progress_seek"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
@@ -119,6 +120,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
 
diff --git a/app/src/main/res/layout/fragment_gradient_controls.xml b/app/src/main/res/layout/fragment_gradient_controls.xml
index 422b93e38..59f4ff77e 100644
--- a/app/src/main/res/layout/fragment_gradient_controls.xml
+++ b/app/src/main/res/layout/fragment_gradient_controls.xml
@@ -93,14 +93,15 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        style="@style/Widget.Retro.Slider"
+        android:paddingVertical="@dimen/seekbar_padding"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
         app:layout_constraintTop_toBottomOf="@id/titleContainer"
@@ -120,6 +121,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
 
diff --git a/app/src/main/res/layout/fragment_gradient_player.xml b/app/src/main/res/layout/fragment_gradient_player.xml
index fc8e9c5f1..2ad07c129 100644
--- a/app/src/main/res/layout/fragment_gradient_player.xml
+++ b/app/src/main/res/layout/fragment_gradient_player.xml
@@ -14,11 +14,9 @@
         android:layout_height="match_parent"
         android:paddingBottom="48dp">
 
-        <include android:id="@+id/status_bar_layout" layout="@layout/status_bar" />
-
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playerAlbumCoverFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+            android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:layout_constrainedHeight="true"
@@ -49,17 +47,29 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment" />
 
+        <FrameLayout
+            android:id="@+id/statusBarContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <include
+                android:id="@+id/status_bar_layout"
+                layout="@layout/status_bar" />
+        </FrameLayout>
+
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/cover_lyrics"
-            android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
+            android:name="io.github.muntashirakon.music.fragments.player.CoverLyricsFragment"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:elevation="20dp"
             app:layout_constraintBottom_toBottomOf="@+id/playerAlbumCoverFragment"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginBottom="16dp"
-            tools:layout="@layout/fragment_cover_lyrics" />
+            app:layout_constraintTop_toBottomOf="@+id/statusBarContainer" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 0bd02c9cd..a8b224b01 100755
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -13,16 +13,47 @@
   -->
 <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:fitsSystemWindows="true">
 
-    <code.name.monkey.retromusic.views.TopAppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
-        style="?appBarLayoutStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true" />
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="true">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_scrollFlags="scroll|enterAlways">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:navigationIcon="@drawable/ic_search"
+                app:popupTheme="?attr/toolbarPopupTheme"
+                app:title="@null"
+                tools:ignore="UnusedAttribute">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/appNameText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:textAppearance="@style/TextViewHeadline6"
+                    android:textStyle="bold" />
+            </androidx.appcompat.widget.Toolbar>
+
+            <ViewStub
+                android:id="@+id/cab_stub"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/toolbar_height" />
+        </FrameLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/container"
@@ -33,13 +64,13 @@
         android:overScrollMode="@integer/overScrollMode"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <io.github.muntashirakon.music.views.insets.InsetsConstraintLayout
             android:id="@+id/contentContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:transitionGroup="true">
 
-            <code.name.monkey.retromusic.views.HomeImageLayout
+            <io.github.muntashirakon.music.views.HomeImageLayout
                 android:id="@+id/imageLayout"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -55,7 +86,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/imageLayout" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </io.github.muntashirakon.music.views.insets.InsetsConstraintLayout>
 
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_player.xml b/app/src/main/res/layout/fragment_home_player.xml
index 92fa82230..0090876e8 100644
--- a/app/src/main/res/layout/fragment_home_player.xml
+++ b/app/src/main/res/layout/fragment_home_player.xml
@@ -7,7 +7,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -15,6 +15,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/songTotalTime"
         android:layout_width="wrap_content"
@@ -85,7 +86,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <code.name.monkey.retromusic.views.StatusBarView
+        <io.github.muntashirakon.music.views.StatusBarView
             android:id="@+id/status_bar"
             android:layout_width="match_parent"
             android:layout_height="@dimen/status_bar_padding" />
@@ -93,8 +94,7 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/playerToolbar"
             style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-                app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 377c55700..f4808a1b2 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
@@ -21,15 +21,16 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
+        android:paddingVertical="@dimen/seekbar_padding"
         android:progressDrawable="@drawable/color_progress_seek"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
@@ -52,6 +53,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/fragment_lyrics.xml b/app/src/main/res/layout/fragment_lyrics.xml
index d60cbf51b..bb118a02c 100644
--- a/app/src/main/res/layout/fragment_lyrics.xml
+++ b/app/src/main/res/layout/fragment_lyrics.xml
@@ -28,56 +28,38 @@
             android:layout_height="match_parent"
             android:background="?attr/colorSurface"
             android:gravity="start"
+            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
             app:contentInsetLeft="0dp"
             app:contentInsetStart="0dp"
             app:contentInsetStartWithNavigation="0dp"
-            app:navigationIcon="@drawable/ic_arrow_back"
-            app:title="@string/lyrics"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black"
+            app:subtitleTextAppearance="@style/TextViewCaption"
             app:titleMargin="0dp"
             app:titleMarginStart="0dp"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
-    </com.google.android.material.appbar.AppBarLayout>
+            app:titleTextAppearance="@style/TextViewSubtitle1">
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize">
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="vertical">
-
-            <TextView
-                android:id="@+id/normalLyrics"
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabLyrics"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/normal_lyrics_padding"
-                android:textIsSelectable="true"
-                android:textSize="@dimen/lyrics_text_size"
-                tools:text="@tools:sample/lorem[100]" />
-        </ScrollView>
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tabIndicator="@drawable/tab_lyrics_indicator"
+                app:tabIndicatorAnimationMode="elastic"
+                app:tabIndicatorFullWidth="false"
+                app:tabIndicatorHeight="5dp" />
+        </com.google.android.material.appbar.MaterialToolbar>
+    </com.google.android.material.appbar.AppBarLayout>
 
-        <code.name.monkey.retromusic.lyrics.LrcView
-            android:id="@+id/lyricsView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-            app:lrcLabel="@string/no_lyrics_found"
-            app:lrcNormalTextSize="24sp"
-            app:lrcPadding="24dp"
-            app:lrcTextGravity="left"
-            app:lrcTextSize="28sp" />
-
-        <TextView
-            android:id="@+id/noLyricsFound"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:text="@string/no_lyrics_found"
-            android:textSize="24sp"
-            android:visibility="gone" />
-    </FrameLayout>
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/lyricsPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/edit_button"
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
new file mode 100644
index 000000000..54bcdccb5
--- /dev/null
+++ b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
@@ -0,0 +1,48 @@
+<?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:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:overScrollMode="@integer/overScrollMode"
+        android:scrollbars="none"
+        android:transitionGroup="true"
+        app:layout_dodgeInsetEdges="bottom"
+        tools:listitem="@layout/item_list" />
+
+    <LinearLayout
+        android:id="@android:id/empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/emptyEmoji"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:text="@string/empty_text_emoji"
+            android:textAppearance="@style/TextViewHeadline3" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/emptyText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/empty"
+            android:textAppearance="@style/TextViewHeadline5"
+            android:textColor="?android:attr/textColorSecondary"
+            tools:visibility="visible" />
+    </LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_main_recycler.xml b/app/src/main/res/layout/fragment_main_recycler.xml
index 32bfec63f..36f9723e4 100644
--- a/app/src/main/res/layout/fragment_main_recycler.xml
+++ b/app/src/main/res/layout/fragment_main_recycler.xml
@@ -6,19 +6,18 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-    <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
+    <io.github.muntashirakon.music.views.insets.InsetsRecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
         android:overScrollMode="@integer/overScrollMode"
-        android:paddingBottom="@dimen/mini_player_height"
         android:scrollbars="none"
         android:transitionGroup="true"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
         tools:listitem="@layout/item_list" />
 
-    <code.name.monkey.retromusic.views.TopAppBarLayout
+    <io.github.muntashirakon.music.views.TopAppBarLayout
         android:id="@+id/appBarLayout"
         style="?appBarLayoutStyle"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml
index 6cffcbfdc..4d06cf605 100644
--- a/app/src/main/res/layout/fragment_main_settings.xml
+++ b/app/src/main/res/layout/fragment_main_settings.xml
@@ -11,19 +11,18 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="@dimen/mini_player_height">
+        android:orientation="vertical">
 
-        <code.name.monkey.retromusic.views.SettingListItemView
+        <io.github.muntashirakon.music.views.SettingListItemView
             android:id="@+id/generalSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:settingListItemIcon="@drawable/ic_palette"
+            app:settingListItemIcon="@drawable/ic_theme_palette"
             app:settingListItemIconColor="@color/md_blue_A400"
             app:settingListItemText="@string/general_settings_summary"
             app:settingListItemTitle="@string/general_settings_title" />
 
-        <code.name.monkey.retromusic.views.SettingListItemView
+        <io.github.muntashirakon.music.views.SettingListItemView
             android:id="@+id/nowPlayingSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -32,7 +31,7 @@
             app:settingListItemText="@string/now_playing_summary"
             app:settingListItemTitle="@string/now_playing" />
 
-        <code.name.monkey.retromusic.views.SettingListItemView
+        <io.github.muntashirakon.music.views.SettingListItemView
             android:id="@+id/audioSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -41,7 +40,7 @@
             app:settingListItemText="@string/audio_settings_summary"
             app:settingListItemTitle="@string/pref_header_audio" />
 
-        <code.name.monkey.retromusic.views.SettingListItemView
+        <io.github.muntashirakon.music.views.SettingListItemView
             android:id="@+id/personalizeSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -51,7 +50,7 @@
             app:settingListItemTitle="@string/personalize" />
 
 
-        <code.name.monkey.retromusic.views.SettingListItemView
+        <io.github.muntashirakon.music.views.SettingListItemView
             android:id="@+id/imageSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -60,7 +59,7 @@
             app:settingListItemText="@string/image_settings_summary"
             app:settingListItemTitle="@string/pref_header_images" />
 
-        <code.name.monkey.retromusic.views.SettingListItemView
+        <io.github.muntashirakon.music.views.SettingListItemView
             android:id="@+id/notificationSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -69,7 +68,7 @@
             app:settingListItemText="@string/notification_settings_summary"
             app:settingListItemTitle="@string/notification" />
 
-        <code.name.monkey.retromusic.views.SettingListItemView
+        <io.github.muntashirakon.music.views.SettingListItemView
             android:id="@+id/otherSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -78,7 +77,7 @@
             app:settingListItemText="@string/other_settings_summary"
             app:settingListItemTitle="@string/others" />
 
-        <code.name.monkey.retromusic.views.SettingListItemView
+        <io.github.muntashirakon.music.views.SettingListItemView
             android:id="@+id/backup_restore_settings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -87,7 +86,7 @@
             app:settingListItemText="@string/backup_restore_settings_summary"
             app:settingListItemTitle="@string/backup_restore_title" />
 
-        <code.name.monkey.retromusic.views.SettingListItemView
+        <io.github.muntashirakon.music.views.SettingListItemView
             android:id="@+id/aboutSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_material.xml b/app/src/main/res/layout/fragment_material.xml
index 1660cea4b..13cbd6545 100644
--- a/app/src/main/res/layout/fragment_material.xml
+++ b/app/src/main/res/layout/fragment_material.xml
@@ -19,21 +19,31 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <include layout="@layout/status_bar" />
+    <FrameLayout
+        android:id="@+id/statusBarContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar" />
+        app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.material.MaterialControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.material.MaterialControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/playerToolbar"
@@ -42,15 +52,15 @@
         app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
         tools:layout="@layout/fragment_player_playback_controls" />
 
+
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
 </androidx.constraintlayout.widget.ConstraintLayout>
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 4eab6b494..5f57e42cd 100644
--- a/app/src/main/res/layout/fragment_material_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_material_playback_controls.xml
@@ -20,15 +20,16 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
+        android:paddingVertical="@dimen/seekbar_padding"
         android:progressDrawable="@drawable/color_progress_seek"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
@@ -48,8 +49,10 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
+
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
@@ -180,10 +183,11 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/nextButton"
         app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
+        app:srcCompat="@drawable/ic_shuffle_sharp"
         tools:ignore="MissingPrefix"
         tools:tint="@color/md_black_1000" />
 
+
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_md3_player.xml b/app/src/main/res/layout/fragment_md3_player.xml
index 87fdcbece..73c7fad84 100644
--- a/app/src/main/res/layout/fragment_md3_player.xml
+++ b/app/src/main/res/layout/fragment_md3_player.xml
@@ -8,23 +8,30 @@
     android:clickable="true"
     android:focusable="true">
 
-    <include layout="@layout/shadow_statusbar_toolbar" />
+    <FrameLayout
+        android:id="@+id/statusBarContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <include layout="@layout/status_bar" />
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.45"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar" />
+        app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.md3.MD3PlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.md3.MD3PlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/playerToolbar"
@@ -37,13 +44,12 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_md3_player_playback_controls.xml b/app/src/main/res/layout/fragment_md3_player_playback_controls.xml
index 99fd4e8d8..a1ac4c979 100644
--- a/app/src/main/res/layout/fragment_md3_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_md3_player_playback_controls.xml
@@ -21,18 +21,20 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
+        android:progressDrawable="@drawable/color_progress_seek"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
         app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="RtlHardcoded,UnusedAttribute"
         tools:progress="20" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -47,6 +49,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <LinearLayout
@@ -72,7 +75,7 @@
             android:paddingHorizontal="16dp"
             android:scrollHorizontally="true"
             android:singleLine="true"
-            android:textAppearance="@style/TextViewHeadline5"
+            android:textAppearance="@style/TextViewHeadline6"
             android:textColor="?android:attr/textColorPrimary"
             android:textStyle="bold"
             tools:text="@tools:sample/lorem/random" />
@@ -91,7 +94,7 @@
             android:paddingHorizontal="16dp"
             android:scrollHorizontally="true"
             android:singleLine="true"
-            android:textAppearance="@style/TextViewSubtitle2"
+            android:textAppearance="@style/TextViewBody1"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constrainedWidth="true"
             tools:text="@tools:sample/full_names" />
diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml
index 9962b68e0..a52709afd 100644
--- a/app/src/main/res/layout/fragment_mini_player.xml
+++ b/app/src/main/res/layout/fragment_mini_player.xml
@@ -1,98 +1,105 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="56dp"
     android:clickable="true"
     android:focusable="true"
-    android:orientation="horizontal"
-    android:paddingStart="8dp"
-    android:paddingEnd="0dp">
+    tools:ignore="UnusedAttribute">
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/imageTextContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="8dp"
-        app:cardCornerRadius="6dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/drag_view"
-        app:layout_constraintTop_toTopOf="parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:paddingStart="8dp"
+        android:paddingEnd="0dp">
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/imageTextContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            app:cardCornerRadius="6dp"
+            android:layout_marginStart="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/drag_view"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/image"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
+                android:scaleType="centerCrop"
+                tools:srcCompat="@tools:sample/backgrounds/scenic"
+                tools:visibility="visible" />
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/miniPlayerTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="16dp"
+            android:layout_weight="1"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:freezesText="true"
+            android:gravity="left"
+            android:marqueeRepeatLimit="marquee_forever"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewNormal"
+            android:textColor="?android:attr/textColorPrimary"
+            tools:text="@tools:sample/lorem/random" />
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image"
+            android:id="@+id/actionPrevious"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="center_vertical"
-            android:gravity="center_vertical"
-            android:scaleType="centerCrop"
-            tools:srcCompat="@tools:sample/backgrounds/scenic"
-            tools:visibility="visible" />
-    </com.google.android.material.card.MaterialCardView>
+            android:background="?roundSelector"
+            android:padding="6dp"
+            app:srcCompat="@drawable/ic_skip_previous"
+            app:tint="?attr/colorControlNormal" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/miniPlayerTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="16dp"
-        android:layout_weight="1"
-        android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:freezesText="true"
-        android:gravity="start"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textAppearance="@style/TextViewNormal"
-        android:textColor="?android:attr/textColorPrimary"
-        tools:text="@tools:sample/lorem/random" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/actionPrevious"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_gravity="center_vertical"
-        android:background="?roundSelector"
-        android:padding="6dp"
-        app:srcCompat="@drawable/ic_skip_previous"
-        app:tint="?attr/colorControlNormal" />
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical">
-
-        <com.google.android.material.progressindicator.CircularProgressIndicator
-            android:id="@+id/progressBar"
+        <FrameLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            app:trackCornerRadius="16dp"
-            tools:progress="10" />
+            android:layout_gravity="center_vertical">
+
+            <com.google.android.material.progressindicator.CircularProgressIndicator
+                android:id="@+id/progressBar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                app:trackCornerRadius="16dp"
+                tools:progress="10" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/miniPlayerPlayPauseButton"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center"
+                android:background="?roundSelector"
+                android:scaleType="center"
+                app:srcCompat="@drawable/ic_pause"
+                app:tint="?attr/colorControlNormal"
+                tools:ignore="ContentDescription" />
+        </FrameLayout>
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/miniPlayerPlayPauseButton"
+            android:id="@+id/actionNext"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_gravity="center"
+            android:layout_gravity="center_vertical"
             android:background="?roundSelector"
-            android:scaleType="center"
-            app:srcCompat="@drawable/ic_pause"
-            app:tint="?attr/colorControlNormal"
-            tools:ignore="ContentDescription" />
-    </FrameLayout>
+            android:padding="6dp"
+            app:srcCompat="@drawable/ic_skip_next"
+            app:tint="?attr/colorControlNormal" />
+    </LinearLayout>
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/actionNext"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_gravity="center_vertical"
-        android:background="?roundSelector"
-        android:padding="6dp"
-        app:srcCompat="@drawable/ic_skip_next"
-        app:tint="?attr/colorControlNormal" />
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_normal_lyrics.xml b/app/src/main/res/layout/fragment_normal_lyrics.xml
new file mode 100644
index 000000000..bf7086a13
--- /dev/null
+++ b/app/src/main/res/layout/fragment_normal_lyrics.xml
@@ -0,0 +1,29 @@
+<?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">
+
+    <ScrollView
+        android:id="@+id/nomal_lyrics_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical">
+
+        <TextView
+            android:id="@+id/normalLyrics"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/normal_lyrics_padding"
+            android:textIsSelectable="true"
+            android:textSize="@dimen/lyrics_text_size" />
+    </ScrollView>
+
+    <TextView
+        android:id="@+id/noLyricsFound"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text="@string/no_lyrics_found"
+        android:textSize="24sp"
+        android:visibility="gone" />
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_peek_control_player.xml b/app/src/main/res/layout/fragment_peek_control_player.xml
index aa6f0a69e..3af7dce4d 100644
--- a/app/src/main/res/layout/fragment_peek_control_player.xml
+++ b/app/src/main/res/layout/fragment_peek_control_player.xml
@@ -31,15 +31,16 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
+        android:paddingVertical="@dimen/seekbar_padding"
         android:progressDrawable="@drawable/color_progress_seek"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
@@ -59,6 +60,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <androidx.appcompat.widget.AppCompatImageButton
diff --git a/app/src/main/res/layout/fragment_peek_player.xml b/app/src/main/res/layout/fragment_peek_player.xml
index aa9a00ce6..27dcbd8be 100644
--- a/app/src/main/res/layout/fragment_peek_player.xml
+++ b/app/src/main/res/layout/fragment_peek_player.xml
@@ -21,26 +21,33 @@
     android:focusable="true"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
+    <FrameLayout
+        android:id="@+id/toolbarContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
+        android:layout_weight="0"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/playerToolbar"
+            style="@style/Toolbar"
+            android:layout_gravity="bottom"
+            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
+    </FrameLayout>
+
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="72dp"
         android:layout_height="72dp"
         android:layout_marginStart="16dp"
         app:layout_constraintHeight_percent="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playerToolbar" />
+        app:layout_constraintTop_toBottomOf="@id/toolbarContainer" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
@@ -58,7 +65,7 @@
         app:layout_constraintBottom_toTopOf="@+id/text"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/playerAlbumCoverFragment"
-        app:layout_constraintTop_toBottomOf="@+id/playerToolbar"
+        app:layout_constraintTop_toBottomOf="@+id/toolbarContainer"
         tools:text="@tools:sample/lorem/random" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -94,7 +101,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.peek.PeekPlayerControlFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.peek.PeekPlayerControlFragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_plain_controls_fragment.xml b/app/src/main/res/layout/fragment_plain_controls_fragment.xml
index e325641cd..d23f7cae9 100644
--- a/app/src/main/res/layout/fragment_plain_controls_fragment.xml
+++ b/app/src/main/res/layout/fragment_plain_controls_fragment.xml
@@ -19,9 +19,10 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -32,7 +33,7 @@
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="RtlHardcoded,UnusedAttribute"
-        style="@style/Widget.Retro.Slider"
+        android:paddingVertical="@dimen/seekbar_padding"
         tools:progress="20" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -47,6 +48,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <androidx.appcompat.widget.AppCompatImageButton
diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml
index 6264dc442..218494e6a 100644
--- a/app/src/main/res/layout/fragment_plain_player.xml
+++ b/app/src/main/res/layout/fragment_plain_player.xml
@@ -10,7 +10,16 @@
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <include layout="@layout/status_bar" />
+    <FrameLayout
+        android:id="@+id/statusBarContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
 
     <LinearLayout
         android:id="@+id/titleContainer"
@@ -18,15 +27,17 @@
         android:layout_height="wrap_content"
         android:clickable="false"
         android:orientation="vertical"
-        android:padding="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar">
+        app:layout_constraintTop_toBottomOf="@id/statusBarContainer">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingTop="8dp"
             android:singleLine="true"
             android:textAppearance="@style/TextViewHeadline6"
             android:textStyle="bold"
@@ -47,7 +58,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -57,7 +68,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.plain.PlainPlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/playerToolbar"
@@ -69,12 +80,11 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
+        android:layout_gravity="bottom"
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 3cc950014..8b10b2340 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -41,7 +41,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -52,7 +52,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.normal.PlayerPlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/playerToolbar"
@@ -65,14 +65,12 @@
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:title="@null"
-        tools:menu="@menu/menu_player" />
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 761120825..74bce77fa 100644
--- a/app/src/main/res/layout/fragment_player_album_cover.xml
+++ b/app/src/main/res/layout/fragment_player_album_cover.xml
@@ -15,7 +15,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/cover_lyrics"
-        android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.CoverLyricsFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical" />
@@ -28,7 +28,7 @@
         app:fel_size_bottom="100dp"
         app:fel_size_top="100dp">
 
-        <code.name.monkey.retromusic.lyrics.CoverLrcView
+        <io.github.muntashirakon.music.lyrics.CoverLrcView
             android:id="@+id/lyricsView"
             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 13194a9ab..e06479a26 100755
--- a/app/src/main/res/layout/fragment_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_player_playback_controls.xml
@@ -19,14 +19,16 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/progressSlider"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/progressSlider"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
+        android:paddingVertical="@dimen/seekbar_padding"
+        android:progressDrawable="@drawable/color_progress_seek"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
         app:layout_constraintTop_toTopOf="parent"
@@ -45,6 +47,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="RtlHardcoded,RtlSymmetry"
         tools:text="@tools:sample/date/hhmmss" />
 
     <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/fragment_playing_queue.xml b/app/src/main/res/layout/fragment_playing_queue.xml
index 6bbd9141c..a77c890ca 100644
--- a/app/src/main/res/layout/fragment_playing_queue.xml
+++ b/app/src/main/res/layout/fragment_playing_queue.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-    <code.name.monkey.retromusic.views.TopAppBarLayout
+    <io.github.muntashirakon.music.views.TopAppBarLayout
         android:id="@+id/appBarLayout"
         style="?appBarLayoutStyle"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_playlist_detail.xml b/app/src/main/res/layout/fragment_playlist_detail.xml
index 40a545dc6..ba919bdbd 100644
--- a/app/src/main/res/layout/fragment_playlist_detail.xml
+++ b/app/src/main/res/layout/fragment_playlist_detail.xml
@@ -15,24 +15,29 @@
         android:fitsSystemWindows="true"
         app:liftOnScroll="true">
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
+        <FrameLayout
+            android:id="@+id/toolbar_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:navigationIcon="@drawable/ic_arrow_back"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
+            app:layout_scrollFlags="scroll|enterAlways">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:navigationIcon="@drawable/ic_keyboard_backspace_black"
+                app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
+        </FrameLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
-    <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
+    <io.github.muntashirakon.music.views.insets.InsetsRecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clipToPadding="false"
-        android:layoutAnimation="@anim/layout_anim_fade"
         android:overScrollMode="@integer/overScrollMode"
-        android:paddingBottom="@dimen/mini_player_height"
         android:scrollbars="none"
+        android:layoutAnimation="@anim/layout_anim_fade"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/fragment_playlist_detail_new.xml b/app/src/main/res/layout/fragment_playlist_detail_new.xml
deleted file mode 100644
index 1d2003ee4..000000000
--- a/app/src/main/res/layout/fragment_playlist_detail_new.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:transitionGroup="true">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:liftOnScroll="true">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsingAppBarLayout"
-            style="?attr/collapsingToolbarLayoutLargeStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:expandedTitleTextColor="@color/transparent"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="?actionBarSize"
-                android:paddingBottom="16dp"
-                android:paddingHorizontal="16dp">
-
-                <com.google.android.material.imageview.ShapeableImageView
-                    android:id="@+id/image"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    app:layout_constraintDimensionRatio="1:1"
-                    app:layout_constraintEnd_toStartOf="@+id/title"
-                    app:layout_constraintHorizontal_chainStyle="spread_inside"
-                    app:layout_constraintHorizontal_weight="0.4"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:shapeAppearanceOverlay="?shapeAppearanceCornerExtraLarge"
-                    tools:src="@tools:sample/avatars[0]" />
-
-                <TextView
-                    android:id="@+id/title"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:textAppearance="?textAppearanceDisplaySmall"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_weight="0.6"
-                    app:layout_constraintStart_toEndOf="@+id/image"
-                    app:layout_constraintTop_toTopOf="@+id/image"
-                    tools:text="Playlist" />
-
-                <TextView
-                    android:id="@+id/subtitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    app:layout_constraintStart_toStartOf="@+id/title"
-                    app:layout_constraintTop_toBottomOf="@+id/title"
-                    tools:text="Playlist" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/play_button"
-                    style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:padding="16dp"
-                    app:icon="@drawable/ic_play_arrow"
-                    app:layout_constraintEnd_toStartOf="@+id/shuffle_button"
-                    app:layout_constraintStart_toStartOf="@+id/subtitle"
-                    app:layout_constraintTop_toBottomOf="@+id/subtitle" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/shuffle_button"
-                    style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="16dp"
-                    android:backgroundTint="?colorTertiaryContainer"
-                    android:padding="16dp"
-                    app:icon="@drawable/ic_shuffle"
-                    app:layout_constraintBottom_toBottomOf="@+id/play_button"
-                    app:layout_constraintDimensionRatio="1:1"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/play_button" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?actionBarSize"
-                app:layout_collapseMode="pin"
-                app:navigationIcon="@drawable/ic_arrow_back"
-                app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:layoutAnimation="@anim/layout_anim_fade"
-        android:overScrollMode="@integer/overScrollMode"
-        android:paddingBottom="@dimen/mini_player_height"
-        android:scrollbars="none"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-        tools:listitem="@layout/item_song" />
-
-    <LinearLayout
-        android:id="@android:id/empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/emptyEmoji"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/empty_text_emoji"
-            android:textAppearance="@style/TextViewHeadline3" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/emptyText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/no_songs"
-            android:textAppearance="@style/TextViewHeadline5"
-            android:textColor="?android:attr/textColorSecondary"
-            tools:visibility="visible" />
-
-    </LinearLayout>
-
-    <com.google.android.material.progressindicator.CircularProgressIndicator
-        android:id="@+id/progressIndicator"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:indeterminate="true" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 4a928ce4f..7080fa22f 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -19,7 +19,7 @@
             style="@style/Toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:titleTextAppearance="@style/ToolbarTextAppearanceNormal">
 
             <LinearLayout
@@ -130,7 +130,7 @@
         </HorizontalScrollView>
     </com.google.android.material.appbar.AppBarLayout>
 
-    <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
+    <io.github.muntashirakon.music.views.insets.InsetsRecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -138,7 +138,6 @@
         android:overScrollMode="@integer/overScrollMode"
         android:scrollbarStyle="outsideOverlay"
         android:scrollbars="vertical"
-        android:paddingBottom="@dimen/mini_player_height"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
 
     <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
deleted file mode 100644
index 7c1b8e54a..000000000
--- a/app/src/main/res/layout/fragment_settings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/contentFrame"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSurface"
-        app:defaultNavHost="true"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-        app:navGraph="@navigation/settings_graph" />
-
-    <code.name.monkey.retromusic.views.TopAppBarLayout
-        android:id="@+id/appBarLayout"
-        style="?appBarLayoutStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:theme="@style/CenteredCheckBoxTheme" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml
index 67442b8ff..a2ff1fa53 100644
--- a/app/src/main/res/layout/fragment_simple_player.xml
+++ b/app/src/main/res/layout/fragment_simple_player.xml
@@ -9,24 +9,35 @@
     android:focusable="true"
     android:orientation="vertical">
 
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <include
-        layout="@layout/status_bar" />
+
+    <FrameLayout
+        android:id="@+id/statusBarContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar" />
+        app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.simple.SimplePlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/playerToolbar"
@@ -35,15 +46,15 @@
         app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
         tools:layout="@layout/fragment_player_playback_controls" />
 
+
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playerToolbar"
         style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_synced_lyrics.xml b/app/src/main/res/layout/fragment_synced_lyrics.xml
new file mode 100644
index 000000000..1a3838a4c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_synced_lyrics.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/synced_lyrics_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <io.github.muntashirakon.music.lyrics.LrcView
+        android:id="@+id/lyricsView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+        app:lrcLabel="@string/no_lyrics_found"
+        app:lrcNormalTextSize="24sp"
+        app:lrcPadding="24dp"
+        app:lrcTextGravity="left"
+        app:lrcTextSize="28sp" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_tiny_player.xml b/app/src/main/res/layout/fragment_tiny_player.xml
index 1a49d06f2..59de47458 100644
--- a/app/src/main/res/layout/fragment_tiny_player.xml
+++ b/app/src/main/res/layout/fragment_tiny_player.xml
@@ -9,7 +9,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -34,9 +34,18 @@
         android:progressDrawable="@drawable/progress_drawable_vertical"
         android:secondaryProgress="100" />
 
-    <include layout="@layout/status_bar" />
+    <FrameLayout
+        android:id="@+id/status_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <code.name.monkey.retromusic.views.VerticalTextView
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
+    <io.github.muntashirakon.music.views.VerticalTextView
         android:id="@+id/playerSongTotalTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -55,7 +64,7 @@
         tools:ignore="MissingPrefix"
         tools:text="@tools:sample/date/hhmm" />
 
-    <code.name.monkey.retromusic.views.VerticalTextView
+    <io.github.muntashirakon.music.views.VerticalTextView
         android:id="@+id/songInfo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -65,34 +74,47 @@
         android:paddingTop="8dp"
         android:paddingEnd="16dp"
         app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@+id/playbackControlsFragment"
+        app:layout_constraintBottom_toTopOf="@+id/playbackControlsFragmentContainer"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/status_bar"
         app:layout_constraintVertical_bias="0"
         tools:ignore="MissingPrefix"
         tools:text="@tools:sample/lorem" />
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
+    <FrameLayout
+        android:id="@+id/toolbarContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+        app:layout_constraintStart_toStartOf="parent">
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.tiny.TinyPlaybackControlsFragment"
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/playerToolbar"
+            style="@style/Toolbar"
+            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black"
+            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" />
+    </FrameLayout>
+
+    <LinearLayout
+        android:id="@+id/playbackControlsFragmentContainer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        app:layout_constraintBottom_toTopOf="@id/playerToolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:layout="@layout/fragment_tiny_controls_fragment" />
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@id/toolbarContainer"
+        app:layout_constraintEnd_toEndOf="parent">
 
-    <code.name.monkey.retromusic.views.VerticalTextView
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/playbackControlsFragment"
+            android:name="io.github.muntashirakon.music.fragments.player.tiny.TinyPlaybackControlsFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:layout="@layout/fragment_tiny_controls_fragment" />
+
+    </LinearLayout>
+
+    <io.github.muntashirakon.music.views.VerticalTextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
@@ -114,7 +136,7 @@
         tools:ignore="MissingPrefix"
         tools:text="@tools:sample/lorem/random" />
 
-    <code.name.monkey.retromusic.views.VerticalTextView
+    <io.github.muntashirakon.music.views.VerticalTextView
         android:id="@+id/text"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_user_info.xml b/app/src/main/res/layout/fragment_user_info.xml
index ebfc9902d..1b516b16d 100644
--- a/app/src/main/res/layout/fragment_user_info.xml
+++ b/app/src/main/res/layout/fragment_user_info.xml
@@ -16,9 +16,8 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
-            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black"
             app:title="@string/profile"
             app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
 
@@ -36,15 +35,15 @@
             android:layout_height="0dp"
             android:layout_margin="16dp"
             android:scaleType="centerCrop"
-            android:transitionName="banner_image"
             app:layout_constraintDimensionRatio="21:10"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            android:transitionName="banner_image"
             app:shapeAppearanceOverlay="@style/circleImageView"
             app:srcCompat="@drawable/material_design_default" />
 
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
+        <io.github.muntashirakon.music.views.RetroShapeableImageView
             android:id="@+id/userImage"
             android:layout_width="72dp"
             android:layout_height="72dp"
@@ -87,13 +86,15 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/next"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
+        android:layout_gravity="bottom"
+        android:layout_marginHorizontal="16dp"
         android:fitsSystemWindows="false"
-        android:src="@drawable/ic_save"
-        android:text="@string/save" />
+        android:gravity="center"
+        android:text="@string/save"
+        app:icon="@drawable/ic_save"
+        app:iconGravity="textStart" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_volume.xml b/app/src/main/res/layout/fragment_volume.xml
index 43bb3e71b..c3f45d113 100755
--- a/app/src/main/res/layout/fragment_volume.xml
+++ b/app/src/main/res/layout/fragment_volume.xml
@@ -23,13 +23,13 @@
         app:srcCompat="@drawable/ic_volume_down"
         app:tint="?attr/colorControlNormal" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/volumeSeekBar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
+        android:paddingVertical="@dimen/seekbar_padding"
         android:progressDrawable="@drawable/color_progress_seek"
         app:layout_constraintBottom_toBottomOf="@+id/volumeDown"
         app:layout_constraintEnd_toStartOf="@+id/volumeUp"
diff --git a/app/src/main/res/layout/fragment_whats_new.xml b/app/src/main/res/layout/fragment_whats_new.xml
index afb6fca00..0bdfb4f53 100644
--- a/app/src/main/res/layout/fragment_whats_new.xml
+++ b/app/src/main/res/layout/fragment_whats_new.xml
@@ -12,7 +12,7 @@
         android:layout_height="match_parent"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-        <code.name.monkey.retromusic.views.LollipopFixedWebView
+        <io.github.muntashirakon.music.views.LollipopFixedWebView
             android:id="@+id/webView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/home_content.xml b/app/src/main/res/layout/home_content.xml
index 606aacd86..b49e0e63c 100644
--- a/app/src/main/res/layout/home_content.xml
+++ b/app/src/main/res/layout/home_content.xml
@@ -29,20 +29,21 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <include
-            android:id="@+id/suggestions"
-            layout="@layout/item_suggestions" />
+        <include android:id="@+id/suggestions" layout="@layout/item_suggestions" />
 
-        <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:nestedScrollingEnabled="false"
             android:overScrollMode="@integer/overScrollMode"
-            android:paddingBottom="@dimen/mini_player_height"
             tools:itemCount="10"
             tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
             tools:listitem="@layout/item_album_card"
             tools:spanCount="3" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/mini_player_height_expanded" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/image.xml b/app/src/main/res/layout/image.xml
index c6af22877..7e938c57f 100644
--- a/app/src/main/res/layout/image.xml
+++ b/app/src/main/res/layout/image.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<code.name.monkey.retromusic.views.WidthFitSquareLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<io.github.muntashirakon.music.views.WidthFitSquareLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/imageContainer"
     android:layout_width="match_parent"
@@ -33,4 +33,4 @@
         android:textAppearance="@style/TextViewSubtitle1"
         android:textColor="@color/md_white_1000"
         tools:text="@tools:sample/full_names" />
-</code.name.monkey.retromusic.views.WidthFitSquareLayout>
\ No newline at end of file
+</io.github.muntashirakon.music.views.WidthFitSquareLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_artist.xml b/app/src/main/res/layout/item_artist.xml
index 8ec97715b..0cdf3db99 100644
--- a/app/src/main/res/layout/item_artist.xml
+++ b/app/src/main/res/layout/item_artist.xml
@@ -8,7 +8,7 @@
     android:background="?attr/rectSelector"
     android:orientation="vertical">
 
-    <code.name.monkey.retromusic.views.RetroShapeableImageView
+    <io.github.muntashirakon.music.views.RetroShapeableImageView
         android:id="@+id/image"
         android:layout_width="156dp"
         android:layout_height="156dp"
diff --git a/app/src/main/res/layout/item_artist_card.xml b/app/src/main/res/layout/item_artist_card.xml
index dc7bf38ef..afc3b2e11 100644
--- a/app/src/main/res/layout/item_artist_card.xml
+++ b/app/src/main/res/layout/item_artist_card.xml
@@ -26,7 +26,7 @@
         android:background="@drawable/artist_card_gradient_effect"
         tools:backgroundTint="@color/md_red_500">
 
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
+        <io.github.muntashirakon.music.views.RetroShapeableImageView
             android:id="@+id/image"
             android:layout_width="42dp"
             android:layout_height="42dp"
diff --git a/app/src/main/res/layout/item_contributor.xml b/app/src/main/res/layout/item_contributor.xml
index d7ba88328..fc1158ec7 100644
--- a/app/src/main/res/layout/item_contributor.xml
+++ b/app/src/main/res/layout/item_contributor.xml
@@ -25,7 +25,7 @@
     android:paddingEnd="12dp"
     tools:ignore="PrivateResource">
 
-    <code.name.monkey.retromusic.views.RetroShapeableImageView
+    <io.github.muntashirakon.music.views.RetroShapeableImageView
         android:id="@+id/icon"
         android:layout_width="42dp"
         android:layout_height="42dp"
@@ -52,7 +52,7 @@
         app:layout_constraintStart_toEndOf="@+id/icon"
         tools:text="@tools:sample/full_names" />
 
-    <code.name.monkey.retromusic.views.BaselineGridTextView
+    <io.github.muntashirakon.music.views.BaselineGridTextView
         android:id="@+id/text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_contributor_header.xml b/app/src/main/res/layout/item_contributor_header.xml
index 964ba980a..6c71b8e30 100644
--- a/app/src/main/res/layout/item_contributor_header.xml
+++ b/app/src/main/res/layout/item_contributor_header.xml
@@ -23,7 +23,7 @@
     android:paddingBottom="24dp"
     tools:ignore="PrivateResource">
 
-    <code.name.monkey.retromusic.views.RetroShapeableImageView
+    <io.github.muntashirakon.music.views.RetroShapeableImageView
         android:id="@+id/icon"
         android:layout_width="72dp"
         android:layout_height="72dp"
@@ -47,7 +47,7 @@
         app:layout_constraintTop_toBottomOf="@id/icon"
         tools:text="@tools:sample/full_names" />
 
-    <code.name.monkey.retromusic.views.BaselineGridTextView
+    <io.github.muntashirakon.music.views.BaselineGridTextView
         android:id="@+id/text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_grid_circle.xml b/app/src/main/res/layout/item_grid_circle.xml
index 2ccb0c7ba..decd698b3 100644
--- a/app/src/main/res/layout/item_grid_circle.xml
+++ b/app/src/main/res/layout/item_grid_circle.xml
@@ -9,7 +9,7 @@
     android:padding="4dp"
     tools:ignore="MissingPrefix">
 
-    <code.name.monkey.retromusic.views.RetroShapeableImageView
+    <io.github.muntashirakon.music.views.RetroShapeableImageView
         android:id="@+id/image"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index de5a0aa5a..8e1d1b2f9 100755
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -35,19 +35,18 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="16dp"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="10dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/drag_view"
         app:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.imageview.ShapeableImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
             android:layout_width="45dp"
             android:layout_height="45dp"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
             android:scaleType="centerCrop"
-            app:shapeAppearance="?shapeAppearanceCornerSmall"
             tools:srcCompat="@tools:sample/backgrounds/scenic"
             tools:visibility="visible" />
 
@@ -88,7 +87,6 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingHorizontal="16dp"
-        android:layout_marginTop="4dp"
         android:textAppearance="@style/TextViewCaption"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_permission.xml b/app/src/main/res/layout/item_permission.xml
index 3179a2c1b..d5f23ab95 100644
--- a/app/src/main/res/layout/item_permission.xml
+++ b/app/src/main/res/layout/item_permission.xml
@@ -38,7 +38,7 @@
         tools:maxLines="@string/grid_size_1"
         tools:text="@tools:sample/lorem/random" />
 
-    <code.name.monkey.retromusic.views.BaselineGridTextView
+    <io.github.muntashirakon.music.views.BaselineGridTextView
         android:id="@+id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_queue.xml b/app/src/main/res/layout/item_queue.xml
index 22ebb08d6..b6911982f 100644
--- a/app/src/main/res/layout/item_queue.xml
+++ b/app/src/main/res/layout/item_queue.xml
@@ -4,15 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?rectSelector"
     android:clickable="true"
-    android:focusable="true">
-
+    android:focusable="true"
+    android:background="?rectSelector"
+    android:transitionGroup="true">
     <FrameLayout
         android:id="@+id/dummy_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -28,7 +27,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
                 android:layout_gravity="center_vertical|start"
-                android:paddingHorizontal="8dp"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -36,6 +34,7 @@
                 app:srcCompat="@drawable/ic_drag_handle"
                 app:tint="?attr/colorControlNormal"
                 tools:ignore="ContentDescription"
+                android:paddingHorizontal="8dp"
                 tools:visibility="visible" />
 
 
@@ -44,20 +43,18 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:transitionGroup="true"
-                app:cardCornerRadius="4dp"
+                app:cardCornerRadius="6dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@id/drag_view"
                 app:layout_constraintTop_toTopOf="parent">
 
-                <com.google.android.material.imageview.ShapeableImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/image"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:scaleType="centerCrop"
-                    app:shapeAppearance="@style/ShapeAppearance.Material3.Corner.ExtraSmall"
                     tools:srcCompat="@tools:sample/backgrounds/scenic"
                     tools:visibility="visible" />
 
@@ -97,7 +94,6 @@
                 android:id="@+id/text"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:paddingHorizontal="16dp"
diff --git a/app/src/main/res/layout/item_suggestions.xml b/app/src/main/res/layout/item_suggestions.xml
index c4580c025..c2f35547f 100644
--- a/app/src/main/res/layout/item_suggestions.xml
+++ b/app/src/main/res/layout/item_suggestions.xml
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <code.name.monkey.retromusic.views.AccentIcon
+    <io.github.muntashirakon.music.views.AccentIcon
         android:id="@+id/refresh_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/layout_notification_collapsed.xml b/app/src/main/res/layout/layout_notification_collapsed.xml
index 2914e6773..93b2f1ed0 100644
--- a/app/src/main/res/layout/layout_notification_collapsed.xml
+++ b/app/src/main/res/layout/layout_notification_collapsed.xml
@@ -107,7 +107,7 @@
             android:layout_height="38dp"
             android:background="@drawable/notification_selector"
             android:scaleType="centerInside"
-            android:src="@drawable/ic_skip_previous"
+            android:src="@drawable/ic_skip_previous_round_white_32dp"
             tools:tint="?colorOnPrimary" />
 
         <ImageButton
@@ -125,7 +125,7 @@
             android:layout_height="38dp"
             android:background="@drawable/notification_selector"
             android:scaleType="centerInside"
-            android:src="@drawable/ic_skip_next"
+            android:src="@drawable/ic_skip_next_round_white_32dp"
             tools:tint="?colorOnPrimary" />
 
         <ImageButton
diff --git a/app/src/main/res/layout/layout_notification_expanded.xml b/app/src/main/res/layout/layout_notification_expanded.xml
index da1540087..bcf799ecf 100644
--- a/app/src/main/res/layout/layout_notification_expanded.xml
+++ b/app/src/main/res/layout/layout_notification_expanded.xml
@@ -98,7 +98,7 @@
                 android:layout_height="42dp"
                 android:background="@drawable/notification_selector"
                 android:scaleType="centerInside"
-                tools:src="@drawable/ic_skip_previous"
+                tools:src="@drawable/ic_skip_previous_round_white_32dp"
                 tools:tint="?colorOnPrimary" />
 
             <ImageButton
@@ -116,7 +116,7 @@
                 android:layout_height="42dp"
                 android:background="@drawable/notification_selector"
                 android:scaleType="centerInside"
-                tools:src="@drawable/ic_skip_next"
+                tools:src="@drawable/ic_skip_next_round_white_32dp"
                 tools:tint="?colorOnPrimary" />
 
             <ImageButton
diff --git a/app/src/main/res/layout/list_item_color_view.xml b/app/src/main/res/layout/list_item_color_view.xml
index 44eb130fd..b4378ea63 100644
--- a/app/src/main/res/layout/list_item_color_view.xml
+++ b/app/src/main/res/layout/list_item_color_view.xml
@@ -50,7 +50,7 @@
         tools:maxLines="@string/grid_size_1"
         tools:text="@tools:sample/lorem" />
 
-    <code.name.monkey.retromusic.views.BaselineGridTextView
+    <io.github.muntashirakon.music.views.BaselineGridTextView
         android:id="@android:id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/list_item_view.xml b/app/src/main/res/layout/list_item_view.xml
index f7ab4c2e2..b76ff4719 100644
--- a/app/src/main/res/layout/list_item_view.xml
+++ b/app/src/main/res/layout/list_item_view.xml
@@ -50,7 +50,7 @@
         tools:maxLines="@string/grid_size_1"
         tools:text="@tools:sample/lorem/random" />
 
-    <code.name.monkey.retromusic.views.BaselineGridTextView
+    <io.github.muntashirakon.music.views.BaselineGridTextView
         android:id="@android:id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/list_item_view_no_card.xml b/app/src/main/res/layout/list_item_view_no_card.xml
index f7ab4c2e2..b76ff4719 100644
--- a/app/src/main/res/layout/list_item_view_no_card.xml
+++ b/app/src/main/res/layout/list_item_view_no_card.xml
@@ -50,7 +50,7 @@
         tools:maxLines="@string/grid_size_1"
         tools:text="@tools:sample/lorem/random" />
 
-    <code.name.monkey.retromusic.views.BaselineGridTextView
+    <io.github.muntashirakon.music.views.BaselineGridTextView
         android:id="@android:id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/list_item_view_seekbar.xml b/app/src/main/res/layout/list_item_view_seekbar.xml
index 2dda3f488..8b73a038b 100644
--- a/app/src/main/res/layout/list_item_view_seekbar.xml
+++ b/app/src/main/res/layout/list_item_view_seekbar.xml
@@ -50,7 +50,7 @@
         tools:maxLines="@string/grid_size_1"
         tools:text="@tools:sample/lorem" />
 
-    <code.name.monkey.retromusic.views.BaselineGridTextView
+    <io.github.muntashirakon.music.views.BaselineGridTextView
         android:id="@android:id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/list_item_view_switch.xml b/app/src/main/res/layout/list_item_view_switch.xml
index 255bb87b2..4299c11fc 100644
--- a/app/src/main/res/layout/list_item_view_switch.xml
+++ b/app/src/main/res/layout/list_item_view_switch.xml
@@ -49,7 +49,7 @@
         tools:maxLines="@string/grid_size_1"
         tools:text="@tools:sample/lorem" />
 
-    <code.name.monkey.retromusic.views.BaselineGridTextView
+    <io.github.muntashirakon.music.views.BaselineGridTextView
         android:id="@android:id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -79,7 +79,8 @@
         app:showText="false"
         android:clickable="false"
         android:focusable="false"
-        style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
+        app:track="@drawable/switch_track"
+        android:thumb="@drawable/switch_thumb"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/list_item_view_switch_no_title.xml b/app/src/main/res/layout/list_item_view_switch_no_title.xml
index e23e42a1b..4f65d0a6e 100644
--- a/app/src/main/res/layout/list_item_view_switch_no_title.xml
+++ b/app/src/main/res/layout/list_item_view_switch_no_title.xml
@@ -65,7 +65,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:showText="false"
-        style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
+        app:track="@drawable/switch_track"
+        android:thumb="@drawable/switch_thumb"
         android:clickable="false"
         android:focusable="false"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/list_setting_item_view.xml b/app/src/main/res/layout/list_setting_item_view.xml
index 958512785..5b9cc39fb 100644
--- a/app/src/main/res/layout/list_setting_item_view.xml
+++ b/app/src/main/res/layout/list_setting_item_view.xml
@@ -23,7 +23,7 @@
     android:gravity="center_vertical"
     android:orientation="horizontal">
 
-    <code.name.monkey.retromusic.views.ColorIconsImageView
+    <io.github.muntashirakon.music.views.ColorIconsImageView
         android:id="@+id/icon"
         android:layout_width="@dimen/adaptive_icon_size"
         android:layout_height="@dimen/adaptive_icon_size"
@@ -33,7 +33,7 @@
         app:iconBackgroundColor="@color/md_blue_A400"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/title"
-        app:srcCompat="@drawable/ic_palette" />
+        app:srcCompat="@drawable/ic_theme_palette" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
diff --git a/app/src/main/res/layout/mcab_toolbar.xml b/app/src/main/res/layout/mcab_toolbar.xml
new file mode 100644
index 000000000..0ad645b06
--- /dev/null
+++ b/app/src/main/res/layout/mcab_toolbar.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="?actionBarSize"
+    android:elevation="@dimen/mcab_toolbar_elevation"
+    android:theme="@style/mcab_theme"
+    tools:ignore="UnusedAttribute" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/number_roll_view.xml b/app/src/main/res/layout/number_roll_view.xml
deleted file mode 100644
index 6bf6370a1..000000000
--- a/app/src/main/res/layout/number_roll_view.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright 2016 The Chromium Authors. All rights reserved.
-     Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file. -->
-<code.name.monkey.retromusic.views.NumberRollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/selection_mode_number"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true">
-
-    <TextView
-        android:id="@+id/up"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.Material3.ActionBar.Title" />
-
-    <TextView
-        android:id="@+id/down"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.Material3.ActionBar.Title" />
-</code.name.monkey.retromusic.views.NumberRollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/section_recycler_view.xml b/app/src/main/res/layout/section_recycler_view.xml
index 5840f9afc..b2a03b9c8 100644
--- a/app/src/main/res/layout/section_recycler_view.xml
+++ b/app/src/main/res/layout/section_recycler_view.xml
@@ -28,7 +28,7 @@
             android:textStyle="bold"
             tools:text="@tools:sample/full_names" />
 
-        <code.name.monkey.retromusic.views.AccentIcon
+        <io.github.muntashirakon.music.views.AccentIcon
             android:id="@+id/arrow"
             android:layout_width="wrap_content"
             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 8e16a74b8..77fb684af 100755
--- a/app/src/main/res/layout/shadow_statusbar_toolbar.xml
+++ b/app/src/main/res/layout/shadow_statusbar_toolbar.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <code.name.monkey.retromusic.views.StatusBarView
+        <io.github.muntashirakon.music.views.StatusBarView
             android:layout_width="match_parent"
             android:layout_height="@dimen/status_bar_padding" />
 
diff --git a/app/src/main/res/layout/simple_appbar_layout.xml b/app/src/main/res/layout/simple_appbar_layout.xml
index 84f9231c8..af05462e6 100644
--- a/app/src/main/res/layout/simple_appbar_layout.xml
+++ b/app/src/main/res/layout/simple_appbar_layout.xml
@@ -1,10 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/toolbar"
+    android:id="@+id/toolbar_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:layout_scrollFlags="scroll|enterAlways"
-    app:navigationIcon="@drawable/ic_search"
-    app:popupTheme="?attr/toolbarPopupTheme"
-    app:titleCentered="true" />
\ No newline at end of file
+    app:layout_scrollFlags="scroll|enterAlways">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:navigationIcon="@drawable/ic_search"
+        app:popupTheme="?attr/toolbarPopupTheme"
+        app:title="@null">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/appNameText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textAppearance="@style/TextViewHeadline6"
+            android:textStyle="bold" />
+    </androidx.appcompat.widget.Toolbar>
+</FrameLayout>
\ No newline at end of file
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 b52f7ee1f..385fda92e 100644
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@@ -11,8 +11,8 @@
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/colorSurface"
         app:defaultNavHost="true"
+        android:background="?attr/colorSurface"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
         tools:layout="@layout/fragment_home" />
 
@@ -25,31 +25,32 @@
         app:behavior_peekHeight="0dp"
         app:enableEdgeToEdge="true"
         app:gestureInsetBottomIgnored="true"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-        tools:visibility="invisible">
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
         <FrameLayout
             android:id="@+id/playerFragmentContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <fragment
+        <androidx.fragment.app.FragmentContainerView
             android:id="@+id/miniPlayerFragment"
-            android:name="code.name.monkey.retromusic.fragments.other.MiniPlayerFragment"
+            android:name="io.github.muntashirakon.music.fragments.other.MiniPlayerFragment"
             android:layout_width="match_parent"
             android:layout_height="@dimen/mini_player_height"
             tools:layout="@layout/fragment_mini_player" />
 
     </FrameLayout>
 
-    <code.name.monkey.retromusic.views.TintedBottomNavigationView
-        android:id="@+id/navigationView"
+    <io.github.muntashirakon.music.views.BottomNavigationBarTinted
+        android:id="@+id/bottomNavigationView"
         style="@style/Widget.Material3.BottomNavigationView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
+        android:elevation="0dp"
         android:minHeight="@dimen/bottom_nav_height"
         app:itemHorizontalTranslationEnabled="false"
-        app:menu="@menu/bottom_navigation_main"
-        tools:viewBindingType="com.google.android.material.navigation.NavigationBarView"/>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+        app:itemPaddingBottom="8dp"
+        app:itemPaddingTop="8dp"
+        app:menu="@menu/bottom_navigation_main" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/status_bar.xml b/app/src/main/res/layout/status_bar.xml
index e29b5c77e..4024183ec 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"?>
-<code.name.monkey.retromusic.views.StatusBarView xmlns:android="http://schemas.android.com/apk/res/android"
+<io.github.muntashirakon.music.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/layout/user_image_layout.xml b/app/src/main/res/layout/user_image_layout.xml
index dec1dfdde..3d8c8c5b3 100644
--- a/app/src/main/res/layout/user_image_layout.xml
+++ b/app/src/main/res/layout/user_image_layout.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
-    <code.name.monkey.retromusic.views.RetroShapeableImageView
+    <io.github.muntashirakon.music.views.RetroShapeableImageView
         android:id="@+id/userImage"
         android:layout_width="42dp"
         android:layout_height="42dp"
diff --git a/app/src/main/res/menu/menu_media_selection.xml b/app/src/main/res/menu/menu_media_selection.xml
index a24f2a8a7..d914cf26f 100644
--- a/app/src/main/res/menu/menu_media_selection.xml
+++ b/app/src/main/res/menu/menu_media_selection.xml
@@ -20,12 +20,6 @@
         android:title="@string/action_add_to_playlist"
         app:showAsAction="ifRoom" />
 
-    <item
-        android:id="@+id/action_share"
-        android:icon="@drawable/ic_share"
-        android:title="@string/action_share"
-        app:showAsAction="ifRoom" />
-
     <item
         android:id="@+id/action_delete_from_device"
         android:icon="@drawable/ic_delete"
diff --git a/app/src/main/res/menu/menu_player.xml b/app/src/main/res/menu/menu_player.xml
index f5a9b8e04..34bef5148 100755
--- a/app/src/main/res/menu/menu_player.xml
+++ b/app/src/main/res/menu/menu_player.xml
@@ -1,12 +1,13 @@
 <?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">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
     <item
-        android:id="@+id/action_sleep_timer"
-        android:icon="@drawable/ic_sleep_timer"
+        android:id="@+id/action_playback_speed"
+        android:icon="@drawable/ic_playback_speed"
         android:orderInCategory="0"
-        android:title="@string/action_sleep_timer"
-        app:showAsAction="always" />
+        android:title="@string/playback_speed"
+        tools:targetApi="23" />
     <item
         android:id="@+id/action_toggle_lyrics"
         android:checkable="true"
@@ -27,15 +28,9 @@
         android:orderInCategory="3"
         android:title="@string/now_playing_queue"
         app:showAsAction="always" />
-    <item
-        android:id="@+id/action_playback_speed"
-        android:icon="@drawable/ic_playback_speed"
-        android:orderInCategory="4"
-        android:title="@string/playback_speed"
-        android:visible="@bool/isMarshmallow"/>
     <item
         android:id="@+id/action_go_to_drive_mode"
-        android:icon="@drawable/ic_car"
+        android:icon="@drawable/ic_drive_eta"
         android:orderInCategory="4"
         android:title="@string/drive_mode" />
     <item
@@ -81,6 +76,11 @@
         android:id="@+id/action_go_to_lyrics"
         android:orderInCategory="11"
         android:title="@string/action_go_to_lyrics" />
+    <item
+        android:id="@+id/action_sleep_timer"
+        android:orderInCategory="12"
+        android:title="@string/action_sleep_timer"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_equalizer"
         android:orderInCategory="13"
diff --git a/app/src/main/res/menu/menu_lyrics.xml b/app/src/main/res/menu/menu_search.xml
similarity index 100%
rename from app/src/main/res/menu/menu_lyrics.xml
rename to app/src/main/res/menu/menu_search.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 1413a3145..4bf80dfc6 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,5 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
+    <monochrome android:drawable="@drawable/retro_you_icon" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 1413a3145..4bf80dfc6 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,5 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
+    <monochrome android:drawable="@drawable/retro_you_icon" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/library_graph.xml b/app/src/main/res/navigation/library_graph.xml
index 67b032002..132dd4686 100644
--- a/app/src/main/res/navigation/library_graph.xml
+++ b/app/src/main/res/navigation/library_graph.xml
@@ -6,37 +6,37 @@
 
     <fragment
         android:id="@+id/action_album"
-        android:name="code.name.monkey.retromusic.fragments.albums.AlbumsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
+        android:name="io.github.muntashirakon.music.fragments.albums.AlbumsFragment"
+        tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_artist"
-        android:name="code.name.monkey.retromusic.fragments.artists.ArtistsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
+        android:name="io.github.muntashirakon.music.fragments.artists.ArtistsFragment"
+        tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_song"
-        android:name="code.name.monkey.retromusic.fragments.songs.SongsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
+        android:name="io.github.muntashirakon.music.fragments.songs.SongsFragment"
+        tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_genre"
-        android:name="code.name.monkey.retromusic.fragments.genres.GenresFragment"
-        tools:layout="@layout/fragment_main_recycler" />
+        android:name="io.github.muntashirakon.music.fragments.genres.GenresFragment"
+        tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_playlist"
-        android:name="code.name.monkey.retromusic.fragments.playlists.PlaylistsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
+        android:name="io.github.muntashirakon.music.fragments.playlists.PlaylistsFragment"
+        tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_folder"
-        android:name="code.name.monkey.retromusic.fragments.folder.FoldersFragment"
+        android:name="io.github.muntashirakon.music.fragments.folder.FoldersFragment"
         tools:layout="@layout/fragment_folder" />
 
     <fragment
         android:id="@+id/action_home"
-        android:name="code.name.monkey.retromusic.fragments.home.HomeFragment"
+        android:name="io.github.muntashirakon.music.fragments.home.HomeFragment"
         android:label=""
         tools:layout="@layout/fragment_home" />
 
diff --git a/app/src/main/res/navigation/main_graph.xml b/app/src/main/res/navigation/main_graph.xml
index d82f88fec..7726dff5a 100644
--- a/app/src/main/res/navigation/main_graph.xml
+++ b/app/src/main/res/navigation/main_graph.xml
@@ -6,27 +6,27 @@
 
     <fragment
         android:id="@+id/genreDetailsFragment"
-        android:name="code.name.monkey.retromusic.fragments.genres.GenreDetailsFragment"
+        android:name="io.github.muntashirakon.music.fragments.genres.GenreDetailsFragment"
         android:label="GenreDetailsFragment"
         tools:layout="@layout/fragment_playlist_detail">
         <argument
             android:name="extra_genre"
-            app:argType="code.name.monkey.retromusic.model.Genre" />
+            app:argType="io.github.muntashirakon.music.model.Genre" />
     </fragment>
 
     <fragment
         android:id="@+id/playlistDetailsFragment"
-        android:name="code.name.monkey.retromusic.fragments.playlists.PlaylistDetailsFragment"
+        android:name="io.github.muntashirakon.music.fragments.playlists.PlaylistDetailsFragment"
         android:label="PlaylistDetailsFragment"
         tools:layout="@layout/fragment_playlist_detail">
         <argument
-            android:name="extra_playlist_id"
-            app:argType="long" />
+            android:name="extra_playlist"
+            app:argType="io.github.muntashirakon.music.db.PlaylistWithSongs" />
     </fragment>
 
     <fragment
         android:id="@+id/albumDetailsFragment"
-        android:name="code.name.monkey.retromusic.fragments.albums.AlbumDetailsFragment"
+        android:name="io.github.muntashirakon.music.fragments.albums.AlbumDetailsFragment"
         android:label="AlbumDetailsFragment"
         tools:layout="@layout/fragment_album_details">
         <argument
@@ -36,7 +36,7 @@
 
     <fragment
         android:id="@+id/artistDetailsFragment"
-        android:name="code.name.monkey.retromusic.fragments.artists.ArtistDetailsFragment"
+        android:name="io.github.muntashirakon.music.fragments.artists.ArtistDetailsFragment"
         android:label="ArtistDetailsFragment"
         tools:layout="@layout/fragment_artist_details">
         <argument
@@ -46,7 +46,7 @@
 
     <fragment
         android:id="@+id/albumArtistDetailsFragment"
-        android:name="code.name.monkey.retromusic.fragments.artists.AlbumArtistDetailsFragment"
+        android:name="io.github.muntashirakon.music.fragments.artists.AlbumArtistDetailsFragment"
         android:label="AlbumArtistDetailsFragment"
         tools:layout="@layout/fragment_artist_details">
         <argument
@@ -56,13 +56,13 @@
 
     <fragment
         android:id="@+id/libraryFragment"
-        android:name="code.name.monkey.retromusic.fragments.library.LibraryFragment"
+        android:name="io.github.muntashirakon.music.fragments.library.LibraryFragment"
         android:label=""
         tools:layout="@layout/fragment_library" />
 
     <fragment
         android:id="@+id/detailListFragment"
-        android:name="code.name.monkey.retromusic.fragments.other.DetailListFragment"
+        android:name="io.github.muntashirakon.music.fragments.other.DetailListFragment"
         android:label="DetailListFragment">
         <argument
             android:name="type"
@@ -71,59 +71,66 @@
 
     <fragment
         android:id="@+id/action_search"
-        android:name="code.name.monkey.retromusic.fragments.search.SearchFragment"
+        android:name="io.github.muntashirakon.music.fragments.search.SearchFragment"
         android:label="SearchFragment"
         tools:layout="@layout/fragment_search" />
 
-    <fragment
-        android:id="@+id/settings_fragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.SettingsFragment" />
+    <activity
+        android:id="@+id/settingsActivity"
+        android:name="io.github.muntashirakon.music.activities.SettingsActivity"
+        android:label="SettingsActivity" />
+
+    <activity
+        android:id="@+id/permissionFragment"
+        android:name="io.github.muntashirakon.music.activities.PermissionActivity"
+        android:label="PermissionFragment"
+        tools:layout="@layout/activity_permission" />
 
     <fragment
         android:id="@+id/action_album"
-        android:name="code.name.monkey.retromusic.fragments.albums.AlbumsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
+        android:name="io.github.muntashirakon.music.fragments.albums.AlbumsFragment"
+        tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_artist"
-        android:name="code.name.monkey.retromusic.fragments.artists.ArtistsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
+        android:name="io.github.muntashirakon.music.fragments.artists.ArtistsFragment"
+        tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_song"
-        android:name="code.name.monkey.retromusic.fragments.songs.SongsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
+        android:name="io.github.muntashirakon.music.fragments.songs.SongsFragment"
+        tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_genre"
-        android:name="code.name.monkey.retromusic.fragments.genres.GenresFragment"
-        tools:layout="@layout/fragment_main_recycler" />
+        android:name="io.github.muntashirakon.music.fragments.genres.GenresFragment"
+        tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_playlist"
-        android:name="code.name.monkey.retromusic.fragments.playlists.PlaylistsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
+        android:name="io.github.muntashirakon.music.fragments.playlists.PlaylistsFragment"
+        tools:layout="@layout/fragment_main_activity_recycler_view" />
 
     <fragment
         android:id="@+id/action_folder"
-        android:name="code.name.monkey.retromusic.fragments.folder.FoldersFragment"
+        android:name="io.github.muntashirakon.music.fragments.folder.FoldersFragment"
         tools:layout="@layout/fragment_folder" />
 
     <fragment
         android:id="@+id/action_home"
-        android:name="code.name.monkey.retromusic.fragments.home.HomeFragment"
+        android:name="io.github.muntashirakon.music.fragments.home.HomeFragment"
         android:label=""
         tools:layout="@layout/fragment_home" />
 
     <fragment
         android:id="@+id/user_info_fragment"
-        android:name="code.name.monkey.retromusic.fragments.other.UserInfoFragment" />
+        android:name="io.github.muntashirakon.music.fragments.other.UserInfoFragment" />
 
     <fragment
         android:id="@+id/playing_queue_fragment"
-        android:name="code.name.monkey.retromusic.fragments.queue.PlayingQueueFragment" />
+        android:name="io.github.muntashirakon.music.fragments.queue.PlayingQueueFragment" />
 
     <fragment
         android:id="@+id/lyrics_fragment"
-        android:name="code.name.monkey.retromusic.fragments.lyrics.LyricsFragment" />
+        android:name="io.github.muntashirakon.music.fragments.other.LyricsFragment" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/settings_graph.xml b/app/src/main/res/navigation/settings_graph.xml
index 70dffca0f..4bd7a715e 100644
--- a/app/src/main/res/navigation/settings_graph.xml
+++ b/app/src/main/res/navigation/settings_graph.xml
@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/mainSettingsFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.MainSettingsFragment"
+        android:name="io.github.muntashirakon.music.fragments.settings.MainSettingsFragment"
         android:label="Settings"
         tools:layout="@layout/fragment_main_settings">
 
@@ -87,47 +87,47 @@
 
     <fragment
         android:id="@+id/audioSettings"
-        android:name="code.name.monkey.retromusic.fragments.settings.AudioSettings"
+        android:name="io.github.muntashirakon.music.fragments.settings.AudioSettings"
         android:label="Audio" />
 
     <fragment
         android:id="@+id/imageSettingFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.ImageSettingFragment"
+        android:name="io.github.muntashirakon.music.fragments.settings.ImageSettingFragment"
         android:label="Image" />
 
     <fragment
         android:id="@+id/notificationSettingsFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.NotificationSettingsFragment"
+        android:name="io.github.muntashirakon.music.fragments.settings.NotificationSettingsFragment"
         android:label="Notification" />
 
     <fragment
         android:id="@+id/nowPlayingSettingsFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.NowPlayingSettingsFragment"
+        android:name="io.github.muntashirakon.music.fragments.settings.NowPlayingSettingsFragment"
         android:label="Now Playing" />
 
     <fragment
         android:id="@+id/otherSettingsFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.OtherSettingsFragment"
+        android:name="io.github.muntashirakon.music.fragments.settings.OtherSettingsFragment"
         android:label="Other" />
 
     <fragment
         android:id="@+id/personalizeSettingsFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.PersonalizeSettingsFragment"
+        android:name="io.github.muntashirakon.music.fragments.settings.PersonalizeSettingsFragment"
         android:label="Personalize" />
 
     <fragment
         android:id="@+id/themeSettingsFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.ThemeSettingsFragment"
+        android:name="io.github.muntashirakon.music.fragments.settings.ThemeSettingsFragment"
         android:label="Look &amp; Feel" />
 
     <fragment
         android:id="@+id/aboutActivity"
-        android:name="code.name.monkey.retromusic.fragments.about.AboutFragment"
+        android:name="io.github.muntashirakon.music.fragments.about.AboutFragment"
         android:label="About" />
 
     <fragment
         android:id="@+id/backup_fragment"
-        android:name="code.name.monkey.retromusic.fragments.backup.BackupFragment"
+        android:name="io.github.muntashirakon.music.fragments.backup.BackupFragment"
         android:label="About" />
 
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 18995c82e..a30a418da 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
     <string name="about_album_label">حول %s</string>
-    <string name="about_settings_summary">الفريق، وسائل التواصل الاجتماعي</string>
+    <string name="about_settings_summary">الفريق، الروابط الاجتماعية</string>
     <string name="accent_color">اللون الأساسي</string>
     <string name="accent_color_desc">لون تمييز المظهر ، يتم تعيينه إلى اللون الأرجواني</string>
     <string name="action_about">حول</string>
     <string name="action_add_to_blacklist">إضافة إلى القائمة السوداء</string>
-    <string name="action_add_to_favorites">إضافة إلى المفضلة</string>
-    <string name="action_add_to_playing_queue">إضافة إلى قائمة التشغيل الحالية</string>
+    <string name="action_add_to_favorites">اضافة الى المفضلة</string>
+    <string name="action_add_to_playing_queue">إضافة الى قائمة التشغيل الحالية</string>
     <string name="action_add_to_playlist">أضف إلى قائمة التشغيل</string>
-    <string name="action_cancel">إلغاء</string>
     <string name="action_cast">ممثلين</string>
     <string name="action_clear_playing_queue">إخلاء قائمة التشغيل الحالية</string>
-    <string name="action_cycle_repeat">وضع التكرار</string>
+    <string name="action_cycle_repeat">وضع تكرار الدورة</string>
     <string name="action_delete">حذف</string>
     <string name="action_delete_from_device">حذف من الجهاز</string>
     <string name="action_details">تفاصيل</string>
@@ -20,9 +19,9 @@
     <string name="action_go_to_album">إنتقل إلى الالبوم</string>
     <string name="action_go_to_artist">إنتقل إلى الفنان</string>
     <string name="action_go_to_genre">إنتقل إلى النوع</string>
-    <string name="action_go_to_lyrics">انتقل إلى كلمات الأغاني</string>
-    <string name="action_go_to_start_directory">انتقل إلى المجلد</string>
-    <string name="action_grant">منح</string>
+    <string name="action_go_to_lyrics">Go to Lyrics</string>
+    <string name="action_go_to_start_directory">إنتقل إلى الدليل</string>
+    <string name="action_grant">امنح</string>
     <string name="action_grid_size">حجم الشبكة</string>
     <string name="action_grid_size_land">حجم الشبكة (أفقيا)</string>
     <string name="action_new_playlist">قائمة تشغيل جديدة</string>
@@ -30,34 +29,34 @@
     <string name="action_play">تشغيل</string>
     <string name="action_play_all">تشغيل الكل</string>
     <string name="action_play_next">تشغيل التالي</string>
-    <string name="action_play_pause">تشغيل/إيقاف</string>
+    <string name="action_play_pause">تشغيل/ايقاف</string>
     <string name="action_previous">السابق</string>
-    <string name="action_remove_from_favorites">إزالة من المفضلة</string>
-    <string name="action_remove_from_playing_queue">إزالة من قائمة التشغيل الحالية</string>
-    <string name="action_remove_from_playlist">إزالة من قائمة التشغيل</string>
-    <string name="action_rename">إعادة التسمية</string>
+    <string name="action_remove_from_favorites">ازالة من المفضلة</string>
+    <string name="action_remove_from_playing_queue">ازالة من قائمة التشغيل الحالية</string>
+    <string name="action_remove_from_playlist">ازالة من قائمة التشغيل</string>
+    <string name="action_rename">اعادة تسمية</string>
     <string name="action_save_playing_queue">حفظ قائمة التشغيل الحالية</string>
     <string name="action_scan">فحص</string>
     <string name="action_search">بحث</string>
-    <string name="action_set">بدء</string>
-    <string name="action_set_as_ringtone">تعيين كنغمة رنين</string>
-    <string name="action_set_as_start_directory">تعيين كملف بداية</string>
+    <string name="action_set">تشغيل</string>
+    <string name="action_set_as_ringtone">تعين كنغمة رنين</string>
+    <string name="action_set_as_start_directory">تعين كدليل بداية</string>
     <string name="action_settings">"الإعدادات"</string>
     <string name="action_share">مشاركة</string>
     <string name="action_shuffle_all">خلط للكل</string>
-    <string name="action_shuffle_playlist">تشغيل عشوائي لقائمة التشغيل</string>
-    <string name="action_sleep_timer">مؤقت السكون</string>
-    <string name="action_sort_order">فرز</string>
-    <string name="action_tag_editor">محرر العلامة</string>
+    <string name="action_shuffle_playlist">تشغيل عشوائي قائمة التشغيل</string>
+    <string name="action_sleep_timer">مؤقت النوم</string>
+    <string name="action_sort_order">ترتيب الفرز</string>
+    <string name="action_tag_editor">محرر البطاقة</string>
     <string name="action_toggle_favorite">تبديل المفضلة</string>
     <string name="action_toggle_shuffle">تفعيل وضع الخلط</string>
     <string name="adaptive">متكيف</string>
     <string name="add_action">إضافة</string>
-    <string name="add_playlist_title">"إضافة إلى قائمة التشغيل"</string>
+    <string name="add_playlist_title">"إضافة الى قائمة التشغيل"</string>
     <string name="add_time_framed_lryics">أضف وقت كلمات الأغاني</string>
-    <string name="added_song_count_to_playlist">تم إضافة %1$d أغنية إلى %2$s</string>
-    <string name="added_title_to_playing_queue">"تمت الإضافة إلى قائمة الانتظار."</string>
-    <string name="added_x_titles_to_playing_queue">إضافة %1$d من العناوين إلى قائمة الانتظار.</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
+    <string name="added_title_to_playing_queue">"إضافة ١ من العناوين الى قائمة التشغيل الحالية"</string>
+    <string name="added_x_titles_to_playing_queue">إضافة %1$d من العناوين الى قائمة التشغيل الحالية</string>
     <string name="album">البوم</string>
     <plurals name="albumSongs">
         <item quantity="zero">الأغاني</item>
@@ -86,23 +85,21 @@
     <string name="app_widget_big_name">صورة كاملة</string>
     <string name="app_widget_card_name">ريترو ميوزك - بطاقة</string>
     <string name="app_widget_classic_name">ريترو ميوزك - تقليدي</string>
-    <string name="app_widget_md3_name">تصميم ماتريال يو</string>
+    <string name="app_widget_md3_name">MD3</string>
     <string name="app_widget_small_name">ريترو ميوزك - صغير</string>
     <string name="app_widget_text_name">الحد الأدنى للنص</string>
     <string name="artist">فنان</string>
     <string name="artists">فنانين</string>
-    <string name="audio_fade_duration">مدة تلاشي الصوت</string>
+    <string name="audio_fade_duration">Audio fade duration</string>
     <string name="audio_focus_denied">تم منع تركيز الصوت</string>
     <string name="audio_settings_summary">تغيير إعدادات الصوت وضبط عناصر التحكم في موازن الصوت</string>
     <string name="auto">تلقائي</string>
-    <string name="backup_restore_settings_summary">النسخ الاحتياطي واستعادة الإعدادات الخاصة بك وقوائم التشغيل</string>
-    <string name="backup_restore_title"><![CDATA[النسخ الاحتياطي والاستعادة]]></string>
-    <string name="backup_title">النسخ الإحتياطية</string>
+    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
+    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
+    <string name="backup_title">Backups</string>
     <string name="biography">سيرة ذاتية</string>
     <string name="black_theme_name">أسود لامع</string>
     <string name="blacklist">القائمة السوداء</string>
-    <string name="bluetooth_summary">يحتاج التطبيق إلى إذن الأجهزة القريبة للتحقق من أجهزة بلوتوث</string>
-    <string name="bluetooth_title">الأجهزة القريبة</string>
     <string name="blur">ضبابي</string>
     <string name="blur_card">بطاقة ضبابية</string>
     <string name="bug_report_failed">لم يمكن ارسال التقرير</string>
@@ -116,7 +113,6 @@
     <string name="bug_report_no_password">الرجاء ادخال كلمة سر صالحة</string>
     <string name="bug_report_no_title">الرجاء ادخال الخطأ هنا</string>
     <string name="bug_report_no_username">الرجاء ادخال أسم مستخدم صالح</string>
-    <string name="bug_report_success">تم الإبلاغ عن الأخطاء</string>
     <string name="bug_report_summary">حصل خطأ غير متوقع. نأسف لذالك, اذا تكرر معك الخطأ \"قم بمسح بيانات التطبيق\"او ارسل ايميل</string>
     <string name="bug_report_use_account">ارسال بأستخدام حساب چيتهب</string>
     <string name="buy_now">اشتري الآن</string>
@@ -129,18 +125,17 @@
     <string name="cascading">المتتالية</string>
     <string name="changelog">سجل التغيرات</string>
     <string name="changelog_summary">تحقق من الجديد</string>
-    <string name="choose_image">اختر صورة</string>
-    <string name="choose_restore_title">اختر ما تريد استعادته</string>
+    <string name="choose_image">Choose Image</string>
+    <string name="choose_restore_title">Choose what to restore</string>
     <string name="circle">دائرية</string>
     <string name="circular">دائري</string>
     <string name="classic">كلاسيكي</string>
     <string name="clear_action">إزالة</string>
     <string name="clear_blacklist">إزالة القائمة السوداء</string>
-    <string name="clear_history">مسح السجل</string>
+    <string name="clear_history">Clear History</string>
     <string name="clear_playing_queue">مسح التسلسل</string>
     <string name="color">لون</string>
     <string name="colors">الوان</string>
-    <string name="compact">مضغوط</string>
     <string name="composer">المؤلف</string>
     <string name="copied_device_info_to_clipboard">تم نسخ معلومات الجهاز للحافظة.</string>
     <string name="could_not_create_playlist">تعذّر\u2019t إنشاء قائمة.</string>
@@ -152,9 +147,9 @@
     <string name="created_playlist_x">قائمة التشغيل الموجودة %1$s.</string>
     <string name="credit_title">الافراد والمساهمين</string>
     <string name="currently_listening_to_x_by_x">يستمع حالياً إلى %1$s لـ %2$s</string>
-    <string name="custom_artist_images">صور فنان مخصصة</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">مشاركة تقرير الأعطال</string>
-    <string name="dark_theme_name">مظلم</string>
+    <string name="custom_artist_images">Custom Artist Images</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
+    <string name="dark_theme_name">أسود قليلاً</string>
     <string name="delete_playlist_title">حذف قائمة التشغيل</string>
     <string name="delete_playlist_x"><![CDATA[حذف قائمة التشغيل <b>%1$s</b>؟]]></string>
     <string name="delete_playlists_title">حذف قوائم التشغيل</string>
@@ -170,7 +165,7 @@
     <string name="device_info">معلومات الجهاز</string>
     <string name="dialog_message_set_ringtone">السمات لتطبيق ريترو ميوزك بتعديل اعدادات الصوت</string>
     <string name="dialog_title_set_ringtone">ك نغمة رنين</string>
-    <string name="disc_hint">رقم القرص</string>
+    <string name="disc_hint">Disc Number</string>
     <string name="do_you_want_to_clear_the_blacklist">هل تريد إزالة القائمة السوداء؟</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[هل تريد إزالة <b>%1$s</b> من القائمة السوداء]]></string>
     <string name="donate">تبرع</string>
@@ -184,15 +179,8 @@
     <string name="edit_synced_lyrics">كلمات الأغنية متزامنة</string>
     <string name="empty">فارغ</string>
     <string name="equalizer">موازن الصوت</string>
-    <string name="error_create_backup">تعذر \u2019 انشاء نسخة</string>
-    <string name="error_delete_backup">تعذر \u2019 حذف نسخة</string>
-    <string name="error_empty_name">لا يمكن أن يكون اسمك فارغاً!</string>
-    <string name="error_load_failed">فشل في التحميل</string>
-    <string name="error_share_file">تعذر مشاركة الملف</string>
-    <string name="expanded">موسع</string>
     <string name="faq">التعليمات</string>
     <string name="favorites">المفضلات</string>
-    <string name="file_already_exists">الملف موجود مسبقا</string>
     <string name="finish_last_song">إنهاء الأغنية الأخيرة</string>
     <string name="fit">تناسق</string>
     <string name="flat">مسطح</string>
@@ -208,7 +196,6 @@
     <string name="genres">فئات</string>
     <string name="git_hub_summary">اجلب المشروع على GitHub</string>
     <string name="gradient">متدرج</string>
-    <string name="grant_access">السماح بالوصول</string>
     <string name="grid_size_1">١</string>
     <string name="grid_size_2">٢</string>
     <string name="grid_size_3">٣</string>
@@ -221,8 +208,8 @@
     <string name="help_summary">بحاجة للمزيد من المساعدة؟</string>
     <string name="hinge">مفصل</string>
     <string name="history">السجل</string>
-    <string name="history_cleared">تم مسح السجل</string>
-    <string name="history_undo_button">تراجع</string>
+    <string name="history_cleared">History cleared</string>
+    <string name="history_undo_button">Undo</string>
     <string name="home">الشاشة الرئيسية</string>
     <string name="horizontal_flip">تدوير عمودي</string>
     <string name="image">صورة</string>
@@ -239,14 +226,13 @@
     <string name="label_file_name">اسم الملف</string>
     <string name="label_file_path">مسار الملف</string>
     <string name="label_file_size">الحجم</string>
-    <string name="label_last_modified">آخر تعديل</string>
+    <string name="label_last_modified">Last Modified</string>
     <string name="label_more_from">المزيد من %s</string>
     <string name="label_sampling_rate">معدل العينات</string>
     <string name="label_track_length">الامتداد</string>
     <string name="labeled">معنون</string>
     <string name="last_added">المضافة مؤخرا</string>
     <string name="last_song">الاغنية الاخيرة</string>
-    <string name="lets_go">لنبدأ</string>
     <string name="library_categories">فئات المكتبة الموسيقية</string>
     <string name="licenses">تراخيص</string>
     <string name="light_theme_name">أبيض صافي</string>
@@ -259,23 +245,17 @@
     <string name="material">ماتيريال</string>
     <string name="md_error_label">خطأ</string>
     <string name="md_storage_perm_error">خطأ في الصلاحيات</string>
-    <string name="message_backup_create_success">تم إنشاء النسخة الاحتياطية بنجاح.</string>
-    <string name="message_limit_tabs">ما لا يزيد على 5 عناصر</string>
-    <string name="message_pro_feature">%s هي ميزة محترفة.</string>
-    <string name="message_restore_success">أكملت الاستعادة بنجاح.</string>
-    <string name="message_updated">محدث</string>
-    <string name="message_welcome"><![CDATA[مرحبا يا هذا! <br>مرحبا بك في %s]]></string>
     <string name="my_name">الأسم</string>
     <string name="my_top_tracks">الأكثر تشغيل</string>
     <string name="never">أبداً</string>
-    <string name="new_music_mix">مزيج موسيقي جديد</string>
+    <string name="new_music_mix">New Music Mix</string>
     <string name="new_playlist_title">قائمة تشغيل جديدة</string>
     <string name="new_start_directory">%s هذا دليل البدء الجديد.</string>
     <string name="next_song">الاغنية التالية</string>
     <string name="no_albums">لا توجد ألبومات</string>
     <string name="no_artists">لا يوجد مغنين</string>
     <string name="no_audio_ID">"قم بتشغيل أغنية أولاً ، ثم حاول مرة أخرى."</string>
-    <string name="no_backups_found">لم يتم العثور على نسخ احتياطي</string>
+    <string name="no_backups_found">No Backups Found</string>
     <string name="no_equalizer">لم يتم العثور موازن الصوت</string>
     <string name="no_genres">لا يوجد تصنيفات</string>
     <string name="no_lyrics_found">لم يتم العثور على كلمات للاغنية</string>
@@ -299,13 +279,12 @@
     <string name="only_on_wifi">فقط على الواي فاي</string>
     <string name="other_settings_summary">اعدادات اختبارية متقدمة</string>
     <string name="others">آخر</string>
-    <string name="over_cover">فوق الغلاف</string>
+    <string name="over_cover">Over Cover</string>
     <string name="password">كلمة السر</string>
     <string name="past_three_months">أخر 3 أشهر</string>
     <string name="paste_lyrics_here">لصق كلمات الاغنية هنا</string>
     <string name="paste_timeframe_lyrics_here">لصق كلمات الإطار الزمني هنا</string>
-    <string name="peek">نظرة خاطفة</string>
-    <string name="permission_bluetooth_denied">تم رفض إذن الأجهزة القريبة.</string>
+    <string name="peek">Peek</string>
     <string name="permission_external_storage_denied">تم رفض إذن الوصول إلى وحدة التخزين الخارجي.</string>
     <string name="permission_summary">يحتاج التطبيق إلى إذن للوصول إلى وحدة تخزين جهازك لتشغيل الموسيقى</string>
     <string name="permission_title">الوصول إلى التخزين</string>
@@ -316,13 +295,13 @@
     <string name="pinterest_page">بينتريست</string>
     <string name="pinterest_page_summary">متابعة صفحة البينتريست لمشاهدة الهامات التصميم</string>
     <string name="plain">عادي</string>
-    <string name="playList_already_exits">قائمة التشغيل موجودة مسبقا</string>
-    <string name="playback_pitch">درجة الصوت</string>
-    <string name="playback_settings">إعدادات التشغيل</string>
-    <string name="playback_speed">سرعة التشغيل</string>
+    <string name="playList_already_exits">Playlist already exists</string>
+    <string name="playback_pitch">Pitch</string>
+    <string name="playback_settings">Playback Settings</string>
+    <string name="playback_speed">Playback Speed</string>
     <string name="playing_notification_description">اشعارات التشغيل توفر إجراءات للتشغيل / الإيقاف المؤقت إلخ.</string>
     <string name="playing_notification_name">تنبيهات التشغيل</string>
-    <string name="playlist_created_sucessfully">تم إنشاء %s بنجاح</string>
+    <string name="playlist_created_sucessfully">%s created successfully</string>
     <string name="playlist_is_empty">قائمة التشغيل فارغة</string>
     <string name="playlist_name_empty">اسم قائمة التشغيل</string>
     <string name="playlists">قوائم التشغيل</string>
@@ -345,11 +324,11 @@
     <string name="pref_keep_screen_on_summary">ضع في اعتبارك أن تمكين هذه الميزة قد يؤثر على عمر البطارية</string>
     <string name="pref_keep_screen_on_title">ابقاء الشاشة تعمل</string>
     <string name="pref_language_name">حدد اللغة</string>
-    <string name="pref_snow_fall_title">تأثير سقوط الثلوج</string>
+    <string name="pref_snow_fall_title">Snow fall effect</string>
     <string name="pref_summary_album_art_on_lockscreen">استخدم غلاف ألبوم الأغنية قيد التشغيل حاليًا كخلفية لشاشة القفل</string>
     <string name="pref_summary_album_artists_only">إظهار ألبوم الفنان في فئة الفنانين</string>
     <string name="pref_summary_audio_ducking">خفض مستوى الصوت عند تشغيل صوت نظام أو تلقي إشعارات</string>
-    <string name="pref_summary_audio_fade">تلاشي الصوت عند الإيقاف المؤقت للأغنية أو تشغيلها</string>
+    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
     <string name="pref_summary_blacklist">محتويات مجلدات القائمة السوداء يتم أخفائها من مكتبتك الموسيقية.</string>
     <string name="pref_summary_bluetooth_playback">بدء التشغيل بمجرد توصيل جهاز بلوتوث</string>
     <string name="pref_summary_blurred_album_art">ظبابية غطاء الألبوم على شاشة القفل . يمكن أن يسبب مشاكل في تطبيقات وويدجت الطرف الثالث</string>
@@ -359,7 +338,7 @@
     <string name="pref_summary_colored_app_shortcuts">تلوين اختصارات التطبيق باللون الثانوي . في كل مرة تقوم فيها بتغيير اللون ، يرجى تفعيل هذا الخيار ليتم تطبيق التغييرات</string>
     <string name="pref_summary_colored_notification">"تلوين الإشعارات في غلاف الألبوم\u2019لون نشط"</string>
     <string name="pref_summary_cross_fade">مدة التقاطع بين الأغاني</string>
-    <string name="pref_summary_desaturated_color">حسب إرشادات التصميم المادي في الوضع المظلم الألوان يجب أن تكون غير مشبعه</string>
+    <string name="pref_summary_desaturated_color">حسب خطوط دليل تصميم المواد بالألوان في الوضع المظلم يجب أن لاتكون مشتته</string>
     <string name="pref_summary_expand_now_playing_panel">النقر على الإشعار سيظهر الآن مايتم تشغيله بدلاً من الشاشة الرئيسية لتطبيق</string>
     <string name="pref_summary_extra_controls">اضافة المزيد من التحكم في المشغل المصغر</string>
     <string name="pref_summary_extra_song_info">إظهار معلومات الأغنية الإضافية، مثل تنسيق الملف، معدل البت، والتواتر</string>
@@ -368,38 +347,37 @@
     <string name="pref_summary_ignore_media_store_artwork">يمكنك أن تزيد من جودة غلاف الألبوم ، لكنه يسبب بطئ في التحميل للصور. قم بتمكين هذا فقط إذا كنت تواجه مشاكل مع صور ألبومات منخفضة الدقة</string>
     <string name="pref_summary_library_categories">تكوين وعرض وترتيب فئات المكتبة.</string>
     <string name="pref_summary_lock_screen">استخدم شاشة القفل المخصصة من ريترو ميوزك لتحكم بالتشغيل</string>
-    <string name="pref_summary_manage_audio_focus">تشغيل الصوت دائما في الخلفية بغض النظر عن أي شيء آخر يتم تشغيله</string>
     <string name="pref_summary_open_source_licences">الرخصة والتفاصيل للبرمجيات مفتوحة المصدر</string>
-    <string name="pref_summary_pause_history">عند التمكين، لن تظهر الأغاني المشغلة حديثا في المحفوظات</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">الانتقال إلى آخر علامة تبويب مستخدمة عند البدء</string>
-    <string name="pref_summary_show_lyrics">عرض كلمات الأغاني المتزامنة على غلاف الألبوم</string>
-    <string name="pref_summary_suggestions">إظهار خليط موسيقي جديد على الشاشة الرئيسية</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">تمكين تغيير الأغنية بالسحب في أي مكان على الشاشة المشغلة الآن</string>
-    <string name="pref_summary_swipe_to_dismiss">اسحب للأسفل لإلغاء المشغل الصغير</string>
+    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
+    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
+    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
     <string name="pref_summary_toggle_full_screen">وضع الشاشة الكاملة</string>
     <string name="pref_summary_toggle_headset">تشغيل تلقائيا عند توصيل السماعة</string>
     <string name="pref_summary_toggle_shuffle">سوف يتم تعطيل وضع الخلط عند التشغيل من قائمة جديدة</string>
     <string name="pref_summary_toggle_volume">في حال توفر مساحة كافية قم بعرض شريط التحكم بالصوت في شاشة التشغيل الآن</string>
-    <string name="pref_summary_wallpaper_accent">استخراج اللون الثانوي من صورة الخلفية</string>
-    <string name="pref_summary_whitelist">إظهار الموسيقى فقط من مجلد الموسيقى</string>
+    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
+    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">عرض غطاء الالبوم</string>
     <string name="pref_title_album_artists_only">التنقل بواسطة ألبوم الفنان</string>
     <string name="pref_title_album_cover_style">ثيم غطاء الالبوم</string>
     <string name="pref_title_album_cover_transform">تخطي غطاء الالبوم</string>
     <string name="pref_title_app_shortcuts">تلوين اختصارات التطبيق</string>
-    <string name="pref_title_appbar_mode">نمط الرأس</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">خفض الصوت عند فقد التركيز</string>
-    <string name="pref_title_audio_fade">تلاشي الصوت</string>
+    <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">تحميل تلقائي لصور الالبومات</string>
     <string name="pref_title_blacklist">القائمة السوداء</string>
     <string name="pref_title_bluetooth_playback">تشغيل البلوتوث</string>
     <string name="pref_title_blurred_album_art">تضبيب صورة الالبوم</string>
-    <string name="pref_title_circle_button">زر التشغيل الدائري</string>
+    <string name="pref_title_circle_button">Circular play button</string>
     <string name="pref_title_classic_notification">تصميم التنبيهات الكلاسيكي</string>
     <string name="pref_title_colored_app">اللون المتكيف</string>
     <string name="pref_title_colored_notification">التنبيهات الملونة</string>
-    <string name="pref_title_cross_fade">التلاشي (تجريبي)</string>
-    <string name="pref_title_custom_font">استخدام خط مانروب</string>
+    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
+    <string name="pref_title_custom_font">Use Manrope font</string>
     <string name="pref_title_desaturated_color">لون مفصّل</string>
     <string name="pref_title_expand_now_playing_panel">إظهار شاشة التشغيل</string>
     <string name="pref_title_extra_controls">المزيد من أزرار التحكم</string>
@@ -412,27 +390,26 @@
     <string name="pref_title_ignore_media_store_artwork">تجاهل صور تخزين الميديا</string>
     <string name="pref_title_last_added_interval">آخر قائمة تشغيل تمت إضافتها</string>
     <string name="pref_title_lock_screen">ازار التحكم في كامل الشاشة</string>
-    <string name="pref_title_lyrics_screen_on">إبقاء الشاشة قيد التشغيل عند عرض كلمات الأغاني</string>
-    <string name="pref_title_lyrics_type">نوع الكلمات</string>
-    <string name="pref_title_manage_audio_focus">تشغيل دائمًا</string>
+    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
+    <string name="pref_title_lyrics_type">Lyrics type</string>
     <string name="pref_title_now_playing_screen_appearance">ثيم التشغيل الان</string>
     <string name="pref_title_open_source_licences">التراخيص مفتوحة المصدر</string>
-    <string name="pref_title_pause_history">إيقاف السجل المؤقت</string>
-    <string name="pref_title_remember_tab">تذكر التبويب الأخير</string>
-    <string name="pref_title_show_lyrics">عرض كلمات الأغاني</string>
-    <string name="pref_title_suggestions">عرض الاقتراحات</string>
-    <string name="pref_title_swipe_anywhere_now_playing">اسحب في أي مكان لتغيير الأغنية</string>
-    <string name="pref_title_swipe_to_dismiss">تجاهل مع السحب لأسفل</string>
+    <string name="pref_title_pause_history">Pause history</string>
+    <string name="pref_title_remember_tab">Remember last tab</string>
+    <string name="pref_title_show_lyrics">Show lyrics</string>
+    <string name="pref_title_suggestions">Show suggestions</string>
+    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
     <string name="pref_title_tab_text_mode">وضع عناوين التبويبات</string>
     <string name="pref_title_toggle_carousel_effect">تاثير التتالي</string>
     <string name="pref_title_toggle_full_screen">التطبيق في كامل الشاشة</string>
     <string name="pref_title_toggle_toggle_headset">التشغيل التلقائي</string>
     <string name="pref_title_toggle_toggle_shuffle">وضع الخلط</string>
     <string name="pref_title_toggle_volume">التحكم بالصوت</string>
-    <string name="pref_title_wallpaper_accent">لون لكنة الخلفية</string>
-    <string name="pref_title_whitelist">موسيقى القائمة البيضاء</string>
+    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
+    <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">الكامل</string>
-    <string name="pro_summary">السمة السوداء, تشغيل الآن السمات, تأثير التكدس وأكثر..</string>
+    <string name="pro_summary">تشغيل الآن السمات ، وتأثير التكدس ، وموضوع اللون وأكثر من ذلك ..</string>
     <string name="profile">الملف الشخصي</string>
     <string name="purchase">شراء</string>
     <string name="queue">تسلسل</string>
@@ -443,19 +420,19 @@
     <string name="remove_action">حذف</string>
     <string name="remove_cover">حذف الغطاء</string>
     <string name="remove_from_blacklist">حذف من القائمة السوداء</string>
-    <string name="remove_image">إزالة الصورة</string>
+    <string name="remove_image">Remove Image</string>
     <string name="remove_song_from_playlist_title">حذف الأغنية من قائمة التشغيل</string>
     <string name="remove_song_x_from_playlist"><![CDATA[حذف الاغنية <b>%1$s</b> من قائمة التشغيل ?]]></string>
     <string name="remove_songs_from_playlist_title">حذف الاغاني من قائمة التشغيل</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[حذف <b>%1$d</b> اغنية من قائمة التشغيل?]]></string>
     <string name="rename_playlist_title">اعادة تسمية قائمة التشغيل</string>
-    <string name="replace_cover">استبدال الغلاف</string>
+    <string name="replace_cover">Replace Cover</string>
     <string name="report_an_issue"> تبليغ عن مشكلة</string>
     <string name="report_bug">تقرير الأخطاء</string>
     <string name="reset_action">استرداد</string>
     <string name="reset_artist_image">اعادة ضبط صور الالبومات</string>
     <string name="restore">استرجاع</string>
-    <string name="restore_message">هل تريد استعادة النسخة الاحتياطية؟</string>
+    <string name="restore_message">Do you want to restore backup?</string>
     <string name="restored_previous_purchase_please_restart">تم استرداد عملية الشراء السابقة. الرجاء اعادة تشغيل التطبيق الاستمتاع بكافة المميزات.</string>
     <string name="restored_previous_purchases">تم </string>
     <string name="restoring_purchase">استرداد عملية الشراء...</string>
@@ -509,7 +486,6 @@
     <string name="sort_order_composer">المؤلف</string>
     <string name="sort_order_date">التاريخ</string>
     <string name="sort_order_date_modified">تاريخ التعديل</string>
-    <string name="sort_order_default">الافتراضي</string>
     <string name="sort_order_num_songs">عدد الأغاني</string>
     <string name="sort_order_num_songs_desc">العد التنازلي للاغنية</string>
     <string name="sort_order_year">السنة</string>
@@ -532,7 +508,7 @@
     <string name="tiny">صغير</string>
     <string name="tiny_card_style">بطاقة صغيرة</string>
     <string name="title">عنوان</string>
-    <string name="title_new_backup">نسخة احتياطية جديدة</string>
+    <string name="title_new_backup">New Backup</string>
     <string name="today">اليوم</string>
     <string name="top_albums">افضل الالبومات</string>
     <string name="top_artists">افضل الفنانين</string>
@@ -548,7 +524,7 @@
     <string name="up_next">التالي</string>
     <string name="update_image">تحديث الصورة</string>
     <string name="updating">تحديث...</string>
-    <string name="user_images_description">صور المستخدم</string>
+    <string name="user_images_description">User Images</string>
     <string name="user_name">إسم المستخدم</string>
     <string name="username">أسم المستخدم</string>
     <string name="version">الإصدار</string>
@@ -569,4 +545,5 @@
     <string name="you_have_to_select_at_least_one_category">عليك اختيار فئة واحدة على الأقل.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">سيتم تحويلك الى صفحة سجل الاخطاء</string>
     <string name="your_account_data_is_only_used_for_authentication">بيانات حسابك تستخدم لتوثيق فقط.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index f2ee69deb..9133fab37 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Přidat k oblíbeným</string>
     <string name="action_add_to_playing_queue">Přidat do fronty </string>
     <string name="action_add_to_playlist">Přidat do seznamu skladeb…</string>
-    <string name="action_cancel">Zrušit aktuální časovač</string>
     <string name="action_cast">Hliník</string>
     <string name="action_clear_playing_queue">Vyčistit frontu</string>
     <string name="action_cycle_repeat">Cycle repeat mode</string>
@@ -95,8 +94,6 @@
     <string name="biography">Bio</string>
     <string name="black_theme_name">Velmi černá</string>
     <string name="blacklist">Černá listina</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
     <string name="blur">Rozostření</string>
     <string name="blur_card">Blur Card</string>
     <string name="bug_report_failed">Hlášení se nepodařilo odeslat</string>
@@ -110,7 +107,6 @@
     <string name="bug_report_no_password">Prosím zadejte platné GitHub heslo</string>
     <string name="bug_report_no_title">Prosím zadejte název problému</string>
     <string name="bug_report_no_username">Prosím zadejte platné uživatelské jméno na GitHubu</string>
-    <string name="bug_report_success">Bug report successful</string>
     <string name="bug_report_summary">Došlo k neočekávané chybě. Je nám líto, že jste našli tuto chybu, pokud aplikace bude stále padat, použijte funkci \"Vymazat data aplikace\" nebo nám pošlete e-mail </string>
     <string name="bug_report_use_account">Odeslat pomocí účtu GitHub</string>
     <string name="buy_now">Zakoupit</string>
@@ -134,7 +130,6 @@
     <string name="clear_playing_queue">Vymazat frontu</string>
     <string name="color">Barva</string>
     <string name="colors">Barvy</string>
-    <string name="compact">Compact</string>
     <string name="composer">Skladatel</string>
     <string name="copied_device_info_to_clipboard">Informace o zařízení zkopírovány do schránky.</string>
     <string name="could_not_create_playlist">Nelze vytvo\u0159it playlist.</string>
@@ -177,15 +172,8 @@
     <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
     <string name="empty">Prázdný</string>
     <string name="equalizer">Ekvalizér</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
     <string name="faq">Často kladené otázky</string>
     <string name="favorites">Oblíbené</string>
-    <string name="file_already_exists">File already exists</string>
     <string name="finish_last_song">Dokončit poslední skladbu</string>
     <string name="fit">Fit</string>
     <string name="flat">Flat</string>
@@ -201,7 +189,6 @@
     <string name="genres">Žánry</string>
     <string name="git_hub_summary">Forkněte projekt na GitHubu</string>
     <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -239,7 +226,6 @@
     <string name="labeled">Labeled</string>
     <string name="last_added">Poslední </string>
     <string name="last_song">Poslední skladba</string>
-    <string name="lets_go">Let\'s go</string>
     <string name="library_categories">Library categories</string>
     <string name="licenses">Licence</string>
     <string name="light_theme_name">Velmi bílá</string>
@@ -252,12 +238,6 @@
     <string name="material">Material</string>
     <string name="md_error_label">Chyba</string>
     <string name="md_storage_perm_error">Chyba oprávnění</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
     <string name="my_name">Název</string>
     <string name="my_top_tracks">Moje top skladby</string>
     <string name="never">Nikdy</string>
@@ -298,7 +278,6 @@
     <string name="paste_lyrics_here">Paste Lyrics Here</string>
     <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
     <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">Povolení přístupu k externímu úložišti bylo zamítnuto.</string>
     <string name="permission_summary">Aplikace potřebuje přístup k úložišti vašeho zařízení, aby mohla přehráváat hudbu</string>
     <string name="permission_title">Přístup k úložišti</string>
@@ -361,26 +340,25 @@
     <string name="pref_summary_ignore_media_store_artwork">Může zvýšit kvalitu obalu alba, ale způsobí pomalejší načítání snímků. Tuto možnost povolte pouze v případě potíží s uměleckými díly s nízkým rozlišením.</string>
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="pref_summary_lock_screen">Use Retro Music\'s custom lockscreen controls</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">License details for open source software</string>
     <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
     <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
     <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
     <string name="pref_summary_toggle_full_screen">Immersive mode</string>
     <string name="pref_summary_toggle_headset">Začít přehrávat ihned po připojení sluchátek</string>
     <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</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_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Zobrazit obal alba</string>
     <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
     <string name="pref_title_album_cover_style">Motiv obalu alba</string>
     <string name="pref_title_album_cover_transform">Album cover skip</string>
     <string name="pref_title_app_shortcuts">Barevné zkratky aplikace</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Snížit hlasitost při ztrátě zaostření</string>
     <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Automatické stahování obrázků interpretů</string>
@@ -407,7 +385,6 @@
     <string name="pref_title_lock_screen">Ovládání na celou obrazovku</string>
     <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pref_title_now_playing_screen_appearance">Vzhled</string>
     <string name="pref_title_open_source_licences">Licence Open source</string>
     <string name="pref_title_pause_history">Pause history</string>
@@ -415,7 +392,6 @@
     <string name="pref_title_show_lyrics">Show lyrics</string>
     <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">Tab titles mode</string>
     <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
     <string name="pref_title_toggle_full_screen">Aplikace přes celou obrazovku</string>
@@ -424,8 +400,9 @@
     <string name="pref_title_toggle_volume">Ovládání hlasitosti</string>
     <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
+    <string name="pro_summary">Černý motiv, motivy stránky přehrávání, kolotočový efekt a další..</string>
     <string name="profile">Profil</string>
     <string name="purchase">Koupit</string>
     <string name="queue">Fronta</string>
@@ -502,7 +479,6 @@
     <string name="sort_order_composer">Skladatel</string>
     <string name="sort_order_date">Datum přidání</string>
     <string name="sort_order_date_modified">Datum změny</string>
-    <string name="sort_order_default">Default</string>
     <string name="sort_order_num_songs">Počet skladeb</string>
     <string name="sort_order_num_songs_desc">Počet skladeb sestupně</string>
     <string name="sort_order_year">Rok</string>
@@ -562,4 +538,5 @@
     <string name="you_have_to_select_at_least_one_category">Musíte zvolit alespoň jednu kategorii.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Budete přesměrováni na webovou stránku pro zadání problému.</string>
     <string name="your_account_data_is_only_used_for_authentication">Vaše údaje k účtu jsou použity pouze k ověření.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 78694db93..ed9211526 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -3,13 +3,12 @@
     <string name="about_album_label">Über %s</string>
     <string name="about_settings_summary">Team, soziale Netzwerke</string>
     <string name="accent_color">Akzentfarbe</string>
-    <string name="accent_color_desc">Akzentfarbe des Farbthemas, Standard ist Lila</string>
+    <string name="accent_color_desc">Akzentfarbe des Farbthemas, Standard ist Grün</string>
     <string name="action_about">Über</string>
-    <string name="action_add_to_blacklist">Ausschließen</string>
+    <string name="action_add_to_blacklist">Zur Blacklist hinzufügen</string>
     <string name="action_add_to_favorites">Zu Favoriten hinzufügen</string>
     <string name="action_add_to_playing_queue">Zur Wiedergabeliste hinzufügen</string>
-    <string name="action_add_to_playlist">Zur Playlist hinzufügen</string>
-    <string name="action_cancel">Timer stoppen</string>
+    <string name="action_add_to_playlist">Zur Playlist hinzufügen...</string>
     <string name="action_cast">Übertragen</string>
     <string name="action_clear_playing_queue">Wiedergabeliste leeren</string>
     <string name="action_cycle_repeat">Wiederholungsmodus wechseln</string>
@@ -18,18 +17,18 @@
     <string name="action_details">Details</string>
     <string name="action_edit">Bearbeiten</string>
     <string name="action_go_to_album">Zum Album gehen</string>
-    <string name="action_go_to_artist">Zum Interpreten gehen</string>
-    <string name="action_go_to_genre">Zum Genre gehen</string>
-    <string name="action_go_to_lyrics">Zum Liedtext gehen</string>
+    <string name="action_go_to_artist">Zum Künstler gehen</string>
+    <string name="action_go_to_genre">Zu Genre gehen</string>
+    <string name="action_go_to_lyrics">Songtext</string>
     <string name="action_go_to_start_directory">Zum Startverzeichnis gehen</string>
     <string name="action_grant">Gewähren</string>
     <string name="action_grid_size">Gittergröße</string>
     <string name="action_grid_size_land">Gittergröße (Querformat)</string>
-    <string name="action_new_playlist">Neue Playlist</string>
+    <string name="action_new_playlist">Neue Wiedergabeliste</string>
     <string name="action_next">Nächstes</string>
     <string name="action_play">Abspielen</string>
     <string name="action_play_all">Alles abspielen</string>
-    <string name="action_play_next">Spiele danach ab</string>
+    <string name="action_play_next">Spiel danach</string>
     <string name="action_play_pause">Abspielen/Pausieren</string>
     <string name="action_previous">Vorheriges</string>
     <string name="action_remove_from_favorites">Aus Favoriten entfernen</string>
@@ -45,23 +44,23 @@
     <string name="action_settings">"Einstellungen"</string>
     <string name="action_share">Teilen</string>
     <string name="action_shuffle_all">Alle zufällig wiedergeben</string>
-    <string name="action_shuffle_playlist">Playlist zufällig abspielen</string>
-    <string name="action_sleep_timer">Einschlafmodus</string>
+    <string name="action_shuffle_playlist">Playlist zufällig wiedergeben</string>
+    <string name="action_sleep_timer">Sleep-Timer</string>
     <string name="action_sort_order">Sortierreihenfolge</string>
     <string name="action_tag_editor">Tag-Editor</string>
     <string name="action_toggle_favorite">Favoriten ein-/ausblenden</string>
-    <string name="action_toggle_shuffle">Zufallswiedergabe</string>
+    <string name="action_toggle_shuffle">Zufällige Wiedergabe</string>
     <string name="adaptive">Adaptiv</string>
     <string name="add_action">Hinzufügen</string>
     <string name="add_playlist_title">"Zur Playlist hinzufügen"</string>
-    <string name="add_time_framed_lryics">Synchronisierten Liedtext hinzufügen</string>
-    <string name="added_song_count_to_playlist">%1$d Titel zu %2$s hinzugefügt</string>
+    <string name="add_time_framed_lryics">Synchronisierten Songtext hinzufügen</string>
+    <string name="added_song_count_to_playlist">%1$d Titel(e) zu %2$s hinzugefügt</string>
     <string name="added_title_to_playing_queue">"1 Titel wurde zur Wiedergabeliste hinzugefügt."</string>
     <string name="added_x_titles_to_playing_queue">%1$d Titel wurden zur Wiedergabeliste hinzugefügt.</string>
     <string name="album">Album</string>
     <plurals name="albumSongs">
-        <item quantity="one">Titel</item>
-        <item quantity="other">Titel</item>
+        <item quantity="one">Lied</item>
+        <item quantity="other">Lieder</item>
     </plurals>
     <string name="album_artist">Album-Interpret</string>
     <string name="albums">Alben</string>
@@ -72,47 +71,44 @@
     <string name="always">Immer</string>
     <string name="app_share">Hey, schau dir diesen coolen Music Player an: https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">Zufällig</string>
-    <string name="app_shortcut_top_tracks_short">Top-Titel</string>
-    <string name="app_widget_big_name">Vollbild</string>
-    <string name="app_widget_card_name">Karte</string>
-    <string name="app_widget_classic_name">Klassisch</string>
+    <string name="app_shortcut_top_tracks_short">Top Songs</string>
+    <string name="app_widget_big_name">Vollständiges Bild</string>
+    <string name="app_widget_card_name">Retro Musik - Karte</string>
+    <string name="app_widget_classic_name">Klassik</string>
     <string name="app_widget_md3_name">MD3</string>
     <string name="app_widget_small_name">Klein</string>
     <string name="app_widget_text_name">Minimaler Text</string>
-    <string name="artist">Interpret</string>
-    <string name="artists">Interpreten</string>
-    <string name="audio_fade_duration">Überblenddauer</string>
-    <string name="audio_focus_denied">Audio-Fokus verweigert.</string>
-    <string name="audio_settings_summary">Toneinstellungen ändern und Klang regeln</string>
+    <string name="artist">Künstler</string>
+    <string name="artists">Künstler</string>
+    <string name="audio_fade_duration">Audio Ausblenddauer</string>
+    <string name="audio_focus_denied">Audio Fokus verweigert.</string>
+    <string name="audio_settings_summary">Sound- und Equalizer-Optionen einstellen</string>
     <string name="auto">Automatisch</string>
-    <string name="backup_restore_settings_summary">Einstellungen, Playlists sichern und wiederherstellen</string>
+    <string name="backup_restore_settings_summary">Einstellungen und Wiedergabelisten Sichern und Wiederherstellen</string>
     <string name="backup_restore_title"><![CDATA[Sichern & Wiederherstellen]]></string>
     <string name="backup_title">Sicherungen</string>
     <string name="biography">Biografie</string>
-    <string name="black_theme_name">Einfach Schwarz</string>
-    <string name="blacklist">Ausschlussliste</string>
-    <string name="bluetooth_summary">Die App benötigt in der Nähe befindliche Geräte, um nach Bluetooth-Geräten zu suchen</string>
-    <string name="bluetooth_title">Geräte in der Nähe</string>
-    <string name="blur">Weichzeichner</string>
-    <string name="blur_card">Weichgezeichnete Karte</string>
+    <string name="black_theme_name">Sehr schwarz</string>
+    <string name="blacklist">Schwarze Liste</string>
+    <string name="blur">Unschärfe</string>
+    <string name="blur_card">Karte (Unschärfe)</string>
     <string name="bug_report_failed">Fehler beim Melden</string>
     <string name="bug_report_failed_invalid_token">Ungültiger Token. Bitte kontaktiere den Entwickler.</string>
-    <string name="bug_report_failed_issues_not_available">Für dieses Repository sind Fehlermeldungen nicht aktiviert. Bitte den Entwickler kontaktieren.</string>
+    <string name="bug_report_failed_issues_not_available">Für diese Repository sind Fehlermeldungen nicht aktiviert. Bitte den Entwickler kontaktieren.</string>
     <string name="bug_report_failed_unknown">Ein unerwarteter Fehler ist aufgetreten. Bitte kontaktiere den Entwickler.</string>
     <string name="bug_report_failed_wrong_credentials">Falscher Nutzername oder Passwort</string>
     <string name="bug_report_issue">Problem</string>
     <string name="bug_report_manual">Manuell senden</string>
-    <string name="bug_report_no_description">Bitte gib eine Beschreibung ein</string>
+    <string name="bug_report_no_description">Bitte gebe eine Beschreibung ein</string>
     <string name="bug_report_no_password">Bitte nutze das korrekte GitHub-Passwort</string>
-    <string name="bug_report_no_title">Bitte gib einen Fehler-Titel ein</string>
-    <string name="bug_report_no_username">Bitte gib einen gültigen GitHub-Nutzernamen ein</string>
-    <string name="bug_report_success">Fehlerbericht erfolgreich</string>
-    <string name="bug_report_summary">Ein unerwarteter Fehler ist aufgetreten. Sorry, dass du ihn entdeckt hast. Wenn er weiterhin auftritt, App-\"Speicherinhalt löschen\" oder eine E-Mail schicken </string>
-    <string name="bug_report_use_account">Über GitHub-Konto senden</string>
+    <string name="bug_report_no_title">Bitte gebe einen Titel ein</string>
+    <string name="bug_report_no_username">Bitte nutze einen gültigen GitHub-Nutzernamen</string>
+    <string name="bug_report_summary">Sorry! Ein unerwarteter Fehler ist aufgetreten. Die App-Daten zurückzusetzen, könnte helfen.</string>
+    <string name="bug_report_use_account">Via GitHub senden</string>
     <string name="buy_now">Jetzt kaufen</string>
     <string name="cancel_current_timer">Timer stoppen</string>
     <string name="card">Karte</string>
-    <string name="card_color_style">Farbige Karte</string>
+    <string name="card_color_style">Karte (Farbe)</string>
     <string name="card_square">Quadratische Karte</string>
     <string name="card_style">Karte</string>
     <string name="carousal_effect_on_now_playing_screen">Karussell-Effekt auf dem Abspielbildschirm</string>
@@ -120,40 +116,39 @@
     <string name="changelog">Änderungen</string>
     <string name="changelog_summary">Sieh dir an, was neu ist</string>
     <string name="choose_image">Bild wählen</string>
-    <string name="choose_restore_title">Wähle, was wiederherzustellen ist</string>
+    <string name="choose_restore_title">Daten wiederherstellen</string>
     <string name="circle">Kreis</string>
     <string name="circular">Rund</string>
-    <string name="classic">Klassisch</string>
-    <string name="clear_action">Leeren</string>
-    <string name="clear_blacklist">Ausschlussliste leeren</string>
+    <string name="classic">Klassik</string>
+    <string name="clear_action">Leer</string>
+    <string name="clear_blacklist">Blacklist leeren</string>
     <string name="clear_history">Verlauf löschen</string>
-    <string name="clear_playing_queue">Warteschlange leeren</string>
+    <string name="clear_playing_queue">Leeren</string>
     <string name="color">Farbe</string>
     <string name="colors">Farben</string>
-    <string name="compact">Kompakt</string>
     <string name="composer">Komponist</string>
-    <string name="copied_device_info_to_clipboard">Geräteinfo wurde in Zwischenablage kopiert.</string>
+    <string name="copied_device_info_to_clipboard">Geräteinformationen wurden kopiert</string>
     <string name="could_not_create_playlist">Playlist konnte nicht erstellt werden.</string>
-    <string name="could_not_download_album_cover">"Passendes Album-Cover konnte nicht heruntergeladen werden."</string>
+    <string name="could_not_download_album_cover">"Passendes Album Cover konnte nicht gedownloadet werden."</string>
     <string name="could_not_restore_purchase">Kauf konnte nicht wiederhergestellt werden.</string>
-    <string name="could_not_scan_files">%d Datei(en) konnte(n) nicht gescannt werden.</string>
+    <string name="could_not_scan_files">%d Dateien konnte(n) nicht gescannt werden.</string>
     <string name="create_action">Erstellen</string>
     <string name="create_new_backup">Erstellen</string>
     <string name="created_playlist_x">Playlist %1$s erstellt.</string>
     <string name="credit_title">Helfende Hände</string>
-    <string name="currently_listening_to_x_by_x">Du hörst gerade %1$s von %2$s.</string>
+    <string name="currently_listening_to_x_by_x">Spielt zur Zeit %1$s von %2$s.</string>
     <string name="custom_artist_images">Benutzerdefinierte Interpretenbilder</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Absturzbericht teilen</string>
-    <string name="dark_theme_name">Irgendwie dunkel</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Absturzbericht senden</string>
+    <string name="dark_theme_name">Dunkel</string>
     <string name="delete_playlist_title">Playlist löschen</string>
-    <string name="delete_playlist_x"><![CDATA[Die Playlist <b>%1$s</b> löschen?]]></string>
-    <string name="delete_playlists_title">Playlists löschen</string>
-    <string name="delete_song_title">Titel löschen</string>
-    <string name="delete_song_x"><![CDATA[Titel <b>%1$s</b> löschen?]]></string>
-    <string name="delete_songs_title">Titel löschen</string>
-    <string name="delete_x_playlists"><![CDATA[<b>%1$d</b> Playlists löschen?]]></string>
-    <string name="delete_x_songs"><![CDATA[<b>%1$d</b> Titel löschen?]]></string>
-    <string name="deleted_x_songs">%1$d Titel gelöscht.</string>
+    <string name="delete_playlist_x"><![CDATA[Playlist <b>%1$s</b> löschen?]]></string>
+    <string name="delete_playlists_title">Playlisten löschen</string>
+    <string name="delete_song_title">Song löschen</string>
+    <string name="delete_song_x"><![CDATA[Song <b>%1$s</b> löschen?]]></string>
+    <string name="delete_songs_title">Songs löschen</string>
+    <string name="delete_x_playlists"><![CDATA[<b>%1$d</b> Playlisten löschen?]]></string>
+    <string name="delete_x_songs"><![CDATA[<b>%1$d</b> Songs löschen?]]></string>
+    <string name="deleted_x_songs">%1$d Songs gelöscht.</string>
     <string name="deleting_songs">Titel werden gelöscht</string>
     <string name="depth">Tiefe</string>
     <string name="description">Beschreibung</string>
@@ -161,43 +156,35 @@
     <string name="dialog_message_set_ringtone">Retro Music erlauben, Audioeinstellungen zu verändern</string>
     <string name="dialog_title_set_ringtone">Klingelton festlegen</string>
     <string name="disc_hint">CD-Nummer</string>
-    <string name="do_you_want_to_clear_the_blacklist">Möchtest du die Ausschlussliste leeren?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Möchtest du <b>%1$s</b> von der Ausschlussliste entfernen?]]></string>
+    <string name="do_you_want_to_clear_the_blacklist">Möchtest du die Blacklist leeren?</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Möchtest du <b>%1$s</b> von der Blacklist entfernen?]]></string>
     <string name="donate">Spenden</string>
-    <string name="donate_summary">Falls du meinst, ich habe mir etwas für meine Arbeit verdient, kannst du hier gerne ein bisschen Geld hinterlassen</string>
-    <string name="donation_header">Kauf\' mir ein(e/n):</string>
+    <string name="donate_summary">Falls du denkst ich habe mir etwas für meine Arbeit verdient, kannst du hier gerne ein bisschen Geld hinterlassen.</string>
+    <string name="donation_header">Kauf\' mir:</string>
     <string name="done">Fertig</string>
     <string name="drive_mode">Fahrmodus</string>
-    <string name="edit_fab">Bearbeitungs-Schaltfläche</string>
-    <string name="edit_normal_lyrics">Liedtext bearbeiten</string>
-    <string name="edit_synced_lyrics">Synchronisierten Liedtext bearbeiten</string>
-    <string name="empty">Leeren</string>
+    <string name="edit_fab">Edit Taste</string>
+    <string name="edit_normal_lyrics">Lyrics bearbeiten</string>
+    <string name="edit_synced_lyrics">Synchronisierte Lyrics bearbeiten</string>
+    <string name="empty">Leer</string>
     <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Konnte keine Sicherung erstellen</string>
-    <string name="error_delete_backup">Konnte Sicherung nicht löschen</string>
-    <string name="error_empty_name">Dein Name kann nicht leer sein!</string>
-    <string name="error_load_failed">Laden fehlgeschlagen</string>
-    <string name="error_share_file">Datei konnte nicht geteilt werden</string>
-    <string name="expanded">Erweitert</string>
     <string name="faq">FAQ</string>
     <string name="favorites">Favoriten</string>
-    <string name="file_already_exists">Datei existiert bereits</string>
-    <string name="finish_last_song">Letzten Titel beenden</string>
-    <string name="fit">Passend</string>
+    <string name="finish_last_song">Letzten Song ganz spielen</string>
+    <string name="fit">Anpassen</string>
     <string name="flat">Flach</string>
     <string name="folders">Ordner</string>
     <string name="follow_system">System folgen</string>
     <string name="for_you">Für dich</string>
     <string name="free">Kostenlos</string>
     <string name="full">Voll</string>
-    <string name="full_card">Komplette Karte</string>
-    <string name="general_settings_summary">Thema und Farben der App ändern</string>
+    <string name="full_card">Karte (Voll)</string>
+    <string name="general_settings_summary">Allgemeine Farben der App ändern</string>
     <string name="general_settings_title">Aussehen</string>
     <string name="genre">Genre</string>
     <string name="genres">Genres</string>
-    <string name="git_hub_summary">Projekt bei GitHub forken</string>
+    <string name="git_hub_summary">Projekt von GitHub forken</string>
     <string name="gradient">Farbverlauf</string>
-    <string name="grant_access">Zugriff gewähren</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -206,337 +193,326 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Rasterstil</string>
+    <string name="grid_style_label">Vorschaubilder</string>
     <string name="help_summary">Benötigst du weitere Hilfe?</string>
-    <string name="hinge">Blättern</string>
+    <string name="hinge">Scharnier</string>
     <string name="history">Verlauf</string>
     <string name="history_cleared">Verlauf gelöscht</string>
     <string name="history_undo_button">Rückgängig</string>
-    <string name="home">Willkommensbildschirm</string>
+    <string name="home">Zuhause</string>
     <string name="horizontal_flip">Horizontale Drehung</string>
     <string name="image">Bild</string>
     <string name="image_gradient">Bild mit Farbverlauf</string>
     <string name="image_settings_summary">Download-Verhalten für Interpretenbilder ändern</string>
     <string name="import_label">Importieren</string>
     <string name="import_playlist">Playlist importieren</string>
-    <string name="import_playlist_message">Alle im Android-Medienspeicher abgelegten Playlists werden importiert. Falls die Playlists bereits existieren, werden die Titel eingefügt.</string>
-    <string name="inserted_x_songs_into_playlist_x">%1$d Titel in Playlist %2$s eingefügt.</string>
-    <string name="instagram_page_summary">Teile dein Retro-Music-Design auf Instagram</string>
+    <string name="import_playlist_message">Es importiert alle im Android Media Store aufgelisteten Playlists, falls die Playlists bereits existieren, werden die Songs zusammengeführt.</string>
+    <string name="inserted_x_songs_into_playlist_x">%1$d Song(s) in Playlist %2$s eingefügt.</string>
+    <string name="instagram_page_summary">Teile dein Retro Music-Design auf Instagram</string>
     <string name="keyboard">Tastatur</string>
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Format</string>
+    <string name="label_file_format">Formattieren</string>
     <string name="label_file_name">Dateiname</string>
     <string name="label_file_path">Dateipfad</string>
     <string name="label_file_size">Größe</string>
     <string name="label_last_modified">Zuletzt geändert</string>
     <string name="label_more_from">Mehr von %s</string>
-    <string name="label_sampling_rate">Abtastrate</string>
+    <string name="label_sampling_rate">Sampling Rate</string>
     <string name="label_track_length">Länge</string>
     <string name="labeled">Beschriftet</string>
     <string name="last_added">Zuletzt hinzugefügt</string>
-    <string name="last_song">Letzter Titel</string>
-    <string name="lets_go">Los</string>
+    <string name="last_song">Letzter Song</string>
     <string name="library_categories">Bibliothekkategorien</string>
     <string name="licenses">Lizenzen</string>
-    <string name="light_theme_name">Deutlich weiß</string>
+    <string name="light_theme_name">Sehr weiß</string>
     <string name="listeners_label">Zuhörer</string>
-    <string name="listing_files">Dateien auflisten</string>
-    <string name="loading_products">Produkte werden geladen…</string>
+    <string name="listing_files">Gelistete Dateien</string>
+    <string name="loading_products">Produkte werden geladen...</string>
     <string name="login">Anmelden</string>
-    <string name="lyrics">Liedtext</string>
-    <string name="made_with_love">Mit ❤ in Indien gemacht</string>
+    <string name="lyrics">Songtext</string>
+    <string name="made_with_love">Hergestellt mit ❤ in Indien</string>
     <string name="material">Material</string>
     <string name="md_error_label">Fehler</string>
     <string name="md_storage_perm_error">Berechtigungsfehler</string>
-    <string name="message_backup_create_success">Sicherung erfolgreich erstellt.</string>
-    <string name="message_limit_tabs">Nicht mehr als 5 Registerkarten</string>
-    <string name="message_pro_feature">%s ist eine Pro-Funktion.</string>
-    <string name="message_restore_success">Wiederherstellung erfolgreich abgeschlossen.</string>
-    <string name="message_updated">Aktualisiert</string>
-    <string name="message_welcome"><![CDATA[Hallo! <br>Willkommen bei %s]]></string>
-    <string name="my_name">Name</string>
-    <string name="my_top_tracks">Meistgespielt</string>
+    <string name="my_name">Mein Name</string>
+    <string name="my_top_tracks">Meine Top Lieder</string>
     <string name="never">Nie</string>
     <string name="new_music_mix">Neuer Musik-Mix</string>
     <string name="new_playlist_title">Neue Playlist</string>
     <string name="new_start_directory">%s ist das neue Startverzeichnis.</string>
-    <string name="next_song">Nächster Titel</string>
-    <string name="no_albums">Du hast keine Alben</string>
-    <string name="no_artists">Du hast keine Interpreten</string>
-    <string name="no_audio_ID">"Spiele einen Titel ab und versuche es erneut."</string>
-    <string name="no_backups_found">Keine Sicherungen gefunden</string>
-    <string name="no_equalizer">Kein Equalizer gefunden</string>
-    <string name="no_genres">Du hast keine Genres</string>
-    <string name="no_lyrics_found">Keine Liedtexte gefunden</string>
-    <string name="no_playing_queue">Es werden keine Titel abgespielt</string>
-    <string name="no_playlists">Du hast keine Playlists</string>
+    <string name="next_song">Nächster Song</string>
+    <string name="no_albums">Keine Alben</string>
+    <string name="no_artists">Keine Künstler</string>
+    <string name="no_audio_ID">"Song abspielen und anschließend erneut versuchen."</string>
+    <string name="no_backups_found">Keine Sicherung gefunden</string>
+    <string name="no_equalizer">Keinen Equalizer gefunden.</string>
+    <string name="no_genres">Keine Genres</string>
+    <string name="no_lyrics_found">Keine Lyrics gefunden</string>
+    <string name="no_playing_queue">Kein Lied wird gespielt</string>
+    <string name="no_playlists">Keine Playlisten</string>
     <string name="no_purchase_found">Kein Kauf gefunden.</string>
     <string name="no_results">Keine Ergebnisse</string>
-    <string name="no_songs">Du hast keine Titel</string>
+    <string name="no_songs">Keine Songs</string>
     <string name="normal">Normal</string>
-    <string name="normal_lyrics">Normaler Liedtext</string>
+    <string name="normal_lyrics">Normaler Songtext</string>
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> ist nicht im Medienspeicher aufgeführt.]]></string>
-    <string name="not_recently_played">Nicht kürzlich abgespielt</string>
+    <string name="not_recently_played">Nicht kürzlich gespielt</string>
     <string name="nothing_to_scan">Nichts zu scannen.</string>
     <string name="nothing_to_see">Nichts zu sehen</string>
     <string name="notification">Benachrichtigung</string>
-    <string name="notification_settings_summary">Den Benachrichtigungsstil anpassen</string>
-    <string name="now_playing">Aktuelle Wiedergabe</string>
-    <string name="now_playing_queue">Wiedergabe-Warteschlange</string>
-    <string name="now_playing_summary">Passe den Wiedergabe-Bildschirm an</string>
-    <string name="now_playing_themes">9+ Themen für den Wiedergabe-Bildschirm</string>
-    <string name="only_on_wifi">Nur über WLAN</string>
-    <string name="other_settings_summary">Experimentelle Funktionen</string>
-    <string name="others">Sonstiges</string>
+    <string name="notification_settings_summary">Benachrichtigungen bearbeiten</string>
+    <string name="now_playing">Derzeit gespielt</string>
+    <string name="now_playing_queue">Aktuelle Wiedergabeliste</string>
+    <string name="now_playing_summary">Passe den Abspielbildschirm an</string>
+    <string name="now_playing_themes">Mehr als 10 Abspiel-Themes</string>
+    <string name="only_on_wifi">Nur über Wi-Fi</string>
+    <string name="other_settings_summary">Erweiterte Testfunktionen</string>
+    <string name="others">Anderes</string>
     <string name="over_cover">Über Cover</string>
     <string name="password">Passwort</string>
     <string name="past_three_months">Letzte 3 Monate</string>
-    <string name="paste_lyrics_here">Liedtext hier einfügen</string>
-    <string name="paste_timeframe_lyrics_here">Synchronisierten Liedtext hier einfügen</string>
+    <string name="paste_lyrics_here">Songtext hier einfügen</string>
+    <string name="paste_timeframe_lyrics_here">Songtexte mit Zeitfenster hier einfügen</string>
     <string name="peek">Vorschau</string>
-    <string name="permission_bluetooth_denied">Berechtigung für Geräte in der Nähe verweigert.</string>
-    <string name="permission_external_storage_denied">Zugriffsberechtigung für externen Speicher verweigert.</string>
-    <string name="permission_summary">Die App benötigt die Berechtigung zum Zugriff auf den Gerätespeicher, um Musik abspielen zu können</string>
+    <string name="permission_external_storage_denied">Berechtigung für den Zugriff auf externen Speicher verweigert.</string>
+    <string name="permission_summary">Die App benötigt die Berechtigung für den Zugriff auf den Gerätespeicher, um Musik abspielen zu können</string>
     <string name="permission_title">Speicherzugriff</string>
-    <string name="permissions_denied">Berechtigungen verweigert.</string>
+    <string name="permissions_denied">Berechtigung verweigert.</string>
     <string name="personalize">Personalisieren</string>
-    <string name="personalize_settings_summary">Wiedergabe-Bildschirm und Steuerelemente anpassen</string>
-    <string name="pick_from_local_storage">Aus lokalem Speicher wählen</string>
+    <string name="personalize_settings_summary">Abspiel-Bildschirm und Interface bearbeiten</string>
+    <string name="pick_from_local_storage">Vom lokalen Speicher wählen</string>
     <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Folge der Pinterest-Seite für Retro Music Design-Ideen</string>
+    <string name="pinterest_page_summary">Folge der Pinterest-Seite für Retro Music Design Inspirationen</string>
     <string name="plain">Einfach</string>
-    <string name="playList_already_exits">Playlist bereits vorhanden</string>
-    <string name="playback_pitch">Tonhöhe</string>
-    <string name="playback_settings">Wiedergabe-Einstellungen</string>
-    <string name="playback_speed">Abspielgeschwindigkeit</string>
-    <string name="playing_notification_description">Die Wiedergabe-Benachrichtigung ermöglicht Play-/Pause-Steuerung etc.</string>
-    <string name="playing_notification_name">Wiedergabe-Benachrichtigung</string>
-    <string name="playlist_created_sucessfully">%s erfolgreich erstellt</string>
+    <string name="playList_already_exits">Playlist existiert bereits</string>
+    <string name="playback_pitch">Tonlage</string>
+    <string name="playback_settings">Wiedergabeeinstellungen</string>
+    <string name="playback_speed">Wiedergabegeschwindigkeit</string>
+    <string name="playing_notification_description">Die Abspielbenachrichtigung bietet Play/Pause-Steuerung</string>
+    <string name="playing_notification_name">Abspielbenachrichtigung</string>
+    <string name="playlist_created_sucessfully">%s Erfolgreich erstellt</string>
     <string name="playlist_is_empty">Playlist ist leer</string>
-    <string name="playlist_name_empty">Playlist-Name</string>
-    <string name="playlists">Playlists</string>
-    <string name="pref_blur_amount_summary">Stärke der Unschärfe, niedriger ist schneller</string>
-    <string name="pref_blur_amount_title">Stärke der Unschärfe</string>
-    <string name="pref_filter_song_summary">Titel nach Länge filtern</string>
-    <string name="pref_filter_song_title">Nach Titellänge filtern</string>
-    <string name="pref_header_advanced">Sonstiges</string>
+    <string name="playlist_name_empty">Playlistname</string>
+    <string name="playlists">Wiedergabelisten</string>
+    <string name="pref_blur_amount_summary">Geringere Unschärfe benötigt weniger Rechenleistung.</string>
+    <string name="pref_blur_amount_title">Unschärfe</string>
+    <string name="pref_filter_song_summary">Lieder nach Länge filtern</string>
+    <string name="pref_filter_song_title">Nach Spieldauer filtern</string>
+    <string name="pref_header_advanced">Erweitert</string>
     <string name="pref_header_album">Album-Stil</string>
-    <string name="pref_header_audio">Ton</string>
-    <string name="pref_header_blacklist">Ausschlussliste</string>
-    <string name="pref_header_controls">Steuerelemente</string>
-    <string name="pref_header_general">Erscheinungsbild</string>
+    <string name="pref_header_audio">Audio</string>
+    <string name="pref_header_blacklist">Schwarze Liste</string>
+    <string name="pref_header_controls">Schaltflächen</string>
+    <string name="pref_header_general">Allgemein</string>
     <string name="pref_header_images">Bilder</string>
     <string name="pref_header_library">Bibliothek</string>
     <string name="pref_header_lockscreen">Sperrbildschirm</string>
-    <string name="pref_header_playlists">Playlists</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pausiert den Titel, wenn die Lautstärke auf Null fällt und nimmt die Wiedergabe bei steigendem Lautstärkepegel wieder auf. Funktioniert auch außerhalb der App</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Beim Stummschalten pausieren</string>
-    <string name="pref_keep_screen_on_summary">Beachte, dass sich diese Funktion auf die Akkulaufzeit auswirkt</string>
+    <string name="pref_header_playlists">Playlist</string>
+    <string name="pref_keep_pause_on_zero_volume_summary">Die Musik pausieren, wenn die Lautstärke auf 0 gestellt wird. Achtung! Wenn die Lautstärke wieder erhöht wird, wird die Musik weiter abgespielt.</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Bei Stummstellung pausieren</string>
+    <string name="pref_keep_screen_on_summary">Beachte, dass diese Funktion sich auf die Akkulaufzeit auswirkt.</string>
     <string name="pref_keep_screen_on_title">Bildschirm anlassen</string>
     <string name="pref_language_name">Sprachauswahl</string>
-    <string name="pref_snow_fall_title">Schneefall-Effekt</string>
-    <string name="pref_summary_album_art_on_lockscreen">Album-Cover des gespielten Titels als Sperrbildschirm-Hintergrund verwenden</string>
+    <string name="pref_snow_fall_title">Schneefall Effekt</string>
+    <string name="pref_summary_album_art_on_lockscreen">Aktuelles Album-Cover als Sperrbildschrim verwenden.</string>
     <string name="pref_summary_album_artists_only">Album-Interpreten in der Kategorie Interpret anzeigen</string>
-    <string name="pref_summary_audio_ducking">Lautstärke während des Abspiels von Geräte- oder App-Benachrichtigungstönen verringern</string>
-    <string name="pref_summary_audio_fade">Beim Anhalten oder Abspielen eines Titels Lautstärke ab- und aufblenden</string>
-    <string name="pref_summary_blacklist">Der Inhalt ausgeschlossener Ordner wird in deiner Bibliothek ausgeblendet.</string>
-    <string name="pref_summary_bluetooth_playback">Wiedergabe starten, sobald das Bluetooth-Gerät verbunden ist</string>
-    <string name="pref_summary_blurred_album_art">Weichzeichnen der Album-Cover auf dem Sperrbildschirm. Kann Probleme mit anderen Apps und Widgets verursachen</string>
-    <string name="pref_summary_carousel_effect">Karussell-Effekt für Album-Cover auf dem Wiedergabe-Bildschirm. Die Designs Karte und Weichgezeichnete Karte funktionieren nicht</string>
+    <string name="pref_summary_audio_ducking">Benachrichtigungen, Benachrichtigung etc.</string>
+    <string name="pref_summary_audio_fade">Audio ausblenden, wenn Lied pausiert oder abgespielt wird</string>
+    <string name="pref_summary_blacklist">Die Musik in Ordnern von der schwarzen Liste wird nicht angezeigt.</string>
+    <string name="pref_summary_bluetooth_playback">Wiedergabe starten, sobald mit dem Bluetooth-Gerät verbunden wurde</string>
+    <string name="pref_summary_blurred_album_art">Verunschärft das Album-Cover des Sperrbildschirm. Kann Probleme mit anderen Apps und Widgets verursachen.</string>
+    <string name="pref_summary_carousel_effect">Karusselleffekt beim Albumcover auf dem Abspiel-Bildschirm. Die Designs Karte und Karte (Unschärfe) unterstützen diese Funktion nicht.</string>
     <string name="pref_summary_classic_notification">Nutze das klassische Benachrichtigungs-Design</string>
-    <string name="pref_summary_colored_app">Farbänderung von Hintergrund und Steuerelementen basierend auf dem Album-Cover vom Wiedergabe-Bildschirm</string>
-    <string name="pref_summary_colored_app_shortcuts">Färbt die App-Verknüpfungen in der Akzentfarbe. Bitte nach jeder Änderung der Akzentfarbe erneut anwenden</string>
-    <string name="pref_summary_colored_notification">"Färbt die Benachrichtigung in der lebendigen Farbe des Album-Covers"</string>
-    <string name="pref_summary_cross_fade">Dauer der Überblendung zwischen den Titeln</string>
-    <string name="pref_summary_desaturated_color">Laut Material-Design-Richtlinien sollen Farben im dunklen Design entsättigt werden</string>
-    <string name="pref_summary_expand_now_playing_panel">Beim Tippen auf die Benachrichtigung wird der Wiedergabe-Bildschirm statt des Willkommensbildschirms angezeigt</string>
-    <string name="pref_summary_extra_controls">Zusätzliche Steuerelemente für Mini-Player hinzufügen</string>
-    <string name="pref_summary_extra_song_info">Zeige zusätzliche Titel-Informationen wie Dateiformat, Bitrate und Frequenz an</string>
-    <string name="pref_summary_gapless_playback">"Kann auf manchen Geräten Abspielprobleme verursachen."</string>
-    <string name="pref_summary_home_banner">Willkommensbildschirm-Banner anzeigen oder ausblenden</string>
-    <string name="pref_summary_ignore_media_store_artwork">Kann die Qualität des Album-Covers erhöhen, aber verursacht längere Bild-Ladezeiten. Nur aktivieren, falls Probleme mit niedrig aufgelösten Bildern bestehen</string>
-    <string name="pref_summary_library_categories">Konfiguriere Sichtbarkeit und Reihenfolge der Bibliothekskategorien.</string>
-    <string name="pref_summary_lock_screen">Verwende die eigenen Steuerelemente von Retro Music auf dem Sperrbildschirm</string>
-    <string name="pref_summary_manage_audio_focus">Audio immer im Hintergrund abspielen, auch während etwas anderes abgespielt wird</string>
-    <string name="pref_summary_open_source_licences">Lizenz-Details über Open-Source-Software</string>
-    <string name="pref_summary_pause_history">Wenn aktiviert, erscheinen neu abgespielte Lieder nicht im Verlauf</string>
-    <string name="pref_summary_remember_tab">Beim Start die zuletzt verwendete Registerkarte öffnen</string>
-    <string name="pref_summary_show_lyrics">Synchronisierten Liedtext über Album-Cover anzeigen</string>
-    <string name="pref_summary_suggestions">Neuer Musik-Mix auf dem Willkommensbildschirm anzeigen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Aktiviert den Titelwechsel durch Wischen auf dem Wiedergabe-Bildschirm</string>
-    <string name="pref_summary_swipe_to_dismiss">Zum Schließen des Mini-Players nach unten wischen</string>
-    <string name="pref_summary_toggle_full_screen">Den Vollbildmodus aktivieren</string>
-    <string name="pref_summary_toggle_headset">Wiedergabe starten, sobald Kopfhörer verbunden sind</string>
-    <string name="pref_summary_toggle_shuffle">Zufallswiedergabe wird ausgeschaltet, wenn eine neue Wiedergabeliste abgespielt wird</string>
-    <string name="pref_summary_toggle_volume">Bei ausreichend Platz Lautstärkeregler auf Wiedergabe-Bildschirm anzeigen</string>
-    <string name="pref_summary_wallpaper_accent">Akzentfarbe aus Hintergrund extrahieren</string>
-    <string name="pref_summary_whitelist">Nur Musik aus dem Ordner /Music einbeziehen</string>
-    <string name="pref_title_album_art_on_lockscreen">Album-Cover anzeigen</string>
-    <string name="pref_title_album_artists_only">Nach Album-Interpreten sortieren</string>
-    <string name="pref_title_album_cover_style">Stil des Album-Covers</string>
+    <string name="pref_summary_colored_app">Hintergrund und Bedienelemente färben sich je nach Album-Cover</string>
+    <string name="pref_summary_colored_app_shortcuts">Färbt die App-Verknüpfungen in der Akzentfarbe. Bitte bei Änderung der Akzentfarbe erneut einschalten.</string>
+    <string name="pref_summary_colored_notification">"F\u00e4rbt die Benachrichtigung passend zum Albumcover"</string>
+    <string name="pref_summary_cross_fade">Dauer der Überblendung zwischen Liedern</string>
+    <string name="pref_summary_desaturated_color">Wie nach Material Design Leitfaden sollten Linien in dunklen Modusfarben desaturatiert werden</string>
+    <string name="pref_summary_expand_now_playing_panel">Wenn Sie auf die Benachrichtigung klicken, wird das \"Now Playing\" Bildschirms statt des Startbildschirms angezeigt</string>
+    <string name="pref_summary_extra_controls">Zusätzliche Schaltflächen für den Mini-Player</string>
+    <string name="pref_summary_extra_song_info">Zeige zusätzliche Songinformationen wie Dateiformat, Bitrate und Häufigkeit</string>
+    <string name="pref_summary_gapless_playback">"Kann bei manchen Geräten Probleme beim Playback verursachen."</string>
+    <string name="pref_summary_home_banner">Home-Banner</string>
+    <string name="pref_summary_ignore_media_store_artwork">Erhöt die Qualität des Album Covers aber verlangsamt die Ladezeit. Nur aktivieren, falls Probleme mit niedriger Auflösung entstehen.</string>
+    <string name="pref_summary_library_categories">Stelle Sichtbarkeit und Reihenfolge der Bibliothekkategorien ein.</string>
+    <string name="pref_summary_lock_screen">Vollständige Musiksteuerung auf dem Sperrbildschirm einschalten.</string>
+    <string name="pref_summary_open_source_licences">Details zu den Lizensen der Open Source Software</string>
+    <string name="pref_summary_pause_history">Wenn aktiviert, werden neu abgespielte Lieder im Verlauf nicht angezeigt</string>
+    <string name="pref_summary_remember_tab">Navigiere zum zuletzt verwendeten Tab beim Start</string>
+    <string name="pref_summary_show_lyrics">Synchronisierte Songtexte über Albumcover anzeigen</string>
+    <string name="pref_summary_suggestions">Neue Musik-Mix auf dem Startbildschirm anzeigen</string>
+    <string name="pref_summary_swipe_anywhere_now_playing">Songwechsel durch Wischen auf dem \"Spielt gerade\" Bildschirm</string>
+    <string name="pref_summary_toggle_full_screen">Schalte den immersiven Modus ein.</string>
+    <string name="pref_summary_toggle_headset">Mit Wiedergabe starten, sobald Kopfhörer verbunden sind.</string>
+    <string name="pref_summary_toggle_shuffle">Shufflemodus wird ausgeschaltet, sobald neue Wiedergabe gestartet wird</string>
+    <string name="pref_summary_toggle_volume">Falls Platz vorhanden ist, Lautstärkeregler auf Derzeit gespielt-Bildschirm zeigen</string>
+    <string name="pref_summary_wallpaper_accent">Akzentfarbe aus Hintergrund wählen</string>
+    <string name="pref_summary_whitelist">Nur Musik aus /Music Ordner anzeigen</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
+    <string name="pref_title_album_art_on_lockscreen">Album Cover anzeigen</string>
+    <string name="pref_title_album_artists_only">Navigiere nach Album-Interpret</string>
+    <string name="pref_title_album_cover_style">Aussehen des Albumcovers</string>
     <string name="pref_title_album_cover_transform">Stil des Album-Covers</string>
-    <string name="pref_title_app_shortcuts">Farbige App-Verknüpfungen</string>
-    <string name="pref_title_appbar_mode">Stil der Suchleiste</string>
+    <string name="pref_title_app_shortcuts">Gefärbte App Shortcuts</string>
+    <string name="pref_title_appbar_mode">Leistenmodus</string>
     <string name="pref_title_audio_ducking">Lautstärke bei Fokusverlust reduzieren</string>
-    <string name="pref_title_audio_fade">Audio überblenden</string>
-    <string name="pref_title_auto_download_artist_images">Interpreten-Bilder automatisch herunterladen</string>
-    <string name="pref_title_blacklist">Ausschlussliste</string>
+    <string name="pref_title_audio_fade">Audio ausblenden</string>
+    <string name="pref_title_auto_download_artist_images">Künstler Bild automatisch downloaden</string>
+    <string name="pref_title_blacklist">Schwarze Liste</string>
     <string name="pref_title_bluetooth_playback">Bluetooth-Wiedergabe</string>
-    <string name="pref_title_blurred_album_art">Album-Cover weichzeichnen</string>
+    <string name="pref_title_blurred_album_art">Album Cover weichzeichnen</string>
     <string name="pref_title_circle_button">Runder Wiedergabeknopf</string>
-    <string name="pref_title_classic_notification">Klassischer Benachrichtigungsstil</string>
-    <string name="pref_title_colored_app">Farbanpassung</string>
-    <string name="pref_title_colored_notification">Farbige Benachrichtigungen</string>
-    <string name="pref_title_cross_fade">Überblenden (experimentell)</string>
-    <string name="pref_title_custom_font">Manrope-Schriftart verwenden</string>
-    <string name="pref_title_desaturated_color">Entsättigte Farben</string>
-    <string name="pref_title_expand_now_playing_panel">Wiedergabe-Bildschirm anzeigen</string>
-    <string name="pref_title_extra_controls">Zusätzliche Steuerelemente</string>
-    <string name="pref_title_extra_song_info">Titel-Info</string>
-    <string name="pref_title_gapless_playback">Unterbrechungsfreie Wiedergabe</string>
-    <string name="pref_title_general_theme">App-Design</string>
-    <string name="pref_title_home_album_grid_style">Alben-Darstellung</string>
-    <string name="pref_title_home_artist_grid_style">Interpreten-Darstellung</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Cover aus dem Medienspeicher ignorieren</string>
-    <string name="pref_title_last_added_interval">Zeitraum für \"Zuletzt-hinzugefügt\"-Playlist</string>
-    <string name="pref_title_lock_screen">Vollbildsteuerung</string>
-    <string name="pref_title_lyrics_screen_on">Display aktiv halten, wenn Liedtexte angezeigt werden</string>
-    <string name="pref_title_lyrics_type">Art des Liedtextes</string>
-    <string name="pref_title_manage_audio_focus">Immer abspielen</string>
-    <string name="pref_title_now_playing_screen_appearance">Stil des Wiedergabe-Bildschirms</string>
-    <string name="pref_title_open_source_licences">Open-Source-Lizenzen</string>
+    <string name="pref_title_classic_notification">Klassisches Design für Benachrichtigungen.</string>
+    <string name="pref_title_colored_app">selbstanpassende Farbe</string>
+    <string name="pref_title_colored_notification">Gefärbte Benachrichtigung</string>
+    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
+    <string name="pref_title_custom_font">Manrope-Schrift verwenden</string>
+    <string name="pref_title_desaturated_color">Desaturatierte Farbe</string>
+    <string name="pref_title_expand_now_playing_panel">\"Now Playing\" Bildschirm anzeigen</string>
+    <string name="pref_title_extra_controls">Zusätzliche Schaltflächen</string>
+    <string name="pref_title_extra_song_info">Song-Info</string>
+    <string name="pref_title_gapless_playback">Lückenlose Wiedergabe</string>
+    <string name="pref_title_general_theme">Hauptthema</string>
+    <string name="pref_title_home_album_grid_style">Album Raster</string>
+    <string name="pref_title_home_artist_grid_style">Künstlerbilder auf der Startseite</string>
+    <string name="pref_title_home_banner">Home-Banner</string>
+    <string name="pref_title_ignore_media_store_artwork">Media Store Cover ignorieren</string>
+    <string name="pref_title_last_added_interval">Zuletzt hinzugefügtes Playlist Intervall</string>
+    <string name="pref_title_lock_screen">Vollbildschirmsteuerung</string>
+    <string name="pref_title_lyrics_screen_on">Bildschirm aktiv lassen, wenn Songtexte angezeigt werden</string>
+    <string name="pref_title_lyrics_type">Songtext-Typ</string>
+    <string name="pref_title_now_playing_screen_appearance">Erscheinungsbild</string>
+    <string name="pref_title_open_source_licences">Open Source Lizenzen</string>
     <string name="pref_title_pause_history">Verlauf pausieren</string>
-    <string name="pref_title_remember_tab">Letzte Registerkarte merken</string>
-    <string name="pref_title_show_lyrics">Liedtext anzeigen</string>
+    <string name="pref_title_remember_tab">Letzten Tab merken</string>
+    <string name="pref_title_show_lyrics">Songtext anzeigen</string>
     <string name="pref_title_suggestions">Vorschläge anzeigen</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Wische irgendwo um den Titel zu wechseln</string>
-    <string name="pref_title_swipe_to_dismiss">Zum Schließen nach unten wischen</string>
+    <string name="pref_title_swipe_anywhere_now_playing">Wische irgendwo um Titel zu wechseln</string>
     <string name="pref_title_tab_text_mode">Beschriftung der Navigationselemente</string>
     <string name="pref_title_toggle_carousel_effect">Karussell-Effekt</string>
-    <string name="pref_title_toggle_full_screen">Vollbildmodus</string>
+    <string name="pref_title_toggle_full_screen">Vollbild App</string>
     <string name="pref_title_toggle_toggle_headset">Automatische Wiedergabe</string>
-    <string name="pref_title_toggle_toggle_shuffle">Zufallswiedergabe</string>
+    <string name="pref_title_toggle_toggle_shuffle">Shuffle-Modus</string>
     <string name="pref_title_toggle_volume">Lautstärkeregler</string>
-    <string name="pref_title_wallpaper_accent">Akzentfarbe aus Hintergrundbild</string>
-    <string name="pref_title_whitelist">Einbezogene Musik</string>
+    <string name="pref_title_wallpaper_accent">Hintergrundbild Akzentfarbe</string>
+    <string name="pref_title_whitelist">Whitelist Musik</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Dunkles Design, Stil des Wiedergabe-Bildschirms, Karussell-Effekt usw.</string>
+    <string name="pro_summary">Themes für \"Now Playing\", Karussell-Effekte und mehr</string>
     <string name="profile">Profil</string>
     <string name="purchase">Kaufen</string>
     <string name="queue">Warteschlange</string>
     <string name="rate_app">App bewerten</string>
-    <string name="rate_on_google_play_summary">Du magst die App? Lass uns im Google Play Store wissen, wie wir sie verbessern können</string>
-    <string name="recent_albums">Kürzlich abgespielte Alben</string>
-    <string name="recent_artists">Kürzlich abgespielte Interpreten</string>
+    <string name="rate_on_google_play_summary">Hinterlasse eine positive Bewertung auf Google Play, wenn die Retro Music gefällt.</string>
+    <string name="recent_albums">Kürzlich gespielte Alben</string>
+    <string name="recent_artists">Kürzlich gehörte Interpreten</string>
     <string name="remove_action">Entfernen</string>
     <string name="remove_cover">Cover entfernen</string>
-    <string name="remove_from_blacklist">Von Ausschlussliste entfernen</string>
+    <string name="remove_from_blacklist">Von der Blacklist löschen</string>
     <string name="remove_image">Bild entfernen</string>
-    <string name="remove_song_from_playlist_title">Titel aus Playlist entfernen</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Den Titel <b>%1$s</b> aus der Playlist entfernen?]]></string>
-    <string name="remove_songs_from_playlist_title">Titel aus der Playlist entfernen</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[<b>%1$d</b> Titel aus der Playlist entfernen?]]></string>
+    <string name="remove_song_from_playlist_title">Songs von Playlist entfernen</string>
+    <string name="remove_song_x_from_playlist"><![CDATA[<b>%1$s</b> von der Playlist entfernen?]]></string>
+    <string name="remove_songs_from_playlist_title">Songs von Playlist entfernen</string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[<b>%1$d</b> Songs von der Playlist entfernen?]]></string>
     <string name="rename_playlist_title">Playlist umbenennen</string>
     <string name="replace_cover">Cover ersetzen</string>
-    <string name="report_an_issue">Ein Problem melden</string>
+    <string name="report_an_issue">Fehler melden</string>
     <string name="report_bug">Einen Fehler melden</string>
     <string name="reset_action">Zurücksetzen</string>
-    <string name="reset_artist_image">Interpreten-Bild zurücksetzen</string>
+    <string name="reset_artist_image">Interpretenbild zurücksetzen</string>
     <string name="restore">Wiederherstellen</string>
-    <string name="restore_message">Möchtest du die Sicherung wiederherstellen?</string>
-    <string name="restored_previous_purchase_please_restart">Früherer Kauf wiederhergestellt. Starte die App bitte neu, um alle Funktionen nutzen zu können.</string>
-    <string name="restored_previous_purchases">Frühere Käufe wiederhergestellt.</string>
-    <string name="restoring_purchase">Kauf wird wiederhergestellt…</string>
+    <string name="restore_message">Möchten Sie die Sicherung wiederherstellen?</string>
+    <string name="restored_previous_purchase_please_restart">Vorherigen Kauf wiederherstellen. Starte die App bitte neu, um den Vorgang abzuschließen.</string>
+    <string name="restored_previous_purchases">Käufe wiederhergestellt</string>
+    <string name="restoring_purchase">Kauf wird wiederhergestellt...</string>
     <string name="retro_music_player">Retro Music Player</string>
     <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Die App benötigt die Berechtigung zum Ändern von Systemeinstellungen, um Musik als Klingelton festlegen zu können</string>
+    <string name="ringtone_summary">Die App benötigt die Berechtigung, auf Ihre Geräte-Einstellungen zuzugreifen, um Musik als Klingelton festlegen zu können</string>
     <string name="ringtone_title">Klingelton (optional)</string>
     <string name="saf_delete_failed">Löschen der Datei fehlgeschlagen: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">Kann SAF URI nicht abrufen</string>
+    <string name="saf_error_uri">SAF-URI kann nicht geladen werden</string>
     <string name="saf_guide_slide1_description">Navigationsleiste öffnen</string>
     <string name="saf_guide_slide1_description_before_o">Aktiviere \'SD-Karte anzeigen\' im Überlaufmenü</string>
     <!-- SAF guide -->
     <string name="saf_guide_slide1_title">%s benötigt Zugriff auf die SD-Karte</string>
-    <string name="saf_guide_slide2_description">Du musst das Stammverzeichnis deiner SD-Karte auswählen</string>
-    <string name="saf_guide_slide2_title">SD-Karte in der Navigationsleiste auswählen</string>
+    <string name="saf_guide_slide2_description">Sie müssen Ihr Stammverzeichnis für die SD-Karte auswählen</string>
+    <string name="saf_guide_slide2_title">SD-Karte im Navigationsmenü auswählen</string>
     <string name="saf_guide_slide3_description">Keine Unterordner öffnen</string>
-    <string name="saf_guide_slide3_title">Tippe auf die Auswählen-Schaltfläche am unteren Bildschirmrand</string>
-    <string name="saf_write_failed">Schreibvorgang fehlgeschlagen: %s</string>
+    <string name="saf_guide_slide3_title">Tippe auf die \'auswählen\' Taste am unteren Bildschirmrand</string>
+    <string name="saf_write_failed">Datei schreiben fehlgeschlagen: %s</string>
     <string name="save">Speichern</string>
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">Als Datei speichern</string>
     <string name="save_playlists_title">Als Dateien speichern</string>
-    <string name="saved_playlist_to">Wiedergabeliste unter %s gespeichert.</string>
-    <string name="saving_changes">Änderungen werden gespeichert</string>
+    <string name="saved_playlist_to">Playlist gespeichert zu %s.</string>
+    <string name="saving_changes">Änderungen speichern</string>
     <string name="scan_media">Medien scannen</string>
     <string name="scanned_files">%1$d von %2$d Dateien gescannt.</string>
     <string name="scrobbles_label">Scrobbles</string>
     <string name="select_all">Alle auswählen</string>
-    <string name="selected">Ausgewählt</string>
-    <string name="set">Festgelegt</string>
-    <string name="set_artist_image">Lege ein Interpreten-Bild fest</string>
+    <string name="selected">Ausgewähltes beschriftet</string>
+    <string name="set">Setzen</string>
+    <string name="set_artist_image">Wähle ein Interpretenbild</string>
     <string name="share_app">App teilen</string>
     <string name="share_summary">Teile die App mit deinen Freunden und Verwandten</string>
     <string name="share_to_stories">In Stories teilen</string>
     <string name="show_album_artists">Album-Interpreten anzeigen</string>
-    <string name="shuffle">Zufallswiedergabe</string>
+    <string name="shuffle">Zufall</string>
     <string name="simple">Einfach</string>
-    <string name="sleep_timer_canceled">Einschlafmodus abgebrochen.</string>
-    <string name="sleep_timer_set">Einschlafmodus auf %d Minuten gesetzt.</string>
-    <string name="social">Soziale Medien</string>
+    <string name="sleep_timer_canceled">Sleep-Timer abgebrochen</string>
+    <string name="sleep_timer_set">Sleep-Timer wurde auf %d minuten eingestellt.</string>
+    <string name="social">Sozial</string>
     <string name="social_stories">Story teilen</string>
-    <string name="song">Titel</string>
-    <string name="song_duration">Länge</string>
+    <string name="song">Lied</string>
+    <string name="song_duration">Songdauer</string>
     <string name="songs">Titel</string>
-    <string name="sort_order">Sortieren nach</string>
+    <string name="sort_order">Sortierreihenfolge</string>
     <string name="sort_order_a_z">Aufsteigend</string>
     <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Interpret</string>
+    <string name="sort_order_artist">Künstler</string>
     <string name="sort_order_composer">Komponist</string>
-    <string name="sort_order_date">Hinzufügedatum</string>
+    <string name="sort_order_date">Datum</string>
     <string name="sort_order_date_modified">Änderungsdatum</string>
-    <string name="sort_order_default">Standard</string>
-    <string name="sort_order_num_songs">Titel-Nummer</string>
-    <string name="sort_order_num_songs_desc">Titel-Nummer absteigend</string>
+    <string name="sort_order_num_songs">Songanzahl</string>
+    <string name="sort_order_num_songs_desc">Anzahl Titel absteigend</string>
     <string name="sort_order_year">Jahr</string>
     <string name="sort_order_z_a">Absteigend</string>
     <string name="speech_not_supported">Tut uns leid! Dein Gerät unterstützt keine Spracheingabe</string>
     <string name="speech_prompt">Bibliothek durchsuchen</string>
     <string name="stack">Gestapelt</string>
-    <string name="start_play_music">Spiele Musik ab.</string>
-    <string name="suggestion_songs">Empfehlungen</string>
-    <string name="support_development">Entwicklung unterstützen</string>
-    <string name="swipe_to_unlock">Zum Entsperren Wischen</string>
-    <string name="synced_lyrics">Synchronisierter Liedtext</string>
+    <string name="start_play_music">Beginne Musik zu spielen.</string>
+    <string name="suggestion_songs">Für dich</string>
+    <string name="support_development">Entwickler unterstützen</string>
+    <string name="swipe_to_unlock">Wischen zum Entsperren</string>
+    <string name="synced_lyrics">Synchronisierter Songtext</string>
     <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Tritt der Telegram-Gruppe bei, um über Fehler zu diskutieren, Vorschläge zu machen, zu protzen usw.</string>
+    <string name="telegram_group_summary">Betritt die Telegram-Gruppe um über Fehler zu diskutieren, um Vorschläge zu geben usw.</string>
     <string name="thank_you">Vielen Dank!</string>
-    <string name="the_audio_file">Audio-Datei</string>
+    <string name="the_audio_file">Die Audiodatei</string>
     <string name="this_month">Diesen Monat</string>
     <string name="this_week">Diese Woche</string>
     <string name="this_year">Dieses Jahr</string>
     <string name="tiny">Winzig</string>
-    <string name="tiny_card_style">Winzige Karte</string>
+    <string name="tiny_card_style">Kleinkartenschrank</string>
     <string name="title">Titel</string>
     <string name="title_new_backup">Neue Sicherung</string>
     <string name="today">Heute</string>
-    <string name="top_albums">Top-Alben</string>
-    <string name="top_artists">Top-Interpreten</string>
-    <string name="track_hint">"Titelnummer (2 für Titel 2 oder 3004 für CD 3, Titel 4)"</string>
-    <string name="track_list">Titel-Nummer</string>
+    <string name="top_albums">Top Alben</string>
+    <string name="top_artists">Top Interpreten</string>
+    <string name="track_hint">"Songnummer (2 für Song 2 oder 3004 für CD3 Song 4)"</string>
+    <string name="track_list">Songnummer</string>
     <string name="translate">Übersetzen</string>
-    <string name="translate_community">Hilf uns, die App in deine Sprache zu übersetzen</string>
+    <string name="translate_community">Hilf\' uns, die App in deine Sprache zu übersetzen!</string>
     <string name="try_retro_music_premium">Retro Music Premium testen</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Teile dein Design mit Retro Music</string>
-    <string name="unlabeled">Unbenannt</string>
-    <string name="unplayable_file">Titel konnte nicht abgespielt werden.</string>
+    <string name="twitter_page">Twitter-Seite</string>
+    <string name="twitter_page_summary">Teile dein Design mit RetroMusic</string>
+    <string name="unlabeled">Unbeschriftet</string>
+    <string name="unplayable_file">Song konnte nicht abgespielt werden.</string>
     <string name="up_next">Als Nächstes</string>
     <string name="update_image">Bild aktualisieren</string>
-    <string name="updating">Aktualisiere…</string>
+    <string name="updating">Aktualisieren...</string>
     <string name="user_images_description">Benutzerbilder</string>
     <string name="user_name">Benutzername</string>
     <string name="username">Benutzername</string>
@@ -546,16 +522,17 @@
     <string name="volume">Lautstärke</string>
     <string name="web_search">Internetsuche</string>
     <string name="website">Webseite</string>
-    <string name="website_summary">Besuche unsere Webseite</string>
+    <string name="website_summary">Besuchen Sie unsere Website</string>
     <string name="welcome">Willkommen,</string>
     <string name="what_do_you_want_to_share">Was möchtest du teilen?</string>
-    <string name="whats_new">Was ist neu</string>
+    <string name="whats_new">Neuigkeiten</string>
     <string name="window">Fenster</string>
     <string name="window_corner_edges">Runde Ecken</string>
     <string name="x_has_been_set_as_ringtone">%1$s als Klingelton verwenden.</string>
     <string name="x_selected">%1$d ausgewählt</string>
     <string name="year">Jahr</string>
-    <string name="you_have_to_select_at_least_one_category">Du musst mindestens eine Kategorie auswählen.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Du wirst auf die Problembehandlungs-Seite weitergeleitet.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Deine Accountdaten werden ausschließlich zur Authentifizierung genutzt.</string>
+    <string name="you_have_to_select_at_least_one_category">Du musst mindestens eine Kategorie auswählen</string>
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Du wirst auf die Issue Tracker-Seite weitergeleitet.</string>
+    <string name="your_account_data_is_only_used_for_authentication">Deine Accountdaten werden ausschließlich zur Authentifizierung genutzt</string>
+    <string name="bug_report_success">Fehlerbericht erfolgreich</string>
 </resources>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 775927ad8..43323f4d5 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Προσθήκη στα αγαπημένα</string>
     <string name="action_add_to_playing_queue">Προσθήκη στην ουρά αναπαραγωγής</string>
     <string name="action_add_to_playlist">Προσθήκη στη λίστα αναπαραγωγής</string>
-    <string name="action_cancel">Ακύρωση τρέχων χρονοδιακόπτη</string>
     <string name="action_cast">Μετάδοση</string>
     <string name="action_clear_playing_queue">Εκκαθάριση ουράς αναπαραγωγής</string>
     <string name="action_cycle_repeat">Λειτουργία κυκλικής επανάληψης</string>
@@ -55,7 +54,7 @@
     <string name="add_action">Προσθήκη</string>
     <string name="add_playlist_title">"Προσθήκη στη λίστα αναπαραγωγής"</string>
     <string name="add_time_framed_lryics">Προσθήκη Στίχων Με Χρονικό Πλαίσιο</string>
-    <string name="added_song_count_to_playlist">Προστέθηκαν %1$d τραγούδι(α) στο %2$s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Προστέθηκε 1 κομμάτι στην ουρά αναπαραγωγής."</string>
     <string name="added_x_titles_to_playing_queue">Προστέθηκαν %1$d κομμάτια στην ουρά αναπαραγωγής.</string>
     <string name="album">Άλμπουμ</string>
@@ -91,8 +90,6 @@
     <string name="biography">Βιογραφία</string>
     <string name="black_theme_name">Απλά Μαύρο</string>
     <string name="blacklist">Μαύρη λίστα</string>
-    <string name="bluetooth_summary">Η εφαρμογή χρειάζεται άδεια κοντινών συσκευών για να ελέγξει για συσκευές Bluetooth</string>
-    <string name="bluetooth_title">Κοντινές συσκευές</string>
     <string name="blur">Θολούρα</string>
     <string name="blur_card">Κάρτα θαμπώματος</string>
     <string name="bug_report_failed">Δεν είναι δυνατή η αποστολή αναφοράς</string>
@@ -106,7 +103,6 @@
     <string name="bug_report_no_password">Παρακαλώ εισαγάγετε τον έγκυρο κωδικό πρόσβασης GitHub</string>
     <string name="bug_report_no_title">Παρακαλώ εισαγάγετε έναν τίτλο ζητήματος</string>
     <string name="bug_report_no_username">Παρακαλώ εισαγάγετε το έγκυρο όνομα χρήστη GitHub</string>
-    <string name="bug_report_success">Επιτυχής αναφορά σφάλματος</string>
     <string name="bug_report_summary">Προέκυψε ένα μη αναμενόμενο σφάλμα. Λυπούμαστε που βρήκατε αυτό το σφάλμα, εάν εξακολουθεί να παρουσιάζεται  \"\"Διαγραφή δεδομένων εφαρμογής\" ή στείλτε ένα Email </string>
     <string name="bug_report_use_account">Αποστολή χρησιμοποιώντας λογαριασμό GitHub</string>
     <string name="buy_now">Αγορά τώρα</string>
@@ -119,18 +115,17 @@
     <string name="cascading">Με υπερχείλιση</string>
     <string name="changelog">Λίστα Αλλαγών</string>
     <string name="changelog_summary">Δείτε τι νέο υπάρχει</string>
-    <string name="choose_image">Επιλογή Εικόνας</string>
+    <string name="choose_image">Choose Image</string>
     <string name="choose_restore_title">Επιλέξτε τι να επαναφέρετε</string>
     <string name="circle">Κύκλος</string>
     <string name="circular">&gt;Κυκλικό</string>
     <string name="classic">Κλασσικό</string>
     <string name="clear_action">Εκκαθάριση</string>
     <string name="clear_blacklist">Εκκαθάριση blacklist</string>
-    <string name="clear_history">Εκκαθάριση Ιστορικού</string>
+    <string name="clear_history">Clear History</string>
     <string name="clear_playing_queue">Εκκαθάριση ουράς</string>
     <string name="color">Χρώμα</string>
     <string name="colors">Χρώματα</string>
-    <string name="compact">Συμπικνωμένο</string>
     <string name="composer">Συνθέτης</string>
     <string name="copied_device_info_to_clipboard">Οι πληροφοριές συσκευής αντιγράφηκαν στο πρόχειρο.</string>
     <string name="could_not_create_playlist">\u0391\u03b4\u03c5\u03bd\u03b1\u03bc\u03af\u03b1 \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03af\u03b1\u03c2 playlist.</string>
@@ -143,7 +138,7 @@
     <string name="credit_title">Μέλη και συνεισφέροντες </string>
     <string name="currently_listening_to_x_by_x">Παίζει το %1$s από τους %2$s.</string>
     <string name="custom_artist_images">Προσαρμοσμένες Εικόνες Καλλιτέχνη</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Αποστολή Αναφοράς Σφάλματος</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
     <string name="dark_theme_name">Κάπως Σκούρο</string>
     <string name="delete_playlist_title">Διαγραφή playlist</string>
     <string name="delete_playlist_x"><![CDATA[Διαγραφή της λίστα αναπαραγωγής <b>%1$s</b>?]]></string>
@@ -173,15 +168,8 @@
     <string name="edit_synced_lyrics">Επεξεργασία Συγχρονισμένων Στίχων</string>
     <string name="empty">Κενό</string>
     <string name="equalizer">Ισοσταθμιστής</string>
-    <string name="error_create_backup">Αδυναμία δημιουργίας αντιγράφων ασφαλείας</string>
-    <string name="error_delete_backup">Αδυναμία διαγραφής αντιγράφων ασφαλείας</string>
-    <string name="error_empty_name">Το όνομά δεν μπορεί να είναι κενό!</string>
-    <string name="error_load_failed">Αποτυχία φόρτωσης</string>
-    <string name="error_share_file">Αδυναμία κοινοποίησης αρχείου</string>
-    <string name="expanded">Επεκταμένο</string>
     <string name="faq">Συχνές ερωτήσεις</string>
     <string name="favorites">Αγαπημένα</string>
-    <string name="file_already_exists">Το αρχείο υπάρχει ήδη</string>
     <string name="finish_last_song">Τελειώσε το τελευταίο κομμάτι</string>
     <string name="fit">Προσαρμογή</string>
     <string name="flat">Επίπεδο</string>
@@ -197,7 +185,6 @@
     <string name="genres">Είδη</string>
     <string name="git_hub_summary">Fork το έργο στο GitHub</string>
     <string name="gradient">Διαβάθμιση</string>
-    <string name="grant_access">Παραχώρηση πρόσβασης</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -210,8 +197,8 @@
     <string name="help_summary">Χρειάζεστε περισσότερη βοήθεια;</string>
     <string name="hinge">Ρολάρισμα</string>
     <string name="history">Ιστορικό</string>
-    <string name="history_cleared">Το ιστορικό διαγράφηκε</string>
-    <string name="history_undo_button">Αναίρεση</string>
+    <string name="history_cleared">History cleared</string>
+    <string name="history_undo_button">Undo</string>
     <string name="home">Αρχική</string>
     <string name="horizontal_flip">Οριζόντια αναστροφή</string>
     <string name="image">Εικόνα</string>
@@ -228,14 +215,13 @@
     <string name="label_file_name">Όνομα Αρχείου</string>
     <string name="label_file_path">Διαδρομή Αρχείου</string>
     <string name="label_file_size">Μέγεθος</string>
-    <string name="label_last_modified">Τελευταία Τροποποιημένα</string>
+    <string name="label_last_modified">Last Modified</string>
     <string name="label_more_from">Περισσότερα από %s</string>
     <string name="label_sampling_rate">Ρυθμός δειγματοληψίας</string>
     <string name="label_track_length">Μήκος</string>
     <string name="labeled">Με ετικέτα</string>
     <string name="last_added">Προστέθηκαν τελευταία</string>
     <string name="last_song">Τελευταίο κομμάτι</string>
-    <string name="lets_go">Ξεκινάμε</string>
     <string name="library_categories">Κατηγορίες βιβλιοθήκης</string>
     <string name="licenses">Άδειες</string>
     <string name="light_theme_name">Ξεκάθαρα Λευκό</string>
@@ -248,12 +234,6 @@
     <string name="material">Υλικό</string>
     <string name="md_error_label">Σφάλμα</string>
     <string name="md_storage_perm_error">Σφάλμα άδειας</string>
-    <string name="message_backup_create_success">Επιτυχής δημιουργία αντιγράφου ασφαλείας.</string>
-    <string name="message_limit_tabs">Το πολύ 5 επιλογές</string>
-    <string name="message_pro_feature">%s είναι μία δυνατότητα της έκδοσης Prο.</string>
-    <string name="message_restore_success">Η επαναφορά ολοκληρώθηκε επιτυχώς.</string>
-    <string name="message_updated">Ενημερώθηκε</string>
-    <string name="message_welcome"><![CDATA[Γεια σας! <br>Καλώς ήρθατε στο %s]]></string>
     <string name="my_name">Το Όνομά μου</string>
     <string name="my_top_tracks">Τα Κορυφαία Κομμάτια μου</string>
     <string name="never">Ποτέ</string>
@@ -294,7 +274,6 @@
     <string name="paste_lyrics_here">Επικολλήστε τους στίχους εδω</string>
     <string name="paste_timeframe_lyrics_here">Επικόλληση στίχων χρονικού πλαισίου εδώ</string>
     <string name="peek">Ματιά</string>
-    <string name="permission_bluetooth_denied">Η άδεια πρόσβασης σε κοντινές συσκευές απορρίφθηκε.</string>
     <string name="permission_external_storage_denied">Η άδεια για προσπέλαση του external storage δεν παραχωρήθηκε.</string>
     <string name="permission_summary">Η εφαρμογή χρειάζεται άδεια για πρόσβαση στον αποθηκευτικό χώρο της συσκευής σας για την αναπαραγωγή μουσικής</string>
     <string name="permission_title">Πρόσβαση Χώρου Αποθήκευσης</string>
@@ -305,13 +284,13 @@
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">Ακολουθήστε τη σελίδα Pinterest για έμπνευση σχεδιασμού του Retro Music</string>
     <string name="plain">Απλό</string>
-    <string name="playList_already_exits">Η λίστα αναπαραγωγής υπάρχει ήδη</string>
+    <string name="playList_already_exits">Playlist already exists</string>
     <string name="playback_pitch">Τόνος</string>
     <string name="playback_settings">Ρυθμίσεις Αναπαραγωγής</string>
     <string name="playback_speed">Ταχύτητα Αναπαραγωγής</string>
     <string name="playing_notification_description">Η ειδοποίηση αναπαραγωγής προσφέρει κουμπιά για αναπαραγωγή/παύση, κλπ.</string>
     <string name="playing_notification_name">Ειδοποίηση Αναπαραγωγής</string>
-    <string name="playlist_created_sucessfully">%s δημιουργήθηκε επιτυχώς</string>
+    <string name="playlist_created_sucessfully">%s created successfully</string>
     <string name="playlist_is_empty">H Λίστα αναπαραγωγής είναι κενή</string>
     <string name="playlist_name_empty">Όνομα Λίστα αναπαραγωγής</string>
     <string name="playlists">Λίστες αναπαραγωγής</string>
@@ -357,26 +336,25 @@
     <string name="pref_summary_ignore_media_store_artwork">Μπορεί να αυξήσει την ποιότητα των εξωφύλλων άλμπουμ, αλλά προκαλεί αργή φόρτωση εικόνων. Ενεργοποιήστε αυτή την επίλογη μόνο εαν αντιμετωπίζετε προβλήματα με εξώφυλλα χαμηλής ανάλυσης.</string>
     <string name="pref_summary_library_categories">Ρυθμίστε την ορατότητα και τη σειρά των κατηγοριών βιβλιοθήκης.</string>
     <string name="pref_summary_lock_screen">Ενεργοποίηση διακοπτών ρύθμισης στην οθόνη κλειδώματος.</string>
-    <string name="pref_summary_manage_audio_focus">Να αναπαράγεται πάντα ο ήχος στο παρασκήνιο ανεξάρτητα από οτιδήποτε άλλο αναπαράγεται</string>
     <string name="pref_summary_open_source_licences">Λεπτομέρειες άδειας για τη χρήση open source λογισμικού</string>
-    <string name="pref_summary_pause_history">Όταν είναι ενεργοποιημένο, τα τραγούδια που αναπαράγονται πρόσφατα δεν θα εμφανίζονται στο ιστορικό</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Μεταβείτε στην τελευταία χρησιμοποιημένη καρτέλα κατά την έναρξη</string>
     <string name="pref_summary_show_lyrics">Εμφάνιση συγχρονισμένων στίχων πάνω από το εξώφυλλο άλμπουμ</string>
     <string name="pref_summary_suggestions">Εμφάνιση Νέου Μείγματος Μουσικής στην Αρχική οθόνη</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Επιτρέπει την αλλαγή τραγουδιού σύροντας οπουδήποτε στην οθόνη αναπαραγωγής</string>
-    <string name="pref_summary_swipe_to_dismiss">Σύρετε προς τα κάτω για να κλείσετε τον μίνι αναπαραγωγέα</string>
     <string name="pref_summary_toggle_full_screen">Ενεργοποίηση της επιλογής για χρήση πλήρους οθόνης</string>
     <string name="pref_summary_toggle_headset">Όταν συνδεθούν ηχεία/ακουστικά , αρχίζει η αναπαραγωγή</string>
     <string name="pref_summary_toggle_shuffle">Η λειτουργία ανακατέματος θα απενεργοποιείται όταν αναπαράγεται μια νέα λίστα τραγουδιών</string>
     <string name="pref_summary_toggle_volume">Εαν υπάρχει χώρος στην οθόνη αναπαραγωγής, ενεργοποιήστε τον πίνακα ελέγχου έντασης.</string>
     <string name="pref_summary_wallpaper_accent">Εξαγωγή απόχρωσης από την ταπετσαρία</string>
     <string name="pref_summary_whitelist">Εμφάνιση μουσικής μόνο από το φάκελο /Μουσική</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Εμφάνιση εξωφύλλου άλμπουμ.</string>
     <string name="pref_title_album_artists_only">Πλοήγηση κατά Καλλιτέχνη Άλμπουμ</string>
     <string name="pref_title_album_cover_style">Θέμα εξώφυλλου άλμπουμ</string>
     <string name="pref_title_album_cover_transform">Παράλειψη εξώφυλλου άλμπουμ</string>
     <string name="pref_title_app_shortcuts">Χρωματιστά app shortcuts</string>
-    <string name="pref_title_appbar_mode">Μορφή επικεφαλίδας</string>
+    <string name="pref_title_appbar_mode">Λειτουργία μπάρας εφαρμογής</string>
     <string name="pref_title_audio_ducking">Μείωση έντασης όταν υπάρχουν εισερχόμενες ειδοποιήσεις</string>
     <string name="pref_title_audio_fade">Εξασθένηση Ήχου</string>
     <string name="pref_title_auto_download_artist_images">Αυτόματη λήψη εικόνων καλλιτεχνών</string>
@@ -403,15 +381,13 @@
     <string name="pref_title_lock_screen">Full screen Ρυθμίσεις</string>
     <string name="pref_title_lyrics_screen_on">Να παραμένει ενεργή η οθόνη όταν εμφανίζονται οι στίχοι</string>
     <string name="pref_title_lyrics_type">Τύπος στίχων</string>
-    <string name="pref_title_manage_audio_focus">Πάντα αναπαραγωγή</string>
     <string name="pref_title_now_playing_screen_appearance">Εμφάνιση</string>
     <string name="pref_title_open_source_licences">Άδειες λογισμικού open source</string>
-    <string name="pref_title_pause_history">Παύση ιστορικού</string>
+    <string name="pref_title_pause_history">Pause history</string>
     <string name="pref_title_remember_tab">Απομνημόνευση τελευταίας καρτέλας</string>
     <string name="pref_title_show_lyrics">Εμφάνιση στίχων</string>
     <string name="pref_title_suggestions">Εμφάνιση προτάσεων</string>
     <string name="pref_title_swipe_anywhere_now_playing">Σύρετε οπουδήποτε για να αλλάξετε τραγούδι</string>
-    <string name="pref_title_swipe_to_dismiss">Κλείσιμο με σάρωση προς τα κάτω</string>
     <string name="pref_title_tab_text_mode">Λειτουργία τίτλων καρτελών</string>
     <string name="pref_title_toggle_carousel_effect">Εφέ καρουσέλ</string>
     <string name="pref_title_toggle_full_screen">Full screen εφαρμογή</string>
@@ -420,6 +396,7 @@
     <string name="pref_title_toggle_volume">Πίνακας Ελέγχου Έντασης</string>
     <string name="pref_title_wallpaper_accent">Απόχρωση ταπετσαρίας</string>
     <string name="pref_title_whitelist">Λίστα επιτρεπόμενων κομματιών</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
     <string name="pro_summary">Μαύρο θέμα, Θέματα στο Τώρα παίζει, εφέ Καρουσέλ και πολλά άλλα..</string>
     <string name="profile">Προφίλ</string>
@@ -432,7 +409,7 @@
     <string name="remove_action">Αφαίρεση</string>
     <string name="remove_cover">Αφαίρεση Εξώφυλλου</string>
     <string name="remove_from_blacklist">Αφαίρεση από τη blacklist</string>
-    <string name="remove_image">Αφαίρεση Εικόνας</string>
+    <string name="remove_image">Remove Image</string>
     <string name="remove_song_from_playlist_title">Αφαίρεσε το κομμάτι από τη λίστα αναπαραγωγής</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Αφαίρεση του κομματιού <b>%1$s</b> από τη λίστα αναπαραγωγής?]]></string>
     <string name="remove_songs_from_playlist_title">Αφαίρεσε τα κομμάτια από τη λίστα αναπαραγωγής</string>
@@ -498,7 +475,6 @@
     <string name="sort_order_composer">Συνθέτης</string>
     <string name="sort_order_date">Ημερομηνία προσθήκης</string>
     <string name="sort_order_date_modified">Ημερομηνία τροποποιήσης</string>
-    <string name="sort_order_default">Προεπιλεγμένη</string>
     <string name="sort_order_num_songs">Αριθμός τραγουδιών</string>
     <string name="sort_order_num_songs_desc">Αριθμός τραγουδιών φθίνουσα</string>
     <string name="sort_order_year">Έτος</string>
@@ -558,4 +534,5 @@
     <string name="you_have_to_select_at_least_one_category">Πρέπει να επιλέξετε τουλάχιστον μία κατηγορία.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Θα προωθηθείτε στον ιστότοπο παρακολούθησης ζητημάτων.</string>
     <string name="your_account_data_is_only_used_for_authentication">Τα δεδομένα του λογαριασμού σας χρησιμοποιούνται μόνο για έλεγχο ταυτότητας.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 239ae40a4..98992346a 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -3,13 +3,12 @@
     <string name="about_album_label">Acerca de %s</string>
     <string name="about_settings_summary">Equipo, enlaces sociales</string>
     <string name="accent_color">Color de énfasis</string>
-    <string name="accent_color_desc">El color de énfasis del tema, por defecto es morado</string>
+    <string name="accent_color_desc">El color de acento del tema, por defecto es morado</string>
     <string name="action_about">Acerca de</string>
-    <string name="action_add_to_blacklist">Añadir a Lista negra</string>
+    <string name="action_add_to_blacklist">Añadir a la Lista negra</string>
     <string name="action_add_to_favorites">Añadir a favoritos</string>
     <string name="action_add_to_playing_queue">Añadir a la cola de reproducción</string>
     <string name="action_add_to_playlist">Añadir a la lista de reproducción</string>
-    <string name="action_cancel">Cancelar</string>
     <string name="action_cast">Emitir</string>
     <string name="action_clear_playing_queue">Limpiar cola de reproducción</string>
     <string name="action_cycle_repeat">Cambiar a modo repetición</string>
@@ -21,7 +20,7 @@
     <string name="action_go_to_artist">Ir al artista</string>
     <string name="action_go_to_genre">Ir al género</string>
     <string name="action_go_to_lyrics">Ir a la letra</string>
-    <string name="action_go_to_start_directory">Ir al directorio inicial</string>
+    <string name="action_go_to_start_directory">Ir al directorio de inicio</string>
     <string name="action_grant">Permitir</string>
     <string name="action_grid_size">Tamaño de la cuadricula</string>
     <string name="action_grid_size_land">Tamaño de cuadrícula (h)</string>
@@ -34,7 +33,7 @@
     <string name="action_previous">Anterior</string>
     <string name="action_remove_from_favorites">Eliminar de favoritos</string>
     <string name="action_remove_from_playing_queue">Eliminar de la cola de reproducción</string>
-    <string name="action_remove_from_playlist">Remover de la lista de reproducción</string>
+    <string name="action_remove_from_playlist">Eliminar de la lista de reproducción</string>
     <string name="action_rename">Renombrar</string>
     <string name="action_save_playing_queue">Guardar cola de reproducción</string>
     <string name="action_scan">Examinar</string>
@@ -55,7 +54,7 @@
     <string name="add_action">Agregar</string>
     <string name="add_playlist_title">"Agregar a lista de reproducción"</string>
     <string name="add_time_framed_lryics">Añadir letras sincronizadas</string>
-    <string name="added_song_count_to_playlist">%1$d Canción(es) añadida(s) a %2$s</string>
+    <string name="added_song_count_to_playlist">%1$d Canción(es) añadidas a %2$s</string>
     <string name="added_title_to_playing_queue">"Se ha agregado 1 canción a la cola de reproducción."</string>
     <string name="added_x_titles_to_playing_queue">%1$d canciones agregadas a la cola de reproducción.</string>
     <string name="album">Álbum</string>
@@ -82,61 +81,57 @@
     <string name="artist">Artista</string>
     <string name="artists">Artistas</string>
     <string name="audio_fade_duration">Duración del desvanecimiento de audio</string>
-    <string name="audio_focus_denied">Enfoque de audio denegado.</string>
-    <string name="audio_settings_summary">Modifica los ajustes de sonido y ajusta los controles del ecualizador</string>
-    <string name="auto">Automático</string>
-    <string name="backup_restore_settings_summary">Respalda y recupera tus configuraciones, listas de reproducción</string>
-    <string name="backup_restore_title"><![CDATA[Copia de seguridad y restauración]]></string>
-    <string name="backup_title">Copias de seguridad</string>
-    <string name="biography">Biografías</string>
-    <string name="black_theme_name">Sólo negro</string>
-    <string name="blacklist">Lista negra</string>
-    <string name="bluetooth_summary">La aplicación necesita el permiso de los dispositivos cercanos para buscar dispositivos bluetooth</string>
-    <string name="bluetooth_title">Dispositivos cercanos</string>
-    <string name="blur">Desenfoque</string>
-    <string name="blur_card">Tarjeta con desenfoque</string>
-    <string name="bug_report_failed">No se puede enviar el informe</string>
-    <string name="bug_report_failed_invalid_token">Token de acceso no válido. Por favor, contacta con el desarrollador de la aplicación.</string>
+    <string name="audio_focus_denied">Enfoque de audio negado.</string>
+    <string name="audio_settings_summary">Cambia los ajustes de sonido y ajusta los controles del ecualizador</string>
+    <string name="auto">Auto</string>
+    <string name="backup_restore_settings_summary">Respalda y recupera las configuraciones de tus playlist</string>
+    <string name="backup_restore_title"><![CDATA[Copia de seguridad / Restauración]]></string>
+    <string name="backup_title">Respaldos</string>
+    <string name="biography">Biografías.</string>
+    <string name="black_theme_name">Sólo Negro</string>
+    <string name="blacklist">Suspendidos</string>
+    <string name="blur">Difuminado</string>
+    <string name="blur_card">Desenfocar tarjeta</string>
+    <string name="bug_report_failed">No es posible enviar el informe</string>
+    <string name="bug_report_failed_invalid_token">Token de acceso inválido. Por favor contacta al desarrollador de la aplicación.</string>
     <string name="bug_report_failed_issues_not_available">Las incidencias no están habilitadas para el repositorio seleccionado. Por favor, póngase en contacto con el desarrollador de la aplicación.</string>
-    <string name="bug_report_failed_unknown">Se ha producido un error inesperado. Por favor, contacta con el desarrollador de la aplicación</string>
-    <string name="bug_report_failed_wrong_credentials">Usuario o contraseña incorrectos</string>
-    <string name="bug_report_issue">Problema</string>
-    <string name="bug_report_manual">Enviar manualmente</string>
-    <string name="bug_report_no_description">Por favor, describe el problema</string>
-    <string name="bug_report_no_password">Por favor, introduce tu contraseña de GitHub</string>
-    <string name="bug_report_no_title">Por favor, introduce un título para el problema</string>
-    <string name="bug_report_no_username">Por favor, introduce tu nombre de usuario de GitHub</string>
-    <string name="bug_report_success">Error reportado correctamente</string>
-    <string name="bug_report_summary">Se ha producido un error inesperado. Sentimos que haya encontrado este error, si sigue fallando \"Borre los datos de la aplicación\" o envíe un correo electrónico </string>
-    <string name="bug_report_use_account">Enviar usando la cuenta de Github</string>
-    <string name="buy_now">Comprar ahora</string>
-    <string name="cancel_current_timer">Cancelar</string>
-    <string name="card">Tarjeta</string>
-    <string name="card_color_style">Tarjeta coloreada</string>
-    <string name="card_square">Tarjeta cuadrada</string>
-    <string name="card_style">Tarjeta</string>
-    <string name="carousal_effect_on_now_playing_screen">Efecto carrusel en la pantalla de reproducción</string>
-    <string name="cascading">En cascada</string>
-    <string name="changelog">Registro de cambios</string>
-    <string name="changelog_summary">Consulta las novedades</string>
+    <string name="bug_report_failed_unknown">Ha ocurrido un error inesperado. Por favor, póngase en contacto con soporte técnico.</string>
+    <string name="bug_report_failed_wrong_credentials">Nombre de usuario o contraseña incorrectos</string>
+    <string name="bug_report_issue">Petición</string>
+    <string name="bug_report_manual">Envío manual</string>
+    <string name="bug_report_no_description">Introduzca una descripción de la incidencia</string>
+    <string name="bug_report_no_password">Por favor, introduzca su contraseña de GitHub válida</string>
+    <string name="bug_report_no_title">Por favor, introduzca una incidencia válida</string>
+    <string name="bug_report_no_username">Por favor, introduzca su nombre de usuario de GitHub válido</string>
+    <string name="bug_report_summary">Se ha producido un error inesperado. Lo sentimos, ha encontrado este error, si sigue bloqueando \"Borrar datos de la aplicación\" o enviando un correo electrónico </string>
+    <string name="bug_report_use_account">Enviar usando cuenta de GitHub</string>
+    <string name="buy_now">Compre ahora</string>
+    <string name="cancel_current_timer">Anular</string>
+    <string name="card">Tarjetas</string>
+    <string name="card_color_style">Tarjeta colorida</string>
+    <string name="card_square">Carta cuadrada</string>
+    <string name="card_style">Carta</string>
+    <string name="carousal_effect_on_now_playing_screen">Efecto de carrusel en la pantalla de reproducción</string>
+    <string name="cascading">Cascadita</string>
+    <string name="changelog">Cambios</string>
+    <string name="changelog_summary">Consulte las novedades</string>
     <string name="choose_image">Elegir imagen</string>
-    <string name="choose_restore_title">Elige qué restaurar</string>
+    <string name="choose_restore_title">Welcome,</string>
     <string name="circle">Círculo</string>
-    <string name="circular">Circular</string>
-    <string name="classic">Clásico</string>
-    <string name="clear_action">Limpiar</string>
-    <string name="clear_blacklist">Limpiar lista negra</string>
+    <string name="circular">Circulares</string>
+    <string name="classic">Clásicos</string>
+    <string name="clear_action">Transparente</string>
+    <string name="clear_blacklist">Borrar lista negra</string>
     <string name="clear_history">Limpiar historial</string>
-    <string name="clear_playing_queue">Limpiar la cola</string>
-    <string name="color">Color</string>
-    <string name="colors">Colores</string>
-    <string name="compact">Compacto</string>
-    <string name="composer">Compositor</string>
+    <string name="clear_playing_queue">Vaciar lista</string>
+    <string name="color">Color.</string>
+    <string name="colors">Colores,</string>
+    <string name="composer">Compositores</string>
     <string name="copied_device_info_to_clipboard">Información de dispositivo copiada al portapapeles.</string>
-    <string name="could_not_create_playlist">No se pudo crear la lista de reproducción.</string>
-    <string name="could_not_download_album_cover">"No se pudo descargar una portada de álbum coincidente."</string>
-    <string name="could_not_restore_purchase">No se pudo restaurar la compra.</string>
-    <string name="could_not_scan_files">No se pudieron escanear %d archivos.</string>
+    <string name="could_not_create_playlist">No se pudo\u2019no crear la lista de reproducción.</string>
+    <string name="could_not_download_album_cover">"No se pudo\u2019descargar una portada de álbum coincidente."</string>
+    <string name="could_not_restore_purchase">No se pudo restaurar la compra</string>
+    <string name="could_not_scan_files">No se pudo examinar %d archivos.</string>
     <string name="create_action">Crear</string>
     <string name="create_new_backup">Crear</string>
     <string name="created_playlist_x">Lista de reproducción %1$s creada.</string>
@@ -144,7 +139,7 @@
     <string name="currently_listening_to_x_by_x">Actualmente estás escuchando %1$s de %2$s.</string>
     <string name="custom_artist_images">Imágenes de artista personalizadas</string>
     <string name="customactivityoncrash_error_activity_error_details_share">Compartir informe de error</string>
-    <string name="dark_theme_name">Un poco oscuro</string>
+    <string name="dark_theme_name">Un poco Oscuro</string>
     <string name="delete_playlist_title">Eliminar lista de reproducción</string>
     <string name="delete_playlist_x"><![CDATA[¿Eliminar la lista de reproducción <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Eliminar listas de reproducción</string>
@@ -160,29 +155,22 @@
     <string name="device_info">Información del dispositivo</string>
     <string name="dialog_message_set_ringtone">Permitir a Retro Music modificar los ajustes de audio</string>
     <string name="dialog_title_set_ringtone">Establecer tono de llamada</string>
-    <string name="disc_hint">Número de disco</string>
+    <string name="disc_hint">Disco numero</string>
     <string name="do_you_want_to_clear_the_blacklist">¿Quieres limpiar la lista negra?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[¿Quiere eliminar <b>%1$s</b> de la lista negra?]]></string>
     <string name="donate">Donar</string>
-    <string name="donate_summary">Si crees que merezco que me paguen por mi trabajo, puedes dejar algo de dinero aquí</string>
+    <string name="donate_summary">Si piensas que merezco recibir un pago por mi trabajo, puedes dejarme un poco de dinero aquí</string>
     <string name="donation_header">Cómprame:</string>
     <string name="done">Listo</string>
-    <string name="drive_mode">Modo coche</string>
+    <string name="drive_mode">Modo de conducir</string>
     <string name="edit_fab">Botón Editar</string>
     <string name="edit_normal_lyrics">Editar letras</string>
-    <string name="edit_synced_lyrics">Editar Letras sincronizadas</string>
+    <string name="edit_synced_lyrics">Editar Letras Sincronizadas</string>
     <string name="empty">Vacío</string>
     <string name="equalizer">Ecualizador</string>
-    <string name="error_create_backup">No se pudo crear la copia de seguridad</string>
-    <string name="error_delete_backup">No se pudo eliminar la copia de seguridad</string>
-    <string name="error_empty_name">¡Su nombre no puede estar vacío!</string>
-    <string name="error_load_failed">Carga fallida</string>
-    <string name="error_share_file">No se pudo compartir el archivo</string>
-    <string name="expanded">Expandido</string>
-    <string name="faq">Preguntas más frecuentes</string>
+    <string name="faq">Preguntas Más Frecuentes</string>
     <string name="favorites">Favoritos</string>
-    <string name="file_already_exists">El archivo ya existe</string>
-    <string name="finish_last_song">Terminar última canción</string>
+    <string name="finish_last_song">Termina la última canción</string>
     <string name="fit">Ajustado</string>
     <string name="flat">Plano</string>
     <string name="folders">Carpetas</string>
@@ -197,7 +185,6 @@
     <string name="genres">Géneros</string>
     <string name="git_hub_summary">Bifurca el proyecto en GitHub</string>
     <string name="gradient">Degradado</string>
-    <string name="grant_access">Conceder acceso</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -211,31 +198,30 @@
     <string name="hinge">Giro</string>
     <string name="history">Historial</string>
     <string name="history_cleared">Historial borrado</string>
-    <string name="history_undo_button">Deshacer</string>
+    <string name="history_undo_button">Undo</string>
     <string name="home">Inicio</string>
     <string name="horizontal_flip">Giro horizontal</string>
     <string name="image">Imagen</string>
     <string name="image_gradient">Imagen de degradado</string>
-    <string name="image_settings_summary">Cambiar los ajustes de descarga de imágenes del artista</string>
+    <string name="image_settings_summary">Cambiar la configuración de descarga de imágenes del artista</string>
     <string name="import_label">Importar</string>
     <string name="import_playlist">Importar lista de reproducción</string>
     <string name="import_playlist_message">Importa todas las listas de reproducción del almacenamiento Android con canciones, si las listas ya existen, las canciones se fusionarán.</string>
     <string name="inserted_x_songs_into_playlist_x">%1$d canciones agregadas a la lista de reproducción %2$s.</string>
-    <string name="instagram_page_summary">Comparte tu configuración de Retro Music para mostrarlo en Instagram</string>
+    <string name="instagram_page_summary">Comparte tu configuración de Retro Music para exhibirlo en Instagram</string>
     <string name="keyboard">Teclado</string>
     <string name="label_bit_rate">Tasa de bits</string>
     <string name="label_file_format">Formato</string>
     <string name="label_file_name">Nombre del archivo</string>
     <string name="label_file_path">Ruta del archivo</string>
     <string name="label_file_size">Tamaño</string>
-    <string name="label_last_modified">Última modificación</string>
+    <string name="label_last_modified">Last Modified</string>
     <string name="label_more_from">Más de %s</string>
     <string name="label_sampling_rate">Tasa de muestreo</string>
     <string name="label_track_length">Duración</string>
     <string name="labeled">Etiquetado</string>
     <string name="last_added">Añadidos recientemente</string>
     <string name="last_song">Última canción</string>
-    <string name="lets_go">¡Vamos!</string>
     <string name="library_categories">Categorías de la Biblioteca</string>
     <string name="licenses">Licencias</string>
     <string name="light_theme_name">Claramente Blanco</string>
@@ -248,19 +234,13 @@
     <string name="material">Material</string>
     <string name="md_error_label">Error</string>
     <string name="md_storage_perm_error">Error de permisos</string>
-    <string name="message_backup_create_success">Copia de seguridad creada con correctamente.</string>
-    <string name="message_limit_tabs">No más de 5 artículos</string>
-    <string name="message_pro_feature">%s es una característica Pro.</string>
-    <string name="message_restore_success">La restauración se ha completado con éxito.</string>
-    <string name="message_updated">Actualizado</string>
-    <string name="message_welcome"><![CDATA[¡Hola! <br> Bienvenido(a) a %s]]></string>
     <string name="my_name">Nombre</string>
     <string name="my_top_tracks">Más reproducidas</string>
     <string name="never">Nunca</string>
-    <string name="new_music_mix">Nueva mezcla musical</string>
+    <string name="new_music_mix">Mezcla de nueva música</string>
     <string name="new_playlist_title">Nueva lista de reproducción</string>
     <string name="new_start_directory">%s es el nuevo directorio de inicio.</string>
-    <string name="next_song">Próxima canción</string>
+    <string name="next_song">Próxima Canción</string>
     <string name="no_albums">No tienes álbumes</string>
     <string name="no_artists">No tienes artistas</string>
     <string name="no_audio_ID">"Reproduce primero una canción y vuelve a intentarlo."</string>
@@ -293,8 +273,7 @@
     <string name="past_three_months">Más de 3 meses</string>
     <string name="paste_lyrics_here">Pega las Letras Aquí</string>
     <string name="paste_timeframe_lyrics_here">Pegar las letras con marcas de tiempo aquí</string>
-    <string name="peek">Mirar</string>
-    <string name="permission_bluetooth_denied">Permiso de dispositivos cercanos denegado.</string>
+    <string name="peek">Peek</string>
     <string name="permission_external_storage_denied">Permiso para acceder al almacenamiento externo denegado.</string>
     <string name="permission_summary">La aplicación necesita permiso para acceder al almacenamiento de tu dispositivo y reproducir música</string>
     <string name="permission_title">Acceso al Almacenamiento</string>
@@ -305,13 +284,13 @@
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">Síguenos en Pinterest para inspirarte en el diseño de Retro Music</string>
     <string name="plain">Plano</string>
-    <string name="playList_already_exits">La lista de reproducción ya existe</string>
-    <string name="playback_pitch">Tono</string>
+    <string name="playList_already_exits">Playlist already exists</string>
+    <string name="playback_pitch">Pitch</string>
     <string name="playback_settings">Configuración de reproducción</string>
     <string name="playback_speed">Velocidad de reproducción</string>
     <string name="playing_notification_description">La notificación de reproducción proporciona acciones para reproducir/pausar, etc.</string>
     <string name="playing_notification_name">Notificación de reproducción</string>
-    <string name="playlist_created_sucessfully">%s creado con éxito</string>
+    <string name="playlist_created_sucessfully">%s created successfully</string>
     <string name="playlist_is_empty">La lista de reproducción está vacía</string>
     <string name="playlist_name_empty">Nombre de la lista de reproducción</string>
     <string name="playlists">Listas de reproducción</string>
@@ -357,26 +336,25 @@
     <string name="pref_summary_ignore_media_store_artwork">Puede aumentar la calidad de la portada del álbum, pero provoca tiempos de carga de imágenes más lentos. Solo habilite esto si tiene problemas con portadas de baja resolución</string>
     <string name="pref_summary_library_categories">Configure la visibilidad y el orden de las categorías de la biblioteca.</string>
     <string name="pref_summary_lock_screen">Usar los controles personalizados de Retro Music en la pantalla de bloqueo</string>
-    <string name="pref_summary_manage_audio_focus">Reproducir siempre el audio en segundo plano independientemente de lo que se esté reproduciendo</string>
     <string name="pref_summary_open_source_licences">Detalles de licencia para software de código abierto</string>
-    <string name="pref_summary_pause_history">Cuando se activa, las canciones recién reproducidas no se muestran en el historial</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Navegar a la última pestaña usada al iniciar</string>
     <string name="pref_summary_show_lyrics">Mostrar letras sincronizadas sobre la portada del álbum</string>
     <string name="pref_summary_suggestions">Mostrar mezcla de nueva música en la pantalla de inicio</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Permite cambiar de canción deslizando el dedo en cualquier parte de la pantalla de reproducción</string>
-    <string name="pref_summary_swipe_to_dismiss">Desliza el dedo hacia abajo para descartar el minirreproductor</string>
+    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
     <string name="pref_summary_toggle_full_screen">Modo inmersivo</string>
     <string name="pref_summary_toggle_headset">Comenzar a reproducir inmediatamente cuando se conecten audífonos</string>
     <string name="pref_summary_toggle_shuffle">El modo aleatorio se desactivará cuando se reproduzca una nueva lista de canciones</string>
     <string name="pref_summary_toggle_volume">Mostrar controles de volumen si hay suficiente espacio disponible</string>
     <string name="pref_summary_wallpaper_accent">Extrae el color del fondo de pantalla</string>
     <string name="pref_summary_whitelist">Mostrar solo música de la carpeta /Music</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Mostrar la portada del álbum</string>
     <string name="pref_title_album_artists_only">Navegar por Artista del Álbum</string>
     <string name="pref_title_album_cover_style">Tema de la portada del álbum</string>
     <string name="pref_title_album_cover_transform">Saltar portada de álbum</string>
     <string name="pref_title_app_shortcuts">Accesos directos de la aplicación coloreados</string>
-    <string name="pref_title_appbar_mode">Estilo de cabecera</string>
+    <string name="pref_title_appbar_mode">Modo App bar</string>
     <string name="pref_title_audio_ducking">Reducir el volumen cuando se pierda el enfoque</string>
     <string name="pref_title_audio_fade">Desvanecer audio</string>
     <string name="pref_title_auto_download_artist_images">Descarga automática de imágenes de artistas</string>
@@ -403,25 +381,24 @@
     <string name="pref_title_lock_screen">Controles en pantalla completa</string>
     <string name="pref_title_lyrics_screen_on">Mantener la pantalla encendida al mostrar letras</string>
     <string name="pref_title_lyrics_type">Tipos de letra</string>
-    <string name="pref_title_manage_audio_focus">Juega siempre</string>
     <string name="pref_title_now_playing_screen_appearance">Tema de la ventana de reproducción actual</string>
     <string name="pref_title_open_source_licences">Licencias de código abierto</string>
-    <string name="pref_title_pause_history">Pausar historial</string>
+    <string name="pref_title_pause_history">Pause history</string>
     <string name="pref_title_remember_tab">Recordar la última pestaña</string>
     <string name="pref_title_show_lyrics">Mostrar Letras</string>
     <string name="pref_title_suggestions">Mostrar sugerencias</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Desliza hacia cualquier lugar para cambiar la canción</string>
-    <string name="pref_title_swipe_to_dismiss">Descarta deslizando hacia abajo</string>
+    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
     <string name="pref_title_tab_text_mode">Modo de los títulos de las pestañas</string>
     <string name="pref_title_toggle_carousel_effect">Efecto Carrusel</string>
     <string name="pref_title_toggle_full_screen">Aplicación en pantalla completa</string>
     <string name="pref_title_toggle_toggle_headset">Reproducir automáticamente</string>
     <string name="pref_title_toggle_toggle_shuffle">Modo aleatorio</string>
     <string name="pref_title_toggle_volume">Controles de volumen</string>
-    <string name="pref_title_wallpaper_accent">Color de énfasis del fondo de pantalla</string>
+    <string name="pref_title_wallpaper_accent">Color de acento del fondo de pantalla</string>
     <string name="pref_title_whitelist">Música en lista blanca</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Tema Negro, Temas \"Ahora reproduciendo\", Efecto Carrusel y más...</string>
+    <string name="pro_summary">Tema Negro, temas para la ventana de reproducción actual, Efecto Carrusel y mucho más..</string>
     <string name="profile">Perfil</string>
     <string name="purchase">Comprar</string>
     <string name="queue">Reproduciendo Cola</string>
@@ -432,7 +409,7 @@
     <string name="remove_action">Eliminar</string>
     <string name="remove_cover">Eliminar portada</string>
     <string name="remove_from_blacklist">Eliminar de la lista negra</string>
-    <string name="remove_image">Quitar imagen</string>
+    <string name="remove_image">Remove Image</string>
     <string name="remove_song_from_playlist_title">Eliminar canción de la lista de reproducción</string>
     <string name="remove_song_x_from_playlist"><![CDATA[¿Eliminar la canción <b>%1$s</b> de la lista de reproducción?]]></string>
     <string name="remove_songs_from_playlist_title">Eliminar canciones de la lista de reproducción</string>
@@ -498,7 +475,6 @@
     <string name="sort_order_composer">Compositor</string>
     <string name="sort_order_date">Fecha agregada</string>
     <string name="sort_order_date_modified">Fecha de modificación</string>
-    <string name="sort_order_default">Por defecto</string>
     <string name="sort_order_num_songs">Número de canciones</string>
     <string name="sort_order_num_songs_desc">Número de canciones descendente</string>
     <string name="sort_order_year">Año</string>
@@ -558,4 +534,5 @@
     <string name="you_have_to_select_at_least_one_category">Tienes que seleccionar al menos una categoría.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Serás redirigido al sitio web para reportar incidencias.</string>
     <string name="your_account_data_is_only_used_for_authentication">Los datos de tu cuenta sólo se utilizan para la autenticación.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
deleted file mode 100644
index c5b5af75a..000000000
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Acerca de %s</string>
-    <string name="about_settings_summary">Equipo, enlaces sociales</string>
-    <string name="accent_color">Color de acento</string>
-    <string name="accent_color_desc">El color de acento del tema, por defecto es morado</string>
-    <string name="action_about">Acerca de</string>
-    <string name="action_add_to_blacklist">Agregar a la lista negra</string>
-    <string name="action_add_to_favorites">Agregar a Tus Me gusta</string>
-    <string name="action_add_to_playing_queue">Agregar a la cola de reproducción</string>
-    <string name="action_add_to_playlist">Agregar a playlist</string>
-    <string name="action_cancel">Cancelar</string>
-    <string name="action_cast">Emitir</string>
-    <string name="action_clear_playing_queue">Vaciar cola de reproducción</string>
-    <string name="action_cycle_repeat">Modo de repetición de ciclo</string>
-    <string name="action_delete">Eliminar</string>
-    <string name="action_delete_from_device">Eliminar del dispositivo</string>
-    <string name="action_details">Detalles</string>
-    <string name="action_edit">Editar</string>
-    <string name="action_go_to_album">Ir al álbum</string>
-    <string name="action_go_to_artist">Ir al artista</string>
-    <string name="action_go_to_genre">Ir a género</string>
-    <string name="action_go_to_lyrics">Ir a la letra</string>
-    <string name="action_go_to_start_directory">Ir al directorio de inicio</string>
-    <string name="action_grant">Permitir</string>
-    <string name="action_grid_size">Tamaño de cuadrícula</string>
-    <string name="action_grid_size_land">Tamaño de cuadrícula (h)</string>
-    <string name="action_new_playlist">Nueva playlist</string>
-    <string name="action_next">Siguiente</string>
-    <string name="action_play">Reproducir</string>
-    <string name="action_play_all">Reproducir</string>
-    <string name="action_play_next">Reproducir siguiente</string>
-    <string name="action_play_pause">Reproducir/Pausar</string>
-    <string name="action_previous">Anterior</string>
-    <string name="action_remove_from_favorites">Eliminar de Tus Me gusta</string>
-    <string name="action_remove_from_playing_queue">Eliminar de la cola de reproducción</string>
-    <string name="action_remove_from_playlist">Eliminar de la playlist</string>
-    <string name="action_rename">Renombrar</string>
-    <string name="action_save_playing_queue">Guardar cola de reproducción</string>
-    <string name="action_scan">Escanear</string>
-    <string name="action_search">Buscar</string>
-    <string name="action_set">Iniciar</string>
-    <string name="action_set_as_ringtone">Establecer como tono de llamada</string>
-    <string name="action_set_as_start_directory">Establecer como directorio de inicio</string>
-    <string name="action_settings">"Configuración"</string>
-    <string name="action_share">Compartir</string>
-    <string name="action_shuffle_all">Aleatorio</string>
-    <string name="action_shuffle_playlist">Lista de reproducción aleatoria</string>
-    <string name="action_sleep_timer">Temporizador de sueño</string>
-    <string name="action_sort_order">Ordenar por</string>
-    <string name="action_tag_editor">Editor de etiquetas</string>
-    <string name="action_toggle_favorite">Alternar favoritos</string>
-    <string name="action_toggle_shuffle">Alternar modo aleatorio</string>
-    <string name="adaptive">Adaptable</string>
-    <string name="add_action">Agregar</string>
-    <string name="add_playlist_title">"Añadir a la lista de reproducción"</string>
-    <string name="add_time_framed_lryics">Añadir letras sincronizadas</string>
-    <string name="added_song_count_to_playlist">%1$d cancion(es) añadidas a %2$s</string>
-    <string name="added_title_to_playing_queue">"Se agregó 1 canción a la cola de reproducción."</string>
-    <string name="added_x_titles_to_playing_queue">Se agregó %1$d canción(es) a la cola de reproducción.</string>
-    <string name="album">Álbum</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Canción</item>
-        <item quantity="other">Canciones</item>
-    </plurals>
-    <string name="album_artist">Artista del álbum</string>
-    <string name="albums">Álbumes</string>
-    <plurals name="albums">
-        <item quantity="one">Álbum</item>
-        <item quantity="other">Álbumes</item>
-    </plurals>
-    <string name="always">Siempre</string>
-    <string name="app_share">Echa un vistazo a este genial reproductor de música en: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Aleatorio</string>
-    <string name="app_shortcut_top_tracks_short">Canciones más reproducidas</string>
-    <string name="app_widget_big_name">Imagen completa</string>
-    <string name="app_widget_card_name">Tarjeta</string>
-    <string name="app_widget_classic_name">Clásico</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Pequeño</string>
-    <string name="app_widget_text_name">Texto mínimo</string>
-    <string name="artist">Artista</string>
-    <string name="artists">Artistas</string>
-    <string name="audio_fade_duration">Duración del desvanecimiento de audio</string>
-    <string name="audio_focus_denied">Enfoque de audio denegado.</string>
-    <string name="audio_settings_summary">Cambiar los ajustes de sonido y ajustar los controles del ecualizador</string>
-    <string name="auto">Auto</string>
-    <string name="backup_restore_settings_summary">Haz una copia de seguridad y restaura tu configuración, listas de reproducción</string>
-    <string name="backup_restore_title"><![CDATA[Copia de seguridad y restauración]]></string>
-    <string name="backup_title">Copias de seguridad</string>
-    <string name="biography">Biografía</string>
-    <string name="black_theme_name">Negro puro</string>
-    <string name="blacklist">Lista negra</string>
-    <string name="bluetooth_summary">La aplicación necesita permiso a dispositivos cercanos para comprobar si hay dispositivos Bluetooth</string>
-    <string name="bluetooth_title">Dispositivos cercanos</string>
-    <string name="blur">Desenfocado</string>
-    <string name="blur_card">Desenfocar tarjeta</string>
-    <string name="bug_report_failed">No se puede enviar el informe</string>
-    <string name="bug_report_failed_invalid_token">Token de acceso no válido. Póngase en contacto con el desarrollador de la aplicación.</string>
-    <string name="bug_report_failed_issues_not_available">Los problemas no están habilitados para el repositorio seleccionado. Póngase en contacto con el desarrollador de la aplicación.</string>
-    <string name="bug_report_failed_unknown">Ocurrió un error inesperado. Ponte en contacto con el desarrollador de la aplicación.</string>
-    <string name="bug_report_failed_wrong_credentials">Nombre de usuario o contraseña incorrectos</string>
-    <string name="bug_report_issue">Problema</string>
-    <string name="bug_report_manual">Enviar manualmente</string>
-    <string name="bug_report_no_description">Por favor ingresa una descripción del problema</string>
-    <string name="bug_report_no_password">Por favor, introduce tu contraseña de GitHub válida</string>
-    <string name="bug_report_no_title">Por favor, ingresa un título del problema</string>
-    <string name="bug_report_no_username">Por favor, introduce tu nombre de usuario de GitHub válido</string>
-    <string name="bug_report_success">Error reportado correctamente</string>
-    <string name="bug_report_summary">Ocurrió un error inesperado. Lamentamos que hayas encontrado este error, si sigue fallando \"Borra los datos de la aplicación\" o envíanos un correo electrónico </string>
-    <string name="bug_report_use_account">Enviar usando la cuenta de GitHub</string>
-    <string name="buy_now">Compra ahora</string>
-    <string name="cancel_current_timer">Cancelar</string>
-    <string name="card">Tarjeta</string>
-    <string name="card_color_style">Tarjeta coloreada</string>
-    <string name="card_square">Tarjeta cuadrada</string>
-    <string name="card_style">Tarjeta</string>
-    <string name="carousal_effect_on_now_playing_screen">Efecto Carrusel en la pantalla de reproducción</string>
-    <string name="cascading">En cascada</string>
-    <string name="changelog">Registro de cambios</string>
-    <string name="changelog_summary">Ver las novedades</string>
-    <string name="choose_image">Elegir imágen</string>
-    <string name="choose_restore_title">Elige qué restaurar</string>
-    <string name="circle">Circular</string>
-    <string name="circular">Circular</string>
-    <string name="classic">Clásico</string>
-    <string name="clear_action">Borrar</string>
-    <string name="clear_blacklist">Borrar lista negra</string>
-    <string name="clear_history">Limpiar historial</string>
-    <string name="clear_playing_queue">Borrar cola</string>
-    <string name="color">Color</string>
-    <string name="colors">Colores</string>
-    <string name="compact">Compacto</string>
-    <string name="composer">Compositores</string>
-    <string name="copied_device_info_to_clipboard">Información del dispositivo copiada al portapapeles.</string>
-    <string name="could_not_create_playlist">No se pudo\u2019no crear la playlist.</string>
-    <string name="could_not_download_album_cover">"No se pudo\u2019descargar una portada de álbum coincidente."</string>
-    <string name="could_not_restore_purchase">No se pudo restaurar la compra.</string>
-    <string name="could_not_scan_files">No se pudo escanear %d archivos.</string>
-    <string name="create_action">Crea</string>
-    <string name="create_new_backup">Crear</string>
-    <string name="created_playlist_x">Crear playlist %1$s.</string>
-    <string name="credit_title">Miembros y colaboradores </string>
-    <string name="currently_listening_to_x_by_x">Actualmente escuchando %1$s de %2$s.</string>
-    <string name="custom_artist_images">Imágenes personalizadas de artistas</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Compartir reporte de fallo</string>
-    <string name="dark_theme_name">Un poco oscuro</string>
-    <string name="delete_playlist_title">Eliminar playlist</string>
-    <string name="delete_playlist_x"><![CDATA[Eliminar la playlist <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Eliminar playlists</string>
-    <string name="delete_song_title">Eliminar canción</string>
-    <string name="delete_song_x"><![CDATA[Eliminar la canción <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Eliminar canciones</string>
-    <string name="delete_x_playlists"><![CDATA[Eliminar <b>%1$d</b> playlists?]]></string>
-    <string name="delete_x_songs"><![CDATA[Eliminar <b>%1$d</b> canciones?]]></string>
-    <string name="deleted_x_songs">Se eliminaron %1$d canciones.</string>
-    <string name="deleting_songs">Eliminando canciones</string>
-    <string name="depth">Profundidad</string>
-    <string name="description">Descripción</string>
-    <string name="device_info">Información del dispositivo</string>
-    <string name="dialog_message_set_ringtone">Permitir que Retro Music modifique la configuración de audio</string>
-    <string name="dialog_title_set_ringtone">Establecer tono de llamada</string>
-    <string name="disc_hint">Número de disco</string>
-    <string name="do_you_want_to_clear_the_blacklist">¿Quieres borrar la lista negra?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[¿Quieres eliminar <b>%1$s</b> de la lista negra?]]></string>
-    <string name="donate">Donar</string>
-    <string name="donate_summary">Si crees que merezco que me paguen por mi trabajo, puedes dejar algo de dinero aquí</string>
-    <string name="donation_header">Cómprame un:</string>
-    <string name="done">Listo</string>
-    <string name="drive_mode">Modo automóvil</string>
-    <string name="edit_fab">Botón editar</string>
-    <string name="edit_normal_lyrics">Editar letras</string>
-    <string name="edit_synced_lyrics">Editar letras sincronizadas</string>
-    <string name="empty">Vacío</string>
-    <string name="equalizer">Ecualizador</string>
-    <string name="error_create_backup">No se pudo crear la copia de seguridad</string>
-    <string name="error_delete_backup">No se pudo eliminar la copia de seguridad</string>
-    <string name="error_empty_name">¡Tu nombre no puede estar vacío!</string>
-    <string name="error_load_failed">Fallo al cargar</string>
-    <string name="error_share_file">No se pudo compartir el archivo</string>
-    <string name="expanded">Expandido</string>
-    <string name="faq">FAQ</string>
-    <string name="favorites">Me gusta</string>
-    <string name="file_already_exists">El archivo ya existe</string>
-    <string name="finish_last_song">Termina la última canción</string>
-    <string name="fit">Encajado</string>
-    <string name="flat">Plano</string>
-    <string name="folders">Carpetas</string>
-    <string name="follow_system">Seguir al sistema</string>
-    <string name="for_you">Para ti</string>
-    <string name="free">Gratuito</string>
-    <string name="full">Completa</string>
-    <string name="full_card">Tarjeta completa</string>
-    <string name="general_settings_summary">Cambiar el tema y colores de la aplicación</string>
-    <string name="general_settings_title">Apariencia y funcionamiento</string>
-    <string name="genre">Género</string>
-    <string name="genres">Géneros</string>
-    <string name="git_hub_summary">Bifurca el proyecto en GitHub</string>
-    <string name="gradient">Degradado</string>
-    <string name="grant_access">Permitir acceso</string>
-    <string name="grid_size_1">1</string>
-    <string name="grid_size_2">2</string>
-    <string name="grid_size_3">3</string>
-    <string name="grid_size_4">4</string>
-    <string name="grid_size_5">5</string>
-    <string name="grid_size_6">6</string>
-    <string name="grid_size_7">7</string>
-    <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Estilo de cuadrícula</string>
-    <string name="help_summary">¿Necesitas más ayuda?</string>
-    <string name="hinge">Giro</string>
-    <string name="history">Historial</string>
-    <string name="history_cleared">Historial limpio</string>
-    <string name="history_undo_button">Deshacer</string>
-    <string name="home">Inicio</string>
-    <string name="horizontal_flip">Giro horizontal</string>
-    <string name="image">Imagen</string>
-    <string name="image_gradient">Imagen de degradado</string>
-    <string name="image_settings_summary">Cambiar la configuración de descarga de imágenes del artista</string>
-    <string name="import_label">Importar</string>
-    <string name="import_playlist">Importar lista de reproducción</string>
-    <string name="import_playlist_message">Importa todas las listas de reproducción en el almacenamiento Android con canciones, si las listas ya existen, las canciones se fusionarán.</string>
-    <string name="inserted_x_songs_into_playlist_x">%1$d canciones agregadas a la lista de reproducción %2$s.</string>
-    <string name="instagram_page_summary">Comparte tu configuración de Retro Music en Instagram</string>
-    <string name="keyboard">Teclado</string>
-    <string name="label_bit_rate">Tasa de bits</string>
-    <string name="label_file_format">Formato</string>
-    <string name="label_file_name">Nombre del archivo</string>
-    <string name="label_file_path">Ruta del archivo</string>
-    <string name="label_file_size">Tamaño</string>
-    <string name="label_last_modified">Última modificación</string>
-    <string name="label_more_from">Más de %s</string>
-    <string name="label_sampling_rate">Tasa de muestreo</string>
-    <string name="label_track_length">Duración</string>
-    <string name="labeled">Etiquetado</string>
-    <string name="last_added">Añadidos recientemente</string>
-    <string name="last_song">Última canción</string>
-    <string name="lets_go">Vamos</string>
-    <string name="library_categories">Categorías de la Biblioteca</string>
-    <string name="licenses">Licencias</string>
-    <string name="light_theme_name">Claramente Blanco</string>
-    <string name="listeners_label">Oyentes</string>
-    <string name="listing_files">Listado de archivos</string>
-    <string name="loading_products">Cargando productos…</string>
-    <string name="login">Iniciar sesión</string>
-    <string name="lyrics">Letras</string>
-    <string name="made_with_love">Hecho con ❤️ en India</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Error</string>
-    <string name="md_storage_perm_error">Error de permiso</string>
-    <string name="message_backup_create_success">Copia de seguridad creada exitosamente.</string>
-    <string name="message_limit_tabs">No más de 5 elementos</string>
-    <string name="message_pro_feature">%s es una característica disponible en la versión Pro.</string>
-    <string name="message_restore_success">Restauración completada con éxito.</string>
-    <string name="message_updated">Actualizada</string>
-    <string name="message_welcome"><![CDATA[¡Hola <br>! Bienvenido a %s]]></string>
-    <string name="my_name">Nombre</string>
-    <string name="my_top_tracks">Más reproducidas</string>
-    <string name="never">Nunca</string>
-    <string name="new_music_mix">Nueva música</string>
-    <string name="new_playlist_title">Nueva playlist</string>
-    <string name="new_start_directory">%s es el nuevo directorio de inicio.</string>
-    <string name="next_song">Siguiente canción</string>
-    <string name="no_albums">No tienes álbumes</string>
-    <string name="no_artists">No tienes artistas</string>
-    <string name="no_audio_ID">"Reproduce primero una canción y vuelve a intentarlo."</string>
-    <string name="no_backups_found">No se encontraron copias de seguridad</string>
-    <string name="no_equalizer">Ecualizador no encontrado</string>
-    <string name="no_genres">No tienes géneros</string>
-    <string name="no_lyrics_found">No se encontraron letras</string>
-    <string name="no_playing_queue">No se está reproduciendo ninguna canción</string>
-    <string name="no_playlists">No tienes playlists</string>
-    <string name="no_purchase_found">No se encontraron compras.</string>
-    <string name="no_results">No hay resultados</string>
-    <string name="no_songs">No tienes canciones</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Letras normales</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> no aparece en el almacén de medios.]]></string>
-    <string name="not_recently_played">No reproducido recientemente</string>
-    <string name="nothing_to_scan">Nada que escanear.</string>
-    <string name="nothing_to_see">Nada que ver</string>
-    <string name="notification">Notificación</string>
-    <string name="notification_settings_summary">Personaliza el estilo de la notificación</string>
-    <string name="now_playing">Reproduciendo ahora</string>
-    <string name="now_playing_queue">Cola de reproducción actual</string>
-    <string name="now_playing_summary">Personalizar la pantalla de reproducción actual</string>
-    <string name="now_playing_themes">Más de 9 temas para la pantalla de reproducción actual</string>
-    <string name="only_on_wifi">Solo con Wi-Fi</string>
-    <string name="other_settings_summary">Funciones de prueba avanzadas</string>
-    <string name="others">Otro</string>
-    <string name="over_cover">Sobre la portada</string>
-    <string name="password">Contraseña</string>
-    <string name="past_three_months">Últimos 3 meses</string>
-    <string name="paste_lyrics_here">Pega las Letras Aquí</string>
-    <string name="paste_timeframe_lyrics_here">Pegar las letras con marcas de tiempo aquí</string>
-    <string name="peek">Mirar</string>
-    <string name="permission_bluetooth_denied">Permiso a dispositivos cercanos denegado.</string>
-    <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
-    <string name="permission_summary">La aplicación necesita permiso para acceder al almacenamiento del dispositivo para reproducir música</string>
-    <string name="permission_title">Acceso al Almacenamiento</string>
-    <string name="permissions_denied">Permisos denegados.</string>
-    <string name="personalize">Personalize</string>
-    <string name="personalize_settings_summary">Personalizar la ventana de reproduciendo ahora y los controles de la interfaz</string>
-    <string name="pick_from_local_storage">Pick from local storage</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-    <string name="plain">Plain</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Velocidad de reproducción</string>
-    <string name="playing_notification_description">La notificación de reproducción proporciona acciones para reproducir/pausar, etc.</string>
-    <string name="playing_notification_name">Playing notification</string>
-    <string name="playlist_created_sucessfully">%s creada exitosamente</string>
-    <string name="playlist_is_empty">Playlist is empty</string>
-    <string name="playlist_name_empty">Nombre de la lista de reproducción</string>
-    <string name="playlists">Playlists</string>
-    <string name="pref_blur_amount_summary">Cantidad de desenfoque aplicado a los temas desenfocados, la cantidad más baja es más rápida</string>
-    <string name="pref_blur_amount_title">Cantidad de desenfoque</string>
-    <string name="pref_filter_song_summary">Filtrar canciones por duración</string>
-    <string name="pref_filter_song_title">Filtrar duración de la canción</string>
-    <string name="pref_header_advanced">Avanzado</string>
-    <string name="pref_header_album">Estilo del álbum</string>
-    <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Lista negra</string>
-    <string name="pref_header_controls">Controles</string>
-    <string name="pref_header_general">Tema</string>
-    <string name="pref_header_images">Imágenes</string>
-    <string name="pref_header_library">Biblioteca</string>
-    <string name="pref_header_lockscreen">Pantalla de bloqueo</string>
-    <string name="pref_header_playlists">Listas de reproducción</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pausa la canción cuando el volumen disminuye a cero y vuelve a reproducir cuando se aumenta el volumen. También funciona fuera de la aplicación</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pausar en cero</string>
-    <string name="pref_keep_screen_on_summary">Ten en cuenta que habilitar esta función puede afectar la duración de la batería</string>
-    <string name="pref_keep_screen_on_title">Mantener la pantalla encendida</string>
-    <string name="pref_language_name">Seleccionar el idioma</string>
-    <string name="pref_snow_fall_title">Efecto de nieve</string>
-    <string name="pref_summary_album_art_on_lockscreen">Utiliza la portada del álbum de la canción que se está reproduciendo como fondo de pantalla de la pantalla de bloqueo</string>
-    <string name="pref_summary_album_artists_only">Mostrar artistas de álbumes en la categoría de artistas</string>
-    <string name="pref_summary_audio_ducking">Bajar el volumen cuando se reproduce un sonido del sistema o se recibe una notificación</string>
-    <string name="pref_summary_audio_fade">Desvanecer el audio cuando la canción está en pausa o se reproduce</string>
-    <string name="pref_summary_blacklist">El contenido de las carpetas de la lista negra se oculta de la biblioteca.</string>
-    <string name="pref_summary_bluetooth_playback">Comienza a reproducir en cuanto se conecta al dispositivo bluetooth</string>
-    <string name="pref_summary_blurred_album_art">Difumina la portada del álbum en la pantalla de bloqueo. Puede causar problemas con aplicaciones y widgets de terceros</string>
-    <string name="pref_summary_carousel_effect">Efecto carrusel para la carátula del álbum en la pantalla de reproducción. Tenga en cuenta que los temas Tarjeta y Tarjeta Desenfocada no funcionarán</string>
-    <string name="pref_summary_classic_notification">Utiliza el diseño clásico de las notificaciones</string>
-    <string name="pref_summary_colored_app">El fondo y los colores de los botones de control cambian según la carátula del álbum en la pantalla de reproducción</string>
-    <string name="pref_summary_colored_app_shortcuts">Colorea los accesos directos de la aplicación en el color de acento. Cada vez que cambie el color por favor active esto para que tenga efecto</string>
-    <string name="pref_summary_colored_notification">"Colorea la notificación con el color vibrante de la portada del álbum"</string>
-    <string name="pref_summary_cross_fade">Duración del crossfade entre canciones</string>
-    <string name="pref_summary_desaturated_color">Según las líneas de la guía Material Design en los colores del modo oscuro deben ser desaturados</string>
-    <string name="pref_summary_expand_now_playing_panel">Al hacer clic en la notificación se mostrará la pantalla de reproducción en lugar de la pantalla de inicio</string>
-    <string name="pref_summary_extra_controls">Añadir controles extra al mini reproductor</string>
-    <string name="pref_summary_extra_song_info">Mostrar información extra de canciones, como el formato de archivo, tasa de bits y frecuencia</string>
-    <string name="pref_summary_gapless_playback">"Puede causar problemas de reproducción en algunos dispositivos."</string>
-    <string name="pref_summary_home_banner">Mostrar u ocultar el banner de inicio</string>
-    <string name="pref_summary_ignore_media_store_artwork">Puede aumentar la calidad de la portada del álbum, pero provoca tiempos de carga de imágenes más lentos. Solo habilite esto si tiene problemas con portadas de baja resolución</string>
-    <string name="pref_summary_library_categories">Configure la visibilidad y el orden de las categorías de la biblioteca.</string>
-    <string name="pref_summary_lock_screen">Usar los controles personalizados de Retro Music en la pantalla de bloqueo</string>
-    <string name="pref_summary_manage_audio_focus">Reproducir siempre audio en segundo plano sin importar cualquier cosa que se reproduzca</string>
-    <string name="pref_summary_open_source_licences">Detalles de licencia para software de código abierto</string>
-    <string name="pref_summary_pause_history">Cuando está habilitado, las canciones recién reproducidas no se mostrarán en el historial</string>
-    <string name="pref_summary_remember_tab">Navegar a la última pestaña usada al iniciar</string>
-    <string name="pref_summary_show_lyrics">Mostrar letras sincronizadas sobre la portada del álbum</string>
-    <string name="pref_summary_suggestions">Mostrar mezcla de nueva música en la pantalla de inicio</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Permite cambiar la canción deslizando en cualquier lugar de la pantalla de reproducción</string>
-    <string name="pref_summary_swipe_to_dismiss">Desliza el dedo hacia abajo para descartar el mini reproductor</string>
-    <string name="pref_summary_toggle_full_screen">Modo inmersivo</string>
-    <string name="pref_summary_toggle_headset">Comenzar a reproducir inmediatamente cuando se conecten audífonos</string>
-    <string name="pref_summary_toggle_shuffle">El modo aleatorio se desactivará cuando se reproduzca una nueva lista de canciones</string>
-    <string name="pref_summary_toggle_volume">Mostrar controles de volumen si hay suficiente espacio disponible</string>
-    <string name="pref_summary_wallpaper_accent">Extrae el color del fondo de pantalla</string>
-    <string name="pref_summary_whitelist">Mostrar solo música de la carpeta /Musica</string>
-    <string name="pref_title_album_art_on_lockscreen">Mostrar la portada del álbum</string>
-    <string name="pref_title_album_artists_only">Navegar por Artista del Álbum</string>
-    <string name="pref_title_album_cover_style">Tema de la portada del álbum</string>
-    <string name="pref_title_album_cover_transform">Saltar portada de álbum</string>
-    <string name="pref_title_app_shortcuts">Accesos directos de la aplicación coloreados</string>
-    <string name="pref_title_appbar_mode">Estilo de cabecera</string>
-    <string name="pref_title_audio_ducking">Reducir el volumen cuando se pierda el enfoque</string>
-    <string name="pref_title_audio_fade">Desvanecer audio</string>
-    <string name="pref_title_auto_download_artist_images">Descarga automática de imágenes de artistas</string>
-    <string name="pref_title_blacklist">Lista negra</string>
-    <string name="pref_title_bluetooth_playback">Reproducción por Bluetooth</string>
-    <string name="pref_title_blurred_album_art">Desenfocar portada del álbum</string>
-    <string name="pref_title_circle_button">Botón de reproducción circular</string>
-    <string name="pref_title_classic_notification">Diseño de notificación clásico</string>
-    <string name="pref_title_colored_app">Color adaptable</string>
-    <string name="pref_title_colored_notification">Notificación coloreada</string>
-    <string name="pref_title_cross_fade">Transición (Beta)</string>
-    <string name="pref_title_custom_font">Usar la fuente \"Manrope\"</string>
-    <string name="pref_title_desaturated_color">Color desaturado</string>
-    <string name="pref_title_expand_now_playing_panel">Mostrar la pantalla de reproducción actual</string>
-    <string name="pref_title_extra_controls">Controles adicionales</string>
-    <string name="pref_title_extra_song_info">Información de la canción</string>
-    <string name="pref_title_gapless_playback">Reproducción sin pausas</string>
-    <string name="pref_title_general_theme">Tema de la aplicación</string>
-    <string name="pref_title_home_album_grid_style">Cuadrícula del álbum</string>
-    <string name="pref_title_home_artist_grid_style">Cuadrícula del artista</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignorar las portadas del Almacén de Medios</string>
-    <string name="pref_title_last_added_interval">Intervalo de la lista \"Añadidos Recientemente\"</string>
-    <string name="pref_title_lock_screen">Controles en pantalla completa</string>
-    <string name="pref_title_lyrics_screen_on">Mantener la pantalla encendida cuando se muestran las letras de la canción</string>
-    <string name="pref_title_lyrics_type">Tipo de letras</string>
-    <string name="pref_title_manage_audio_focus">Reproducir siempre</string>
-    <string name="pref_title_now_playing_screen_appearance">Tema de la ventana de reproducción actual</string>
-    <string name="pref_title_open_source_licences">Licencias de código abierto</string>
-    <string name="pref_title_pause_history">Pausar el historial</string>
-    <string name="pref_title_remember_tab">Recordar la última pestaña</string>
-    <string name="pref_title_show_lyrics">Mostrar letras</string>
-    <string name="pref_title_suggestions">Mostrar sugerencias</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Desliza en cualquier lugar para cambiar la canción</string>
-    <string name="pref_title_swipe_to_dismiss">Descartar con deslizar hacia abajo</string>
-    <string name="pref_title_tab_text_mode">Modo de los títulos de las pestañas</string>
-    <string name="pref_title_toggle_carousel_effect">Efecto Carrusel</string>
-    <string name="pref_title_toggle_full_screen">Aplicación en pantalla completa</string>
-    <string name="pref_title_toggle_toggle_headset">Reproducción automática</string>
-    <string name="pref_title_toggle_toggle_shuffle">Modo aleatorio</string>
-    <string name="pref_title_toggle_volume">Controles de volumen</string>
-    <string name="pref_title_wallpaper_accent">Color de acento del fondo de pantalla</string>
-    <string name="pref_title_whitelist">Música en lista blanca</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Tema negro, temas para la ventana de Reproducción Actual, efecto Carrusel y más...</string>
-    <string name="profile">Perfil</string>
-    <string name="purchase">Comprar</string>
-    <string name="queue">Reproduciendo cola</string>
-    <string name="rate_app">Califica la aplicación</string>
-    <string name="rate_on_google_play_summary">¿Te encanta la aplicación? Haznoslo saber en la Play Store cómo podemos hacerla aún mejor</string>
-    <string name="recent_albums">Álbumes recientes</string>
-    <string name="recent_artists">Artistas recientes</string>
-    <string name="remove_action">Eliminar</string>
-    <string name="remove_cover">Eliminar portada</string>
-    <string name="remove_from_blacklist">Eliminar de la lista negra</string>
-    <string name="remove_image">Eliminar imagen</string>
-    <string name="remove_song_from_playlist_title">Eliminar la canción de la lista de reproducción</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[¿Eliminar la canción <b>%1$s</b> de la lista de reproducción?]]></string>
-    <string name="remove_songs_from_playlist_title">Eliminar canciones de la lista de reproducción</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[¿Eliminar <b>%1$d</b> canciones de la lista de reproducción?]]></string>
-    <string name="rename_playlist_title">Renombrar lista de reproducción</string>
-    <string name="replace_cover">Reemplazar la portada</string>
-    <string name="report_an_issue">Reportar un problema</string>
-    <string name="report_bug">Reportar fallo</string>
-    <string name="reset_action">Restablecer</string>
-    <string name="reset_artist_image">Reiniciar imagen del artista</string>
-    <string name="restore">Restaurar</string>
-    <string name="restore_message">¿Quieres restaurar la copia de seguridad?</string>
-    <string name="restored_previous_purchase_please_restart">Compra anterior restaurada. Por favor, reinicie la aplicación para hacer uso de todas las funciones.</string>
-    <string name="restored_previous_purchases">Compras anteriores restauradas.</string>
-    <string name="restoring_purchase">Restaurando compra…</string>
-    <string name="retro_music_player">Reproductor Retro</string>
-    <string name="retro_music_pro">Reproductor Retro Pro</string>
-    <string name="ringtone_summary">La aplicación necesita permiso para acceder a la configuración de tu dispositivo para establecer música como Tono de Llamada</string>
-    <string name="ringtone_title">Tono de Llamada (Opcional)</string>
-    <string name="saf_delete_failed">La eliminación del archivo: %s falló</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">No se puede obtener SAF URI</string>
-    <string name="saf_guide_slide1_description">Abrir el cajón de navegación</string>
-    <string name="saf_guide_slide1_description_before_o">Activar \"Mostrar tarjeta SD\" en el menú</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s necesita acceso a la tarjeta SD</string>
-    <string name="saf_guide_slide2_description">Debes seleccionar el directorio raíz de tu tarjeta SD</string>
-    <string name="saf_guide_slide2_title">Selecciona tu tarjeta SD en el cajón de navegación</string>
-    <string name="saf_guide_slide3_description">No abra ninguna sub-carpeta</string>
-    <string name="saf_guide_slide3_title">Toca el botón \'seleccionar\' en la parte inferior de la pantalla</string>
-    <string name="saf_write_failed">Error al escribir: %s</string>
-    <string name="save">Guardar</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Guardar como archivo</string>
-    <string name="save_playlists_title">Guardar como archivos</string>
-    <string name="saved_playlist_to">Guardar lista de reproducción a %s.</string>
-    <string name="saving_changes">Guardando cambios</string>
-    <string name="scan_media">Examinar medios</string>
-    <string name="scanned_files">%1$d de %2$d archivos examinados.</string>
-    <string name="scrobbles_label">Enviar a</string>
-    <string name="select_all">Seleccionar todo</string>
-    <string name="selected">Seleccionado</string>
-    <string name="set">Establecer</string>
-    <string name="set_artist_image">Establecer imagen del artista</string>
-    <string name="share_app">Compartir aplicación</string>
-    <string name="share_summary">Comparte la aplicación con tus amigos y familia</string>
-    <string name="share_to_stories">Compartir en Historias</string>
-    <string name="show_album_artists">Mostrar Artistas del Álbum</string>
-    <string name="shuffle">Aleatorio</string>
-    <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">Temporizador cancelado.</string>
-    <string name="sleep_timer_set">Temporizado establecido para %d minutos desde ahora.</string>
-    <string name="social">Redes Sociales</string>
-    <string name="social_stories">Compartir historia</string>
-    <string name="song">Canción</string>
-    <string name="song_duration">Duración de la canción</string>
-    <string name="songs">Canciones</string>
-    <string name="sort_order">Ordenar por</string>
-    <string name="sort_order_a_z">Ascendente</string>
-    <string name="sort_order_album">Álbum</string>
-    <string name="sort_order_artist">Artista</string>
-    <string name="sort_order_composer">Compositores</string>
-    <string name="sort_order_date">Fecha agregada</string>
-    <string name="sort_order_date_modified">Fecha de modificación</string>
-    <string name="sort_order_default">Predeterminado</string>
-    <string name="sort_order_num_songs">Número de canciones</string>
-    <string name="sort_order_num_songs_desc">Número de canciones descendente</string>
-    <string name="sort_order_year">Año</string>
-    <string name="sort_order_z_a">Descendente</string>
-    <string name="speech_not_supported">¡Lo siento! Tu dispositivo no es compatible con la entrada de voz</string>
-    <string name="speech_prompt">Buscar en tu biblioteca</string>
-    <string name="stack">Apilado</string>
-    <string name="start_play_music">Comenzar a reproducir música.</string>
-    <string name="suggestion_songs">Sugerencias</string>
-    <string name="support_development">Apoya el desarrollo</string>
-    <string name="swipe_to_unlock">Desliza para desbloquear</string>
-    <string name="synced_lyrics">Letras sincronizadas</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Únete al grupo de Telegram para discutir los fallos, hacer sugerencias, presumir y más</string>
-    <string name="thank_you">¡Gracias!</string>
-    <string name="the_audio_file">El archivo de audio</string>
-    <string name="this_month">Este mes</string>
-    <string name="this_week">Esta semana</string>
-    <string name="this_year">Este año</string>
-    <string name="tiny">Diminuto</string>
-    <string name="tiny_card_style">Tarjeta diminuta</string>
-    <string name="title">Titulo</string>
-    <string name="title_new_backup">Nueva copia de seguridad</string>
-    <string name="today">Hoy</string>
-    <string name="top_albums">Álbumes más reproducidos</string>
-    <string name="top_artists">Artistas más reproducidos</string>
-    <string name="track_hint">"Pista (2 para pista 2 o 3004 para CD3 pista 4)"</string>
-    <string name="track_list">Número de pista</string>
-    <string name="translate">Traducir</string>
-    <string name="translate_community">Ayúdanos a traducir la aplicación a tu idioma</string>
-    <string name="try_retro_music_premium">Prueba Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Comparte tu diseño con Retro Music</string>
-    <string name="unlabeled">Sin etiqueta</string>
-    <string name="unplayable_file">No se pudo reproducir esta canción.</string>
-    <string name="up_next">A continuación</string>
-    <string name="update_image">Actualizar imagen</string>
-    <string name="updating">Actualizando…</string>
-    <string name="user_images_description">Imágenes del Usuario</string>
-    <string name="user_name">Nombre del usuario</string>
-    <string name="username">Usuario</string>
-    <string name="version">Versión</string>
-    <string name="vertical_flip">Giro vertical</string>
-    <string name="view_on_telegram">Ver en Telegram</string>
-    <string name="volume">Volumen</string>
-    <string name="web_search">Buscar en la Web</string>
-    <string name="website">Sitio Web</string>
-    <string name="website_summary">Echa un vistazo a nuestro Sitio Web</string>
-    <string name="welcome">Bienvenido,</string>
-    <string name="what_do_you_want_to_share">¿Qué quieres compartir?</string>
-    <string name="whats_new">Lo Nuevo</string>
-    <string name="window">Ventana</string>
-    <string name="window_corner_edges">Esquinas redondeadas</string>
-    <string name="x_has_been_set_as_ringtone">Establecer %1$s como tono de llamada.</string>
-    <string name="x_selected">%1$d seleccionado</string>
-    <string name="year">Año</string>
-    <string name="you_have_to_select_at_least_one_category">Tienes que seleccionar al menos una categoría.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Serás redirigido al sitio web para reportar incidencias.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Los datos de tu cuenta sólo se utilizan para la autenticación.</string>
-</resources>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index b4baef208..e614462f3 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">درباره %s...</string>
+    <string name="about_album_label">درباره‌ی%s</string>
     <string name="about_settings_summary">تیم، پیوندهای اجتماعی</string>
     <string name="accent_color">رنگ تشدید کننده</string>
     <string name="accent_color_desc">رنگ تشدید کننده به صورت پیش فرض بنفش انتخاب شده</string>
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">افزودن به موارد مورد علاقه</string>
     <string name="action_add_to_playing_queue">افزودن به لیست پخش آهنگ</string>
     <string name="action_add_to_playlist">افزودن به لیست پخش</string>
-    <string name="action_cancel">انصراف</string>
     <string name="action_cast">پخش و نمایش تصویر</string>
     <string name="action_clear_playing_queue">لیست پخش اهنگ هارا پاک کنید</string>
     <string name="action_cycle_repeat">حالت چرخش تکراری اهنگ ها</string>
@@ -31,33 +30,33 @@
     <string name="action_play_all">پخش همه</string>
     <string name="action_play_next">پخش بعدی</string>
     <string name="action_play_pause">پخش/توقف</string>
-    <string name="action_previous">قبلی</string>
-    <string name="action_remove_from_favorites">حذف از علاقه‌مندی‌ها</string>
+    <string name="action_previous">قبلى</string>
+    <string name="action_remove_from_favorites">حذف از علاقه مندی ها</string>
     <string name="action_remove_from_playing_queue">حذف از لیست پخش</string>
-    <string name="action_remove_from_playlist">حذف از لیست پخش</string>
+    <string name="action_remove_from_playlist">حذف از لیست پخش آهنگ ها</string>
     <string name="action_rename">تغییر نام</string>
     <string name="action_save_playing_queue">ذخیره صف پلی لیست</string>
     <string name="action_scan">اسکن</string>
     <string name="action_search">جستجو</string>
     <string name="action_set">شروع</string>
     <string name="action_set_as_ringtone">تنظیم به‌عنوان زنگ</string>
-    <string name="action_set_as_start_directory">تنظیم به عنوان منوی آغاز</string>
+    <string name="action_set_as_start_directory">تنظیم به عنوان منوی آغاز و شروع کننده</string>
     <string name="action_settings">"تنظیمات"</string>
-    <string name="action_share">اشتراک گذاری</string>
+    <string name="action_share">اشتراک ﮔﺬﺍﺭﯼ</string>
     <string name="action_shuffle_all">پخش تصادفی همه</string>
     <string name="action_shuffle_playlist">پخش تصادفی</string>
-    <string name="action_sleep_timer">زمان سنج خواب</string>
-    <string name="action_sort_order">ترتیب نمایش</string>
+    <string name="action_sleep_timer">تایمر خواب</string>
+    <string name="action_sort_order">مرتب سازی</string>
     <string name="action_tag_editor"> ویرایشگر برچسب </string>
-    <string name="action_toggle_favorite">تغییر علاقه‌مندی‌ها</string>
+    <string name="action_toggle_favorite">تغییر موارد مورد علاقه و پسند</string>
     <string name="action_toggle_shuffle">تغییر حالت پخش مخلوط</string>
-    <string name="adaptive">سازگار</string>
+    <string name="adaptive">تطبیق</string>
     <string name="add_action">ﺍﻓﺰﻭﺩﻥ</string>
     <string name="add_playlist_title">"افزودن به لیست پخش"</string>
     <string name="add_time_framed_lryics">اضافه کردن متون دارای زمان</string>
-    <string name="added_song_count_to_playlist">%1$d عدد آهنگ به %2$s اضافه شد</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"یک‌ مورد به لیست پخش اهنگ ها اضافه شد."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d مورد به صف پخش اضافه شد.</string>
+    <string name="added_x_titles_to_playing_queue">مورد خاص به لیست پخش اهنگ اضافه شد.</string>
     <string name="album">آلبوم</string>
     <plurals name="albumSongs">
         <item quantity="one">آهنگ ها</item>
@@ -67,48 +66,45 @@
     <string name="albums">آلبوم‌ها</string>
     <plurals name="albums">
         <item quantity="one">آلبوم</item>
-        <item quantity="other">آلبوم ها</item>
+        <item quantity="other">Albums</item>
     </plurals>
     <string name="always">همیشه</string>
     <string name="app_share">به اشتراک گذاری برنامه</string>
     <string name="app_shortcut_shuffle_all_short">حالت مخلوط</string>
-    <string name="app_shortcut_top_tracks_short">بهترین اهنگ ها</string>
+    <string name="app_shortcut_top_tracks_short">اهنگ های برتر</string>
     <string name="app_widget_big_name">تصویر کامل</string>
     <string name="app_widget_card_name">کارت</string>
     <string name="app_widget_classic_name">کلاسیک</string>
     <string name="app_widget_md3_name">MD3</string>
     <string name="app_widget_small_name">كوچك</string>
-    <string name="app_widget_text_name">متن کوچک</string>
+    <string name="app_widget_text_name">متن حداقلی</string>
     <string name="artist">هنرمند</string>
     <string name="artists">هنرمندان</string>
     <string name="audio_fade_duration">مدت زمان محو شدن صدا</string>
-    <string name="audio_focus_denied">تمرکز صدا قطع شد.</string>
-    <string name="audio_settings_summary">تنظیمات صدا را تغییر دهید و کنترل های اکولایزر را تنظیم کنید</string>
+    <string name="audio_focus_denied">حالت تمرکز بر صدا قطع شد‌.</string>
+    <string name="audio_settings_summary">تنظیمات صدا را تغییر دهید</string>
     <string name="auto">خودکار</string>
     <string name="backup_restore_settings_summary">از تنظیمات، لیست های پخش خود نسخه پشتیبان تهیه و بازیابی کنید</string>
     <string name="backup_restore_title"><![CDATA[پشتیبان‌گیری و بازیابی]]></string>
-    <string name="backup_title">پشتیبان گیری</string>
+    <string name="backup_title">پشتیبان گیری ها</string>
     <string name="biography">زندگینامه</string>
-    <string name="black_theme_name">فقط مشکی</string>
+    <string name="black_theme_name">حالت فقط مِشکی</string>
     <string name="blacklist">لیست سیاه</string>
-    <string name="bluetooth_summary">برای بررسی دستگاه‌های بلوتوث،برنامه نیاز به مجوز دسترسی دستگاه‌های نزدیک دارد</string>
-    <string name="bluetooth_title">دستگاه‌های نزدیک</string>
-    <string name="blur">تاری</string>
-    <string name="blur_card">کارت تاری</string>
-    <string name="bug_report_failed">امکان ارسال گزارش وجود ندارد</string>
+    <string name="blur">حالت بلور</string>
+    <string name="blur_card">حالت برگه ی بلور شده</string>
+    <string name="bug_report_failed">نتوانستیم گزارش را بفرستیم</string>
     <string name="bug_report_failed_invalid_token">لطفاً به توسعه دهنده پیام دهید، اشکالی در کار پیش آمد.</string>
-    <string name="bug_report_failed_issues_not_available">مشکلات برای مخزن انتخابی فعال نیستند. لطفا با توسعه دهنده برنامه تماس بگیرید.</string>
-    <string name="bug_report_failed_unknown">یک خطای غیر منتظره پیش آمد. لطفا با توسعه دهنده برنامه تماس بگیرید.</string>
+    <string name="bug_report_failed_issues_not_available">مشکلاتی برای موارد انتخاب شده یافت نشد، به توسعه دهنده پیام دهید.</string>
+    <string name="bug_report_failed_unknown">یک خطای غیر منتظره پیش آمد. لطفاً به توسعه دهنده این برنامه پیام دهید.</string>
     <string name="bug_report_failed_wrong_credentials">نام کاربری یا رمز اشتباه است</string>
-    <string name="bug_report_issue">موضوع</string>
-    <string name="bug_report_manual">ارسال دستی</string>
-    <string name="bug_report_no_description">لطفاً عنوان مشکل را وارد کنید</string>
+    <string name="bug_report_issue">مسئله</string>
+    <string name="bug_report_manual">به صورت دستی فرستادن</string>
+    <string name="bug_report_no_description">لطفاً یک توضیح معتبر وارد کنید</string>
     <string name="bug_report_no_password">لطفاً رمز گیتهاب خود را وارد کنید</string>
     <string name="bug_report_no_title">لطفاً عنوان مشکل را وارد کنید</string>
-    <string name="bug_report_no_username">لطفاً نام کاربری GitHub خود را وارد کنید</string>
-    <string name="bug_report_success">گزارش اشکال موفقیت آمیز بود</string>
+    <string name="bug_report_no_username">لطفاً نام کاربری گیتهاب خود را وارد کنید</string>
     <string name="bug_report_summary">یک مشکل پیش بینی نشده رخ داد. متأسفیم که شما این باگ را پیدا کردید، اگر برنامه به متوقف شدن ادامه داد لطفاً برنامه را کلیر دیتا کنید یا برای ما ایمیل بفرستید </string>
-    <string name="bug_report_use_account">با استفاده از حساب GitHub ارسال کنید</string>
+    <string name="bug_report_use_account">فرستادن به عنوان اکانت گیتهاب</string>
     <string name="buy_now">اکنون بخرید</string>
     <string name="cancel_current_timer">انصراف</string>
     <string name="card">کارت</string>
@@ -119,18 +115,17 @@
     <string name="cascading">کاسکاد</string>
     <string name="changelog">لیست تغییرات</string>
     <string name="changelog_summary">ببینید چه چیزی جدید و نو است</string>
-    <string name="choose_image">انتخاب تصویر</string>
+    <string name="choose_image">Choose Image</string>
     <string name="choose_restore_title">انتخاب کنید چه چیزی را بازیابی کنید</string>
     <string name="circle">دایره</string>
     <string name="circular">دایره ای</string>
     <string name="classic">کلاسیک</string>
     <string name="clear_action">پاک‌کردن</string>
     <string name="clear_blacklist">پاک کردن لیست سیاه</string>
-    <string name="clear_history">پاکسازی تاریخچه</string>
+    <string name="clear_history">Clear History</string>
     <string name="clear_playing_queue">پاکسازی صف</string>
     <string name="color">رنگ</string>
     <string name="colors">رنگ ها</string>
-    <string name="compact">جمع و جور</string>
     <string name="composer">آهنگساز</string>
     <string name="copied_device_info_to_clipboard">اطلاعات دستگاه در کلیپ بورد کپی شد.</string>
     <string name="could_not_create_playlist">نمیتوان پلی لیست ساخت.</string>
@@ -143,7 +138,7 @@
     <string name="credit_title">اعضا و دست اندرکاران </string>
     <string name="currently_listening_to_x_by_x">در حال حاضر شما به s$1% از s$2% گوش می‌دهید.</string>
     <string name="custom_artist_images">تصاویر هنرمند سفارشی</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">به اشتراک گذاری گزارش خرابی</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
     <string name="dark_theme_name">تقریبا مشکی</string>
     <string name="delete_playlist_title">حذف کردن پلی لیست</string>
     <string name="delete_playlist_x"><![CDATA[حذف پلی لیست <b>%1$s</b>?<b>?]]></string>
@@ -158,46 +153,38 @@
     <string name="depth">عمق</string>
     <string name="description">توضیحات</string>
     <string name="device_info">اطلاعات دستگاه</string>
-    <string name="dialog_message_set_ringtone">به موسیقی رترو اجازه دهید تنظیمات صدا را تغییر دهد</string>
+    <string name="dialog_message_set_ringtone">به رترو موزیک دسترسی به قسمت صوت ها بدهید</string>
     <string name="dialog_title_set_ringtone">تنظیم آهنگ زنگ</string>
     <string name="disc_hint">شماره دیسک</string>
     <string name="do_you_want_to_clear_the_blacklist">ایا می‌خواهید بلک لیست را پاک کنید؟</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[آیا شما میخواهید آهنگ X را از لیست سیاه حذف کنید؟]]></string>
     <string name="donate">کمک مالی</string>
-    <string name="donate_summary">اگر فکر میکنید شایسته ی دریافت کمک مالی هستم، می توانید مقداری پول اینجا بگذارید</string>
-    <string name="donation_header">برای من بخر:</string>
-    <string name="done">انجام شد</string>
+    <string name="donate_summary">اگر فکر میکنید شایسته ی دریافت کمک مالی هستم، می‌توانید در اینجا انجام دهید...</string>
+    <string name="donation_header">به من پول بدهید:-)</string>
+    <string name="done">انجام شده</string>
     <string name="drive_mode">حالت رانندگی</string>
     <string name="edit_fab">کلید ویرایش</string>
     <string name="edit_normal_lyrics">ویرایش متن ترانه</string>
     <string name="edit_synced_lyrics">متن آهنگ های هماهنگ شده</string>
     <string name="empty">خالی</string>
     <string name="equalizer">اکولایزر</string>
-    <string name="error_create_backup">پشتیبان گیری \u2019 انجام نشد</string>
-    <string name="error_delete_backup">حذف \u2019 نسخه پشتیبان انجام نشد</string>
-    <string name="error_empty_name">نام شما نمیتواند خالی باشد!</string>
-    <string name="error_load_failed">بارگیری انجام نشد</string>
-    <string name="error_share_file">فایل به اشتراک گذاشته نشد</string>
-    <string name="expanded">گسترش یافته</string>
     <string name="faq">سوالات متداول</string>
-    <string name="favorites">علاقه‌مندی‌ها</string>
-    <string name="file_already_exists">فایل از قبل موجود میباشد</string>
-    <string name="finish_last_song">پایان آخرین آهنگ</string>
+    <string name="favorites">موارد مورد علاقه</string>
+    <string name="finish_last_song">اخرین اهنگ را تمام کردن</string>
     <string name="fit">متناسب</string>
-    <string name="flat">تخت</string>
+    <string name="flat">تخت و مسطح</string>
     <string name="folders">پوشه ها</string>
-    <string name="follow_system">پیروی از سیستم</string>
-    <string name="for_you">برای شما</string>
-    <string name="free">رایگان</string>
-    <string name="full">کامل</string>
-    <string name="full_card">کارت کامل</string>
+    <string name="follow_system">همگام با سیستم</string>
+    <string name="for_you">مخصوص برای شما</string>
+    <string name="free">مجانی</string>
+    <string name="full">حالت کامل و تمام</string>
+    <string name="full_card">حالت برگه ی کامل</string>
     <string name="general_settings_summary">عوض کردن تم و رنگ های برنامه</string>
     <string name="general_settings_title">شکل ظاهری برنامه</string>
     <string name="genre">ژانر</string>
     <string name="genres">ژانر ها</string>
-    <string name="git_hub_summary">ستاره‌دار کردن پروژه در گیت‌هاب</string>
-    <string name="gradient">شیب</string>
-    <string name="grant_access">اجازه دسترسی</string>
+    <string name="git_hub_summary">فورک زدن پروژه در گیتهاب</string>
+    <string name="gradient">حالت شیب دار</string>
     <string name="grid_size_1">۱</string>
     <string name="grid_size_2">۲</string>
     <string name="grid_size_3">۳</string>
@@ -206,57 +193,50 @@
     <string name="grid_size_6">۶</string>
     <string name="grid_size_7">۷</string>
     <string name="grid_size_8">۸</string>
-    <string name="grid_style_label">نوع شبکه</string>
+    <string name="grid_style_label">استایل شبکه</string>
     <string name="help_summary">به کمک بیشتری نیاز دارید؟</string>
     <string name="hinge">لولا</string>
     <string name="history">تاریخچه پخش اهنگ</string>
-    <string name="history_cleared">تاریخچه پاک شد</string>
-    <string name="history_undo_button">بازگشت به قبل</string>
+    <string name="history_cleared">History cleared</string>
+    <string name="history_undo_button">Undo</string>
     <string name="home">صفحه اصلی</string>
-    <string name="horizontal_flip">حالت افقی</string>
+    <string name="horizontal_flip">پرش از لبه خارجی به صورت افقی</string>
     <string name="image">تصویر</string>
-    <string name="image_gradient">تصویر شیب دار</string>
+    <string name="image_gradient">عکس شیب دار</string>
     <string name="image_settings_summary">عوض کردن حالت دانلود تصویر هنرمند</string>
     <string name="import_label">وارد کردن</string>
-    <string name="import_playlist">وارد کردن لیست پخش</string>
-    <string name="import_playlist_message">تمام لیست های پخش لیست شده در فروشگاه رسانه اندروید را با آهنگ ها وارد می کند، اگر لیست های پخش از قبل وجود داشته باشد، آهنگ ها ادغام می شوند.</string>
+    <string name="import_playlist">وارد کردن لیست پخش آهنگ</string>
+    <string name="import_playlist_message">تمام لیست پخش آهنگ ها در اندروید مدیا وارد می‌شود، اگر اهنگ ها از قبل موجود باشند، اهنگ ها ادغام می‌شوند.</string>
     <string name="inserted_x_songs_into_playlist_x">X اهنگ به پلی لیست Y وارد شد.</string>
-    <string name="instagram_page_summary">تنظیمات Retro Music خود را برای نمایش در اینستاگرام به اشتراک بگذارید</string>
+    <string name="instagram_page_summary">شخصی سازی رترو موزیک خود را در اینستاگرام به اشتراک بگذارید</string>
     <string name="keyboard">کیبورد</string>
-    <string name="label_bit_rate">نرخ بیت</string>
+    <string name="label_bit_rate">بیت ریت</string>
     <string name="label_file_format">فرمت</string>
     <string name="label_file_name">نام فایل</string>
     <string name="label_file_path">مسیر فایل</string>
     <string name="label_file_size">سایز</string>
-    <string name="label_last_modified">آخرین تغییر</string>
+    <string name="label_last_modified">Last Modified</string>
     <string name="label_more_from">بیشتر از s%</string>
-    <string name="label_sampling_rate">نرخ نمونه‌گذاري</string>
+    <string name="label_sampling_rate">نرخ سمپل</string>
     <string name="label_track_length">مدت</string>
     <string name="labeled">برچسب دار</string>
-    <string name="last_added">آخرین اضافه شده</string>
-    <string name="last_song">آخرین آهنگ</string>
-    <string name="lets_go">بزن بریم</string>
+    <string name="last_added">آخرین مورد اضافه شده</string>
+    <string name="last_song">اخرین آهنگ</string>
     <string name="library_categories">دسته بندی های کتابخانه</string>
     <string name="licenses">مجوزها</string>
     <string name="light_theme_name">کاملا سفید</string>
     <string name="listeners_label">شنوندگان</string>
     <string name="listing_files">لیست کردن پوشه ها</string>
-    <string name="loading_products">در حال بارگیری محصولات…</string>
-    <string name="login">ورود</string>
-    <string name="lyrics">متن ترانه</string>
-    <string name="made_with_love">ساخته شده با ❤️ در هند</string>
+    <string name="loading_products">Loading product…</string>
+    <string name="login">ورود به سیستم</string>
+    <string name="lyrics">متون ترانه</string>
+    <string name="made_with_love">ساختِہ شُدِه با \u2665 دَر هِندوستان</string>
     <string name="material">تم material</string>
     <string name="md_error_label">خطا</string>
     <string name="md_storage_perm_error">خطای دسترسی</string>
-    <string name="message_backup_create_success">پشتیبان گیری با موفقیت انجام شد.</string>
-    <string name="message_limit_tabs">بیشتر از ۵ مورد نیست</string>
-    <string name="message_pro_feature">%s یک ویژگی نسخه حرفه‌ای برنامه است.</string>
-    <string name="message_restore_success">بازیابی با موفقیت انجام شد.</string>
-    <string name="message_updated">به روز شد</string>
-    <string name="message_welcome"><![CDATA[سلام! <br> به %s خوش آمدید]]></string>
     <string name="my_name">عنوان</string>
     <string name="my_top_tracks">بیشترین پخش شده</string>
-    <string name="never">هیچوقت</string>
+    <string name="never">هرگز</string>
     <string name="new_music_mix">میکس موسیقی جدید</string>
     <string name="new_playlist_title">فهرست پخش جدید %d</string>
     <string name="new_start_directory">دایرکتوری شروع جدید است%s.</string>
@@ -270,12 +250,12 @@
     <string name="no_lyrics_found">متنی یافت نشد</string>
     <string name="no_playing_queue">آهنگی پخش نمی‌شود</string>
     <string name="no_playlists">شما هیچ صفحه پخشی ندارید</string>
-    <string name="no_purchase_found">خریدها یافت نشد</string>
+    <string name="no_purchase_found">افزونه خرید نرم افزار یافت نشد.</string>
     <string name="no_results">بدون نتیجه</string>
     <string name="no_songs">شما هیچ آهنگی ندارید</string>
     <string name="normal">معمولی</string>
     <string name="normal_lyrics">متن معمولی آهنگ</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> در فروشگاه رسانه فهرست نشده است.]]></string>
+    <string name="not_listed_in_media_store"><![CDATA[s% در مدیااستور لیست نشده.]]></string>
     <string name="not_recently_played">اخیراً پخش نشده</string>
     <string name="nothing_to_scan">هیچ چیزی برای اسکن نیست.</string>
     <string name="nothing_to_see">اینچا چیزی برای دیدن نیست</string>
@@ -288,45 +268,44 @@
     <string name="only_on_wifi">فقط از طریق wi-fi</string>
     <string name="other_settings_summary">ویژگی های تستی پیش‌رفته</string>
     <string name="others">غیره</string>
-    <string name="over_cover">روی پوشش</string>
+    <string name="over_cover">بیش از پوشش</string>
     <string name="password">گذرواژه</string>
     <string name="past_three_months">3 ماه گذشته</string>
     <string name="paste_lyrics_here">متن را در اینجا بارگزاری کنید</string>
-    <string name="paste_timeframe_lyrics_here">متن های زمان دار را در اینجا بارگزاری کنید</string>
-    <string name="peek">نمایش مختصر</string>
-    <string name="permission_bluetooth_denied">مجوز دستگاه‌های نزدیک داده نشد.</string>
+    <string name="paste_timeframe_lyrics_here">متون زمان دار را در اینجا بارگزاری کنید</string>
+    <string name="peek">Peek</string>
     <string name="permission_external_storage_denied">مجوز دسترسی به حافظه رد شد</string>
     <string name="permission_summary">برنامه نیاز به دسترسی به حافظه برای پخش آهنگ ها دارد</string>
     <string name="permission_title">دسترسی به حافظه</string>
     <string name="permissions_denied">دسترسی رد شد</string>
     <string name="personalize">شخصی سازی</string>
     <string name="personalize_settings_summary">صفحه پخش اهنگ و رابط کاربری برنامه را شخصی سازی کنید</string>
-    <string name="pick_from_local_storage">از فضای ذخیره‌سازی داخلی انتخاب کنید</string>
-    <string name="pinterest_page">پینترست</string>
-    <string name="pinterest_page_summary">صفحه پینترست را برای الهام گرفتن از طراحی Retro Music دنبال کنید</string>
+    <string name="pick_from_local_storage">انتخاب از حافظه ی محلی</string>
+    <string name="pinterest_page">Pinterest</string>
+    <string name="pinterest_page_summary">صفحه پینترست رترو را دنبال کنید</string>
     <string name="plain">ساده</string>
-    <string name="playList_already_exits">لیست پخش از قبل وجود دارد</string>
-    <string name="playback_pitch">میزان صدا</string>
+    <string name="playList_already_exits">Playlist already exists</string>
+    <string name="playback_pitch">گام صدا</string>
     <string name="playback_settings">تنظیمات پخش</string>
     <string name="playback_speed">سرعت پخش</string>
-    <string name="playing_notification_description">اعلان پخش، اقداماتی را برای پخش/مکث و غیره ارائه می دهد.</string>
+    <string name="playing_notification_description">اعلان موزیک به شما امکان قطع کردن موزیک، پخش موزیک و... می‌دهد.</string>
     <string name="playing_notification_name">اعلان در حال پخش</string>
-    <string name="playlist_created_sucessfully">%s با موفقیت ایجاد شد</string>
+    <string name="playlist_created_sucessfully">%s created successfully</string>
     <string name="playlist_is_empty">صفحه پخش خالی است</string>
     <string name="playlist_name_empty">نام لیست پخش آهنگ</string>
     <string name="playlists">لیست پخش آهنگ ها</string>
-    <string name="pref_blur_amount_summary">میزان تاری اعمال شده برای تم هایی که قابلیت بلور دارن، هر چی کمتر، سریعتر است</string>
-    <string name="pref_blur_amount_title">مقدار تاری</string>
-    <string name="pref_filter_song_summary">مرتب‌سازی اهنگ ها بر اساس مدت زمان</string>
-    <string name="pref_filter_song_title">مرتب‌سازی مدت زمان آهنگ</string>
+    <string name="pref_blur_amount_summary">مقدار بلور برای تم هایی که قابلیت بلور دارن، هر چی کمتر، سریعتر.</string>
+    <string name="pref_blur_amount_title">مقدار بلور</string>
+    <string name="pref_filter_song_summary">مرتب سازی اهنگ ها بر اساس مدت</string>
+    <string name="pref_filter_song_title">مرتب سازی مدت اهنگ</string>
     <string name="pref_header_advanced">پیشرفته</string>
-    <string name="pref_header_album">سبک آلبوم</string>
+    <string name="pref_header_album">استایل آلبوم</string>
     <string name="pref_header_audio">صدا</string>
     <string name="pref_header_blacklist">لیست سیاه</string>
     <string name="pref_header_controls">کنترل ها</string>
     <string name="pref_header_general">تم</string>
     <string name="pref_header_images">تصاویر</string>
-    <string name="pref_header_library">کتابخانه</string>
+    <string name="pref_header_library">مجموعه</string>
     <string name="pref_header_lockscreen">صفحه‌ قفل</string>
     <string name="pref_header_playlists">لیست پخش آهنگ ها</string>
     <string name="pref_keep_pause_on_zero_volume_summary">آهنگ به محض اینکه صدای گوشی به صفر می‌رسد متوقف می‌شود و به هنگام بالا رفتن صدا موزیک پخش می‌شود</string>
@@ -336,95 +315,93 @@
     <string name="pref_language_name">انتخاب زبان</string>
     <string name="pref_snow_fall_title">اثر بارش برف</string>
     <string name="pref_summary_album_art_on_lockscreen">از عکس آهنگ کنونی به عنوان نمایه ی صفحه ی قفل استفاده کنید</string>
-    <string name="pref_summary_album_artists_only">البوم های هنرمندان را در قسمت دسته نمایش دهید</string>
+    <string name="pref_summary_album_artists_only">البوم های هنرمندان را در قسمت Category نمایش دهید</string>
     <string name="pref_summary_audio_ducking">صدای گوشی کم شود هنگامیکه از سیستم صدایی شنیده شود یا اعلانی دریافت شود</string>
     <string name="pref_summary_audio_fade">هنگام توقف یا پخش آهنگ، صدا را محو کنید</string>
-    <string name="pref_summary_blacklist">محتوای پوشه های لیست سیاه از کتابخانه شما پنهان است.</string>
-    <string name="pref_summary_bluetooth_playback">به محض اتصال به دستگاه بلوتوث شروع به پخش کنید</string>
-    <string name="pref_summary_blurred_album_art">جلد آلبوم را روی صفحه قفل تار کنید. می تواند با برنامه ها و ویجت های شخص ثالث مشکل ایجاد کند</string>
-    <string name="pref_summary_carousel_effect">جلوه چرخ فلک برای آلبوم هنرمند در صفحه در حال پخش. توجه داشته باشید که تم‌های کارت و کارت تاری کار نمی‌کنند</string>
-    <string name="pref_summary_classic_notification">از طراحی اعلان کلاسیک استفاده کنید</string>
-    <string name="pref_summary_colored_app">رنگ‌های پس‌زمینه و دکمه کنترل با توجه به هنر آلبوم از صفحه در حال پخش تغییر می‌کنند</string>
-    <string name="pref_summary_colored_app_shortcuts">میانبرهای برنامه را با رنگ تاکیدی رنگ می کند. هر بار که رنگ را تغییر می‌دهید، لطفاً آن را تغییر دهید تا تأثیر بگذارد</string>
-    <string name="pref_summary_colored_notification">"به اعلان های جلذ آلبوم\u2019 رنگ های متنوع بدهید"</string>
-    <string name="pref_summary_cross_fade">مدت زمان تقاطع بین آهنگ ها</string>
-    <string name="pref_summary_desaturated_color">طبق دستورالعمل طراحی Material، خطوط در رنگ‌های حالت تاریک باید غیراشباع باشند</string>
-    <string name="pref_summary_expand_now_playing_panel">با کلیک بر روی اعلان، به جای صفحه اصلی، صفحه در حال پخش نمایش داده می شود</string>
-    <string name="pref_summary_extra_controls">اضافه کردن کنترل های اضافی برای پخش‌کننده کوچک</string>
-    <string name="pref_summary_extra_song_info">نمایش اطلاعات اضافی آهنگ، مانند فرمت فایل، میزان بیت و فرکانس</string>
-    <string name="pref_summary_gapless_playback">"می تواند باعث مشکلات پخش در برخی دستگاه ها شود."</string>
+    <string name="pref_summary_blacklist">محتوای فولدر لیست سیاه در حال حاضر پنهان شده است از نمایش در صفحه اصلی.</string>
+    <string name="pref_summary_bluetooth_playback">هنگامیکه یک دستگاه بلوتوثی وصل شد اهنگ بلافاصله پخش شود</string>
+    <string name="pref_summary_blurred_album_art">کاور البوم را در صفحه قفل بلور کنید. می‌تواند باعث مشکل دستگاه شود</string>
+    <string name="pref_summary_carousel_effect">افکت carousel برای کاور آلبوم. این افکت در حالت برگه و برگه ی بلور شده کار نمیکند</string>
+    <string name="pref_summary_classic_notification">از نمایش اعلان های موزیک به سورت کلاسیک استفاده کنید</string>
+    <string name="pref_summary_colored_app">بک گراند و دکمه های کنترل طبق کاور البوم تغییر میکنند</string>
+    <string name="pref_summary_colored_app_shortcuts">رنگ شورت کات برنامه را به صورت رنگ اصلی در بیاورید، لطفاً با هر بار رنگ عوض کردن این گزینه را غیر فعال و دوباره فعال کنید.</string>
+    <string name="pref_summary_colored_notification">"به اعلان های کاور آلبوم\u2019 رنگ های متنوع بدهید"</string>
+    <string name="pref_summary_cross_fade">مدت زمان crossfade بین آهنگ ها</string>
+    <string name="pref_summary_desaturated_color">رنگ اصلی را به صورت کم‌رنگ در بیاورید</string>
+    <string name="pref_summary_expand_now_playing_panel">اگر این گزینه را فعال کنید، با کلیک بر اعلان اهنگ، شما مستقیم به آهنگ هدایت می‌شوید بجای صفحه اصلی</string>
+    <string name="pref_summary_extra_controls">دکمه های کنترل اضافه به مینی پلیر اضافه کنید</string>
+    <string name="pref_summary_extra_song_info">اطلاعات اضافی اهنگ را نشان دهید؛ همانند فرمت فایل، بیت ریت و فرکانس اهنگ</string>
+    <string name="pref_summary_gapless_playback">"ممکن است باعث مشکل در بعضی از دستگاه ها شود."</string>
     <string name="pref_summary_home_banner">نمایش یا عدم نمایش نوار</string>
-    <string name="pref_summary_ignore_media_store_artwork">می تواند کیفیت جلد آلبوم را افزایش دهد، اما باعث کندی بارگذاری تصویر می شود. فقط اگر با آثار هنری با وضوح پایین مشکل دارید این را فعال کنید</string>
-    <string name="pref_summary_library_categories">قابلیت مشاهده و ترتیب دسته‌های کتابخانه را پیکربندی کنید.</string>
-    <string name="pref_summary_lock_screen">از کنترل‌های صفحه قفل سفارشی Retro Music استفاده کنید</string>
-    <string name="pref_summary_manage_audio_focus">همیشه صدا را در پس زمینه بدون توجه به هر چیز دیگری که در حال پخش است پخش کنید</string>
-    <string name="pref_summary_open_source_licences">جزئیات مجوز برای نرم‌افزار منبع باز</string>
-    <string name="pref_summary_pause_history">وقتی فعال باشد، آهنگ‌های تازه پخش شده در تاریخ نمایش داده نمی‌شوند</string>
-    <string name="pref_summary_remember_tab">در شروع به آخرین برگه استفاده شده بروید</string>
-    <string name="pref_summary_show_lyrics">نمایش متن های همگام‌سازی شده روی جلد آلبوم</string>
+    <string name="pref_summary_ignore_media_store_artwork">باعث افزایش کیفیت کاور آلبوم ها میشود اما ممکن است لود انها دیرتر باشد. فقط در صورتی که با کیفیت ضعیف کاور البوم مشکل دارید فعالش کنید</string>
+    <string name="pref_summary_library_categories">Library نمایش داده شود یا خیر.</string>
+    <string name="pref_summary_lock_screen">از کنترل های رترو موزیک برای صفحه قفل استفاده شود</string>
+    <string name="pref_summary_open_source_licences">جزئیات مجوز برای نرم افزار منبع باز</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
+    <string name="pref_summary_remember_tab">هدایت شود به اخرین tab استفاده شده در آغاز</string>
+    <string name="pref_summary_show_lyrics">نمایش متن آهنگ همگام‌سازی شده روی جلد آلبوم</string>
     <string name="pref_summary_suggestions">نمایش ترکیب موسیقی جدید در صفحه اصلی</string>
     <string name="pref_summary_swipe_anywhere_now_playing">تغییر آهنگ را با کشیدن انگشت در هر نقطه ای از صفحه در حال پخش فعال می کند</string>
-    <string name="pref_summary_swipe_to_dismiss">برای رد کردن پخش‌کننده کوچک، انگشت خود را به پایین بکشید</string>
-    <string name="pref_summary_toggle_full_screen">حالت فراگیر</string>
-    <string name="pref_summary_toggle_headset">بلافاصله پس از اتصال هدفون شروع به پخش کنید</string>
-    <string name="pref_summary_toggle_shuffle">هنگام پخش لیست جدیدی از آهنگ‌ها، حالت مخلوط خاموش می‌شود</string>
-    <string name="pref_summary_toggle_volume">اگر فضای کافی در دسترس است، کنترل‌های صدا را در صفحه در حال پخش نمایش دهید</string>
+    <string name="pref_summary_toggle_full_screen">حالت همه جانبه</string>
+    <string name="pref_summary_toggle_headset">پس از وصل شدن هدفون موزیک بلافاصله پخش شود</string>
+    <string name="pref_summary_toggle_shuffle">حالت پخش مخلوط اهنگ ها زمانی که لیست جدید اهنگ را پلی می‌کنید، خاموش می‌شود</string>
+    <string name="pref_summary_toggle_volume">اگر فضای کافی موجود بود، نوار صدا را نشان دهید در صفحه پخش موزیک</string>
     <string name="pref_summary_wallpaper_accent">رنگ تاکیدی را از کاغذ دیواری استخراج کنید</string>
-    <string name="pref_summary_whitelist">فقط موسیقی از /Music Folder نمایش داده شود</string>
+    <string name="pref_summary_whitelist">فقط از پوشه ی موزیک، موزیک ها نمایش داده شود</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">نمایش جلد آلبوم</string>
     <string name="pref_title_album_artists_only">هدایت توسط آلبوم هنرمند</string>
-    <string name="pref_title_album_cover_style">تم جلد آلبوم</string>
-    <string name="pref_title_album_cover_transform">انیمیشن جلد البوم</string>
+    <string name="pref_title_album_cover_style">تم کاور آلبوم</string>
+    <string name="pref_title_album_cover_transform">انیمیشن کاور البوم</string>
     <string name="pref_title_app_shortcuts">میان بُرهای رنگی برنامه</string>
-    <string name="pref_title_appbar_mode">سبک سربرگ</string>
-    <string name="pref_title_audio_ducking">کاهش حجم در هنگام از دست دادن تمرکز</string>
+    <string name="pref_title_appbar_mode">حالت نوار برنامه</string>
+    <string name="pref_title_audio_ducking">کاهش حجم از دست دادن فوکوس</string>
     <string name="pref_title_audio_fade">محو کردن صدا</string>
-    <string name="pref_title_auto_download_artist_images">دانلود خودکار تصاویر هنرمندان</string>
+    <string name="pref_title_auto_download_artist_images">دانلود خودکار عکس هنرمندان</string>
     <string name="pref_title_blacklist">لیست سیاه</string>
-    <string name="pref_title_bluetooth_playback">پخش بلوتوث</string>
-    <string name="pref_title_blurred_album_art">تار کردن جلد البوم</string>
+    <string name="pref_title_bluetooth_playback">پلی بک بلوتوث</string>
+    <string name="pref_title_blurred_album_art">بلور کردن کاور البوم</string>
     <string name="pref_title_circle_button">دکمه پخش دایره ای</string>
     <string name="pref_title_classic_notification">از نمایش اعلان های موزیک به صورت کلاسیک استفاده کنید</string>
     <string name="pref_title_colored_app">رنگ تطبیقی</string>
     <string name="pref_title_colored_notification">اعلان رنگی</string>
     <string name="pref_title_cross_fade">پخش بعدی قبل از اتمام فعلی (میلی ثانیه)</string>
-    <string name="pref_title_custom_font">از فونت مانروپ استفاده کنید</string>
-    <string name="pref_title_desaturated_color">رنگ غیر اشباع</string>
-    <string name="pref_title_expand_now_playing_panel">نمایش در حال پخش صفحه نمایش</string>
+    <string name="pref_title_custom_font">استفاده از فونت Manrope</string>
+    <string name="pref_title_desaturated_color">استفاده از رنگ های کم رنگ</string>
+    <string name="pref_title_expand_now_playing_panel">نمایش صفحه پخش موزیک</string>
     <string name="pref_title_extra_controls">کنترل های اضافی</string>
-    <string name="pref_title_extra_song_info">اطلاعات آهنگ</string>
+    <string name="pref_title_extra_song_info">اطلاعات موزیک</string>
     <string name="pref_title_gapless_playback">پخش بدون شکاف</string>
-    <string name="pref_title_general_theme">تم برنامه</string>
+    <string name="pref_title_general_theme">پوسته برنامه</string>
     <string name="pref_title_home_album_grid_style">تصویر آلبوم</string>
-    <string name="pref_title_home_artist_grid_style">صفحه هنرمند</string>
+    <string name="pref_title_home_artist_grid_style">صفحه آرتیست ( اندازه)</string>
     <string name="pref_title_home_banner">بنر</string>
     <string name="pref_title_ignore_media_store_artwork">پوشش های فروشگاه رسانه را نادیده بگیرید</string>
     <string name="pref_title_last_added_interval">آخرین فاصله لیست پخش اضافه شده</string>
     <string name="pref_title_lock_screen">کنترل های تمام صفحه</string>
     <string name="pref_title_lyrics_screen_on">هنگام نمایش متن ترانه صفحه نمایش را روشن نگه دارید</string>
     <string name="pref_title_lyrics_type">نوع متن ترانه</string>
-    <string name="pref_title_manage_audio_focus">همیشه پخش کن</string>
-    <string name="pref_title_now_playing_screen_appearance">در حال پخش تم</string>
+    <string name="pref_title_now_playing_screen_appearance">تمی که اکنون در حال پخش است</string>
     <string name="pref_title_open_source_licences">مجوزهای منبع باز</string>
-    <string name="pref_title_pause_history">توقف تاریخچه</string>
-    <string name="pref_title_remember_tab">به خاطر سپردن آخرین برگه</string>
+    <string name="pref_title_pause_history">Pause history</string>
+    <string name="pref_title_remember_tab">به خاطر سپردن آخرین زبانه</string>
     <string name="pref_title_show_lyrics">نمایش متن ترانه</string>
     <string name="pref_title_suggestions">نمایش پیشنهادات</string>
     <string name="pref_title_swipe_anywhere_now_playing">برای تغییر آهنگ، انگشت خود را به هر جایی بکشید</string>
-    <string name="pref_title_swipe_to_dismiss">رد کردن با کشیدن انگشت به پایین</string>
     <string name="pref_title_tab_text_mode">حالت عنوان برگه ها</string>
     <string name="pref_title_toggle_carousel_effect">جلوه چرخ فلک</string>
     <string name="pref_title_toggle_full_screen">برنامه تمام‌صفحه</string>
     <string name="pref_title_toggle_toggle_headset">پخش خودکار</string>
-    <string name="pref_title_toggle_toggle_shuffle">حالت مخلوط</string>
+    <string name="pref_title_toggle_toggle_shuffle">حالت زدن</string>
     <string name="pref_title_toggle_volume">کنترل صدا</string>
     <string name="pref_title_wallpaper_accent">رنگ تاکیدی کاغذ دیواری</string>
     <string name="pref_title_whitelist">لیست سفید موسیقی</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">حرفه‌ای</string>
     <string name="pro_summary">تم سیاه، تم های در حال پخش، جلوه چرخ فلک و موارد دیگر..</string>
     <string name="profile">نمایه</string>
     <string name="purchase">خرید</string>
-    <string name="queue">صف درحال پخش</string>
+    <string name="queue">صف پخش</string>
     <string name="rate_app">به برنامه امتیاز دهید</string>
     <string name="rate_on_google_play_summary">این برنامه را دوست دارید؟ در فروشگاه گوگل پلی به ما اطلاع دهید که چگونه می‌توانیم آن را بهتر کنیم</string>
     <string name="recent_albums">آلبوم های اخیر</string>
@@ -432,7 +409,7 @@
     <string name="remove_action">حذف</string>
     <string name="remove_cover">حذف پوشش</string>
     <string name="remove_from_blacklist">حذف از لیست سیاه</string>
-    <string name="remove_image">حذف تصویر</string>
+    <string name="remove_image">Remove Image</string>
     <string name="remove_song_from_playlist_title">حذف آهنگ از لیست پخش</string>
     <string name="remove_song_x_from_playlist"><![CDATA[آهنگ <b>%1$s</b> از لیست پخش حذف شود?]]></string>
     <string name="remove_songs_from_playlist_title">حذف آهنگ‌ها از لیست پخش</string>
@@ -445,21 +422,21 @@
     <string name="reset_artist_image">تنظیم مجدد تصویر هنرمند</string>
     <string name="restore">بازیابی</string>
     <string name="restore_message">آیا می خواهید نسخه پشتیبان را بازیابی کنید؟</string>
-    <string name="restored_previous_purchase_please_restart">خرید قبلی بازیابی شد، لطفا برای استفاده از تمام ویژگی ها ، برنامه را دوباره راه اندازی کنید.</string>
-    <string name="restored_previous_purchases">خریدهای قبلی بازیابی شد.</string>
+    <string name="restored_previous_purchase_please_restart">خرید قبلی را بازیابی کرد، لطفا برای استفاده از تمام ویژگی ها ، برنامه را دوباره راه اندازی کنید.</string>
+    <string name="restored_previous_purchases">نسخه‌ قبلی بازگردانده شد.</string>
     <string name="restoring_purchase">در حال برگرداندن پول…</string>
-    <string name="retro_music_player">پخش‌کننده موسیقی Retro</string>
-    <string name="retro_music_pro">پخش‌کننده موسیقی Retro نسخه ویژه</string>
+    <string name="retro_music_player">موزیک پلیر ریت رو</string>
+    <string name="retro_music_pro">موزیک پلیر ریت رو نسخه ویژه</string>
     <string name="ringtone_summary">برنامه برای دسترسی به تنظیمات دستگاه شما برای تنظیم موسیقی به عنوان آهنگ زنگ نیاز به مجوز دارد</string>
     <string name="ringtone_title">آهنگ زنگ (اختیاری)</string>
     <string name="saf_delete_failed">حذف پرونده انجام نشد:%s</string>
     <!-- SAF -->
     <string name="saf_error_uri">نمی توان آدرس را دریافت کرد</string>
-    <string name="saf_guide_slide1_description">کشوی ناوبری را باز کنید</string>
+    <string name="saf_guide_slide1_description">بازکردن حالت کشویی</string>
     <string name="saf_guide_slide1_description_before_o">«نمایش کارت حافظه» را در منوی زیرین فعال کنید</string>
     <!-- SAF guide -->
     <string name="saf_guide_slide1_title">%s نیاز به دسترسی به کارت حافظه دارد</string>
-    <string name="saf_guide_slide2_description">باید دایرکتوری ریشه کارت SD خود را انتخاب کنید</string>
+    <string name="saf_guide_slide2_description">باید دایرکتوری ریشه کارت حافظه خود را انتخاب کنید</string>
     <string name="saf_guide_slide2_title">مکان کارت SD خود را انتخاب کنید</string>
     <string name="saf_guide_slide3_description">هیچ زیر پوشه ای را باز نکنید</string>
     <string name="saf_guide_slide3_title">بر روی دکمه \"انتخاب\" در پایین صفحه ضربه بزنید</string>
@@ -483,7 +460,7 @@
     <string name="share_to_stories">اشتراک گذاری در استوری</string>
     <string name="show_album_artists">نمایش هنرمندان آلبوم</string>
     <string name="shuffle">حالت مخلوط</string>
-    <string name="simple">ساده</string>
+    <string name="simple">نمونه</string>
     <string name="sleep_timer_canceled">زمان خواب لغو شد.</string>
     <string name="sleep_timer_set">تایمر خواب از هم اکنون برای %d دقیقه تنظیم شده است.</string>
     <string name="social">شبکه های اجتماعی</string>
@@ -496,9 +473,8 @@
     <string name="sort_order_album">آلبوم</string>
     <string name="sort_order_artist">هنرمند</string>
     <string name="sort_order_composer">آهنگساز</string>
-    <string name="sort_order_date">تاریخ اضافه شده</string>
+    <string name="sort_order_date">تاریخ اضافه شدن</string>
     <string name="sort_order_date_modified">تاریخ ویرایش شده</string>
-    <string name="sort_order_default">پیش‌فرض</string>
     <string name="sort_order_num_songs">تعداد آهنگ</string>
     <string name="sort_order_num_songs_desc">کاهش تعداد آهنگ</string>
     <string name="sort_order_year">سال</string>
@@ -512,13 +488,13 @@
     <string name="swipe_to_unlock">برای باز کردن قفل، انگشت خود را بکشید</string>
     <string name="synced_lyrics">همگام سازی متن ترانه ها</string>
     <string name="telegram_group">تلگرام</string>
-    <string name="telegram_group_summary">برای بحث در مورد اشکالات، ارائه پیشنهادات، نمایش و موارد دیگر به گروه تلگرام بپیوندید</string>
+    <string name="telegram_group_summary">برای بحث در مورد اشکالات، ارائه پیشنهادات، خودنمایی و موارد دیگر به گروه تلگرام بپیوندید</string>
     <string name="thank_you">متشکریم!</string>
     <string name="the_audio_file">فایل صوتی</string>
     <string name="this_month">این ماه</string>
     <string name="this_week">این هفته</string>
     <string name="this_year">امسال</string>
-    <string name="tiny">کوچک</string>
+    <string name="tiny">بسیار کوچک</string>
     <string name="tiny_card_style">کارت کوچک</string>
     <string name="title">عنوان</string>
     <string name="title_new_backup">پشتیبان گیری جدید</string>
@@ -529,11 +505,11 @@
     <string name="track_list">شماره  آهنگ</string>
     <string name="translate">ترجمه کردن</string>
     <string name="translate_community">به ما کمک کنید تا برنامه را به زبان شما ترجمه کنیم</string>
-    <string name="try_retro_music_premium">نسخه ویژه موزیک پلیر Retro را امتحان کنید</string>
+    <string name="try_retro_music_premium">موزیک پلیر ریت رو نسخه ویژه را امتحان کنید</string>
     <string name="twitter_page">توییتر</string>
-    <string name="twitter_page_summary">طرح خود را با موسیقی Retro به اشتراک بگذارید</string>
+    <string name="twitter_page_summary">نشان دادن طراحی شما با موزیک پلیر ریت رو</string>
     <string name="unlabeled">بدون برچسب</string>
-    <string name="unplayable_file">این آهنگ پخش نمیشود.</string>
+    <string name="unplayable_file">این موزیک پخش نمیشود</string>
     <string name="up_next">تا بعدی</string>
     <string name="update_image">بروز رسانی تصویر</string>
     <string name="updating">درحال به روز رسانی…</string>
@@ -558,4 +534,5 @@
     <string name="you_have_to_select_at_least_one_category">شما باید حداقل یک دسته را انتخاب کنید.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">شما به وب سایت ردیاب مشکل هدایت می شوید.</string>
     <string name="your_account_data_is_only_used_for_authentication">اطلاعات حساب شما فقط برای احراز هویت استفاده می شود.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-fil-rPH/strings.xml b/app/src/main/res/values-fil-rPH/strings.xml
index 5312aaf02..1ac0f2af1 100644
--- a/app/src/main/res/values-fil-rPH/strings.xml
+++ b/app/src/main/res/values-fil-rPH/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Idagdag sa mga paborito</string>
     <string name="action_add_to_playing_queue">Idagdag sa playing queue</string>
     <string name="action_add_to_playlist">Idagdag sa playlist</string>
-    <string name="action_cancel">Kanselahin</string>
     <string name="action_cast">Kast</string>
     <string name="action_clear_playing_queue">Burahin ang playing queue</string>
     <string name="action_cycle_repeat">Cycle repeat mode</string>
@@ -91,8 +90,6 @@
     <string name="biography">Talambuhay</string>
     <string name="black_theme_name">Itim Lamang</string>
     <string name="blacklist">Blacklist</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
     <string name="blur">Blur</string>
     <string name="blur_card">Blur Card</string>
     <string name="bug_report_failed">Hindi makapag-padala ng report</string>
@@ -106,7 +103,6 @@
     <string name="bug_report_no_password">Pakilagay ang iyong wastong password sa GitHub</string>
     <string name="bug_report_no_title">Maglagay ng pamagat sa isyu</string>
     <string name="bug_report_no_username">Pakilagay ang iyong wastong GitHub username</string>
-    <string name="bug_report_success">Bug report successful</string>
     <string name="bug_report_summary">May naganap na hindi inaasahang error. Paumanhin, nakikita mo ang bug na ito, kung patuloy itong nagka-crash \"Burahin ang data ng app\" o magpadala ng Email </string>
     <string name="bug_report_use_account">Ipadala gamit ang GitHub account</string>
     <string name="buy_now">Bumili na ngayon</string>
@@ -130,7 +126,6 @@
     <string name="clear_playing_queue">Linisin ang queue</string>
     <string name="color">Kulay</string>
     <string name="colors">Mga kulay</string>
-    <string name="compact">Compact</string>
     <string name="composer">Kompositor</string>
     <string name="copied_device_info_to_clipboard">Kinopya ang impormasyon ng device sa clipboard.</string>
     <string name="could_not_create_playlist">Hindi makagawa ng playlist.</string>
@@ -173,15 +168,8 @@
     <string name="edit_synced_lyrics">I-edit ang Naka-sync na Lyrics</string>
     <string name="empty">Walang laman</string>
     <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
     <string name="faq">FAQ</string>
     <string name="favorites">Mga Paborito</string>
-    <string name="file_already_exists">File already exists</string>
     <string name="finish_last_song">Tapusin ang huling kanta</string>
     <string name="fit">Angkop</string>
     <string name="flat">Patag</string>
@@ -193,11 +181,10 @@
     <string name="full_card">Full Kard</string>
     <string name="general_settings_summary">I-change ang theme at mga kulay ng app</string>
     <string name="general_settings_title">Tanaw at diwa</string>
-    <string name="genre">Dyanra</string>
-    <string name="genres">Mga Dyanra</string>
+    <string name="genre">Genre</string>
+    <string name="genres">Mga Genre</string>
     <string name="git_hub_summary">I-fork ang proyekto sa GitHub</string>
     <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -235,7 +222,6 @@
     <string name="labeled">Lebelado</string>
     <string name="last_added">Huling idinagdag</string>
     <string name="last_song">Huling kanta</string>
-    <string name="lets_go">Let\'s go</string>
     <string name="library_categories">Mga kategorya ng librerya</string>
     <string name="licenses">Mga lisensya</string>
     <string name="light_theme_name">Malinaw na Puti</string>
@@ -248,12 +234,6 @@
     <string name="material">Materyal</string>
     <string name="md_error_label">Nagka-mali</string>
     <string name="md_storage_perm_error">Maling permiso</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
     <string name="my_name">Pangalan</string>
     <string name="my_top_tracks">Madalas patugtugin</string>
     <string name="never">Hindi kailanman</string>
@@ -294,7 +274,6 @@
     <string name="paste_lyrics_here">Idikit ang Lyrics Dito</string>
     <string name="paste_timeframe_lyrics_here">Idikit ang timeframe lyrics dito</string>
     <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">Tinanggihan ang pahintulot na ma-access ang panlabas na storage.</string>
     <string name="permission_summary">Ang app ay nangangailangan ng permiso upang ma-access ang storage ng iyong device para ma-play ang musika</string>
     <string name="permission_title">I-access ang storage</string>
@@ -357,26 +336,25 @@
     <string name="pref_summary_ignore_media_store_artwork">Maaaring pataasin ang kalidad ng album cover, ngunit nagiging sanhi ng mas mabagal na oras ng paglo-load ng larawan. Paganahin lamang ito kung mayroon kang mga problema sa mga likhang sining na may mababang resolusyon</string>
     <string name="pref_summary_library_categories">I-configure ang visibility at pagkakasunud-sunod ng mga kategorya ng librerya.</string>
     <string name="pref_summary_lock_screen">Gamitin ang Reto Music\'s custom para sa lockscreen controls</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">Mga detalye ng lisensya para sa open source software</string>
     <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">I-navigate sa huling ginamit na tab sa simula</string>
     <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
     <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
     <string name="pref_summary_toggle_full_screen">Immersive mode</string>
     <string name="pref_summary_toggle_headset">Agad magsimula ang kanta pagkatapos maikonekta ang mga headphone</string>
     <string name="pref_summary_toggle_shuffle">Mag-o-off ang shuffle mode kapag nagpe-play ng bagong listahan ng mga kanta</string>
     <string name="pref_summary_toggle_volume">Kung may sapat na espasyo, ipakita ang mga kontrol ng volume sa screen ng now playing</string>
     <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Magpakita lamang ng musika mula sa /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Ipakita ang album cover</string>
     <string name="pref_title_album_artists_only">I-navigate ayon sa Album Artist</string>
     <string name="pref_title_album_cover_style">Album cover theme</string>
     <string name="pref_title_album_cover_transform">Laktawan ang album cover</string>
     <string name="pref_title_app_shortcuts">May kulay na mga shortcut app</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Bawasan ang volume sa focus loss</string>
     <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Auto-download mga larawan ng artista</string>
@@ -403,7 +381,6 @@
     <string name="pref_title_lock_screen">Mga kontrol sa fullscreen</string>
     <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pref_title_now_playing_screen_appearance">Theme para sa now playing</string>
     <string name="pref_title_open_source_licences">Mga lisensyang open source</string>
     <string name="pref_title_pause_history">Pause history</string>
@@ -411,7 +388,6 @@
     <string name="pref_title_show_lyrics">Show lyrics</string>
     <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">Mode sa mga pamagat ng tab</string>
     <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
     <string name="pref_title_toggle_full_screen">I-Fullscreen ang app</string>
@@ -420,8 +396,9 @@
     <string name="pref_title_toggle_volume">Mga kontrol sa volume</string>
     <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
+    <string name="pro_summary">Black theme, Mga theme sa now playing, Carousel effect at higit pa..</string>
     <string name="profile">Profile</string>
     <string name="purchase">Bumili</string>
     <string name="queue">Playing Queue</string>
@@ -498,7 +475,6 @@
     <string name="sort_order_composer">Kompositor</string>
     <string name="sort_order_date">Ang petsa ay nadagdag</string>
     <string name="sort_order_date_modified">Ang petsa ay nabago</string>
-    <string name="sort_order_default">Default</string>
     <string name="sort_order_num_songs">Bilang ng kanta</string>
     <string name="sort_order_num_songs_desc">Bilang ng kanta pababa</string>
     <string name="sort_order_year">Taon</string>
@@ -523,7 +499,7 @@
     <string name="title">Pamagat</string>
     <string name="title_new_backup">Bagong Backup</string>
     <string name="today">Ngayon</string>
-    <string name="top_albums">Mga nangungunang album</string>
+    <string name="top_albums">Nangungunang mga album</string>
     <string name="top_artists">Nangungunang mga artista</string>
     <string name="track_hint">"Track (2 para sa track 2 o 3004 para sa CD3 track 4)"</string>
     <string name="track_list">Numero ng track</string>
@@ -558,4 +534,5 @@
     <string name="you_have_to_select_at_least_one_category">Kailangan mong pumili ng kahit isang kategorya.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Ipapasa ka sa website ng tagasubaybay ng isyu.</string>
     <string name="your_account_data_is_only_used_for_authentication">Ginagamit lang ang iyong account data para sa pagpapatunay.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 6e695a840..f6815b369 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Ajouter aux favoris</string>
     <string name="action_add_to_playing_queue">Ajouter à la file d\'attente</string>
     <string name="action_add_to_playlist">Ajouter à la liste de lecture</string>
-    <string name="action_cancel">Annuler</string>
     <string name="action_cast">Diffuser</string>
     <string name="action_clear_playing_queue">Vider la file d\'attente</string>
     <string name="action_cycle_repeat">Mode de répétition</string>
@@ -45,7 +44,7 @@
     <string name="action_settings">"Paramètres"</string>
     <string name="action_share">Partager</string>
     <string name="action_shuffle_all">Tout en aléatoire</string>
-    <string name="action_shuffle_playlist">Mélanger la liste de lecture</string>
+    <string name="action_shuffle_playlist">Lecture aléatoire des titres de la liste de lecture</string>
     <string name="action_sleep_timer">Minuteur de sommeil</string>
     <string name="action_sort_order">Ordre de tri</string>
     <string name="action_tag_editor">Éditeur de tag</string>
@@ -55,7 +54,7 @@
     <string name="add_action">Ajouter</string>
     <string name="add_playlist_title">"Ajouter à la liste de lecture"</string>
     <string name="add_time_framed_lryics">Ajouter des paroles synchronisées</string>
-    <string name="added_song_count_to_playlist">%1$d chanson(s) ajoutée(s) à %2$s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$d</string>
     <string name="added_title_to_playing_queue">"1 titre a été ajouté à la file d'attente."</string>
     <string name="added_x_titles_to_playing_queue">%1$d titres ont été ajoutés à la file d\'attente.</string>
     <string name="album">Album</string>
@@ -81,7 +80,7 @@
     <string name="app_widget_text_name">Retro Music – Texte Minimum</string>
     <string name="artist">Artiste</string>
     <string name="artists">Artistes</string>
-    <string name="audio_fade_duration">Durée du fondu audio</string>
+    <string name="audio_fade_duration">Audio fade duration</string>
     <string name="audio_focus_denied">Focus audio refusé.</string>
     <string name="audio_settings_summary">Changer les paramètres audio et ajuster l\'égaliseur</string>
     <string name="auto">Automatique</string>
@@ -91,8 +90,6 @@
     <string name="biography">Biographie</string>
     <string name="black_theme_name">Noir Complet</string>
     <string name="blacklist">Liste noire</string>
-    <string name="bluetooth_summary">L\'application nécessite la permission des appareils à proximité pour vérifier la disponibilité d\'appareils Bluetooth</string>
-    <string name="bluetooth_title">Appareils à proximité</string>
     <string name="blur">Flou</string>
     <string name="blur_card">Carte floue</string>
     <string name="bug_report_failed">Impossible d\'envoyer le rapport de bug</string>
@@ -106,7 +103,6 @@
     <string name="bug_report_no_password">Veuillez entrer votre mot de passe GitHub valide</string>
     <string name="bug_report_no_title">Veuillez entrer un titre pour le problème</string>
     <string name="bug_report_no_username">Veuillez entrer votre nom d\'utilisateur GitHub valide</string>
-    <string name="bug_report_success">Le bogue a bien été signalé</string>
     <string name="bug_report_summary">Une erreur inattendue s\'est produite. Nous sommes désolés que vous ayez rencontré ce bug, si l\'application continue de planter, effacez les données de l\'application </string>
     <string name="bug_report_use_account">Envoyer en utilisant un compte GitHub</string>
     <string name="buy_now">Acheter maintenant</string>
@@ -119,18 +115,17 @@
     <string name="cascading">En cascade</string>
     <string name="changelog">Liste des changements</string>
     <string name="changelog_summary">Découvrez les nouveautés</string>
-    <string name="choose_image">Choisissez l\'image</string>
+    <string name="choose_image">Choose Image</string>
     <string name="choose_restore_title">Choisir les éléments à restaurer</string>
     <string name="circle">Cercle</string>
     <string name="circular">Circulaire</string>
     <string name="classic">Classique</string>
     <string name="clear_action">Effacer</string>
     <string name="clear_blacklist">Effacer la liste noire</string>
-    <string name="clear_history">Vider l\'historique</string>
+    <string name="clear_history">Clear History</string>
     <string name="clear_playing_queue">Vider la file d\'attente</string>
     <string name="color">Couleur</string>
     <string name="colors">Couleurs</string>
-    <string name="compact">Compacte</string>
     <string name="composer">Compositeur</string>
     <string name="copied_device_info_to_clipboard">Informations sur l’appareil copiées dans le presse-papier.</string>
     <string name="could_not_create_playlist">La liste de lecture n’a pas pu être créée.</string>
@@ -142,8 +137,8 @@
     <string name="created_playlist_x">Liste de lecture %1$s créée.</string>
     <string name="credit_title">Membres et contributeurs </string>
     <string name="currently_listening_to_x_by_x">Vous écoutez actuellement %1$s par %2$s.</string>
-    <string name="custom_artist_images">Images personnalisées pour l\'artiste</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Envoyer les rapports de plantage</string>
+    <string name="custom_artist_images">Custom Artist Images</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
     <string name="dark_theme_name">Plutôt Sombre</string>
     <string name="delete_playlist_title">Supprimer la liste de lecture</string>
     <string name="delete_playlist_x"><![CDATA[Supprimer la liste <b>%1$s</b> ?]]></string>
@@ -173,15 +168,8 @@
     <string name="edit_synced_lyrics">Modifier les paroles synchronisées</string>
     <string name="empty">Vide</string>
     <string name="equalizer">Égaliseur</string>
-    <string name="error_create_backup">Impossible de créer une sauvegarde</string>
-    <string name="error_delete_backup">Impossible de supprimer une sauvegarde</string>
-    <string name="error_empty_name">Votre nom ne peut pas être vide !</string>
-    <string name="error_load_failed">Échec du chargement</string>
-    <string name="error_share_file">Impossible de partager le fichier</string>
-    <string name="expanded">Développé</string>
     <string name="faq">Foire aux questions</string>
     <string name="favorites">Favoris</string>
-    <string name="file_already_exists">Le fichier existe déjà</string>
     <string name="finish_last_song">Finissez le dernier morceau</string>
     <string name="fit">Adapter</string>
     <string name="flat">Plat</string>
@@ -197,7 +185,6 @@
     <string name="genres">Genres</string>
     <string name="git_hub_summary">Cloner le projet sur GitHub</string>
     <string name="gradient">Dégradé</string>
-    <string name="grant_access">Accorder l\'accès</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -210,8 +197,8 @@
     <string name="help_summary">Encore besoin d\'aide ?</string>
     <string name="hinge">Charnière</string>
     <string name="history">Historique</string>
-    <string name="history_cleared">Historique effacé</string>
-    <string name="history_undo_button">Annuler</string>
+    <string name="history_cleared">History cleared</string>
+    <string name="history_undo_button">Undo</string>
     <string name="home">Accueil</string>
     <string name="horizontal_flip">Balayage horizontal</string>
     <string name="image">Image</string>
@@ -228,14 +215,13 @@
     <string name="label_file_name">Nom du fichier</string>
     <string name="label_file_path">Chemin du fichier</string>
     <string name="label_file_size">Taille du fichier</string>
-    <string name="label_last_modified">Dernière modification</string>
+    <string name="label_last_modified">Last Modified</string>
     <string name="label_more_from">Plus de %s</string>
     <string name="label_sampling_rate">Taux d’échantillonnage</string>
     <string name="label_track_length">Durée</string>
     <string name="labeled">Étiqueté</string>
     <string name="last_added">Dernier ajout</string>
     <string name="last_song">Dernier morceau</string>
-    <string name="lets_go">C\'est parti</string>
     <string name="library_categories">Catégories</string>
     <string name="licenses">Licences</string>
     <string name="light_theme_name">Blanc</string>
@@ -248,16 +234,10 @@
     <string name="material">Material</string>
     <string name="md_error_label">Erreur</string>
     <string name="md_storage_perm_error">Erreur d\'autorisation</string>
-    <string name="message_backup_create_success">Sauvegarde créée avec succès.</string>
-    <string name="message_limit_tabs">Pas plus de 5 éléments</string>
-    <string name="message_pro_feature">%s est une fonctionnalité Pro.</string>
-    <string name="message_restore_success">Restauration effectuée avec succès.</string>
-    <string name="message_updated">Mis à jour</string>
-    <string name="message_welcome"><![CDATA[Bonjour ! <br>Bienvenue dans %s]]></string>
     <string name="my_name">Nom</string>
     <string name="my_top_tracks">Plus jouées</string>
     <string name="never">Jamais</string>
-    <string name="new_music_mix">Nouveau Mix</string>
+    <string name="new_music_mix">New Music Mix</string>
     <string name="new_playlist_title">Nouvelle liste de lecture</string>
     <string name="new_start_directory">%s est le nouveau dossier de départ.</string>
     <string name="next_song">Prochain morceau</string>
@@ -288,13 +268,12 @@
     <string name="only_on_wifi">Uniquement via Wi-Fi</string>
     <string name="other_settings_summary">Fonctions de test avancées</string>
     <string name="others">Autre</string>
-    <string name="over_cover">À propos de la pochette</string>
+    <string name="over_cover">Over Cover</string>
     <string name="password">Mot de passe</string>
     <string name="past_three_months">3 derniers mois</string>
     <string name="paste_lyrics_here">Copiez les paroles ici</string>
     <string name="paste_timeframe_lyrics_here">Collez les paroles de la période ici</string>
-    <string name="peek">Aperçu</string>
-    <string name="permission_bluetooth_denied">Autorisation refusée par les appareils à proximité.</string>
+    <string name="peek">Peek</string>
     <string name="permission_external_storage_denied">La permission pour accéder au stockage externe a été refusée.</string>
     <string name="permission_summary">L\'application a besoin d\'accéder au stockage de votre appareil pour lire votre musique</string>
     <string name="permission_title">Accès au stockage</string>
@@ -305,13 +284,13 @@
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">Suivez la page Pinterest pour des inspirations de design</string>
     <string name="plain">Simple</string>
-    <string name="playList_already_exits">La playlist existe déjà</string>
-    <string name="playback_pitch">Hauteur</string>
-    <string name="playback_settings">Paramètres de lecture</string>
-    <string name="playback_speed">Vitesse de lecture</string>
+    <string name="playList_already_exits">Playlist already exists</string>
+    <string name="playback_pitch">Pitch</string>
+    <string name="playback_settings">Playback Settings</string>
+    <string name="playback_speed">Playback Speed</string>
     <string name="playing_notification_description">La notification de lecture fournit des actions pour la lecture / pause etc.</string>
     <string name="playing_notification_name">Notification de lecture</string>
-    <string name="playlist_created_sucessfully">%s a été créé avec succès</string>
+    <string name="playlist_created_sucessfully">%s created successfully</string>
     <string name="playlist_is_empty">Cette liste de lecture est vide</string>
     <string name="playlist_name_empty">Nom de la liste de lecture</string>
     <string name="playlists">Listes de lecture</string>
@@ -329,66 +308,65 @@
     <string name="pref_header_library">Bibliothèque</string>
     <string name="pref_header_lockscreen">Écran de verrouillage</string>
     <string name="pref_header_playlists">Listes de lecture</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">La lecture se met en pause lorsque le son est coupé et redémarre lorsque le volume augmente. Fonctionne aussi en dehors de l\'application</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pause si muet</string>
+    <string name="pref_keep_pause_on_zero_volume_summary">La lecture se met en pause à zéro et se lance lorsque le volume augmente. Fonctionne même en dehors de l\'application</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Pause à zéro</string>
     <string name="pref_keep_screen_on_summary">Veuillez garder en tête que l\'activation de cette fonctionnalité peut réduire la durée de vie de la batterie</string>
     <string name="pref_keep_screen_on_title">Garder l\'écran allumé</string>
     <string name="pref_language_name">Choisir la langue</string>
-    <string name="pref_snow_fall_title">Effet neige qui tombe</string>
+    <string name="pref_snow_fall_title">Snow fall effect</string>
     <string name="pref_summary_album_art_on_lockscreen">Utiliser la couverture d\'album du morceau en cours de lecture comme fond sur l\'écran de verrouillage</string>
     <string name="pref_summary_album_artists_only">Afficher les artistes de l\'album dans la catégorie Artiste</string>
     <string name="pref_summary_audio_ducking">Baisser le volume quand un son système ou une notification est reçue</string>
-    <string name="pref_summary_audio_fade">Fondu audio lorsque la musique est mise en pause ou recommence</string>
+    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
     <string name="pref_summary_blacklist">Le contenu des dossiers en liste noire est masqué de votre bibliothèque.</string>
     <string name="pref_summary_bluetooth_playback">Commencez à jouer dès que vous êtes connecté à un appareil Bluetooth</string>
     <string name="pref_summary_blurred_album_art">Flouter la couverture de l\'album sur l\'écran de verrouillage. Cela peut poser des problèmes avec des applications et widgets tiers</string>
     <string name="pref_summary_carousel_effect">Effet carrousel pour les couvertures d\'albums sur l\'écran de lecture en cours. Veuillez noter que les thèmes Carte et Carte floutée ne fonctionneront pas</string>
     <string name="pref_summary_classic_notification">Utiliser le design classique pour les notifications</string>
     <string name="pref_summary_colored_app">La couleur du fond et des boutons de contrôles change en fonction de l\'image d\'album sur l\'écran de lecture en cours</string>
-    <string name="pref_summary_colored_app_shortcuts">Raccourcis de l\'application selon la couleur d\'accent. Chaque fois que vous changez de couleur, veuillez activer ceci afin que le changement soit pris en compte</string>
-    <string name="pref_summary_colored_notification">"Colorer la notification avec la couleur dominante des pochettes d'albums"</string>
+    <string name="pref_summary_colored_app_shortcuts">Les raccourcis rapides de l\'application prendront la couleur d\'accent. Chaque fois que vous changez de couleur, veuillez activer ceci afin que le changement soit pris en compte</string>
+    <string name="pref_summary_colored_notification">"Colorer la notification avec la couleur dominante des couvertures d'albums"</string>
     <string name="pref_summary_cross_fade">Durée du fondu enchaîné entre les morceaux</string>
     <string name="pref_summary_desaturated_color">Selon les lignes directrices du Material Design, les couleurs devraient être désaturées en mode sombre</string>
-    <string name="pref_summary_expand_now_playing_panel">Toucher la notification affichera l\'écran de lecture en cours au lieu de l\'écran d\'accueil</string>
+    <string name="pref_summary_expand_now_playing_panel">Toucher la notification affichera l\'écran de lecture en cours à la place de l\'écran d\'accueil</string>
     <string name="pref_summary_extra_controls">Ajouter des contrôles supplémentaires pour le mini lecteur</string>
     <string name="pref_summary_extra_song_info">Afficher les informations supplémentaires du morceau, comme le format de fichier, le débit et la fréquence</string>
     <string name="pref_summary_gapless_playback">"Peut causer des problèmes de lecture sur certains appareils."</string>
-    <string name="pref_summary_home_banner">Montrer ou cacher la bannière d\'accueil</string>
-    <string name="pref_summary_ignore_media_store_artwork">Peut améliorer la qualité de la pochette de l\'album, mais ralenti le chargement des images. N\'activez ceci que si vous avez des problèmes avec les images basse résolution</string>
+    <string name="pref_summary_home_banner">Changer le style de la bannière sur l\'accueil</string>
+    <string name="pref_summary_ignore_media_store_artwork">Peut améliorer la qualité de l\'image d\'album, mais ralenti le chargement des images. N\'activez ceci que si vous avez des problèmes avec les images basse résolution</string>
     <string name="pref_summary_library_categories">Configurer la visibilité et l\'ordre des catégories de la librairie.</string>
     <string name="pref_summary_lock_screen">Utiliser les contrôles personnalisés de Retro Music sur l\'écran de verrouillage</string>
-    <string name="pref_summary_manage_audio_focus">Toujours jouer l\'audio en arrière-plan indépendamment de tout autre élément en cours de lecture</string>
     <string name="pref_summary_open_source_licences">Détails des licences pour les logiciels open source</string>
-    <string name="pref_summary_pause_history">Lorsque cette option est activée, les nouvelles chansons jouées n\'apparaîtront pas dans l\'historique</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Afficher le dernier onglet au démarrage</string>
-    <string name="pref_summary_show_lyrics">Afficher les paroles sur la pochette de l\'album</string>
-    <string name="pref_summary_suggestions">Afficher une sélection de nouveaux morceaux sur l\'écran d\'accueil</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Active le changement de morceau en balayant n\'importe où sur l\'écran de lecture en cours</string>
-    <string name="pref_summary_swipe_to_dismiss">Balayer vers le bas pour fermer le lecteur réduit</string>
+    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
+    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
+    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
     <string name="pref_summary_toggle_full_screen">Mode immersif</string>
     <string name="pref_summary_toggle_headset">Commencer immédiatement la lecture lors du branchement d\'un casque</string>
     <string name="pref_summary_toggle_shuffle">Le mode aléatoire se désactivera lors de la lecture d\'une nouvelle liste de morceaux</string>
     <string name="pref_summary_toggle_volume">Si vous avez assez de place, affiche les contrôle du volume sur l\'écran de lecture</string>
-    <string name="pref_summary_wallpaper_accent">Choisir la couleur accentuée suivant le fond d\'écran</string>
+    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Afficher uniquement les morceaux du dossier /Musique</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Afficher la couverture de l\'album</string>
     <string name="pref_title_album_artists_only">Naviguer par artiste de l\'album</string>
     <string name="pref_title_album_cover_style">Thème de la couverture d\'album</string>
     <string name="pref_title_album_cover_transform">Style du balayage de l\'image d\'album</string>
     <string name="pref_title_app_shortcuts">Raccourcis d\'application colorés</string>
-    <string name="pref_title_appbar_mode">Style de l\'entête</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Réduire le volume à la perte de focus</string>
-    <string name="pref_title_audio_fade">Fondu audio</string>
+    <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Télécharger automatiquement les photos des artistes</string>
     <string name="pref_title_blacklist">Liste noire</string>
     <string name="pref_title_bluetooth_playback">Lecture via Bluetooth</string>
     <string name="pref_title_blurred_album_art">Flouter la couverture d\'album</string>
-    <string name="pref_title_circle_button">Bouton de lecture circulaire</string>
+    <string name="pref_title_circle_button">Circular play button</string>
     <string name="pref_title_classic_notification">Design de notification classique</string>
     <string name="pref_title_colored_app">Couleur adaptative</string>
     <string name="pref_title_colored_notification">Notification colorée</string>
     <string name="pref_title_cross_fade">Fondu enchaîné (Beta)</string>
-    <string name="pref_title_custom_font">Utiliser la police Manrope</string>
+    <string name="pref_title_custom_font">Use Manrope font</string>
     <string name="pref_title_desaturated_color">Couleur désaturée</string>
     <string name="pref_title_expand_now_playing_panel">Afficher l\'écran de lecture en cours</string>
     <string name="pref_title_extra_controls">Contrôles supplémentaires</string>
@@ -401,51 +379,50 @@
     <string name="pref_title_ignore_media_store_artwork">Ignorer les couvertures du stockage média</string>
     <string name="pref_title_last_added_interval">Intervalle de dernière liste de lecture ajoutée</string>
     <string name="pref_title_lock_screen">Contrôles plein-écran</string>
-    <string name="pref_title_lyrics_screen_on">Laisser l\'écran allumé lors de l\'affichage des paroles</string>
-    <string name="pref_title_lyrics_type">Type de paroles</string>
-    <string name="pref_title_manage_audio_focus">Toujours jouer</string>
+    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
+    <string name="pref_title_lyrics_type">Lyrics type</string>
     <string name="pref_title_now_playing_screen_appearance">Thème d\'écran de lecture</string>
     <string name="pref_title_open_source_licences">Licences open source</string>
-    <string name="pref_title_pause_history">Mettre l\'historique en pause</string>
-    <string name="pref_title_remember_tab">Se souvenir du dernier onglet</string>
-    <string name="pref_title_show_lyrics">Afficher les paroles</string>
-    <string name="pref_title_suggestions">Afficher les suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Balayer n\'importe où pour changer de morceau</string>
-    <string name="pref_title_swipe_to_dismiss">Ignorer en balayant vers le bas</string>
+    <string name="pref_title_pause_history">Pause history</string>
+    <string name="pref_title_remember_tab">Remember last tab</string>
+    <string name="pref_title_show_lyrics">Show lyrics</string>
+    <string name="pref_title_suggestions">Show suggestions</string>
+    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
     <string name="pref_title_tab_text_mode">Mode Titres onglets</string>
     <string name="pref_title_toggle_carousel_effect">Effet carousel</string>
     <string name="pref_title_toggle_full_screen">App en plein écran</string>
     <string name="pref_title_toggle_toggle_headset">Lecture automatique</string>
     <string name="pref_title_toggle_toggle_shuffle">Mode aléatoire</string>
-    <string name="pref_title_toggle_volume">Contrôles du volume</string>
-    <string name="pref_title_wallpaper_accent">Couleur d\'accentuation du fond d\'écran</string>
-    <string name="pref_title_whitelist">Liste blanche</string>
+    <string name="pref_title_toggle_volume">Contrôles de volume</string>
+    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
+    <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Thème noir, thèmes en cours de lecture, effet carrousel, et plus encore...</string>
+    <string name="pro_summary">Maintenant les thèmes de jeu, L\'effet de carrousel, thème de couleur et plus..</string>
     <string name="profile">Profil</string>
     <string name="purchase">Acheter</string>
-    <string name="queue">File de lecture</string>
+    <string name="queue">File d\'attente</string>
     <string name="rate_app">Noter l\'application</string>
-    <string name="rate_on_google_play_summary">Vous aimez cette application ? Dites-nous sur Google Play Store comment nous pourrions l\'améliorer davantage</string>
+    <string name="rate_on_google_play_summary">Vous aimez l\'application ? Faites-le nous savoir sur le Play Store afin que nous puissions l\'améliorer davantage</string>
     <string name="recent_albums">Albums récents</string>
     <string name="recent_artists">Artistes récents</string>
     <string name="remove_action">Supprimer</string>
-    <string name="remove_cover">Supprimer la pochette</string>
+    <string name="remove_cover">Supprimer la couverture</string>
     <string name="remove_from_blacklist">Retirer de la liste noire</string>
-    <string name="remove_image">Supprimer l\'image</string>
+    <string name="remove_image">Remove Image</string>
     <string name="remove_song_from_playlist_title">Supprimer le morceau de la liste de lecture</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Retirer le morceau <b>%1$s</b> de la liste de lecture ?]]></string>
-    <string name="remove_songs_from_playlist_title">Retirer les morceaux de la liste de lecture</string>
+    <string name="remove_songs_from_playlist_title">Retirer le morceau de la liste de lecture</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Retirer <b>%1$d</b> morceaux de la liste de lecture ?]]></string>
     <string name="rename_playlist_title">Renommer la liste de lecture</string>
-    <string name="replace_cover">Remplacer la pochette</string>
+    <string name="replace_cover">Replace Cover</string>
     <string name="report_an_issue">Signaler un problème</string>
     <string name="report_bug">Signaler un bug</string>
     <string name="reset_action">Réinitialiser</string>
     <string name="reset_artist_image">Réinitialiser la photo de l\'artiste</string>
     <string name="restore">Restaurer</string>
     <string name="restore_message">Voulez-vous restaurer cette sauvegarde ?</string>
-    <string name="restored_previous_purchase_please_restart">Achat restauré. Veuillez redémarrer l\'application pour utiliser toutes les fonctionnalités.</string>
+    <string name="restored_previous_purchase_please_restart">Achat précédent restauré. Veuillez redémarrer l\'application pour utiliser toutes les fonctionnalités.</string>
     <string name="restored_previous_purchases">Achats précédents restaurés.</string>
     <string name="restoring_purchase">Restauration de l\'achat…</string>
     <string name="retro_music_player">Retro Music Player</string>
@@ -498,7 +475,6 @@
     <string name="sort_order_composer">Compositeur</string>
     <string name="sort_order_date">Date</string>
     <string name="sort_order_date_modified">Date de modification</string>
-    <string name="sort_order_default">Par défaut</string>
     <string name="sort_order_num_songs">Nombre de morceaux</string>
     <string name="sort_order_num_songs_desc">Nombre de morceaux décroissant</string>
     <string name="sort_order_year">Année</string>
@@ -537,7 +513,7 @@
     <string name="up_next">À suivre</string>
     <string name="update_image">Mettre à jour l\'image</string>
     <string name="updating">Mise à jour...</string>
-    <string name="user_images_description">Images de l\'utilisateur</string>
+    <string name="user_images_description">User Images</string>
     <string name="user_name">Nom d\'utilisateur</string>
     <string name="username">Nom d\'utilisateur</string>
     <string name="version">version</string>
@@ -558,4 +534,5 @@
     <string name="you_have_to_select_at_least_one_category">Vous devez sélectionner au moins une catégorie.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Vous allez être redirigé vers le site web de suivi des problèmes.</string>
     <string name="your_account_data_is_only_used_for_authentication">Vos données de compte sont utilisées uniquement pour vous authentifier.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index ec2519436..f8c207635 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -5,13 +5,12 @@
     <string name="accent_color">एक्सेंट रंग</string>
     <string name="accent_color_desc">The theme accent color, defaults to purple</string>
     <string name="action_about">जानकारी</string>
-    <string name="action_add_to_blacklist">कालीसूची में जोड़ें</string>
+    <string name="action_add_to_blacklist">Add to Blacklist</string>
     <string name="action_add_to_favorites">पसंदीदा में जोड़े</string>
-    <string name="action_add_to_playing_queue">बजने वाली कतार में जोड़ें</string>
+    <string name="action_add_to_playing_queue">Add to playing queue</string>
     <string name="action_add_to_playlist">प्लेलिस्ट में जोड़ें</string>
-    <string name="action_cancel">वर्तमान टाइमर को रद्द करें</string>
-    <string name="action_cast">प्रसारित करें</string>
-    <string name="action_clear_playing_queue">बजने वाली कतार साफ़ करें</string>
+    <string name="action_cast">Cast</string>
+    <string name="action_clear_playing_queue">Clear playing queue</string>
     <string name="action_cycle_repeat">Cycle repeat mode</string>
     <string name="action_delete">हटाएं</string>
     <string name="action_delete_from_device">डिवाइस से हटाएं</string>
@@ -91,8 +90,6 @@
     <string name="biography">जीवनी</string>
     <string name="black_theme_name">सिर्फ काला</string>
     <string name="blacklist">ब्लैकलिस्ट</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
     <string name="blur">कलंक</string>
     <string name="blur_card">ब्लर कार्ड</string>
     <string name="bug_report_failed">रिपोर्ट भेजने में असमर्थ</string>
@@ -106,7 +103,6 @@
     <string name="bug_report_no_password">कृपया अपना वैध GitHub पासवर्ड दर्ज करें</string>
     <string name="bug_report_no_title">कृपया एक समस्या शीर्षक दर्ज करें</string>
     <string name="bug_report_no_username">कृपया अपना वैध GitHub उपयोगकर्ता नाम दर्ज करें</string>
-    <string name="bug_report_success">Bug report successful</string>
     <string name="bug_report_summary">एक अप्रत्याशित त्रुटि हुई। क्षमा करें, आपको यह बग मिल गया है, अगर यह \"क्लियर ऐप डेटा\" को क्रैश करता है या ईमेल भेजता है </string>
     <string name="bug_report_use_account">GitHub खाते का उपयोग करके भेजें</string>
     <string name="buy_now">अभी खरीदें</string>
@@ -130,7 +126,6 @@
     <string name="clear_playing_queue">Clear queue</string>
     <string name="color">रंग</string>
     <string name="colors">Colors</string>
-    <string name="compact">Compact</string>
     <string name="composer">Composer</string>
     <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
     <string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
@@ -173,15 +168,8 @@
     <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
     <string name="empty">Empty</string>
     <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
     <string name="faq">FAQ</string>
     <string name="favorites">Favorites</string>
-    <string name="file_already_exists">File already exists</string>
     <string name="finish_last_song">Finish last song</string>
     <string name="fit">Fit</string>
     <string name="flat">Flat</string>
@@ -197,7 +185,6 @@
     <string name="genres">Genres</string>
     <string name="git_hub_summary">Fork the project on GitHub</string>
     <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -235,7 +222,6 @@
     <string name="labeled">Labeled</string>
     <string name="last_added">Last added</string>
     <string name="last_song">Last song</string>
-    <string name="lets_go">Let\'s go</string>
     <string name="library_categories">Library categories</string>
     <string name="licenses">Licenses</string>
     <string name="light_theme_name">Clearly White</string>
@@ -248,12 +234,6 @@
     <string name="material">Material</string>
     <string name="md_error_label">Error</string>
     <string name="md_storage_perm_error">Permission error</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
     <string name="my_name">Name</string>
     <string name="my_top_tracks">Most played</string>
     <string name="never">Never</string>
@@ -294,7 +274,6 @@
     <string name="paste_lyrics_here">Paste Lyrics Here</string>
     <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
     <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
     <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
     <string name="permission_title">Storage Access</string>
@@ -357,26 +336,25 @@
     <string name="pref_summary_ignore_media_store_artwork">Can increase the album cover quality, but causes slower image loading times. Only enable this if you have problems with low resolution artworks</string>
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="pref_summary_lock_screen">Use Retro Music\'s custom lockscreen controls</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">License details for open source software</string>
     <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
     <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
     <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
     <string name="pref_summary_toggle_full_screen">Immersive mode</string>
     <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</string>
     <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</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_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
     <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
     <string name="pref_title_album_cover_style">Album cover theme</string>
     <string name="pref_title_album_cover_transform">Album cover skip</string>
     <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
     <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Auto-download artist images</string>
@@ -403,7 +381,6 @@
     <string name="pref_title_lock_screen">Fullscreen controls</string>
     <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pref_title_now_playing_screen_appearance">Now playing theme</string>
     <string name="pref_title_open_source_licences">Open source licences</string>
     <string name="pref_title_pause_history">Pause history</string>
@@ -411,7 +388,6 @@
     <string name="pref_title_show_lyrics">Show lyrics</string>
     <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">Tab titles mode</string>
     <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
     <string name="pref_title_toggle_full_screen">Fullscreen app</string>
@@ -420,6 +396,7 @@
     <string name="pref_title_toggle_volume">Volume controls</string>
     <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
     <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
     <string name="profile">Profile</string>
@@ -498,7 +475,6 @@
     <string name="sort_order_composer">Composer</string>
     <string name="sort_order_date">Date added</string>
     <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_default">Default</string>
     <string name="sort_order_num_songs">Song count</string>
     <string name="sort_order_num_songs_desc">Song count desc</string>
     <string name="sort_order_year">Year</string>
@@ -558,4 +534,5 @@
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index f9f8d2093..43d1cf84c 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Dodaj u favorite</string>
     <string name="action_add_to_playing_queue">Dodaj u red čekanja</string>
     <string name="action_add_to_playlist">Dodaj na popis</string>
-    <string name="action_cancel">Odustani</string>
     <string name="action_cast">Emitiraj</string>
     <string name="action_clear_playing_queue">Očisti red čekanja</string>
     <string name="action_cycle_repeat">Cycle repeat mode</string>
@@ -93,8 +92,6 @@
     <string name="biography">Biography</string>
     <string name="black_theme_name">Just Black</string>
     <string name="blacklist">Blacklist</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
     <string name="blur">Blur</string>
     <string name="blur_card">Blur Card</string>
     <string name="bug_report_failed">Unable to send report</string>
@@ -108,7 +105,6 @@
     <string name="bug_report_no_password">Please enter your valid GitHub password</string>
     <string name="bug_report_no_title">Please enter an issue title</string>
     <string name="bug_report_no_username">Please enter your valid GitHub username</string>
-    <string name="bug_report_success">Bug report successful</string>
     <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
     <string name="bug_report_use_account">Send using GitHub account</string>
     <string name="buy_now">Kupi sada</string>
@@ -132,7 +128,6 @@
     <string name="clear_playing_queue">Očisti red čekanja</string>
     <string name="color">Boja</string>
     <string name="colors">Boje</string>
-    <string name="compact">Compact</string>
     <string name="composer">Composer</string>
     <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
     <string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
@@ -175,15 +170,8 @@
     <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
     <string name="empty">Empty</string>
     <string name="equalizer">Ekvalizator</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
     <string name="faq">FAQ</string>
     <string name="favorites">Favoriti</string>
-    <string name="file_already_exists">File already exists</string>
     <string name="finish_last_song">Finish last song</string>
     <string name="fit">Fit</string>
     <string name="flat">Flat</string>
@@ -199,7 +187,6 @@
     <string name="genres">Žanrovi</string>
     <string name="git_hub_summary">Fork the project on GitHub</string>
     <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -237,7 +224,6 @@
     <string name="labeled">Labeled</string>
     <string name="last_added">Last added</string>
     <string name="last_song">Last song</string>
-    <string name="lets_go">Let\'s go</string>
     <string name="library_categories">Library categories</string>
     <string name="licenses">Licenses</string>
     <string name="light_theme_name">Clearly White</string>
@@ -250,12 +236,6 @@
     <string name="material">Material</string>
     <string name="md_error_label">Error</string>
     <string name="md_storage_perm_error">Permission error</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
     <string name="my_name">Name</string>
     <string name="my_top_tracks">Most played</string>
     <string name="never">Never</string>
@@ -296,7 +276,6 @@
     <string name="paste_lyrics_here">Paste Lyrics Here</string>
     <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
     <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
     <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
     <string name="permission_title">Storage Access</string>
@@ -359,26 +338,25 @@
     <string name="pref_summary_ignore_media_store_artwork">Can increase the album cover quality, but causes slower image loading times. Only enable this if you have problems with low resolution artworks</string>
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="pref_summary_lock_screen">Use Retro Music\'s custom lockscreen controls</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">License details for open source software</string>
     <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
     <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
     <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
     <string name="pref_summary_toggle_full_screen">Immersive mode</string>
     <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</string>
     <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</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_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
     <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
     <string name="pref_title_album_cover_style">Album cover theme</string>
     <string name="pref_title_album_cover_transform">Album cover skip</string>
     <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
     <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Auto-download artist images</string>
@@ -405,7 +383,6 @@
     <string name="pref_title_lock_screen">Fullscreen controls</string>
     <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pref_title_now_playing_screen_appearance">Now playing theme</string>
     <string name="pref_title_open_source_licences">Open source licences</string>
     <string name="pref_title_pause_history">Pause history</string>
@@ -413,7 +390,6 @@
     <string name="pref_title_show_lyrics">Show lyrics</string>
     <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">Tab titles mode</string>
     <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
     <string name="pref_title_toggle_full_screen">Fullscreen app</string>
@@ -422,6 +398,7 @@
     <string name="pref_title_toggle_volume">Volume controls</string>
     <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
     <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
     <string name="profile">Profile</string>
@@ -500,7 +477,6 @@
     <string name="sort_order_composer">Skladatelj</string>
     <string name="sort_order_date">Datum dodavanja</string>
     <string name="sort_order_date_modified">Datum izmjene</string>
-    <string name="sort_order_default">Default</string>
     <string name="sort_order_num_songs">Broj pjesama</string>
     <string name="sort_order_num_songs_desc">Song count desc</string>
     <string name="sort_order_year">Godina</string>
@@ -560,4 +536,5 @@
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index bf89c2c75..18469ebe8 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -9,10 +9,9 @@
     <string name="action_add_to_favorites">Hozzáadás a kedvencekhez</string>
     <string name="action_add_to_playing_queue">Hozzáadás a lejátszási sorhoz</string>
     <string name="action_add_to_playlist">Hozzáadás lejátszási listához</string>
-    <string name="action_cancel">Mégse</string>
     <string name="action_cast">Tartalomátküldés</string>
     <string name="action_clear_playing_queue">Lejátszási sor törlése</string>
-    <string name="action_cycle_repeat">Ciklus ismétlési üzemmód</string>
+    <string name="action_cycle_repeat">Ciklus ismétlés üzemmód</string>
     <string name="action_delete">Törlés</string>
     <string name="action_delete_from_device">Törlés az eszközről</string>
     <string name="action_details">Részletek</string>
@@ -20,7 +19,7 @@
     <string name="action_go_to_album">Ugrás az albumhoz</string>
     <string name="action_go_to_artist">Ugrás az előadóhoz</string>
     <string name="action_go_to_genre">Ugrás a műfajhoz</string>
-    <string name="action_go_to_lyrics">Ugrás a dalszövegre</string>
+    <string name="action_go_to_lyrics">Go to Lyrics</string>
     <string name="action_go_to_start_directory">Ugrás a kiindulási könyvtárhoz</string>
     <string name="action_grant">Engedélyezés</string>
     <string name="action_grid_size">Rácsméret</string>
@@ -37,9 +36,9 @@
     <string name="action_remove_from_playlist">Eltávolítás a lejátszási listáról</string>
     <string name="action_rename">Átnevezés</string>
     <string name="action_save_playing_queue">Lejátszási sor mentése</string>
-    <string name="action_scan">Keresés</string>
+    <string name="action_scan">Beolvasás</string>
     <string name="action_search">Keresés</string>
-    <string name="action_set">Indítás</string>
+    <string name="action_set">Elkezdés</string>
     <string name="action_set_as_ringtone">Beállítás csengőhangként</string>
     <string name="action_set_as_start_directory">Beállítás kezdőkönyvtárként</string>
     <string name="action_settings">"Beállítások"</string>
@@ -55,7 +54,7 @@
     <string name="add_action">Hozzáad</string>
     <string name="add_playlist_title">"Hozzáadás lejátszási listához"</string>
     <string name="add_time_framed_lryics">Időzített dalszöveg hozzáadása</string>
-    <string name="added_song_count_to_playlist">%1$d zene hozzáadva a %2$s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"1 cím lett hozzáadva a lejátszási sorhoz."</string>
     <string name="added_x_titles_to_playing_queue">%1$d cím hozzáadva a lejátszási sorhoz.</string>
     <string name="album">Album</string>
@@ -81,7 +80,7 @@
     <string name="app_widget_text_name">Minimális szöveg</string>
     <string name="artist">Előadó</string>
     <string name="artists">Előadók</string>
-    <string name="audio_fade_duration">Hangáttűnés hossza</string>
+    <string name="audio_fade_duration">Audio fade duration</string>
     <string name="audio_focus_denied">Az audiofókusz megtagadva.</string>
     <string name="audio_settings_summary">Módosítsd a hangbeállításokat és állítsd be a hangszínszabályzó vezérlőit</string>
     <string name="auto">Auto</string>
@@ -91,8 +90,6 @@
     <string name="biography">Életrajz</string>
     <string name="black_theme_name">Csak Fekete</string>
     <string name="blacklist">Feketelista</string>
-    <string name="bluetooth_summary">Az alkalmazásnak szüksége van a \'Közeli eszközök\' engedélyre, hogy Bluetooth eszközöket kereshessen</string>
-    <string name="bluetooth_title">Közeli eszközök</string>
     <string name="blur">Homályosítás</string>
     <string name="blur_card">Homályosított kártya</string>
     <string name="bug_report_failed">Nem sikerült elküldeni a jelentést</string>
@@ -106,7 +103,6 @@
     <string name="bug_report_no_password">Kérem, adja meg az érvényes GitHub jelszavát</string>
     <string name="bug_report_no_title">Kérem, nevezze meg a probléma címét</string>
     <string name="bug_report_no_username">Kérem, adja meg az érvényes GitHub felhasználónevét</string>
-    <string name="bug_report_success">Sikeres hibajelentés</string>
     <string name="bug_report_summary">Egy váratlan hiba történt. Sajnáljuk, hogy hibába botlottál, ha folyton összeomlik, töröld az alkalmazásadatokat, vagy küldj nekünk E-Mailt.</string>
     <string name="bug_report_use_account">Küldés a GitHub fiókkal</string>
     <string name="buy_now">Vedd meg most</string>
@@ -119,18 +115,17 @@
     <string name="cascading">Növelés</string>
     <string name="changelog">Változtatási napló</string>
     <string name="changelog_summary">Nézd meg az újdonságokat</string>
-    <string name="choose_image">Válasszon képet</string>
-    <string name="choose_restore_title">Visszaállítandó elemek kiválasztása</string>
+    <string name="choose_image">Choose Image</string>
+    <string name="choose_restore_title">Choose what to restore</string>
     <string name="circle">Kör</string>
     <string name="circular">Kör alakú</string>
     <string name="classic">Klasszikus</string>
     <string name="clear_action">Kiürítés</string>
     <string name="clear_blacklist">Feketelista kiürítése</string>
-    <string name="clear_history">Előzmények törlése</string>
+    <string name="clear_history">Clear History</string>
     <string name="clear_playing_queue">Lejátszási sor törlése</string>
     <string name="color">Szín</string>
     <string name="colors">Színek</string>
-    <string name="compact">Kompakt</string>
     <string name="composer">Zeneszerző</string>
     <string name="copied_device_info_to_clipboard">Eszköz információk a vágólapra másolva.</string>
     <string name="could_not_create_playlist">Lejátszási lista létrehozása nem sikerült.</string>
@@ -142,8 +137,8 @@
     <string name="created_playlist_x">Létrehozott lejátszási lista %1$s.</string>
     <string name="credit_title">Tagok és támogatók</string>
     <string name="currently_listening_to_x_by_x">Jelenleg %1$s hallgatása %2$s által.</string>
-    <string name="custom_artist_images">Egyedi művészképek</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Hibajelentés megosztása</string>
+    <string name="custom_artist_images">Custom Artist Images</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
     <string name="dark_theme_name">Kissé sötét</string>
     <string name="delete_playlist_title">Lejátszási lista törlése</string>
     <string name="delete_playlist_x"><![CDATA[Törli a <b>%1$s</b> lejátszási listát?]]></string>
@@ -160,7 +155,7 @@
     <string name="device_info">Eszköz információ</string>
     <string name="dialog_message_set_ringtone">Engedélyezed, hogy a Retro Music módosítsa az audiobeállításokat</string>
     <string name="dialog_title_set_ringtone">Csengőhang beállítás</string>
-    <string name="disc_hint">Lemez száma</string>
+    <string name="disc_hint">Disc Number</string>
     <string name="do_you_want_to_clear_the_blacklist">Szeretné kiüríteni a feketelistát?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Szeretné eltávolítani a <b>%1$s</b> elemet a feketelistáról?]]></string>
     <string name="donate">Támogatás</string>
@@ -173,15 +168,8 @@
     <string name="edit_synced_lyrics">Szinkronizált dalszöveg szerkesztése</string>
     <string name="empty">Üres</string>
     <string name="equalizer">Hangszínszabályzó</string>
-    <string name="error_create_backup">Biztonsági mentés sikertelen</string>
-    <string name="error_delete_backup">Biztonsági mentés törlése sikertelen</string>
-    <string name="error_empty_name">A neved nem lehet üres!</string>
-    <string name="error_load_failed">Betöltés sikertelen</string>
-    <string name="error_share_file">Nem sikerült megosztani a fájlt</string>
-    <string name="expanded">Kibővített</string>
     <string name="faq">GYIK</string>
     <string name="favorites">Kedvencek</string>
-    <string name="file_already_exists">A fájl már létezik</string>
     <string name="finish_last_song">Fejezze be az utolsó dalt</string>
     <string name="fit">Illeszkedő</string>
     <string name="flat">Lapos</string>
@@ -197,7 +185,6 @@
     <string name="genres">Műfajok</string>
     <string name="git_hub_summary">Szerezd meg a projektet a githubon</string>
     <string name="gradient">Színátmenet</string>
-    <string name="grant_access">Hozzáférés engedélyezése</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -210,8 +197,8 @@
     <string name="help_summary">További segítségre van szüksége?</string>
     <string name="hinge">Zsanér</string>
     <string name="history">Előzmény</string>
-    <string name="history_cleared">Előzmények törölve</string>
-    <string name="history_undo_button">Visszavonás</string>
+    <string name="history_cleared">History cleared</string>
+    <string name="history_undo_button">Undo</string>
     <string name="home">Kezdőlap</string>
     <string name="horizontal_flip">Vízszintes forgatás</string>
     <string name="image">Kép</string>
@@ -228,14 +215,13 @@
     <string name="label_file_name">Fájl név</string>
     <string name="label_file_path">Fájl elérési út</string>
     <string name="label_file_size">Méret</string>
-    <string name="label_last_modified">Utoljára módosított</string>
+    <string name="label_last_modified">Last Modified</string>
     <string name="label_more_from">Több a következőtől: %s</string>
     <string name="label_sampling_rate">Mintavételi arány</string>
     <string name="label_track_length">Hossz</string>
     <string name="labeled">Címkézve</string>
     <string name="last_added">Utoljára hozzáadva</string>
     <string name="last_song">Utolsó dal</string>
-    <string name="lets_go">Vágjunk neki!</string>
     <string name="library_categories">Könyvtár kategóriák</string>
     <string name="licenses">Licencek</string>
     <string name="light_theme_name">Világos fehér</string>
@@ -248,16 +234,10 @@
     <string name="material">Materiál</string>
     <string name="md_error_label">Hiba</string>
     <string name="md_storage_perm_error">Engedély hiba</string>
-    <string name="message_backup_create_success">Biztonsági mentés sikeresen létrehozva</string>
-    <string name="message_limit_tabs">Nem lehet több 5 elemnél</string>
-    <string name="message_pro_feature">%s egy prémium funkció</string>
-    <string name="message_restore_success">A visszaállítás sikeresen befejeződött</string>
-    <string name="message_updated">Frissítve</string>
-    <string name="message_welcome"><![CDATA[Szia! <br>Üdv a %s-ban]]></string>
     <string name="my_name">Név</string>
     <string name="my_top_tracks">Legjobb számok</string>
     <string name="never">Soha</string>
-    <string name="new_music_mix">Új Zene Mix</string>
+    <string name="new_music_mix">New Music Mix</string>
     <string name="new_playlist_title">Új lejátszási lista</string>
     <string name="new_start_directory">%s az új indítókönyvtár.</string>
     <string name="next_song">Következő dal</string>
@@ -288,13 +268,12 @@
     <string name="only_on_wifi">Csak Wi-Fi-n</string>
     <string name="other_settings_summary">Speciális tesztelési funkciók</string>
     <string name="others">Egyéb</string>
-    <string name="over_cover">Albumborító helyett</string>
+    <string name="over_cover">Over Cover</string>
     <string name="password">Jelszó</string>
     <string name="past_three_months">Elmúlt 3 hónap</string>
     <string name="paste_lyrics_here">Dalszöveg beillesztése ide</string>
     <string name="paste_timeframe_lyrics_here">Időzített dalszöveg beillesztése ide</string>
-    <string name="peek">Kandikál</string>
-    <string name="permission_bluetooth_denied">\'Közeli eszközök\' engedély megtagadva</string>
+    <string name="peek">Peek</string>
     <string name="permission_external_storage_denied">A külső tárolási hozzáférés engedélyezése tiltva.</string>
     <string name="permission_summary">Az alkalmazásnak engedélyre van szüksége az eszköz tárhelyéhez a zenék lejátszásához</string>
     <string name="permission_title">Tárhely engedély</string>
@@ -305,13 +284,13 @@
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">Kövesse a Pinterest oldalt a Retro Music design ötletekért</string>
     <string name="plain">Letisztult</string>
-    <string name="playList_already_exits">A lejátszási lista már létezik</string>
-    <string name="playback_pitch">Hangmagasság</string>
-    <string name="playback_settings">Visszajátszás beállításai</string>
-    <string name="playback_speed">Visszajátszási sebesség</string>
+    <string name="playList_already_exits">Playlist already exists</string>
+    <string name="playback_pitch">Pitch</string>
+    <string name="playback_settings">Playback Settings</string>
+    <string name="playback_speed">Playback Speed</string>
     <string name="playing_notification_description">A lejátszási értesítés lejátszási/szüneteltetési akciógombokat tartalmazzon.</string>
     <string name="playing_notification_name">Lejátszási értesítés</string>
-    <string name="playlist_created_sucessfully">%s sikeresen létrehozva</string>
+    <string name="playlist_created_sucessfully">%s created successfully</string>
     <string name="playlist_is_empty">A lejátszási lista üres</string>
     <string name="playlist_name_empty">Lejátszási lista neve</string>
     <string name="playlists">Lejátszási listák</string>
@@ -334,11 +313,11 @@
     <string name="pref_keep_screen_on_summary">Vedd figyelembe, hogy ezen funkció engedélyezése hatással lehet az akkuidőre</string>
     <string name="pref_keep_screen_on_title">Tartsa bekapcsolva a képernyőt</string>
     <string name="pref_language_name">Válasszon nyelvet</string>
-    <string name="pref_snow_fall_title">Hóesés effect</string>
+    <string name="pref_snow_fall_title">Snow fall effect</string>
     <string name="pref_summary_album_art_on_lockscreen">A jelenlegi zeneszám albumborítóját zárolt háttérképként használja.</string>
     <string name="pref_summary_album_artists_only">Album előadók mutatása az Előadók kategóriában</string>
     <string name="pref_summary_audio_ducking">Hangerő csökkentése rendszerhang vagy értesítés érkezik</string>
-    <string name="pref_summary_audio_fade">A hang fokozatos elhalkítása/hangosítása amikor a zene megáll/elindul</string>
+    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
     <string name="pref_summary_blacklist">A feketelistán szereplő mappák tartalma el van rejtve a könyvtárban.</string>
     <string name="pref_summary_bluetooth_playback">Amint csatlakoztatta a bluetooth készüléket, kezdje el a lejátszást</string>
     <string name="pref_summary_blurred_album_art">Elhomályosítja az album borítóját a zárolás képernyőjén. Problémákat okozhat harmadik féltől származó alkalmazásokkal és widgetekkel.</string>
@@ -357,38 +336,37 @@
     <string name="pref_summary_ignore_media_store_artwork">Növelheti az albumborító minőségét, de lassabb kép betöltési időt eredményez. Csak akkor engedélyezze ezt, ha problémái vannak az alacsony felbontású borítókkal kapcsolatban.</string>
     <string name="pref_summary_library_categories">A könyvtári kategóriák sorrendjének és láthatóságának beállítása.</string>
     <string name="pref_summary_lock_screen">Retro Music egyéni vezérlőinek a használata zárolási képernyőn.</string>
-    <string name="pref_summary_manage_audio_focus">Mindig játssza le a hangot a háttérben, függetlenül attól, hogy bármi más megy a háttérben</string>
     <string name="pref_summary_open_source_licences">A nyílt forráskódú szoftverek licence részletei</string>
-    <string name="pref_summary_pause_history">Ha engedélyezve van, akkor az újonnan lejátszott dalok nem jelennek meg az előzményekben</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Lépjen az utoljára használt fülre az alkalmazás indításakor</string>
-    <string name="pref_summary_show_lyrics">Szinkronizált dalszövegek megjelenítése albumborító helyett</string>
-    <string name="pref_summary_suggestions">Új zene mix mutatása kezdőoldalon</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Engedélyezi a zenék váltását a \'Jelenleg játszott\' képernyőn, akárhova is húzza az ujját</string>
-    <string name="pref_summary_swipe_to_dismiss">A mini lejátszó eltüntetéséhez húzza lefele az ujját</string>
+    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
+    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
+    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
     <string name="pref_summary_toggle_full_screen">Kiterjesztett üzemmód</string>
     <string name="pref_summary_toggle_headset">Indítsa el a lejátszást azonnal, amikor a fejhallgató csatlakoztatva van.</string>
     <string name="pref_summary_toggle_shuffle">A véletlen sorrendű mód kikapcsol, ha új számlistát játszik le</string>
     <string name="pref_summary_toggle_volume">Ha van elég szabad hely, mutassa a hangerőszabályzókat a most játszott képernyőn</string>
-    <string name="pref_summary_wallpaper_accent">A kiemelő szín kinyerése a háttérképből</string>
+    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Csak a /Music mappában lévő zenék mutatása</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Az album borítójának megjelenítése</string>
     <string name="pref_title_album_artists_only">Album előadók szerinti navigálás</string>
     <string name="pref_title_album_cover_style">Album borító téma</string>
     <string name="pref_title_album_cover_transform">Albumborító stílusa váltáskor</string>
     <string name="pref_title_app_shortcuts">Színes alkalmazás parancsikonok</string>
-    <string name="pref_title_appbar_mode">Fejléc stílusa</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Hangerőcsökkentés fókusz vesztés esetén</string>
-    <string name="pref_title_audio_fade">Hang elhalkítása/felerősítése</string>
+    <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Automatikusan letölti az előadók képeit</string>
     <string name="pref_title_blacklist">Feketelista</string>
     <string name="pref_title_bluetooth_playback">Bluetooth lejátszás</string>
     <string name="pref_title_blurred_album_art">Elhomályosított albumborító</string>
-    <string name="pref_title_circle_button">Kerek lejátszási gomb</string>
+    <string name="pref_title_circle_button">Circular play button</string>
     <string name="pref_title_classic_notification">Klasszikus értesítés design</string>
     <string name="pref_title_colored_app">Adaptív szín</string>
     <string name="pref_title_colored_notification">Színes értesítés</string>
     <string name="pref_title_cross_fade">Átfedés (Béta)</string>
-    <string name="pref_title_custom_font">Manrope betűtípus használata</string>
+    <string name="pref_title_custom_font">Use Manrope font</string>
     <string name="pref_title_desaturated_color">Deszaturált szín</string>
     <string name="pref_title_expand_now_playing_panel">Most játszott képernyő mutatása</string>
     <string name="pref_title_extra_controls">Extra vezérlők</string>
@@ -401,27 +379,26 @@
     <string name="pref_title_ignore_media_store_artwork">A médiatár albumborítóinak figyelmen kívül hagyása</string>
     <string name="pref_title_last_added_interval">Az utoljára hozzáadott lejátszási lista hossza</string>
     <string name="pref_title_lock_screen">Teljes képernyős vezérlők</string>
-    <string name="pref_title_lyrics_screen_on">Képernyő bekapcsolva tartása, amikor meg van jelenítve a dalszöveg</string>
-    <string name="pref_title_lyrics_type">Dalszöveg típusa</string>
-    <string name="pref_title_manage_audio_focus">Folyamatos lejátszás</string>
+    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
+    <string name="pref_title_lyrics_type">Lyrics type</string>
     <string name="pref_title_now_playing_screen_appearance">Most játszott felület megjelenése</string>
     <string name="pref_title_open_source_licences">Nyílt forráskódú licencek</string>
-    <string name="pref_title_pause_history">Megállítás előzmények</string>
-    <string name="pref_title_remember_tab">Jegyezze meg a legutóbbi lapot</string>
-    <string name="pref_title_show_lyrics">Dalszöveg megjelenítése</string>
-    <string name="pref_title_suggestions">Javaslatok megjelenítése</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Húzd az ujjad bárhova, hogy zenét válts</string>
-    <string name="pref_title_swipe_to_dismiss">Elvetés lefele húzásra</string>
+    <string name="pref_title_pause_history">Pause history</string>
+    <string name="pref_title_remember_tab">Remember last tab</string>
+    <string name="pref_title_show_lyrics">Show lyrics</string>
+    <string name="pref_title_suggestions">Show suggestions</string>
+    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
     <string name="pref_title_tab_text_mode">Lap címek módja</string>
     <string name="pref_title_toggle_carousel_effect">Carousel hatás</string>
     <string name="pref_title_toggle_full_screen">Teljes képernyős alkalmazás</string>
     <string name="pref_title_toggle_toggle_headset">Automatikus lejátszás</string>
     <string name="pref_title_toggle_toggle_shuffle">Kevert mód</string>
     <string name="pref_title_toggle_volume">Hangerőszabályzók</string>
-    <string name="pref_title_wallpaper_accent">Háttérkép kiemelő szín</string>
-    <string name="pref_title_whitelist">Engedélyezett zenelisták</string>
+    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
+    <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Fekete téma, Most lejátszott téma, Carousel effekt és több..</string>
+    <string name="pro_summary">Sötét téma, Most játszott felület témái, Carousel hatás és még sok más ..</string>
     <string name="profile">Profil</string>
     <string name="purchase">Vásárlás</string>
     <string name="queue">Sorban áll</string>
@@ -432,13 +409,13 @@
     <string name="remove_action">Eltávolítás</string>
     <string name="remove_cover">Borító eltávolítása</string>
     <string name="remove_from_blacklist">Eltávolítás a feketelistáról</string>
-    <string name="remove_image">Kép eltávolítása</string>
+    <string name="remove_image">Remove Image</string>
     <string name="remove_song_from_playlist_title">Távolítsa el a dalt a lejátszási listáról</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Eltávolítja a <b>%1$s</b> dalt a lejátszási listából?]]></string>
     <string name="remove_songs_from_playlist_title">A dalok eltávolítása a lejátszási listáról</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Eltávolítja a <b>%1$d</b> dalokat a lejátszási listából?]]></string>
     <string name="rename_playlist_title">Lejátszási lista átnevezése</string>
-    <string name="replace_cover">Borító cserélése</string>
+    <string name="replace_cover">Replace Cover</string>
     <string name="report_an_issue">Hibajelentés</string>
     <string name="report_bug">Hibajelentés</string>
     <string name="reset_action">Visszaállítás</string>
@@ -498,7 +475,6 @@
     <string name="sort_order_composer">Zeneszerző</string>
     <string name="sort_order_date">Hozzáadás dátuma</string>
     <string name="sort_order_date_modified">Módosítás dátuma</string>
-    <string name="sort_order_default">Alapértelmezett</string>
     <string name="sort_order_num_songs">Zenék darabszáma</string>
     <string name="sort_order_num_songs_desc">Zenék darabszáma szerint csökkenő sorrendben</string>
     <string name="sort_order_year">Év</string>
@@ -537,7 +513,7 @@
     <string name="up_next">A következő</string>
     <string name="update_image">Kép frissítése</string>
     <string name="updating">Frissítés...</string>
-    <string name="user_images_description">Felhasználó képei</string>
+    <string name="user_images_description">User Images</string>
     <string name="user_name">Felhasználónév</string>
     <string name="username">Felhasználónév</string>
     <string name="version">Verzió</string>
@@ -558,4 +534,5 @@
     <string name="you_have_to_select_at_least_one_category">Legalább egy kategóriát kell kiválasztania</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Továbbítani fogjuk a problémakezelő weboldalra.</string>
     <string name="your_account_data_is_only_used_for_authentication">Fiókja adatait kizárólag a hitelesítéshez fogjuk használni.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index da7443799..d29ccad8f 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Tambah ke Favorit</string>
     <string name="action_add_to_playing_queue">Tambahkan ke antrean putar</string>
     <string name="action_add_to_playlist">Tambah ke daftar putar</string>
-    <string name="action_cancel">Batal</string>
     <string name="action_cast">Transmisi</string>
     <string name="action_clear_playing_queue">Kosongkan antrean pemutaran</string>
     <string name="action_cycle_repeat">Mode pengulangan siklus</string>
@@ -89,8 +88,6 @@
     <string name="biography">Biografi</string>
     <string name="black_theme_name">Hitam Pekat</string>
     <string name="blacklist">Daftar hitam</string>
-    <string name="bluetooth_summary">Aplikasi butuh izin ke perangkat terdekat untuk memeriksa perangkat bluetooth</string>
-    <string name="bluetooth_title">Perangkat terdekat</string>
     <string name="blur">Keburaman</string>
     <string name="blur_card">Kartu buram</string>
     <string name="bug_report_failed">Tidak dapat mengirim laporan</string>
@@ -104,7 +101,6 @@
     <string name="bug_report_no_password">Mohon masukkan kata sandi Github Anda dengan benar</string>
     <string name="bug_report_no_title">Harap masukkan judul masalah</string>
     <string name="bug_report_no_username">Mohon masukkan nama pengguna Github Anda dengan benar</string>
-    <string name="bug_report_success">Lapor bug sukses</string>
     <string name="bug_report_summary">Terjadi kesalahan tak terduga. Maaf jika Anda menemukan bug ini, jika terus terjadi maka \"Hapus data aplikasi\" atau kirim Email </string>
     <string name="bug_report_use_account">Kirim dengan menggunakan akun Github</string>
     <string name="buy_now">Beli sekarang</string>
@@ -128,7 +124,6 @@
     <string name="clear_playing_queue">Bersihkan antrean</string>
     <string name="color">Warna</string>
     <string name="colors">Warna</string>
-    <string name="compact">Ringkas</string>
     <string name="composer">Komposer</string>
     <string name="copied_device_info_to_clipboard">Info perangkat tersalin ke papan klip.</string>
     <string name="could_not_create_playlist">Tidak dapat membuat daftar putar.</string>
@@ -171,21 +166,14 @@
     <string name="edit_synced_lyrics">Edit Lirik Yang Disinkronkan</string>
     <string name="empty">Kosong</string>
     <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Tidak dapat membuat cadangan</string>
-    <string name="error_delete_backup">Tidak dapat menghapus cadangan</string>
-    <string name="error_empty_name">Namamu tidak boleh kosong!</string>
-    <string name="error_load_failed">Gagal memuat</string>
-    <string name="error_share_file">Tidak dapat berbagi berkas</string>
-    <string name="expanded">Diperluas</string>
     <string name="faq">Pertanyaan Umum (FAQ)</string>
     <string name="favorites">Favorit</string>
-    <string name="file_already_exists">Berkas sudah ada</string>
     <string name="finish_last_song">Selesaikan lagu terakhir</string>
     <string name="fit">Paskan</string>
     <string name="flat">Datar</string>
     <string name="folders">Folder</string>
     <string name="follow_system">Ikuti sistem</string>
-    <string name="for_you">Untukmu</string>
+    <string name="for_you">Untuk Anda</string>
     <string name="free">Gratis</string>
     <string name="full">Penuh</string>
     <string name="full_card">Kartu penuh</string>
@@ -195,7 +183,6 @@
     <string name="genres">Genre</string>
     <string name="git_hub_summary">Beri fork pada proyek di GitHub</string>
     <string name="gradient">Gradasi</string>
-    <string name="grant_access">Izinkan akses</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -233,7 +220,6 @@
     <string name="labeled">Berlabel</string>
     <string name="last_added">Terakhir ditambah</string>
     <string name="last_song">Lagu terakhir</string>
-    <string name="lets_go">Ayo mulai</string>
     <string name="library_categories">Kategori perpustakaan</string>
     <string name="licenses">Lisensi</string>
     <string name="light_theme_name">Putih Terang</string>
@@ -246,16 +232,10 @@
     <string name="material">Material</string>
     <string name="md_error_label">Kesalahan</string>
     <string name="md_storage_perm_error">Kesalahan izin</string>
-    <string name="message_backup_create_success">Cadangan berhasil dibuat.</string>
-    <string name="message_limit_tabs">Tidak lebih dari 5 item</string>
-    <string name="message_pro_feature">%s adalah fitur Pro.</string>
-    <string name="message_restore_success">Restorasi sukses.</string>
-    <string name="message_updated">Diperbarui</string>
-    <string name="message_welcome"><![CDATA[Halo! <br> Selamat datang ke %s]]></string>
     <string name="my_name">Nama</string>
     <string name="my_top_tracks">Sering diputar</string>
     <string name="never">Tidak pernah</string>
-    <string name="new_music_mix">Acak Musik Baru</string>
+    <string name="new_music_mix">Campuran Musik Baru</string>
     <string name="new_playlist_title">Daftar putar baru</string>
     <string name="new_start_directory">%s adalah direktori awal yang baru.</string>
     <string name="next_song">Lagu berikutnya</string>
@@ -292,7 +272,6 @@
     <string name="paste_lyrics_here">Tempel Lirik Disini</string>
     <string name="paste_timeframe_lyrics_here">Tempel kerangka waktu lirik di sini</string>
     <string name="peek">Mengintip</string>
-    <string name="permission_bluetooth_denied">Izin perangkat terdekat ditolak.</string>
     <string name="permission_external_storage_denied">Izin untuk mengakses penyimpanan eksternal ditolak.</string>
     <string name="permission_summary">Aplikasi memerlukan izin untuk mengakses penyimpanan perangkat Anda untuk memutar musik</string>
     <string name="permission_title">Akses Penyimpanan</string>
@@ -355,26 +334,25 @@
     <string name="pref_summary_ignore_media_store_artwork">Dapat meningkatkan kualitas sampul album, namun menyebabkan waktu pemuatan lebih lambat. Aktifkan jika Anda bermasalah dengan resolusi gambar album yang rendah</string>
     <string name="pref_summary_library_categories">Mengkonfigurasi visibilitas dan susunan kategori perpustakaan.</string>
     <string name="pref_summary_lock_screen">Gunakan kontrol layar kunci khusus Musik Retro</string>
-    <string name="pref_summary_manage_audio_focus">Selalu putar audio di latar belakang tanpa pedulikan apapun lainnya yang diputar</string>
     <string name="pref_summary_open_source_licences">Detail lisensi untuk perangkat lunak sumber terbuka</string>
     <string name="pref_summary_pause_history">Saat diaktifkan, lagu yang baru diputar tidak akan muncul di riwayat</string>
     <string name="pref_summary_remember_tab">Arahkan ke tab yang terakhir digunakan saat memulai</string>
     <string name="pref_summary_show_lyrics">Tampilkan lirik yang disinkronkan di atas sampul album</string>
     <string name="pref_summary_suggestions">Tampilkan Campuran Musik Baru di layar beranda</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Memungkinkan mengubah lagu dengan menggeser di mana saja di layar yang sedang diputar</string>
-    <string name="pref_summary_swipe_to_dismiss">Usap ke bawah untuk hentikan pemutar mini</string>
     <string name="pref_summary_toggle_full_screen">Mode Layar Penuh</string>
     <string name="pref_summary_toggle_headset">Mulai memutar segera setelah headphone terhubung</string>
     <string name="pref_summary_toggle_shuffle">Mode acak akan mati saat memutar daftar lagu baru</string>
     <string name="pref_summary_toggle_volume">Jika tersedia cukup ruang, tampilkan kontrol volume di layar pemutaran</string>
     <string name="pref_summary_wallpaper_accent">Ambil warna aksen dari wallpaper</string>
     <string name="pref_summary_whitelist">Tampilkan musik hanya dari folder /Music</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Tampilkan sampul album</string>
     <string name="pref_title_album_artists_only">Navigasi berdasarkan Album Artis</string>
     <string name="pref_title_album_cover_style">Tema sampul album</string>
     <string name="pref_title_album_cover_transform">Lewati sampul album</string>
     <string name="pref_title_app_shortcuts">Pintasan Berwarna</string>
-    <string name="pref_title_appbar_mode">Gaya header</string>
+    <string name="pref_title_appbar_mode">Mode bilah aplikasi</string>
     <string name="pref_title_audio_ducking">Kurangi volume saat ada notifikasi</string>
     <string name="pref_title_audio_fade">Suara Memudar</string>
     <string name="pref_title_auto_download_artist_images">Unduh otomatis gambar artis</string>
@@ -401,15 +379,13 @@
     <string name="pref_title_lock_screen">Kontrol layar penuh</string>
     <string name="pref_title_lyrics_screen_on">Tetap aktifkan layar saat menampilkan lirik</string>
     <string name="pref_title_lyrics_type">Tipe lirik</string>
-    <string name="pref_title_manage_audio_focus">Selalu putar</string>
     <string name="pref_title_now_playing_screen_appearance">Tema Pemutaran</string>
     <string name="pref_title_open_source_licences">Lisensi sumber terbuka</string>
     <string name="pref_title_pause_history">Jeda riwayat</string>
     <string name="pref_title_remember_tab">Ingat tab terakhir</string>
     <string name="pref_title_show_lyrics">Tampilkan lirik</string>
     <string name="pref_title_suggestions">Tampilkan Saran</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Geser ke mana saja untuk mengubah lagu</string>
-    <string name="pref_title_swipe_to_dismiss">Hentikan dengan usap ke bawah</string>
+    <string name="pref_title_swipe_anywhere_now_playing">Usap kemana saja untuk mengubah lagu</string>
     <string name="pref_title_tab_text_mode">Mode judul tab</string>
     <string name="pref_title_toggle_carousel_effect">Efek korsel</string>
     <string name="pref_title_toggle_full_screen">Aplikasi layar penuh</string>
@@ -418,8 +394,9 @@
     <string name="pref_title_toggle_volume">Kontrol volume</string>
     <string name="pref_title_wallpaper_accent">Warna aksen wallpaper</string>
     <string name="pref_title_whitelist">Musik daftar putih</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Tema hitam, tema yang sedang diputar, efek korsel, dan lainnya...</string>
+    <string name="pro_summary">Tema hitam, Tema yang sedang diputar, efek korsel, dan lainnya...</string>
     <string name="profile">Profil</string>
     <string name="purchase">Pembelian</string>
     <string name="queue">Antrean Putar</string>
@@ -496,7 +473,6 @@
     <string name="sort_order_composer">Komposer</string>
     <string name="sort_order_date">Tanggal ditambahkan</string>
     <string name="sort_order_date_modified">Tanggal diubah</string>
-    <string name="sort_order_default">Bawaan</string>
     <string name="sort_order_num_songs">Jumlah lagu</string>
     <string name="sort_order_num_songs_desc">Desc jumlah lagu</string>
     <string name="sort_order_year">Tahun</string>
@@ -554,6 +530,7 @@
     <string name="x_selected">%1$d dipilih</string>
     <string name="year">Tahun</string>
     <string name="you_have_to_select_at_least_one_category">Anda harus memilih setidaknya satu kategori.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Anda akan diteruskan ke situs web pelacak galat.</string>
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Anda akan ditersukan ke situs web pelacak masalah.</string>
     <string name="your_account_data_is_only_used_for_authentication">Data akun Anda hanya digunakan untuk autentikasi.</string>
+    <string name="bug_report_success">Lapor bug sukses</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 2bc3f795b..7f848d1cd 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Aggiungi ai preferiti</string>
     <string name="action_add_to_playing_queue">Aggiungi alla coda</string>
     <string name="action_add_to_playlist">Aggiungi alla playlist</string>
-    <string name="action_cancel">Annulla</string>
     <string name="action_cast">Trasmetti</string>
     <string name="action_clear_playing_queue">Cancella coda</string>
     <string name="action_cycle_repeat">Modalità ripetizione continua</string>
@@ -55,7 +54,7 @@
     <string name="add_action">Aggiungi</string>
     <string name="add_playlist_title">"Aggiungi alla playlist"</string>
     <string name="add_time_framed_lryics">Aggiungi testi sincronizzati</string>
-    <string name="added_song_count_to_playlist">Aggiunte %1$d canzoni a %2$s</string>
+    <string name="added_song_count_to_playlist">Aggiunta/e %1$d canzone/i a %2$s</string>
     <string name="added_title_to_playing_queue">"Aggiunto un brano alla coda."</string>
     <string name="added_x_titles_to_playing_queue">Aggiunti %1$d brani alla coda.</string>
     <string name="album">Album</string>
@@ -92,8 +91,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="biography">Biografia</string>
     <string name="black_theme_name">Solo nero</string>
     <string name="blacklist">Blacklist</string>
-    <string name="bluetooth_summary">L\'app richiede l\'autorizzazione dei dispositivi nelle vicinanze per verificare la presenza di dispositivi Bluetooth</string>
-    <string name="bluetooth_title">Dispositivi nelle vicinanze</string>
     <string name="blur">Sfocatura</string>
     <string name="blur_card">Card sfocata</string>
     <string name="bug_report_failed">Impossibile inviare il rapporto</string>
@@ -107,7 +104,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="bug_report_no_password">Inserisci la tua password GitHub</string>
     <string name="bug_report_no_title">Inserisci un titolo al problema</string>
     <string name="bug_report_no_username">Inserisci il tuo nome utente GitHub</string>
-    <string name="bug_report_success">Segnalazione bug riuscita</string>
     <string name="bug_report_summary">Si è verificato un errore imprevisto. Mi dispiace, se continua a bloccarsi \"Cancella i dati\" dell\'app o inviami un\'email</string>
     <string name="bug_report_use_account">Invia con l\'account GitHub</string>
     <string name="buy_now">Acquista ora</string>
@@ -131,7 +127,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="clear_playing_queue">Cancella coda</string>
     <string name="color">Colore</string>
     <string name="colors">Colori</string>
-    <string name="compact">Compatto</string>
     <string name="composer">Compositore</string>
     <string name="copied_device_info_to_clipboard">Info dispositivo copiate negli appunti.</string>
     <string name="could_not_create_playlist">Impossibile creare la playlist.</string>
@@ -174,15 +169,8 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="edit_synced_lyrics">Modifica testi sincronizzati</string>
     <string name="empty">Vuoto</string>
     <string name="equalizer">Equalizzatore</string>
-    <string name="error_create_backup">Impossibile creare il backup</string>
-    <string name="error_delete_backup">Impossibile eliminare il backup</string>
-    <string name="error_empty_name">Il tuo nome non può essere vuoto!</string>
-    <string name="error_load_failed">Caricamento fallito</string>
-    <string name="error_share_file">Impossibile condividere il file</string>
-    <string name="expanded">Esteso</string>
     <string name="faq">FAQ</string>
     <string name="favorites">Preferiti</string>
-    <string name="file_already_exists">Il file esiste già</string>
     <string name="finish_last_song">Termina ultimo brano</string>
     <string name="fit">Adatta</string>
     <string name="flat">Piatto</string>
@@ -198,7 +186,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="genres">Generi</string>
     <string name="git_hub_summary">Sviluppa il progetto su GitHub</string>
     <string name="gradient">Sfumatura</string>
-    <string name="grant_access">Concedi accesso</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -236,7 +223,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="labeled">Etichettato</string>
     <string name="last_added">Ultimi aggiunti</string>
     <string name="last_song">Ultimo brano</string>
-    <string name="lets_go">Andiamo</string>
     <string name="library_categories">Categorie della raccolta</string>
     <string name="licenses">Licenze</string>
     <string name="light_theme_name">Chiaro</string>
@@ -249,12 +235,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="material">Material</string>
     <string name="md_error_label">Errore</string>
     <string name="md_storage_perm_error">Errore di autorizzazione</string>
-    <string name="message_backup_create_success">Backup creato con successo.</string>
-    <string name="message_limit_tabs">Non più di 5 elementi</string>
-    <string name="message_pro_feature">%s è una funzionalità Pro.</string>
-    <string name="message_restore_success">Ripristino completato con successo.</string>
-    <string name="message_updated">Aggiornato</string>
-    <string name="message_welcome"><![CDATA[Ciao! <br> Benvenuto su %s]]></string>
     <string name="my_name">Nome</string>
     <string name="my_top_tracks">I più riprodotti</string>
     <string name="never">Mai</string>
@@ -295,7 +275,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="paste_lyrics_here">Incolla i testi qui</string>
     <string name="paste_timeframe_lyrics_here">Incolla i testi sincronizzati qui</string>
     <string name="peek">Sbirciata</string>
-    <string name="permission_bluetooth_denied">Autorizzazione dispositivi nelle vicinanze negata.</string>
     <string name="permission_external_storage_denied">Autorizzazione ad accedere all\'archiviazione esterna negata.</string>
     <string name="permission_summary">L\'app necessita dell\'autorizzazione ad accedere all\'archiviazione del dispositivo per riprodurre musica</string>
     <string name="permission_title">Accesso all\'archiviazione</string>
@@ -358,26 +337,25 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_summary_ignore_media_store_artwork">Può aumentare la qualità delle copertine degli album, ma causa un rallentamento nel caricamento delle immagini. Abilita solo se hai problemi con la bassa qualità delle copertine</string>
     <string name="pref_summary_library_categories">Configura la visibilità e l\'ordine delle categorie</string>
     <string name="pref_summary_lock_screen">Usa i comandi di Retro Music nella schermata di blocco</string>
-    <string name="pref_summary_manage_audio_focus">Riproduci sempre l\'audio in background indipendentemente da qualsiasi altra cosa in riproduzione</string>
     <string name="pref_summary_open_source_licences">Dettagli licenza per il software open source</string>
     <string name="pref_summary_pause_history">Se abilitato, i brani appena riprodotti non verranno visualizzati nella cronologia</string>
     <string name="pref_summary_remember_tab">All\'avvio apri l\'ultima scheda usata</string>
     <string name="pref_summary_show_lyrics">Mostra i testi sincronizzati sulla copertina dell\'album</string>
     <string name="pref_summary_suggestions">Mostra il nuovo mix musicale nella homepage</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Cambia brano scorrendo dovunque sulla schermata di riproduzione</string>
-    <string name="pref_summary_swipe_to_dismiss">Scorri verso il basso per chiudere il mini player</string>
     <string name="pref_summary_toggle_full_screen">Modalità immersiva</string>
     <string name="pref_summary_toggle_headset">Inizia la riproduzione subito dopo aver collegato le cuffie</string>
     <string name="pref_summary_toggle_shuffle">La modalità casuale viene disattivata quando si riproduce un nuovo elenco di brani</string>
     <string name="pref_summary_toggle_volume">Se c\'è spazio sufficiente, mostra i controlli del volume nella schermata in riproduzione</string>
     <string name="pref_summary_wallpaper_accent">Estrai il colore in rilievo dallo sfondo</string>
     <string name="pref_summary_whitelist">Mostra solo i brani dalla cartella /Music</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Mostra la copertina dell\'album</string>
     <string name="pref_title_album_artists_only">Naviga per artista album</string>
     <string name="pref_title_album_cover_style">Tema copertina dell\'album</string>
     <string name="pref_title_album_cover_transform">Modalità cambio copertina dell\'album</string>
     <string name="pref_title_app_shortcuts">Scorciatoie app colorate</string>
-    <string name="pref_title_appbar_mode">Stile header</string>
+    <string name="pref_title_appbar_mode">Modalità barra app</string>
     <string name="pref_title_audio_ducking">Riduci il volume alla perdita di focalizzazione</string>
     <string name="pref_title_audio_fade">Dissolvenza audio</string>
     <string name="pref_title_auto_download_artist_images">Scarica automaticamente immagini artista</string>
@@ -404,7 +382,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_title_lock_screen">Controlli a schermo intero</string>
     <string name="pref_title_lyrics_screen_on">Schermo sempre acceso con i testi</string>
     <string name="pref_title_lyrics_type">Tipo di testi</string>
-    <string name="pref_title_manage_audio_focus">Riproduci sempre</string>
     <string name="pref_title_now_playing_screen_appearance">Tema schermata riproduzione</string>
     <string name="pref_title_open_source_licences">Licenze open source</string>
     <string name="pref_title_pause_history">Metti in pausa la cronologia</string>
@@ -412,7 +389,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_title_show_lyrics">Mostra testi</string>
     <string name="pref_title_suggestions">Mostra suggerimenti</string>
     <string name="pref_title_swipe_anywhere_now_playing">Scorri per cambiare brano</string>
-    <string name="pref_title_swipe_to_dismiss">Chiudi con scorrimento verso il basso</string>
     <string name="pref_title_tab_text_mode">Modalità titoli schede</string>
     <string name="pref_title_toggle_carousel_effect">Effetto scorrimento</string>
     <string name="pref_title_toggle_full_screen">Applicazione a schermo intero</string>
@@ -421,8 +397,9 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_title_toggle_volume">Controlli volume</string>
     <string name="pref_title_wallpaper_accent">Colore in rilievo sfondo</string>
     <string name="pref_title_whitelist">Whitelist</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Tema nero, temi schermata riproduzione, effetto scorrimento e molto altro..</string>
+    <string name="pro_summary">Temi in riproduzione, effetto scorrimento e molto altro...</string>
     <string name="profile">Profilo</string>
     <string name="purchase">Acquista</string>
     <string name="queue">Coda</string>
@@ -499,7 +476,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="sort_order_composer">Compositore</string>
     <string name="sort_order_date">Data</string>
     <string name="sort_order_date_modified">Ultima modifica</string>
-    <string name="sort_order_default">Predefinito</string>
     <string name="sort_order_num_songs">Numero brani</string>
     <string name="sort_order_num_songs_desc">Numero brani decrescente</string>
     <string name="sort_order_year">Anno</string>
@@ -559,4 +535,5 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="you_have_to_select_at_least_one_category">Seleziona almeno una categoria.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Verrai reindirizzato al sito web dei problemi.</string>
     <string name="your_account_data_is_only_used_for_authentication">I dati del tuo account vengono utilizzati solo per l\'autenticazione.</string>
+    <string name="bug_report_success">Segnalazione bug riuscita</string>
 </resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 91fd054ad..30cbda947 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -3,13 +3,12 @@
     <string name="about_album_label">%s について</string>
     <string name="about_settings_summary">我々のチームとソーシャルリンク</string>
     <string name="accent_color">アクセントカラー</string>
-    <string name="accent_color_desc">テーマのアクセントカラー、既定は紫色です。</string>
+    <string name="accent_color_desc">テーマのアクセントカラー、既定は青緑色です。</string>
     <string name="action_about">このアプリについて</string>
     <string name="action_add_to_blacklist">ブラックリストに追加</string>
     <string name="action_add_to_favorites">お気に入りに追加</string>
     <string name="action_add_to_playing_queue">再生キューに追加</string>
-    <string name="action_add_to_playlist">プレイリストに追加</string>
-    <string name="action_cancel">キャンセル</string>
+    <string name="action_add_to_playlist">プレイリストに追加…</string>
     <string name="action_cast">キャスト</string>
     <string name="action_clear_playing_queue">再生キューをクリア</string>
     <string name="action_cycle_repeat">サイクルリピートモード</string>
@@ -55,19 +54,19 @@
     <string name="add_action">追加</string>
     <string name="add_playlist_title">"プレイリストに追加"</string>
     <string name="add_time_framed_lryics">時間指定の歌詞を追加</string>
-    <string name="added_song_count_to_playlist">%2$s に%1$d曲追加しました</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"1曲が再生キューに追加されました"</string>
     <string name="added_x_titles_to_playing_queue">%1$d 曲が再生キューに追加されました</string>
     <string name="album">アルバム</string>
     <plurals name="albumSongs">
-        <item quantity="other">楽曲</item>
+        <item quantity="other">曲</item>
     </plurals>
     <string name="album_artist">アルバムアーティスト</string>
     <string name="albums">アルバム</string>
     <plurals name="albums">
         <item quantity="other">アルバム</item>
     </plurals>
-    <string name="always">常時</string>
+    <string name="always">常に</string>
     <string name="app_share">クールな音楽プレイヤーをチェックしよう: https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">シャッフル</string>
     <string name="app_shortcut_top_tracks_short">トップ曲</string>
@@ -86,11 +85,9 @@
     <string name="backup_restore_settings_summary">設定、プレイリストのバックアップと復元</string>
     <string name="backup_restore_title"><![CDATA[バックアップと復元]]></string>
     <string name="backup_title">バックアップ</string>
-    <string name="biography">説明</string>
+    <string name="biography">バイオグラフィー</string>
     <string name="black_theme_name">ダークテーマ時に漆黒にする</string>
     <string name="blacklist">ブラックリスト</string>
-    <string name="bluetooth_summary">付近の Bluetooth デバイスを確認するために Nearby デバイス権限が必要です</string>
-    <string name="bluetooth_title">付近のデバイス</string>
     <string name="blur">ぼかし</string>
     <string name="blur_card">ブラーカード</string>
     <string name="bug_report_failed">レポートを送信できませんでした</string>
@@ -104,7 +101,6 @@
     <string name="bug_report_no_password">有効なGitHubのパスワードを入力してください</string>
     <string name="bug_report_no_title">問題のタイトルを入力してください</string>
     <string name="bug_report_no_username">有効なGitHubアカウントのユーザー名を入力してください</string>
-    <string name="bug_report_success">バグ報告に成功しました</string>
     <string name="bug_report_summary">予期しないエラーが発生しました。申し訳ございません。
 このバグが何度も発生する場合は、端末のアプリ設定より「データを削除する(Androidバージョンによって異なります)」を実行するか、概要をメールで送信してください。</string>
     <string name="bug_report_use_account">GitHubアカウントを使って送信</string>
@@ -118,7 +114,7 @@
     <string name="cascading">重ねて表示</string>
     <string name="changelog">パッチノート</string>
     <string name="changelog_summary">新機能をチェック</string>
-    <string name="choose_image">画像を選択</string>
+    <string name="choose_image">Choose Image</string>
     <string name="choose_restore_title">復元するアイテムを選択</string>
     <string name="circle">サークル</string>
     <string name="circular">円</string>
@@ -129,7 +125,6 @@
     <string name="clear_playing_queue">キューを削除</string>
     <string name="color">カラフル</string>
     <string name="colors">色</string>
-    <string name="compact">コンパクト</string>
     <string name="composer">作曲家</string>
     <string name="copied_device_info_to_clipboard">端末情報をコピー</string>
     <string name="could_not_create_playlist">\u30d7\u30ec\u30a4\u30ea\u30b9\u30c8\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002</string>
@@ -140,9 +135,9 @@
     <string name="create_new_backup">作成</string>
     <string name="created_playlist_x">プレイリストを作成しました %1$s</string>
     <string name="credit_title">メンバーと貢献者</string>
-    <string name="currently_listening_to_x_by_x">現在、 %2$s で %1$s を聴いています。</string>
+    <string name="currently_listening_to_x_by_x">現在、 %1$s によって %2$s で聴いています。</string>
     <string name="custom_artist_images">カスタムアーティスト画像</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">クラッシュレポートを共有</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
     <string name="dark_theme_name">ダーク</string>
     <string name="delete_playlist_title">プレイリストを削除</string>
     <string name="delete_playlist_x"><![CDATA[プレイリスト <b>%1$s</b> を削除しますか?]]></string>
@@ -172,21 +167,14 @@
     <string name="edit_synced_lyrics">同期された歌詞を編集</string>
     <string name="empty">空の</string>
     <string name="equalizer">イコライザー</string>
-    <string name="error_create_backup">バックアップを作成できませんでした</string>
-    <string name="error_delete_backup">バックアップを削除できませんでした</string>
-    <string name="error_empty_name">名前を空欄にはできません。</string>
-    <string name="error_load_failed">読み込み失敗</string>
-    <string name="error_share_file">ファイルを共有できませんでした</string>
-    <string name="expanded">展開</string>
     <string name="faq">よくある質問</string>
     <string name="favorites">お気に入り</string>
-    <string name="file_already_exists">ファイルは既に存在します</string>
-    <string name="finish_last_song">最後の曲の終了を待つ</string>
+    <string name="finish_last_song">最後の曲を終了する</string>
     <string name="fit">フィット</string>
     <string name="flat">フラット</string>
     <string name="folders">フォルダ</string>
     <string name="follow_system">システムに従う</string>
-    <string name="for_you">おすすめ</string>
+    <string name="for_you">あなたのために</string>
     <string name="free">なし</string>
     <string name="full">フル</string>
     <string name="full_card">全体のカード</string>
@@ -196,7 +184,6 @@
     <string name="genres">ジャンル</string>
     <string name="git_hub_summary">GitHubでプロジェクトにフォークする</string>
     <string name="gradient">グラデーション</string>
-    <string name="grant_access">アクセスを許可</string>
     <string name="grid_size_1">１</string>
     <string name="grid_size_2">２</string>
     <string name="grid_size_3">３</string>
@@ -209,8 +196,8 @@
     <string name="help_summary">さらにヘルプが必要ですか？</string>
     <string name="hinge">ヒンジ</string>
     <string name="history">履歴</string>
-    <string name="history_cleared">履歴を消去しました</string>
-    <string name="history_undo_button">元に戻す</string>
+    <string name="history_cleared">History cleared</string>
+    <string name="history_undo_button">Undo</string>
     <string name="home">ホーム</string>
     <string name="horizontal_flip">水平方向に反転</string>
     <string name="image">画像</string>
@@ -232,9 +219,8 @@
     <string name="label_sampling_rate">サンプリングレート</string>
     <string name="label_track_length">長さ</string>
     <string name="labeled">ラベルを表示する</string>
-    <string name="last_added">最近追加</string>
+    <string name="last_added">最後に追加された</string>
     <string name="last_song">前の曲</string>
-    <string name="lets_go">はじめよう</string>
     <string name="library_categories">ライブラリの表示項目</string>
     <string name="licenses">ライセンス</string>
     <string name="light_theme_name">ライト</string>
@@ -243,20 +229,14 @@
     <string name="loading_products">商品の読み込み中...</string>
     <string name="login">ログイン</string>
     <string name="lyrics">歌詞</string>
-    <string name="made_with_love">インドにて、❤をこめて開発</string>
+    <string name="made_with_love">インドの❤によって開発</string>
     <string name="material">マテリアル</string>
     <string name="md_error_label">エラー</string>
     <string name="md_storage_perm_error">権限が付与されていません</string>
-    <string name="message_backup_create_success">バックアップは正常に作成されました。</string>
-    <string name="message_limit_tabs">5 アイテムまで</string>
-    <string name="message_pro_feature">%s はプロ版の機能です。</string>
-    <string name="message_restore_success">復元が正常に完了しました。</string>
-    <string name="message_updated">更新しました</string>
-    <string name="message_welcome"><![CDATA[こんにちは！ <br> %s へようこそ]]></string>
     <string name="my_name">名前</string>
-    <string name="my_top_tracks">最近のお気に入り</string>
+    <string name="my_top_tracks">最も再生された</string>
     <string name="never">決して</string>
-    <string name="new_music_mix">新曲ミックス</string>
+    <string name="new_music_mix">新しい曲のミックス</string>
     <string name="new_playlist_title">新しいプレイリスト</string>
     <string name="new_start_directory">%s は新しい開始ディレクトリです。</string>
     <string name="next_song">次の曲</string>
@@ -287,16 +267,15 @@
     <string name="only_on_wifi">Wi-Fi時のみ</string>
     <string name="other_settings_summary">高度な試験的機能</string>
     <string name="others">その他</string>
-    <string name="over_cover">カバーに重ねて表示</string>
+    <string name="over_cover">Over Cover</string>
     <string name="password">パスワード</string>
     <string name="past_three_months">過去3ヶ月</string>
     <string name="paste_lyrics_here">ここに歌詞を貼り付け</string>
     <string name="paste_timeframe_lyrics_here">時間指定の歌詞をペースト</string>
     <string name="peek">ピーク</string>
-    <string name="permission_bluetooth_denied">近くのデバイスにアクセスできません。</string>
     <string name="permission_external_storage_denied">外部ストレージへのアクセスが拒否されました</string>
-    <string name="permission_summary">音楽を再生するために、デバイスのストレージにアクセスする権限が必要です</string>
-    <string name="permission_title">ストレージへのアクセス</string>
+    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
+    <string name="permission_title">Storage Access</string>
     <string name="permissions_denied">許可が拒否されました</string>
     <string name="personalize">個人設定</string>
     <string name="personalize_settings_summary">再生中のUI画面をカスタマイズ</string>
@@ -304,19 +283,19 @@
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">PintrestでRetro Musicのデザインのインスピレーションを感じましょう！</string>
     <string name="plain">プレーン</string>
-    <string name="playList_already_exits">プレイリストは既に存在します</string>
-    <string name="playback_pitch">音程</string>
-    <string name="playback_settings">再生設定</string>
-    <string name="playback_speed">再生速度</string>
+    <string name="playList_already_exits">Playlist already exists</string>
+    <string name="playback_pitch">Pitch</string>
+    <string name="playback_settings">Playback Settings</string>
+    <string name="playback_speed">Playback Speed</string>
     <string name="playing_notification_description">再生中の通知は再生/停止の操作が利用できます</string>
     <string name="playing_notification_name">再生中の通知</string>
-    <string name="playlist_created_sucessfully">%s の作成に成功しました</string>
+    <string name="playlist_created_sucessfully">%s created successfully</string>
     <string name="playlist_is_empty">プレイリストが空です</string>
     <string name="playlist_name_empty">プレイリストの名前</string>
     <string name="playlists">プレイリスト</string>
     <string name="pref_blur_amount_summary">ブラーを使用するテーマを使用した際のブラーの強さを設定します。低いほど処理が早くなります</string>
     <string name="pref_blur_amount_title">ぼかしの強さ</string>
-    <string name="pref_filter_song_summary">楽曲を長さで並び替え</string>
+    <string name="pref_filter_song_summary">Filter songs by length</string>
     <string name="pref_filter_song_title">曲の長さをフィルター</string>
     <string name="pref_header_advanced">高度な設定</string>
     <string name="pref_header_album">アルバムのスタイル</string>
@@ -333,11 +312,11 @@
     <string name="pref_keep_screen_on_summary">この機能をオンにすると、バッテリー寿命に影響する可能性があります</string>
     <string name="pref_keep_screen_on_title">画面をオンのままにする</string>
     <string name="pref_language_name">言語を選択</string>
-    <string name="pref_snow_fall_title">雪エフェクト</string>
+    <string name="pref_snow_fall_title">Snow fall effect</string>
     <string name="pref_summary_album_art_on_lockscreen">再生中のジャケットをロック画面の壁紙に適用する</string>
     <string name="pref_summary_album_artists_only">アーティストカテゴリ内にアルバムのアーティストを表示する</string>
     <string name="pref_summary_audio_ducking">システムでサウンドが再生されたとき、または通知が受信されたときに一時的に音量を下げる</string>
-    <string name="pref_summary_audio_fade">曲を一時停止または再生するときにオーディオをフェードします</string>
+    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
     <string name="pref_summary_blacklist">ブラックリストに登録されたフォルダの内容はコレクションには表示されません。</string>
     <string name="pref_summary_bluetooth_playback">端末にBluetoothデバイスが接続されたとき、再生を開始する</string>
     <string name="pref_summary_blurred_album_art">ロック画面のジャケットをぼかします。他のアプリやウィジェットに問題を及ぼす可能性があります</string>
@@ -346,7 +325,7 @@
     <string name="pref_summary_colored_app">ジャケットから抽出された色が背景と再生ボタンに適用されます</string>
     <string name="pref_summary_colored_app_shortcuts">アプリのショートカットアイコンをアクセントカラーに切り替えます。アクセントカラーを変更した場合はトグルを切り替えて設定を適用してください</string>
     <string name="pref_summary_colored_notification">"\u30b8\u30e3\u30b1\u30c3\u30c8\u304b\u3089\u62bd\u51fa\u3055\u308c\u305f\u8272\u3067\u901a\u77e5\u3092\u7740\u8272\u3059\u308b"</string>
-    <string name="pref_summary_cross_fade">曲間でクロスフェードする時間</string>
+    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
     <string name="pref_summary_desaturated_color">マテリアルデザインのガイドラインに従いダークモードで彩度の低い色を使用する</string>
     <string name="pref_summary_expand_now_playing_panel">通知をタップすることでアプリのトップ画面ではなく、再生画面を表示するようにする</string>
     <string name="pref_summary_extra_controls">ミニプレイヤー専用のコントロールボタンを追加する</string>
@@ -356,38 +335,37 @@
     <string name="pref_summary_ignore_media_store_artwork">アルバムジャケットのクオリティを上げますが、読み込みに時間がかかる場合があります。低解像度の画像で問題がある場合に有効です。</string>
     <string name="pref_summary_library_categories">ライブラリに表示される項目と、順番を変更する</string>
     <string name="pref_summary_lock_screen">Retro Musicのカスタムされたロック画面を使用する</string>
-    <string name="pref_summary_manage_audio_focus">ほかのアプリでの再生に関わらず再生し続けます</string>
     <string name="pref_summary_open_source_licences">オープンソースライセンスの詳細</string>
-    <string name="pref_summary_pause_history">有効にすると、新たに再生された曲は履歴に表示されません</string>
-    <string name="pref_summary_remember_tab">開始時に最後に表示したタブに移動します</string>
-    <string name="pref_summary_show_lyrics">同期歌詞をアルバムカバーに重ねて表示します</string>
-    <string name="pref_summary_suggestions">新曲ミックスをホーム画面に表示する</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">再生中画面のどこかをスワイプして、楽曲の変更を行います</string>
-    <string name="pref_summary_swipe_to_dismiss">下にスワイプしてミニプレイヤーを閉じます</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
+    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
+    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
+    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
+    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
     <string name="pref_summary_toggle_full_screen">アプリをフルスクリーン表示にする</string>
     <string name="pref_summary_toggle_headset">ヘッドフォンが接続されたら自動で再生を開始する</string>
     <string name="pref_summary_toggle_shuffle">新しいリストの楽曲を再生する時にシャッフルは自動的にオフになります</string>
     <string name="pref_summary_toggle_volume">再生画面に十分なスペースがある場合に音量コントロールを追加する</string>
-    <string name="pref_summary_wallpaper_accent">壁紙からアクセントカラーを抽出します</string>
-    <string name="pref_summary_whitelist">/Music フォルダからの音楽のみ表示します</string>
+    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
+    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">アルバムジャケットを表示</string>
     <string name="pref_title_album_artists_only">アルバムのアーティストを表示</string>
     <string name="pref_title_album_cover_style">アルバムカバーのテーマ</string>
     <string name="pref_title_album_cover_transform">アルバムジャケットをスキップ</string>
     <string name="pref_title_app_shortcuts">色のついたアプリショートカット</string>
-    <string name="pref_title_appbar_mode">ヘッダーのスタイル</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">フォーカスロス時に音量を下げる</string>
-    <string name="pref_title_audio_fade">オーディオをフェードする</string>
-    <string name="pref_title_auto_download_artist_images">アーティスト画像を自動でダウンロード</string>
+    <string name="pref_title_audio_fade">Fade audio</string>
+    <string name="pref_title_auto_download_artist_images">アーティスト画像を自動でダウンロードする</string>
     <string name="pref_title_blacklist">ブラックリスト</string>
     <string name="pref_title_bluetooth_playback">Bluetooth接続時に再生</string>
     <string name="pref_title_blurred_album_art">アルバムジャケットにぼかしを適用する</string>
-    <string name="pref_title_circle_button">丸い再生ボタン</string>
+    <string name="pref_title_circle_button">Circular play button</string>
     <string name="pref_title_classic_notification">古い通知デザイン</string>
     <string name="pref_title_colored_app">アダプティブカラー</string>
     <string name="pref_title_colored_notification">色付きの通知</string>
-    <string name="pref_title_cross_fade">クロスフェード (ベータ版)</string>
-    <string name="pref_title_custom_font">フォントに Manrope を使用する</string>
+    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
+    <string name="pref_title_custom_font">Use Manrope font</string>
     <string name="pref_title_desaturated_color">彩度の低い色</string>
     <string name="pref_title_expand_now_playing_panel">通知から再生画面を開く</string>
     <string name="pref_title_extra_controls">追加コントロール</string>
@@ -400,27 +378,26 @@
     <string name="pref_title_ignore_media_store_artwork">Media Store のカバーを無視する</string>
     <string name="pref_title_last_added_interval">最後に追加されたプレイリストの間隔</string>
     <string name="pref_title_lock_screen">フルスクリーンコントロール</string>
-    <string name="pref_title_lyrics_screen_on">歌詞の表示時に画面を点灯し続ける</string>
-    <string name="pref_title_lyrics_type">歌詞の種類</string>
-    <string name="pref_title_manage_audio_focus">常に再生する</string>
+    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
+    <string name="pref_title_lyrics_type">Lyrics type</string>
     <string name="pref_title_now_playing_screen_appearance">再生中のテーマ</string>
     <string name="pref_title_open_source_licences">オープンソースライセンス</string>
-    <string name="pref_title_pause_history">視聴履歴を一時停止</string>
-    <string name="pref_title_remember_tab">最後に開いたタブを記憶する</string>
-    <string name="pref_title_show_lyrics">歌詞を表示する</string>
-    <string name="pref_title_suggestions">提案を表示する</string>
-    <string name="pref_title_swipe_anywhere_now_playing">画面のどこかをスワイプして曲変更する</string>
-    <string name="pref_title_swipe_to_dismiss">下スワイプで閉じる</string>
+    <string name="pref_title_pause_history">Pause history</string>
+    <string name="pref_title_remember_tab">Remember last tab</string>
+    <string name="pref_title_show_lyrics">Show lyrics</string>
+    <string name="pref_title_suggestions">Show suggestions</string>
+    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
     <string name="pref_title_tab_text_mode">タブのラベル</string>
     <string name="pref_title_toggle_carousel_effect">カルーセルエフェクト</string>
     <string name="pref_title_toggle_full_screen">フルスクリーン表示</string>
     <string name="pref_title_toggle_toggle_headset">自動再生</string>
     <string name="pref_title_toggle_toggle_shuffle">シャッフルモード</string>
     <string name="pref_title_toggle_volume">ボリュームコントロール</string>
-    <string name="pref_title_wallpaper_accent">壁紙の色を使用する</string>
-    <string name="pref_title_whitelist">楽曲のホワイトリスト</string>
-    <string name="pro">プロ版</string>
-    <string name="pro_summary">ダークモード、「再生中」スキン、カルーセルエフェクトなど…</string>
+    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
+    <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
+    <string name="pro">Pro</string>
+    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
     <string name="profile">プロフィール</string>
     <string name="purchase">購入</string>
     <string name="queue">キュー</string>
@@ -431,37 +408,37 @@
     <string name="remove_action">削除</string>
     <string name="remove_cover">ジャケットを削除</string>
     <string name="remove_from_blacklist">ブラックリストから削除</string>
-    <string name="remove_image">画像を削除する</string>
+    <string name="remove_image">Remove Image</string>
     <string name="remove_song_from_playlist_title">プレイリストから曲を削除</string>
     <string name="remove_song_x_from_playlist"><![CDATA[ <b>%1$s</b> をプレイリストから削除しますか？]]></string>
     <string name="remove_songs_from_playlist_title">プレイリストから曲を削除する</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[<b>%1$d</b> をプレイリストから削除しますか？]]></string>
     <string name="rename_playlist_title">プレイリストの名前を変更</string>
-    <string name="replace_cover">カバーを交換する</string>
+    <string name="replace_cover">Replace Cover</string>
     <string name="report_an_issue">問題を報告</string>
     <string name="report_bug">不具合を報告する</string>
-    <string name="reset_action">リセット</string>
+    <string name="reset_action">Reset</string>
     <string name="reset_artist_image">アーティスト画像をリセット</string>
     <string name="restore">復元</string>
-    <string name="restore_message">バックアップを復元しますか？</string>
+    <string name="restore_message">Do you want to restore backup?</string>
     <string name="restored_previous_purchase_please_restart">購入を復元しました。アプリを再起動してフルバージョンをご堪能ください！</string>
     <string name="restored_previous_purchases">購入を復元しました</string>
     <string name="restoring_purchase">購入を復元しています...</string>
     <string name="retro_music_player">Retro Music Player</string>
     <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">音楽を着信音に設定するには、端末の設定にアクセスする権限が必要です</string>
-    <string name="ringtone_title">着信音（オプション）</string>
-    <string name="saf_delete_failed">ファイルの削除に失敗しました。%s</string>
+    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
+    <string name="ringtone_title">Ringtone (Optional)</string>
+    <string name="saf_delete_failed">File delete failed: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">SAF URIを取得できません</string>
-    <string name="saf_guide_slide1_description">ナビゲーション ドロワーを開く</string>
-    <string name="saf_guide_slide1_description_before_o">オーバーフローメニューの「SDカードを表示」を有効にする</string>
+    <string name="saf_error_uri">Can\'t get SAF URI</string>
+    <string name="saf_guide_slide1_description">Open navigation drawer</string>
+    <string name="saf_guide_slide1_description_before_o">Enable \'Show SD card\' in overflow menu</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s はSDカードへのアクセスが必要です</string>
-    <string name="saf_guide_slide2_description">SDカードのルートディレクトリを選択してください</string>
-    <string name="saf_guide_slide2_title">ナビゲーションドロワーからSDカードを選択します</string>
-    <string name="saf_guide_slide3_description">サブフォルダは開かないでください</string>
-    <string name="saf_guide_slide3_title">画面下の「選択」ボタンをタップしてください</string>
+    <string name="saf_guide_slide1_title">%s needs SD card access</string>
+    <string name="saf_guide_slide2_description">You need to select your SD card root directory</string>
+    <string name="saf_guide_slide2_title">Select your SD card in navigation drawer</string>
+    <string name="saf_guide_slide3_description">Do not open any sub-folders</string>
+    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
     <string name="saf_write_failed">ファイルの書き込みに失敗しました: %s</string>
     <string name="save">保存</string>
     <!-- SAF -->
@@ -472,7 +449,7 @@
     <string name="saving_changes">変更を保存中</string>
     <string name="scan_media">メディアをスキャン</string>
     <string name="scanned_files">%2$d のうち、%1$d がスキャンされました</string>
-    <string name="scrobbles_label">Scrobble 機能</string>
+    <string name="scrobbles_label">Scrobbles</string>
     <string name="select_all">すべて選択</string>
     <string name="selected">選択された</string>
     <string name="set">決定</string>
@@ -497,7 +474,6 @@
     <string name="sort_order_composer">作曲家</string>
     <string name="sort_order_date">日付</string>
     <string name="sort_order_date_modified">最後の編集日</string>
-    <string name="sort_order_default">デフォルト</string>
     <string name="sort_order_num_songs">曲数順（昇順）</string>
     <string name="sort_order_num_songs_desc">曲数順（降順）</string>
     <string name="sort_order_year">年</string>
@@ -557,4 +533,5 @@
     <string name="you_have_to_select_at_least_one_category">少なくとも 1 つのカテゴリを選択する必要があります。</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">issue trackerのウェブサイトに移動します</string>
     <string name="your_account_data_is_only_used_for_authentication">あなたのアカウントは認証にのみ使用されます</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-kmr-rTR/strings.xml b/app/src/main/res/values-kmr-rTR/strings.xml
index 20ac63491..af134c1c6 100644
--- a/app/src/main/res/values-kmr-rTR/strings.xml
+++ b/app/src/main/res/values-kmr-rTR/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Tevlî bijarteyan bike</string>
     <string name="action_add_to_playing_queue">Tevlî rêzê stranên têne lêdan bike</string>
     <string name="action_add_to_playlist">Tevlî rêzoka lêdanê bike</string>
-    <string name="action_cancel">Têk bibe</string>
     <string name="action_cast">Biweşîne</string>
     <string name="action_clear_playing_queue">Rêzê stranên têne lêdan pak bike</string>
     <string name="action_cycle_repeat">Awaya dubarekirinê</string>
@@ -44,13 +43,13 @@
     <string name="action_set_as_start_directory">Wek rêberiya destpêkê saz bike</string>
     <string name="action_settings">"Sazkarî"</string>
     <string name="action_share">Parve bike</string>
-    <string name="action_shuffle_all">Hemûyan tevlîhev bike</string>
-    <string name="action_shuffle_playlist">Rêzoka lêdanê tevlîhev bike</string>
+    <string name="action_shuffle_all">Hemûyan tevlihev bike</string>
+    <string name="action_shuffle_playlist">Rêzoka lêdanê tevlihev bike</string>
     <string name="action_sleep_timer">Demkera xewê</string>
     <string name="action_sort_order">Rêzkirin bi</string>
     <string name="action_tag_editor">Zanyariyên stranê serrast bike</string>
     <string name="action_toggle_favorite">Bijarteyan biguherîne</string>
-    <string name="action_toggle_shuffle">Awaya tevlîhevkirinê çalak bike</string>
+    <string name="action_toggle_shuffle">Awaya tevlihevkirinê çalak bike</string>
     <string name="adaptive">Guncav</string>
     <string name="add_action">Tevlî bike</string>
     <string name="add_playlist_title">"Tevlî rêzoka lêdanê bike"</string>
@@ -72,8 +71,8 @@
     <string name="always">Her dem</string>
     <string name="app_share">Silav ev lêdera muzîkê ya xweşik li vir binêre:
 https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Tevlîhev bike</string>
-    <string name="app_shortcut_top_tracks_short">Baştirîn stran</string>
+    <string name="app_shortcut_shuffle_all_short">Tevlihev bike</string>
+    <string name="app_shortcut_top_tracks_short">Xweştirîn stran</string>
     <string name="app_widget_big_name">Wêneya tijî</string>
     <string name="app_widget_card_name">Kert</string>
     <string name="app_widget_classic_name">Klasîk</string>
@@ -92,8 +91,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="biography">Jînborî</string>
     <string name="black_theme_name">Tenê reş</string>
     <string name="blacklist">Rêzoka reş</string>
-    <string name="bluetooth_summary">Sepanê mafê gihîştinê ji bo amûrên bluetooth nêzîk daxwaz dike</string>
-    <string name="bluetooth_title">Amûrên nêzîk</string>
     <string name="blur">Mijbarî</string>
     <string name="blur_card">Kerta mijbarî</string>
     <string name="bug_report_failed">Nikare ragihandinê bişîne</string>
@@ -107,7 +104,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="bug_report_no_password">Jkx borînpeyva derbasdar a xwe ya Github binivisîne</string>
     <string name="bug_report_no_title">Jkx sernaveke pirsgirêkê binivisîne</string>
     <string name="bug_report_no_username">Jkx navê bikarhêner a derbasdar a xwe ya Github binivisîne</string>
-    <string name="bug_report_success">Ragihandina çewtiyê serkeftî bû</string>
     <string name="bug_report_summary">Çewtiyeke nehêvîkirî derket. Bibore, ku ev bidome \"Daneyên sepanê pak bike\" an jî E-nameyekê bişîne </string>
     <string name="bug_report_use_account">Bi riya karanîna ajimêra GitHub bişîne</string>
     <string name="buy_now">Niha bikire</string>
@@ -131,7 +127,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="clear_playing_queue">Rêzê pak bike</string>
     <string name="color">Reng</string>
     <string name="colors">Reng</string>
-    <string name="compact">Pêkhatî</string>
     <string name="composer">Awazvan</string>
     <string name="copied_device_info_to_clipboard">Zanyariyên amûrê ji bo tûrikê hate jêgirtin.</string>
     <string name="could_not_create_playlist">Nikare rêzoka lêdanê çê bike\u2019.</string>
@@ -174,17 +169,10 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="edit_synced_lyrics">Peyvên stranê yên hevdemkirî serrast bike</string>
     <string name="empty">Vala</string>
     <string name="equalizer">Yeksaneker</string>
-    <string name="error_create_backup">Nikare hîlanîna\u2019 çê bikê</string>
-    <string name="error_delete_backup">Nikare hîlanîna\u2019 jê bibê</string>
-    <string name="error_empty_name">Navê te nabe ku vala be!</string>
-    <string name="error_load_failed">Barkirin têk çû</string>
-    <string name="error_share_file">Pel nayê parvekirin</string>
-    <string name="expanded">Dirêjkirî</string>
     <string name="faq">Pirsên pir têne pirsîn (PPP)</string>
     <string name="favorites">Bijarte</string>
-    <string name="file_already_exists">Pel jixwe heye</string>
     <string name="finish_last_song">Strana dawî biqedîne</string>
-    <string name="fit">Lihevhatî</string>
+    <string name="fit">Guncav bike</string>
     <string name="flat">Dûz</string>
     <string name="folders">Peldank</string>
     <string name="follow_system">Pergalê bişopîne</string>
@@ -198,7 +186,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="genres">Cure</string>
     <string name="git_hub_summary">Kodê li ser GitHub bibîne</string>
     <string name="gradient">Gradyan</string>
-    <string name="grant_access">Mafê bide</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -207,7 +194,7 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Awaya torê</string>
+    <string name="grid_style_label">Şêwaza torê</string>
     <string name="help_summary">Bêtir alîkarî dixwazî?</string>
     <string name="hinge">Mofirk</string>
     <string name="history">Dîrok</string>
@@ -236,7 +223,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="labeled">Nîşankirî</string>
     <string name="last_added">Tevlîkirinên dawî</string>
     <string name="last_song">Strana dawî</string>
-    <string name="lets_go">Em hernê</string>
     <string name="library_categories">Beşên pirtûkxaneyê</string>
     <string name="licenses">Lîsans</string>
     <string name="light_theme_name">Ron</string>
@@ -249,16 +235,10 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="material">Material</string>
     <string name="md_error_label">Çewtî</string>
     <string name="md_storage_perm_error">Çewtiya mafdayînê</string>
-    <string name="message_backup_create_success">Hîlanîn bi serkeftî hate çêkirin.</string>
-    <string name="message_limit_tabs">Ji 5 hêmanan ne bêtir e</string>
-    <string name="message_pro_feature">%s taybetmendiyeke Pro ye.</string>
-    <string name="message_restore_success">Vegerandin bi serkeftî qediya.</string>
-    <string name="message_updated">Rojanekirî ye</string>
-    <string name="message_welcome"><![CDATA[Silav! <br>Tu bi xêr hatî %s]]></string>
     <string name="my_name">Nav</string>
     <string name="my_top_tracks">Herî pir lêdayî</string>
     <string name="never">Tu car</string>
-    <string name="new_music_mix">Muzîka nû tevlîhev bike</string>
+    <string name="new_music_mix">Muzîka nû tevlihev bike</string>
     <string name="new_playlist_title">Rêzoka lêdanê ya nû</string>
     <string name="new_start_directory">%s reberiya destpêkê ya nû ye.</string>
     <string name="next_song">Strana pêş</string>
@@ -281,7 +261,7 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="nothing_to_scan">Tiştek bo venêrînê tune ye.</string>
     <string name="nothing_to_see">Tiştek bo dîtinê tune ye</string>
     <string name="notification">Agahî</string>
-    <string name="notification_settings_summary">Awaya agahiyan kesane bike</string>
+    <string name="notification_settings_summary">Şêwaza agahiyan kesane bike</string>
     <string name="now_playing">Niha tê lêdan</string>
     <string name="now_playing_queue">Rêzeya niha tê lêdan</string>
     <string name="now_playing_summary">Dîmendera niha tê lêdan kesane bike</string>
@@ -295,7 +275,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="paste_lyrics_here">Peyvên stranê Li vir pêve bike</string>
     <string name="paste_timeframe_lyrics_here">Peyvên stranê demsazkirî li vir binivisîne</string>
     <string name="peek">Serî</string>
-    <string name="permission_bluetooth_denied">Daxwaza gihîştina amûrên nêzîk hate têkbirin.</string>
     <string name="permission_external_storage_denied">Mafa gihiştînê bo bîrgeha derveyî hate têkbirin.</string>
     <string name="permission_summary">Pêdiviya sepanê bi gihiştîna bîrgeha derveyî ya amûra te heye ji bo lêdana muzîkê</string>
     <string name="permission_title">Gihîştina bergehê</string>
@@ -321,7 +300,7 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_filter_song_summary">Stranan bi ya dirêjahiyê parzûn bike</string>
     <string name="pref_filter_song_title">Dema stranê parzûn bike</string>
     <string name="pref_header_advanced">Pêşketî</string>
-    <string name="pref_header_album">Awaya albumê</string>
+    <string name="pref_header_album">Şêwaza albumê</string>
     <string name="pref_header_audio">Deng</string>
     <string name="pref_header_blacklist">Rêzoka reş</string>
     <string name="pref_header_controls">Kontrol</string>
@@ -359,26 +338,25 @@ têne guhertin</string>
     <string name="pref_summary_ignore_media_store_artwork">Dikare kalîteya bergê albûmê bilind bike, lê dibe sedema ku demên barkirina wêneyê hêdî bibe. Tenê ku pirsgirêkên te bi bergê albumên bi çareseriya kêm re hebin vê yekê çalak bike</string>
     <string name="pref_summary_library_categories">Dîtin û rêzkirina beşên pirtûkxaneyê pevsaz bike.</string>
     <string name="pref_summary_lock_screen">Kontrolên dîmendera kilîtkirinê yên kesanekirî yên Retro Music bi kar bîne</string>
-    <string name="pref_summary_manage_audio_focus">Her dem dengê li paşrûyê bide lêdan tevî ku tiştek din hatibe lêdan</string>
     <string name="pref_summary_open_source_licences">Hûrguliyên Lîsansê ji bo nermalava çavkaniya vekirî</string>
     <string name="pref_summary_pause_history">Dema ku çalak be, stranên ku nû hatine lêdan wê di dîrokê de neyên xuyakirin</string>
     <string name="pref_summary_remember_tab">Dema ku dest pê dike, biçe rûgera herî dawî ya ku hatiye bikaranîn</string>
     <string name="pref_summary_show_lyrics">Peyvên stranê hevdemkirî li ser berga albumê nîşan bide</string>
-    <string name="pref_summary_suggestions">Bişkoka tevlîhevkirina Muzîka nû li ser dîmenera sereke nîşan bide</string>
+    <string name="pref_summary_suggestions">Bişkoka tevlihevkirina Muzîka nû li ser dîmenera sereke nîşan bide</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Bi kişandina li her derê li ser dîmendera lêdanê stranan biguherîne</string>
-    <string name="pref_summary_swipe_to_dismiss">Berjêr kaş bike da ku lêdera mini paşguh bikî</string>
     <string name="pref_summary_toggle_full_screen">Awaya dîmendera tije çalak bike</string>
     <string name="pref_summary_toggle_headset">Piştî ku guhik hate girêdan tavilê dest bi lêdanê bike</string>
-    <string name="pref_summary_toggle_shuffle">Dema ku ji rêzeyeke stran were lêdan wê awaya tevlîhevkirinê were neçalakkirin</string>
+    <string name="pref_summary_toggle_shuffle">Dema ku ji rêzeyeke stran were lêdan wê awaya tevlihevkirinê were neçalakkirin</string>
     <string name="pref_summary_toggle_volume">Ku şûn hebe, di dîmendera ku niha tê lêdan de kontrolên dengê nîşan bide</string>
     <string name="pref_summary_wallpaper_accent">Renga çarçoveyê ji paşrûyê derxîne</string>
     <string name="pref_summary_whitelist">Muzîkê tenê ji /Peldanka muzîkê nîşan bide</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Bergê albumê nîşan bide</string>
     <string name="pref_title_album_artists_only">Geran bi riya albuma hunermend</string>
     <string name="pref_title_album_cover_style">Rûkara bergê albumê</string>
     <string name="pref_title_album_cover_transform">Berga albumê derbas bike</string>
     <string name="pref_title_app_shortcuts">Kurteyên sepanê yên rengîn</string>
-    <string name="pref_title_appbar_mode">Awayê sernav</string>
+    <string name="pref_title_appbar_mode">Awaya darika sepanê</string>
     <string name="pref_title_audio_ducking">Dengê kêm bike di dema hatina agahiyan de</string>
     <string name="pref_title_audio_fade">Wendabûna dengê</string>
     <string name="pref_title_auto_download_artist_images">Wêneyên hunermendan bixweber daxe</string>
@@ -405,7 +383,6 @@ têne guhertin</string>
     <string name="pref_title_lock_screen">Kontrolên dîmendera tije</string>
     <string name="pref_title_lyrics_screen_on">Dema ku peyvên stranê têne nîşandan dîmenderê vêketî bihêle</string>
     <string name="pref_title_lyrics_type">Cureya peyvên stranê</string>
-    <string name="pref_title_manage_audio_focus">Her dem lêde</string>
     <string name="pref_title_now_playing_screen_appearance">Rûkara niha tê lêdan</string>
     <string name="pref_title_open_source_licences">Lîsansên çavkaniya vekirî</string>
     <string name="pref_title_pause_history">Dîrokê rawestîne</string>
@@ -413,15 +390,15 @@ têne guhertin</string>
     <string name="pref_title_show_lyrics">Peyvên stranê nîşan bide</string>
     <string name="pref_title_suggestions">Pêşniyaran nîşan bide</string>
     <string name="pref_title_swipe_anywhere_now_playing">Ji bo guhertina stranê li her derê kaş bike</string>
-    <string name="pref_title_swipe_to_dismiss">Paşguh bike bi riya kaşandina berjêr</string>
     <string name="pref_title_tab_text_mode">Awaya sernavê rûgeran</string>
     <string name="pref_title_toggle_carousel_effect">Bandora gilover</string>
     <string name="pref_title_toggle_full_screen">Sepanê di dîmendera tije bide xebitandin</string>
     <string name="pref_title_toggle_toggle_headset">Lêdana xweber</string>
-    <string name="pref_title_toggle_toggle_shuffle">Awaya tevlîhevkirinê</string>
+    <string name="pref_title_toggle_toggle_shuffle">Awaya tevlihevkirinê</string>
     <string name="pref_title_toggle_volume">Kontrola dengê</string>
     <string name="pref_title_wallpaper_accent">Rengê devokê paşrûyê</string>
     <string name="pref_title_whitelist">Rêzoka stranên spî</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
     <string name="pro_summary">Rûkara reş, rûkara stranên niha têne lêdan, bandora gilover û bêtir..</string>
     <string name="profile">Profîl</string>
@@ -458,7 +435,7 @@ têne guhertin</string>
     <!-- SAF -->
     <string name="saf_error_uri">Nikare girêdana SAF bi dest bixe</string>
     <string name="saf_guide_slide1_description">Menuya geranê veke</string>
-    <string name="saf_guide_slide1_description_before_o">Di menuya tevlîhev de \'Kerta SD nîşan bide\' çalak bike</string>
+    <string name="saf_guide_slide1_description_before_o">Di menuya tevlihev de \'Kerta SD nîşan bide\' çalak bike</string>
     <!-- SAF guide -->
     <string name="saf_guide_slide1_title">%s pêdivî bi gihiştina karta SD heye</string>
     <string name="saf_guide_slide2_description">Pêdivî ye ku tu rêberiya rehê kerta SD hilbijêrî</string>
@@ -474,7 +451,7 @@ têne guhertin</string>
     <string name="saved_playlist_to">Rêzoka lêdanê li %s hate tomarkirin.</string>
     <string name="saving_changes">Guhertinan tomar bike</string>
     <string name="scan_media">Medya venêre</string>
-    <string name="scanned_files">%1$d ji %2$d pel hate guhertin.</string>
+    <string name="scanned_files">%1$d ji %2$d pel hate venêrîn.</string>
     <string name="scrobbles_label">Scrobbles</string>
     <string name="select_all">Hemûyan hilbijêre</string>
     <string name="selected">Hilbijartî</string>
@@ -484,7 +461,7 @@ têne guhertin</string>
     <string name="share_summary">Sepanê bi heval û malbata xwe re parve bike</string>
     <string name="share_to_stories">Di çîrokan de parve bike</string>
     <string name="show_album_artists">Hunermendê albumê nîşan bide</string>
-    <string name="shuffle">Tevlîhev bike</string>
+    <string name="shuffle">Tevlihev bike</string>
     <string name="simple">Hêsan</string>
     <string name="sleep_timer_canceled">Demkera xewê hate têkbirin.</string>
     <string name="sleep_timer_set">Demkera xewê ji bo %d xulek hate sazkirin.</string>
@@ -500,7 +477,6 @@ têne guhertin</string>
     <string name="sort_order_composer">Awazvan</string>
     <string name="sort_order_date">Dîroka tevlîkirinê</string>
     <string name="sort_order_date_modified">Dîroka guhertinê</string>
-    <string name="sort_order_default">Berdest</string>
     <string name="sort_order_num_songs">Jimara stranan</string>
     <string name="sort_order_num_songs_desc">Jimara stranan (berjêr)</string>
     <string name="sort_order_year">Sal</string>
@@ -525,8 +501,8 @@ têne guhertin</string>
     <string name="title">Sernav</string>
     <string name="title_new_backup">Hilanîna nû</string>
     <string name="today">Îro</string>
-    <string name="top_albums">Baştirîn album</string>
-    <string name="top_artists">Baştirîn hunermend</string>
+    <string name="top_albums">Xweştirîn album</string>
+    <string name="top_artists">Xweştirîn hunermend</string>
     <string name="track_hint">"Herik (2 bo herika 2 an jî 3004 bo herika CD3 4)"</string>
     <string name="track_list">Jimara herikê</string>
     <string name="translate">Wergerandin</string>
@@ -560,4 +536,5 @@ têne guhertin</string>
     <string name="you_have_to_select_at_least_one_category">Divê tu herî kêm yek beş hilbijêrî.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Tu yê ji bo malpera şopandina pirsgirêkê werî beralîkirin.</string>
     <string name="your_account_data_is_only_used_for_authentication">Daneyên ajimêra te tenê ji bo pejirandinê têne bikaranîn.</string>
+    <string name="bug_report_success">Ragihandina çewtiyê serkeftî bû</string>
 </resources>
diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml
deleted file mode 100644
index c95ad0b7e..000000000
--- a/app/src/main/res/values-kn-rIN/strings.xml
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">%s ನ ಬಗ್ಗೆ</string>
-    <string name="about_settings_summary">ತಂಡ, ಸಾಮಾಜಿಕ ಮಾಧ್ಯಮ ಲಿಂಕ್‌ಗಳು</string>
-    <string name="accent_color">ಪ್ರಧಾನ ಬಣ್ಣ</string>
-    <string name="accent_color_desc">ಪ್ರಧಾನ ಬಣ್ಣ, ಇದು ನೇರಳೆ ಬಣ್ಣಕ್ಕೆ ಪೂರ್ವನಿಯೋಜಿತವಾಗಿರುತ್ತದೆ</string>
-    <string name="action_about">ಕುರಿತು</string>
-    <string name="action_add_to_blacklist">ಕಪ್ಪುಪಟ್ಟಿಗೆ ಸೇರಿಸಿ</string>
-    <string name="action_add_to_favorites">ಮೆಚ್ಚಿನವುಗಳಿಗೆ ಸೇರಿಸಿ</string>
-    <string name="action_add_to_playing_queue">ಚಲಿಸುವ ಪಟ್ಟಿಯಲ್ಲಿ ಸೇರಿಸಿ</string>
-    <string name="action_add_to_playlist">ಪ್ಲೇಲಿಸ್ಟ್‌ಗೆ ಸೇರಿಸಿ</string>
-    <string name="action_cancel">ರದ್ದುಮಾಡಿ</string>
-    <string name="action_cast">ಕ್ಯಾಸ್ಟ್</string>
-    <string name="action_clear_playing_queue">ಚಲಿಸುವ ಪಟ್ಟಿಯನ್ನು ತೆರವುಗೊಳಿಸಿ</string>
-    <string name="action_cycle_repeat">ಸೈಕಲ್ ರಿಪೀಟ್ ಮೋಡ್</string>
-    <string name="action_delete">ಅಳಿಸಿ</string>
-    <string name="action_delete_from_device">ಡಿವೈಸ್‌ ನಿಂದ ಅಳಿಸಿ</string>
-    <string name="action_details">ವಿವರಗಳು</string>
-    <string name="action_edit">ತಿದ್ದು</string>
-    <string name="action_go_to_album">ಆಲ್ಬಮ್ ಗೆ ಹೋಗಿ</string>
-    <string name="action_go_to_artist">ಈ ಕಲಾವಿದರಿಗೆ ಹೋಗಿ</string>
-    <string name="action_go_to_genre">ಈ ಪ್ರಕಾರಕ್ಕೆ ಹೋಗಿ</string>
-    <string name="action_go_to_lyrics">ಈ ಸಾಹಿತ್ಯಕ್ಕೆ ಹೋಗಿ</string>
-    <string name="action_go_to_start_directory">ಡೈರೆಕ್ಟರಿಯ ಆರಂಭಕ್ಕೆ ಹೋಗಿ</string>
-    <string name="action_grant">ಮಂಜೂರು ಮಾಡಿ</string>
-    <string name="action_grid_size">ಗ್ರಿಡ್ ಗಾತ್ರ</string>
-    <string name="action_grid_size_land">ಗ್ರಿಡ್ ಗಾತ್ರ (ಭೂಮಿ)</string>
-    <string name="action_new_playlist">ಹೊಸ ಪ್ಲೇಲೀಸ್ಟ್‌</string>
-    <string name="action_next">ಮುಂದೆ</string>
-    <string name="action_play">ಪ್ಲೇ ಮಾಡಿ</string>
-    <string name="action_play_all">ಎಲ್ಲಾವನ್ನು ಪ್ಲೇ ಮಾಡಿ</string>
-    <string name="action_play_next">ಮುಂದಿನದನ್ನು ಪ್ಲೇ ಮಾಡಿ</string>
-    <string name="action_play_pause">ಪ್ಲೇ/ವಿರಾಮ</string>
-    <string name="action_previous">ಹಿಂದಿನದು</string>
-    <string name="action_remove_from_favorites">ಮೆಚ್ಚಿನವುಗಳಿಂದ ತೆಗೆಯಿರಿ</string>
-    <string name="action_remove_from_playing_queue">ಚಲಿಸುವ ಪಟ್ಟಿಯಿಂದ ತೆಗೆಯಿರಿ</string>
-    <string name="action_remove_from_playlist">ಪ್ಲೇಲಿಸ್ಟ್ ನಿಂದ ತೆಗೆದುಹಾಕಿ</string>
-    <string name="action_rename">ಮರುಹೆಸರಿಸಿ</string>
-    <string name="action_save_playing_queue">ಚಲಿಸುವ ಪಟ್ಟಿಯನ್ನು ಸೇವ್ ಮಾಡಿ</string>
-    <string name="action_scan">ಸ್ಕ್ಯಾನ್</string>
-    <string name="action_search">ಹುಡುಕಿ</string>
-    <string name="action_set">ಪ್ರಾರಂಭಿಸಿ</string>
-    <string name="action_set_as_ringtone">ರಿಂಗ್‌ಟೋನ್‌ ಅಗಿ ಸೆಟ್ ಮಾಡಿ</string>
-    <string name="action_set_as_start_directory">ಆರಂಭಿಕ ಕೋಶವಾಗಿ ಹೊಂದಿಸಿ</string>
-    <string name="action_settings">"ಸಂಯೋಜನೆಗಳು"</string>
-    <string name="action_share">ಶೇರ್</string>
-    <string name="action_shuffle_all">ಎಲ್ಲವನ್ನೂ ಷಫಲ್ ಮಾಡಿ</string>
-    <string name="action_shuffle_playlist">ಪ್ಲೇಲಿಸ್ಟ್ ಅನ್ನು ಷಫಲ್ ಮಾಡಿ</string>
-    <string name="action_sleep_timer">ಸ್ಲೀಪ್ ಟೈಮರ್</string>
-    <string name="action_sort_order">ವಿಂಗಡಣಾ ಕ್ರಮ</string>
-    <string name="action_tag_editor">ಟ್ಯಾಗ್ ಗಳನ್ನು ತಿದ್ದಿ</string>
-    <string name="action_toggle_favorite">ಮೆಚ್ಚಿನವುಗಳನ್ನು ಟಾಗಲ್ ಮಾಡಿ</string>
-    <string name="action_toggle_shuffle">ಷಫಲ್ ಮೋಡ್ ಅನ್ನು ಟಾಗಲ್ ಮಾಡಿ</string>
-    <string name="adaptive">ಹೊಂದಿಕೊಳ್ಳುವ</string>
-    <string name="add_action">ಸೇರಿಸಿ</string>
-    <string name="add_playlist_title">"ಪ್ಲೇಲಿಸ್ಟ್‌ಗೆ ಸೇರಿಸಿ"</string>
-    <string name="add_time_framed_lryics">ಸಮಯದ ಚೌಕಟ್ಟಿನ ಸಾಹಿತ್ಯವನ್ನು ಸೇರಿಸಿ</string>
-    <string name="added_song_count_to_playlist">%1$d ಹಾಡು(ಗಳನ್ನು) %2$s ಗೆ ಸೇರಿಸಲಾಗಿದೆ</string>
-    <string name="added_title_to_playing_queue">"ಚಲಿಸುತ್ತಿರುವ ಪಟ್ಟಿಯಲ್ಲಿ 1 ಶಿರ್ಷೀಕೆಯನ್ನು ಸೇರಿಸಲಾಗಿದೆ."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d ಶಿರ್ಷೀಕೆಗಳನ್ನು ಚಲಿಸುತ್ತಿರುವ ಪಟ್ಟಿಯಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ.</string>
-    <string name="album">ಆಲ್ಬಮ್</string>
-    <plurals name="albumSongs">
-        <item quantity="one">ಹಾಡು</item>
-        <item quantity="other">ಹಾಡುಗಳು</item>
-    </plurals>
-    <string name="album_artist">ಆಲ್ಬಮ್ ನ ಕಲಾವಿದ</string>
-    <string name="albums">ಆಲ್ಬಮ್ಗಳು</string>
-    <plurals name="albums">
-        <item quantity="one">ಆಲ್ಬಮ್</item>
-        <item quantity="other">ಆಲ್ಬಮ್ಗಳು</item>
-    </plurals>
-    <string name="always">ಯಾವಾಗಲೂ</string>
-    <string name="app_share">ಈ ಉತ್ತಮ ಮ್ಯೂಸಿಕ್ ಪ್ಲೇಯರ್ ಅನ್ನು ಇಲ್ಲಿ ನೋಡಿ: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">ಷಫಲ್</string>
-    <string name="app_shortcut_top_tracks_short">ಉನ್ನತ ಹಾಡುಗಳು</string>
-    <string name="app_widget_big_name">ಪೂರ್ಣ ಚಿತ್ರ</string>
-    <string name="app_widget_card_name">ಕಾರ್ಡ್</string>
-    <string name="app_widget_classic_name">ಕ್ಲಾಸಿಕ್‌</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">ಸ್ಮಾಲ್</string>
-    <string name="app_widget_text_name">ಮಿನಿಮಲ್ ಟೆಕ್ಸ್ಟ್</string>
-    <string name="artist">ಕಲಾವಿದ</string>
-    <string name="artists">ಕಲಾವಿದರು</string>
-    <string name="audio_fade_duration">ಆಡಿಯೊ ಮರೆಯಾಗುವ ಅವಧಿ</string>
-    <string name="audio_focus_denied">ಧ್ವನಿ ಫೋಕಸ್ ತಿರಸ್ಕೃತಗೊಂಡಿದೆ.</string>
-    <string name="audio_settings_summary">ಧ್ವನಿ ಸಂಯೋಜನೆಗಳನ್ನು ಬದಲಾಯಿಸಿ ಮತ್ತು ಈಕ್ವಲೈಜರ್ ನಿಯಂತ್ರಣಗಳನ್ನು ಹೊಂದಿಸಿ</string>
-    <string name="auto">ಸ್ವಯಂ</string>
-    <string name="backup_restore_settings_summary">ನಿಮ್ಮ ಸಂಯೋಜನೆಗಳನ್ನು, ಪ್ಲೇಲಿಸ್ಟ್ಗಳನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಿ ಮತ್ತು ಮರುಸ್ಥಾಪಿಸಿ</string>
-    <string name="backup_restore_title"><![CDATA[ಬ್ಯಾಕ್ಅಪ್ ಮತ್ತು ಮರುಸ್ಥಾಪನೆ]]></string>
-    <string name="backup_title">ಬ್ಯಾಕಪ್‍ಗಳು</string>
-    <string name="biography">ಜೀವನಚರಿತ್ರೆ</string>
-    <string name="black_theme_name">ಜಸ್ಟ್ ಬ್ಲಾಕ್</string>
-    <string name="blacklist">ಕಪ್ಪುಪಟ್ಟಿ</string>
-    <string name="bluetooth_summary">ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳನ್ನು ಪರಿಶೀಲಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಹತ್ತಿರದ ಸಾಧನಗಳ ಅನುಮತಿಗಳ ಅಗತ್ಯವಿದೆ</string>
-    <string name="bluetooth_title">ಹತ್ತಿರದ ಸಾಧನಗಳು</string>
-    <string name="blur">ಬ್ಲರ್</string>
-    <string name="blur_card">ಬ್ಲರ್ ಕಾರ್ಡ್</string>
-    <string name="bug_report_failed">ವರದಿ ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ</string>
-    <string name="bug_report_failed_invalid_token">ಅಮಾನ್ಯ ಪ್ರವೇಶ ಟೋಕನ್. ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಡೆವಲಪರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿ.</string>
-    <string name="bug_report_failed_issues_not_available">ಆಯ್ಕೆಮಾಡಿದ ರೆಪೊಸಿಟರಿಗಾಗಿ ಸಮಸ್ಯೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಡೆವಲಪರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿ.</string>
-    <string name="bug_report_failed_unknown">ಅನೀರೀಕ್ಷಿತ ದೋಷ ಉಂಟಾಗಿದೆ. ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಡೆವಲಪರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿ.</string>
-    <string name="bug_report_failed_wrong_credentials">ತಪ್ಪಾದ ಬಳಕೆದಾರಹೆಸರು ಅಥವಾ ಪಾಸ್ವರ್ಡ್</string>
-    <string name="bug_report_issue">ಸಮಸ್ಯೆ</string>
-    <string name="bug_report_manual">ಹಸ್ತಚಾಲಿತವಾಗಿ ಕಳುಹಿಸಿ</string>
-    <string name="bug_report_no_description">ದಯವಿಟ್ಟು ಸಮಸ್ಯೆಯ ವಿವರಣೆಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="bug_report_no_password">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಮಾನ್ಯವಾದ GitHub ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="bug_report_no_title">ದಯವಿಟ್ಟು ಸಮಸ್ಯೆಯ ವಿವರಣೆಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="bug_report_no_username">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಮಾನ್ಯವಾದ GitHub ಬಳಕೆದಾರಹೆಸರನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="bug_report_success">ಬಗ್ ವರದಿ ಯಶಸ್ವಿಯಾಗಿದೆ</string>
-    <string name="bug_report_summary">ಅನಿರೀಕ್ಷಿತ ದೋಷ ಸಂಭವಿಸಿದೆ. ಅಪ್ಲಿಕೇಶನ್ ಕ್ರ್ಯಾಶ್ ಆಗುತ್ತಿದ್ದರೆ \"ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಿ\" ಅಥವಾ ಇಮೇಲ್ ಕಳುಹಿಸಿ. ನಿಮ್ಮ ಅನಾನುಕೂಲತೆಗಾಗಿ ಕ್ಷಮಿಸಿ </string>
-    <string name="bug_report_use_account">GitHub ಖಾತೆಯನ್ನು ಬಳಸಿ ಕಳುಹಿಸಿ</string>
-    <string name="buy_now">ಈಗ ಖರೀದಿಸಿ</string>
-    <string name="cancel_current_timer">ರದ್ದುಮಾಡಿ</string>
-    <string name="card">ಕಾರ್ಡ್</string>
-    <string name="card_color_style">ಕಲರ್ಡ್ ಕಾರ್ಡ್</string>
-    <string name="card_square">ಸ್ಕ್ವೇರ್ ಕಾರ್ಡ್</string>
-    <string name="card_style">ಕಾರ್ಡ್</string>
-    <string name="carousal_effect_on_now_playing_screen">ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪರದೆಯ ಮೇಲೆ ಏರಿಳಿಕೆ ಪರಿಣಾಮ</string>
-    <string name="cascading">ಕ್ಯಾಸ್ಕೇಡಿಂಗ್</string>
-    <string name="changelog">ಚೇಂಜ್ ಲಾಗ್</string>
-    <string name="changelog_summary">ಹೊಸದೇನಿದೆ ಎಂಬುದನ್ನು ಪರಿಶೀಲಿಸಿ</string>
-    <string name="choose_image">ಚಿತ್ರವನ್ನು ಆರಿಸಿ</string>
-    <string name="choose_restore_title">ಏನನ್ನು ಮರುಸ್ಥಾಪಿಸಬೇಕು ಎಂಬುದನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
-    <string name="circle">ವೃತ್ತ</string>
-    <string name="circular">ವೃತ್ತಾಕಾರದ</string>
-    <string name="classic">ಕ್ಲಾಸಿಕ್‌</string>
-    <string name="clear_action">ತೆರವು ಮಾಡಿ</string>
-    <string name="clear_blacklist">ಕಪ್ಪು ಪಟ್ಟಿಯನ್ನು ತೆರವುಗೊಳಿಸಿ</string>
-    <string name="clear_history">ಹಿಸ್ಟರಿಯನ್ನು ತೆರವುಗೊಳಿಸು</string>
-    <string name="clear_playing_queue">ಕ್ಯೂ ತೆರವುಗೊಳಿಸಿ</string>
-    <string name="color">ಬಣ್ಣ</string>
-    <string name="colors">ಬಣ್ಣಗಳು</string>
-    <string name="compact">ಕಾಂಪ್ಯಾಕ್ಟ್</string>
-    <string name="composer">ರಚನಕಾರ</string>
-    <string name="copied_device_info_to_clipboard">ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ಸಾಧನದ ಮಾಹಿತಿಯನ್ನು ನಕಲಿಸಲಾಗಿದೆ.</string>
-    <string name="could_not_create_playlist">ಪ್ಲೇಲಿಸ್ಟ್ ರಚಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.</string>
-    <string name="could_not_download_album_cover">"ಹೊಂದಾಣಿಕೆಯ ಆಲ್ಬಮ್ ಕವರ್ ಅನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="could_not_restore_purchase">ಖರೀದಿಯನ್ನು ಮರುಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.</string>
-    <string name="could_not_scan_files">%d ಫೈಲ್ಗಳನ್ನು ಹುಡುಕಲಾಗಿಲ್ಲ.</string>
-    <string name="create_action">ರಚಿಸಿ</string>
-    <string name="create_new_backup">ರಚಿಸಿ</string>
-    <string name="created_playlist_x">%1$s ಪ್ಲೇಲಿಸ್ಟ್ ರಚಿಸಲಾಗಿದೆ.</string>
-    <string name="credit_title">ಸದಸ್ಯರು ಮತ್ತು ಕೊಡುಗೆದಾರರು </string>
-    <string name="currently_listening_to_x_by_x">ಪ್ರಸ್ತುತವಾಗಿ %2$s ಇವರಿಂದ %1$s ನ್ನು ಕೇಳುತ್ತಿದ್ದೀರ.</string>
-    <string name="custom_artist_images">ಕಸ್ಟಮ್ ಕಲಾವಿದರ ಚಿತ್ರಗಳು</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">ಕ್ರ್ಯಾಶ್ ವರದಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
-    <string name="dark_theme_name">ಸ್ವಲ್ಪ ಡಾರ್ಕ್</string>
-    <string name="delete_playlist_title">ಪ್ಲೇಲಿಸ್ಟ್ ಅನ್ನು ಅಳಿಸಿ</string>
-    <string name="delete_playlist_x"><![CDATA[<b>%1$s</b> ಪ್ಲೇಲಿಸ್ಟ್ ಅಳಿಸುವುದೇ?]]></string>
-    <string name="delete_playlists_title">ಪ್ಲೇಲಿಸ್ಟ್ಗಳನ್ನು ಅಳಿಸಿ</string>
-    <string name="delete_song_title">ಹಾಡನ್ನು ಅಳಿಸಿ</string>
-    <string name="delete_song_x"><![CDATA[<b>%1$s</b> ಹಾಡನ್ನು ಅಳಿಸುವುದೇ?]]></string>
-    <string name="delete_songs_title">ಗೀತೆಗಳನ್ನು ಅಳಿಸಿ</string>
-    <string name="delete_x_playlists"><![CDATA[<b>%1$d</b> ಪ್ಲೇಲಿಸ್ಟ್ಗಳನ್ನು ಅಳಿಸುವುದೇ?]]></string>
-    <string name="delete_x_songs"><![CDATA[<b>%1$d</b> ಹಾಡುಗಳನ್ನು ಅಳಿಸುವುದೇ?]]></string>
-    <string name="deleted_x_songs">%1$d ಹಾಡುಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ.</string>
-    <string name="deleting_songs">ಹಾಡುಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ</string>
-    <string name="depth">ಆಳ</string>
-    <string name="description">ವಿವರಣೆ</string>
-    <string name="device_info">ಸಾಧನದ ಮಾಹಿತಿ</string>
-    <string name="dialog_message_set_ringtone">ಆಡಿಯೊ ಸಂಯೋಜನೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು Retro Music ಗೆ ಅನುಮತಿ ನೀಡಿ</string>
-    <string name="dialog_title_set_ringtone">ರಿಂಗ್‌ಟೋನ್ ಹೊಂದಿಸಿ</string>
-    <string name="disc_hint">ಡಿಸ್ಕ್ ಸಂಖ್ಯೆ</string>
-    <string name="do_you_want_to_clear_the_blacklist">ನೀವು ಕಪ್ಪುಪಟ್ಟಿಯನ್ನು ತೆರವುಗೊಳಿಸಲು ಬಯಸುವಿರಾ?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[ನೀವು ಕಪ್ಪುಪಟ್ಟಿಯಿಂದ <b>%1$s</b> ಅನ್ನು ತೆಗೆದುಹಾಕಲು ಬಯಸುವಿರಾ?]]></string>
-    <string name="donate">ಕಾಣಿಕೆನೀಡಿ</string>
-    <string name="donate_summary">ನನ್ನ ಕೆಲಸಕ್ಕೆ ಹಣ ಪಡೆಯಲು ಅರ್ಹನೆಂದು ನೀವು ಭಾವಿಸಿದರೆ, ನೀವು ಸ್ವಲ್ಪ ಹಣವನ್ನು ಇಲ್ಲಿ ಬಿಡಬಹುದು</string>
-    <string name="donation_header">ನನಗೆ ಖರೀದಿಸಿ:</string>
-    <string name="done">ಆಗಿದೆ</string>
-    <string name="drive_mode">ಡ್ರೈವ್ ಮೋಡ್</string>
-    <string name="edit_fab">ಎಡಿಟ್ ಬಟನ್</string>
-    <string name="edit_normal_lyrics">ಸಾಹಿತ್ಯ ಎಡಿಟ್‌ ಮಾಡಿ</string>
-    <string name="edit_synced_lyrics">ಸಿಂಕ್ ಮಾಡಿದ ಸಾಹಿತ್ಯವನ್ನು ಎಡಿಟ್ ಮಾಡಿ</string>
-    <string name="empty">ಖಾಲಿ</string>
-    <string name="equalizer">ಈಕ್ವಲೈಸರ್</string>
-    <string name="error_create_backup">ಬ್ಯಾಕಪ್ ರಚಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</string>
-    <string name="error_delete_backup">ಬ್ಯಾಕಪ್ ಅನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</string>
-    <string name="error_empty_name">ನಿಮ್ಮ ಹೆಸರು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ!</string>
-    <string name="error_load_failed">ಲೋಡ್ ವಿಫಲವಾಗಿದೆ</string>
-    <string name="error_share_file">ಫೈಲ್ ಅನ್ನು ಶೇರ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</string>
-    <string name="expanded">ವಿಸ್ತರಿಸಿದೆ</string>
-    <string name="faq">ಪದೇ ಪದೇ ಕೇಳಲಾಗುವ ಪ್ರಶ್ನೆಗಳು</string>
-    <string name="favorites">ಮೆಚ್ಚಿನವು</string>
-    <string name="file_already_exists">ಫೈಲ್ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ</string>
-    <string name="finish_last_song">ಕೊನೆಯ ಹಾಡನ್ನು ಮುಗಿಸಿ</string>
-    <string name="fit">ಫಿಟ್‌</string>
-    <string name="flat">ಫ್ಲಾಟ್</string>
-    <string name="folders">ಫೋಲ್ಡರ್‌ಗಳು</string>
-    <string name="follow_system">ಸಿಸ್ಟಮ್ ಸಂಯೋಜನೆಗಳನ್ನು ಅನುಸರಿಸಿ</string>
-    <string name="for_you">ನಿಮಗಾಗಿ</string>
-    <string name="free">ಉಚಿತ</string>
-    <string name="full">ಪೂರ್ಣ</string>
-    <string name="full_card">ಫುಲ್ ಕಾರ್ಡ್</string>
-    <string name="general_settings_summary">ಅಪ್ಲಿಕೇಶನ್‌ನ ಥೀಮ್ ಮತ್ತು ಬಣ್ಣಗಳನ್ನು ಬದಲಾಯಿಸಿ</string>
-    <string name="general_settings_title">ನೋಟ ಮತ್ತು ಭಾವನೆ</string>
-    <string name="genre">ಪ್ರಕಾರ</string>
-    <string name="genres">ಪ್ರಕಾರಗಳು</string>
-    <string name="git_hub_summary">GitHub ನಲ್ಲಿ ಯೋಜನೆಯನ್ನು ಫೋರ್ಕ್ ಮಾಡಿ</string>
-    <string name="gradient">ಗ್ರೇಡಿಯಂಟ್</string>
-    <string name="grant_access">ಪ್ರವೇಶವನ್ನು ನೀಡಿ</string>
-    <string name="grid_size_1">1</string>
-    <string name="grid_size_2">2</string>
-    <string name="grid_size_3">3</string>
-    <string name="grid_size_4">4</string>
-    <string name="grid_size_5">5</string>
-    <string name="grid_size_6">6</string>
-    <string name="grid_size_7">7</string>
-    <string name="grid_size_8">8</string>
-    <string name="grid_style_label">ಗ್ರಿಡ್ ಶೈಲಿ</string>
-    <string name="help_summary">ಹೆಚ್ಚಿನ ಸಹಾಯ ಬೇಕೇ?</string>
-    <string name="hinge">ಹಿಂಜ್</string>
-    <string name="history">ಹಿಸ್ಟರಿ</string>
-    <string name="history_cleared">ಹಿಸ್ಟರಿಯನ್ನು ತೆರವುಗೊಳಿಸಲಾಗಿದೆ</string>
-    <string name="history_undo_button">ರದ್ದುಮಾಡು</string>
-    <string name="home">ಮುಖಪುಟ</string>
-    <string name="horizontal_flip">ಸಮತಲ ಫ್ಲಿಪ್</string>
-    <string name="image">ಚಿತ್ರ</string>
-    <string name="image_gradient">ಗ್ರೇಡಿಯಂಟ್ ಚಿತ್ರ</string>
-    <string name="image_settings_summary">ಕಲಾವಿದರ ಚಿತ್ರ ಡೌನ್‌ಲೋಡ್ ಸಂಯೋಜನೆಗಳನ್ನು ಬದಲಾಯಿಸಿ</string>
-    <string name="import_label">ಆಮದು ಮಾಡಿ</string>
-    <string name="import_playlist">ಪ್ಲೇಲಿಸ್ಟ್ ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ</string>
-    <string name="import_playlist_message">ಇದು ಹಾಡುಗಳೊಂದಿಗೆ ಆಂಡ್ರಾಯ್ಡ್ ಮೀಡಿಯಾ ಸ್ಟೋರ್‌ನಲ್ಲಿ ಪಟ್ಟಿ ಮಾಡಲಾದ ಎಲ್ಲಾ ಪ್ಲೇಲಿಸ್ಟ್ಗಳನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳುತ್ತದೆ, 
-ಪ್ಲೇಲಿಸ್ಟ್ಗಳು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ, ಹಾಡುಗಳು ವಿಲೀನಗೊಳ್ಳುತ್ತವೆ.</string>
-    <string name="inserted_x_songs_into_playlist_x">%2$s ಪ್ಲೇಲಿಸ್ಟ್ ಗೆ %1$d ಹಾಡುಗಳನ್ನು ಸೇರಿಸಲಾಗಿದೆ.</string>
-    <string name="instagram_page_summary">Instagram ನಲ್ಲಿ ಪ್ರದರ್ಶಿಸಲು ನಿಮ್ಮ Retro Music ಸೆಟಪ್ ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
-    <string name="keyboard">ಕೀಬೋರ್ಡ್‌</string>
-    <string name="label_bit_rate">ಬಿಟ್ ರೇಟ್</string>
-    <string name="label_file_format">ಸ್ವರೂಪ</string>
-    <string name="label_file_name">ಕಡತದ ಹೆಸರು</string>
-    <string name="label_file_path">ಕಡತದ ಮಾರ್ಗ</string>
-    <string name="label_file_size">ಗಾತ್ರ</string>
-    <string name="label_last_modified">ಕೊನೆಯದಾಗಿ ಮಾರ್ಪಡಿಸಲಾದುದು</string>
-    <string name="label_more_from">%s ನಿಂದ ಇನ್ನಷ್ಟು</string>
-    <string name="label_sampling_rate">ಸ್ಯಾಂಪ್ಲಿಂಗ್ ರೇಟ್</string>
-    <string name="label_track_length">ಅವಧಿ</string>
-    <string name="labeled">ಲೇಬಲ್ ಮಾಡಲಾಗಿದೆ</string>
-    <string name="last_added">ಇಗ ಸೇರಿಸಿರುವುದು</string>
-    <string name="last_song">ಕೊನೆಯ ಹಾಡು</string>
-    <string name="lets_go">ಹೋಗೋಣ</string>
-    <string name="library_categories">ಸಂಗ್ರಹ ವಿಭಾಗಗಳು</string>
-    <string name="licenses">ಪರವಾನಗಿಗಳು</string>
-    <string name="light_theme_name">ಸ್ಪಷ್ಟವಾಗಿ ಬಿಳಿ</string>
-    <string name="listeners_label">ಕೇಳುಗರು</string>
-    <string name="listing_files">ಕಡತಗಳ ಪಟ್ಟಿಮಾಡಲಾಗುತ್ತಿದೆ</string>
-    <string name="loading_products">ಉತ್ಪನ್ನಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…</string>
-    <string name="login">ಲಾಗಿನ್</string>
-    <string name="lyrics">ಸಾಹಿತ್ಯ</string>
-    <string name="made_with_love">ಭಾರತದಲ್ಲಿ ❤️ ನೊಂದಿಗೆ ತಯಾರಿಸಲಾಗುತ್ತಿದೆ</string>
-    <string name="material">ಮೆಟೀರಿಯಲ್</string>
-    <string name="md_error_label">ದೋಷ</string>
-    <string name="md_storage_perm_error">ಅನುಮತಿ ದೋಷ</string>
-    <string name="message_backup_create_success">ಬ್ಯಾಕಪ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ರಚಿಸಲಾಗಿದೆ.</string>
-    <string name="message_limit_tabs">5 ಐಟಂಗಳಿಗಿಂತ ಹೆಚ್ಚಿಲ್ಲ</string>
-    <string name="message_pro_feature">%s ಪ್ರೊ ವೈಶಿಷ್ಟ್ಯವಾಗಿದೆ.</string>
-    <string name="message_restore_success">ಮರುಸ್ಥಾಪನೆ ಯಶಸ್ವಿಯಾಗಿ ಪೂರ್ಣಗೊಂಡಿದೆ.</string>
-    <string name="message_updated">ನವೀಕರಿಸಲಾಗಿದೆ</string>
-    <string name="message_welcome"><![CDATA[ನಮಸ್ಕಾರ! <br>%s ಗೆ ಸುಸ್ವಾಗತ]]></string>
-    <string name="my_name">ಹೆಸರು</string>
-    <string name="my_top_tracks">ಹೆಚ್ಚು ಕೇಳಿರುವುದು</string>
-    <string name="never">ಎಂದಿಗೂ ಬೇಡ</string>
-    <string name="new_music_mix">ಹೊಸ ಹಾಡುಗಳ ಮಿಶ್ರಣ</string>
-    <string name="new_playlist_title">ಹೊಸ ಪ್ಲೇಲೀಸ್ಟ್‌</string>
-    <string name="new_start_directory">%s ಹೊಸ ಪ್ರಾರಂಭದ ಡೈರೆಕ್ಟರಿಯಾಗಿದೆ.</string>
-    <string name="next_song">ಮುಂದಿನ ಹಾಡು</string>
-    <string name="no_albums">ನೀವು ಯಾವುದೇ ಆಲ್ಬಮ್‌ಗಳನ್ನು ಹೊಂದಿಲ್ಲ</string>
-    <string name="no_artists">ನೀವು ಯಾವುದೇ ಕಲಾವಿದರನ್ನು ಹೊಂದಿಲ್ಲ</string>
-    <string name="no_audio_ID">"ಮೊದಲು ಹಾಡನ್ನು ಪ್ಲೇ ಮಾಡಿ, ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="no_backups_found">ಯಾವುದೇ ಬ್ಯಾಕ್‌ಅಪ್‌ಗಳು ಕಂಡುಬಂದಿಲ್ಲ</string>
-    <string name="no_equalizer">ಯಾವುದೇ ಈಕ್ವಲೈಜರ್ ಕಂಡುಬಂದಿಲ್ಲ</string>
-    <string name="no_genres">ನೀವು ಯಾವುದೇ ಪ್ರಕಾರಗಳನ್ನು ಹೊಂದಿಲ್ಲ</string>
-    <string name="no_lyrics_found">ಯಾವುದೇ ಸಾಹಿತ್ಯ ಕಂಡುಬಂದಿಲ್ಲ</string>
-    <string name="no_playing_queue">ಯಾವುದೇ ಹಾಡು ಪ್ಲೇ ಆಗುತ್ತಿಲ್ಲ</string>
-    <string name="no_playlists">ನೀವು ಯಾವುದೇ ಪ್ಲೇಲಿಸ್ಟ್ ಅನ್ನು ಹೊಂದಿಲ್ಲ</string>
-    <string name="no_purchase_found">ಯಾವುದೇ ಖರೀದಿ ಕಂಡುಬಂದಿಲ್ಲ.</string>
-    <string name="no_results">ಯಾವುದೇ ಫಲಿತಾಂಶಗಳಿಲ್ಲ</string>
-    <string name="no_songs">ನಿಮ್ಮ ಬಳಿ ಯಾವುದೇ ಹಾಡುಗಳಿಲ್ಲ</string>
-    <string name="normal">ಸಾಧಾರಣ</string>
-    <string name="normal_lyrics">ಸಾಮಾನ್ಯ ಸಾಹಿತ್ಯ</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> ಯು ಮೀಡಿಯಾ ಸ್ಟೋರ್‌ನಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ.]]></string>
-    <string name="not_recently_played">ಇತ್ತೀಚೆಗೆ ಪ್ಲೇ ಮಾಡಲಾಗಿಲ್ಲ</string>
-    <string name="nothing_to_scan">ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಏನೂ ಇಲ್ಲ.</string>
-    <string name="nothing_to_see">ನೋಡಲು ಏನೂ ಇಲ್ಲ</string>
-    <string name="notification">ಅಧಿಸೂಚನೆ</string>
-    <string name="notification_settings_summary">ಅಧಿಸೂಚನೆ ಶೈಲಿಯನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ</string>
-    <string name="now_playing">ಇವಾಗ ಪ್ಲೇ ಮಾಡಲಾಗುತ್ತಿರುವುದು</string>
-    <string name="now_playing_queue">ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪಟ್ಟಿ</string>
-    <string name="now_playing_summary">ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪರದೆಯನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ</string>
-    <string name="now_playing_themes">9 ಕ್ಕೂ ಹೆಚ್ಚು ನೌ ಪ್ಲೇಯಿಂಗ್ ಥೀಮ್ಗಳು</string>
-    <string name="only_on_wifi">ವೈಫೈನಲ್ಲಿ ಮಾತ್ರ</string>
-    <string name="other_settings_summary">ಸುಧಾರಿತ ಪರೀಕ್ಷಾ ವೈಶಿಷ್ಟ್ಯಗಳು</string>
-    <string name="others">ಇತರೆ</string>
-    <string name="over_cover">ಕವರ್ ಮೇಲೆ</string>
-    <string name="password">ಗುಪ್ತಪದ</string>
-    <string name="past_three_months">ಕಳೆದ 3 ತಿಂಗಳುಗಳು</string>
-    <string name="paste_lyrics_here">ಸಾಹಿತ್ಯವನ್ನು ಇಲ್ಲಿ ಪೇಸ್ಟ್ ಮಾಡಿ</string>
-    <string name="paste_timeframe_lyrics_here">ಸಮಯದ ಚೌಕಟ್ಟಿನ ಸಾಹಿತ್ಯವನ್ನು ಇಲ್ಲಿ ಪೇಸ್ಟ್ ಮಾಡಿ</string>
-    <string name="peek">ಇಣುಕಿ ನೋಡಿ</string>
-    <string name="permission_bluetooth_denied">ಸಮೀಪದ ಸಾಧನಗಳ ಅನುಮತಿಯನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ.</string>
-    <string name="permission_external_storage_denied">ಬಾಹ್ಯ ಸಂಗ್ರಹಣೆಯನ್ನು ಪ್ರವೇಶಿಸಲು ಅನುಮತಿ ನಿರಾಕರಿಸಲಾಗಿದೆ.</string>
-    <string name="permission_summary">ಸಂಗೀತವನ್ನು ಪ್ಲೇ ಮಾಡಲು ನಿಮ್ಮ ಸಾಧನದ ಸಂಗ್ರಹಣೆಯನ್ನು ಪ್ರವೇಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ</string>
-    <string name="permission_title">ಸಂಗ್ರಹಣೆಯ ಪ್ರವೇಶ</string>
-    <string name="permissions_denied">ಅನುಮತಿ ನಿರಾಕರಿಸಲಾಗಿದೆ.</string>
-    <string name="personalize">ವೈಯಕ್ತಿಕಗೊಳಿಸಿ</string>
-    <string name="personalize_settings_summary">ನಿಮ್ಮ ನೌ ಪ್ಲೇಯಿಂಗ್ ಮತ್ತು UI ನಿಯಂತ್ರಣಗಳನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ</string>
-    <string name="pick_from_local_storage">ಲೋಕಲ್ ಸ್ಟೋರೇಜ್ ನಿಂದ ಆರಿಸಿ</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Retro Music ವಿನ್ಯಾಸ ಸ್ಫೂರ್ತಿಗಾಗಿ Pinterest ಪುಟವನ್ನು ಅನುಸರಿಸಿ</string>
-    <string name="plain">ಸಾದಾ</string>
-    <string name="playList_already_exits">ಪ್ಲೇಲೀಸ್ಟ್‌ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ</string>
-    <string name="playback_pitch">ಪಿಚ್</string>
-    <string name="playback_settings">ಪ್ಲೇಬ್ಯಾಕ್ ಸಂಯೋಜನೆಗಳು</string>
-    <string name="playback_speed">ಪ್ಲೇಬ್ಯಾಕ್‌ ವೇಗ</string>
-    <string name="playing_notification_description">ಪ್ಲೇಯಿಂಗ್ ಅಧಿಸೂಚನೆಯು ಪ್ಲೇ / ವಿರಾಮ ಇತ್ಯಾದಿಗಳಿಗೆ ಕ್ರಿಯೆಗಳನ್ನು ಒದಗಿಸುತ್ತದೆ.</string>
-    <string name="playing_notification_name">ಪ್ಲೇಯಿಂಗ್ ಅಧಿಸೂಚನೆ</string>
-    <string name="playlist_created_sucessfully">%s ಯಶಸ್ವಿಯಾಗಿ ರಚಿಸಲಾಗಿದೆ</string>
-    <string name="playlist_is_empty">ಪ್ಲೇಲಿಸ್ಟ್ ಖಾಲಿ ಇದೆ</string>
-    <string name="playlist_name_empty">ಪ್ಲೇಲಿಸ್ಟ್ ಹೆಸರು</string>
-    <string name="playlists">ಪ್ಲೇಲೀಸ್ಟ್‌ಗಳು</string>
-    <string name="pref_blur_amount_summary">ಮಸುಕು ಥೀಮ್‌ಗಳಿಗೆ ಮಸುಕು ಪ್ರಮಾಣವನ್ನು ಅನ್ವಯಿಸಲಾಗಿದೆ, ಕಡಿಮೆ ವೇಗವಾಗಿರುತ್ತದೆ</string>
-    <string name="pref_blur_amount_title">ಮಸುಕಿನ ಪ್ರಮಾಣ</string>
-    <string name="pref_filter_song_summary">ಹಾಡುಗಳನ್ನು ಉದ್ದದ ಮೂಲಕ ಫಿಲ್ಟರ್ ಮಾಡಿ</string>
-    <string name="pref_filter_song_title">ಅವಧಿಯ ಪ್ರಕಾರ ಹಾಡನ್ನು ಫಿಲ್ಟರ್ ಮಾಡಿ</string>
-    <string name="pref_header_advanced">ಮುಂದುವರಿದ</string>
-    <string name="pref_header_album">ಆಲ್ಬಮ್ ಶೈಲಿ</string>
-    <string name="pref_header_audio">ಆಡಿಯೋ</string>
-    <string name="pref_header_blacklist">ಕಪ್ಪುಪಟ್ಟಿ</string>
-    <string name="pref_header_controls">ನಿಯಂತ್ರಣಗಳು</string>
-    <string name="pref_header_general">ಥೀಮ್</string>
-    <string name="pref_header_images">ಚಿತ್ರಗಳು</string>
-    <string name="pref_header_library">ಸಂಗ್ರಹಣೆ</string>
-    <string name="pref_header_lockscreen">ಲಾಕ್ ಪರದೆ</string>
-    <string name="pref_header_playlists">ಪ್ಲೇಲೀಸ್ಟ್‌ಗಳು</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">ವಾಲ್ಯೂಮ್ ಸೊನ್ನೆಗೆ ಕಡಿಮೆಯಾದಾಗ ಹಾಡನ್ನು ವಿರಾಮಗೊಳಿಸುತ್ತದೆ ಮತ್ತು ವಾಲ್ಯೂಮ್ ಮಟ್ಟ ಹೆಚ್ಚಾದಾಗ ಮತ್ತೆ ಪ್ಲೇ ಮಾಡಲು ಪ್ರಾರಂಭಿಸುತ್ತದೆ. ಅಪ್ಲಿಕೇಶನ್ ಹೊರಗೆ ಸಹ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ</string>
-    <string name="pref_keep_pause_on_zero_volume_title">ಶೂನ್ಯದಲ್ಲಿ ವಿರಾಮಗೊಳಿಸುತ್ತದೆ</string>
-    <string name="pref_keep_screen_on_summary">ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆ ಪರಿಣಾಮ ಬೀರಬಹುದು ಎಂಬುದನ್ನು ನೆನಪಿನಲ್ಲಿಡಿ</string>
-    <string name="pref_keep_screen_on_title">ಸ್ಕ್ರೀನ್ ಆನ್‌ನಲ್ಲಿರಿಸಿ</string>
-    <string name="pref_language_name">ಭಾಷೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
-    <string name="pref_snow_fall_title">ಹಿಮಪಾತದ ಪರಿಣಾಮ</string>
-    <string name="pref_summary_album_art_on_lockscreen">ಲಾಕ್‌ಸ್ಕ್ರೀನ್ ವಾಲ್‌ಪೇಪರ್ ಆಗಿ ಪ್ರಸ್ತುತ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಹಾಡಿನ ಆಲ್ಬಮ್ ಕವರ್ ಅನ್ನು ಬಳಸಿ</string>
-    <string name="pref_summary_album_artists_only">ಕಲಾವಿದರ ವರ್ಗದಲ್ಲಿ ಆಲ್ಬಮ್ ಕಲಾವಿದರನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_summary_audio_ducking">ಸಿಸ್ಟಮ್ ಧ್ವನಿಯನ್ನು ಪ್ಲೇ ಮಾಡಿದಾಗ ಅಥವಾ ಅಧಿಸೂಚನೆಯನ್ನು ಸ್ವೀಕರಿಸಿದಾಗ ವಾಲ್ಯೂಮ್ ಅನ್ನು ಕಡಿಮೆ ಮಾಡಿ</string>
-    <string name="pref_summary_audio_fade">ಹಾಡನ್ನು ವಿರಾಮಗೊಳಿಸಿದಾಗ ಅಥವಾ ಪ್ಲೇ ಮಾಡಿದಾಗ ಆಡಿಯೊವನ್ನು ಫೇಡ್ ಮಾಡಿ</string>
-    <string name="pref_summary_blacklist">ಕಪ್ಪುಪಟ್ಟಿ ಮಾಡಲಾದ ಫೋಲ್ಡರ್‌ಗಳ ವಿಷಯವನ್ನು ನಿಮ್ಮ ಲೈಬ್ರರಿಯಿಂದ ಮರೆಮಾಡಲಾಗಿದೆ.</string>
-    <string name="pref_summary_bluetooth_playback">ಬ್ಲೂಟೂತ್ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಗೊಂಡ ತಕ್ಷಣ ಪ್ಲೇ ಮಾಡಲು ಪ್ರಾರಂಭಿಸಿ</string>
-    <string name="pref_summary_blurred_album_art">ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ಆಲ್ಬಮ್ ಕವರ್ ಅನ್ನು ಮಸುಕುಗೊಳಿಸಿ. ಇಥರರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ವಿಜೆಟ್‌ಗಳೊಂದಿಗೆ ಸಮಸ್ಯೆಗಳನ್ನು ಉಂಟುಮಾಡಬಹುದು</string>
-    <string name="pref_summary_carousel_effect">ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪರದೆಯಲ್ಲಿ ಆಲ್ಬಮ್ ಆರ್ಟ್‌ಗಾಗಿ ಏರಿಳಿಕೆ ಪರಿಣಾಮ ಇರುವುದು. ಕಾರ್ಡ್ ಮತ್ತು ಬ್ಲರ್ ಕಾರ್ಡ್ ಥೀಮ್‌ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ ಎಂಬುದನ್ನು ಗಮನಿಸಿ</string>
-    <string name="pref_summary_classic_notification">ಕ್ಲಾಸಿಕ್ ಅಧಿಸೂಚನೆ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿ</string>
-    <string name="pref_summary_colored_app">ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪರದೆಯಿಂದ ಆಲ್ಬಮ್ ಕಲೆಗೆ ಅನುಗುಣವಾಗಿ ಹಿನ್ನೆಲೆ ಮತ್ತು ನಿಯಂತ್ರಣ ಬಟನ್ ಬಣ್ಣಗಳು ಬದಲಾಗುತ್ತವೆ</string>
-    <string name="pref_summary_colored_app_shortcuts">ಪ್ರಧಾನ ಬಣ್ಣದಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಬಣ್ಣಿಸುತ್ತದೆ. ಪ್ರತಿ ಬಾರಿ ನೀವು ಬಣ್ಣವನ್ನು ಬದಲಾಯಿಸಿದಾಗ ದಯವಿಟ್ಟು ಪರಿಣಾಮ ಬೀರಲು ಇದನ್ನು ಟಾಗಲ್ ಮಾಡಿ</string>
-    <string name="pref_summary_colored_notification">"ಆಲ್ಬಮ್ ಕವರ್‌ನ ರೋಮಾಂಚಕ ಬಣ್ಣದಲ್ಲಿ ಅಧಿಸೂಚನೆಯನ್ನು ಬಣ್ಣಿಸುತ್ತದೆ"</string>
-    <string name="pref_summary_cross_fade">ಹಾಡುಗಳ ನಡುವೆ ಕ್ರಾಸ್‌ಫೇಡ್ ಮಾಡುವ ಅವಧಿ</string>
-    <string name="pref_summary_desaturated_color">ಡಾರ್ಕ್ ಮೋಡ್‌ನಲ್ಲಿನ ಮೆಟೀರಿಯಲ್ ಡಿಸೈನ್ ಮಾರ್ಗಸೂಚಿಗಳ ಪ್ರಕಾರ ಡಿಸ್ಯಾಚುರೇಟೆಡ್ ಆಗಿರಬೇಕು</string>
-    <string name="pref_summary_expand_now_playing_panel">ಅಧಿಸೂಚನೆಯ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡುವುದರಿಂದ ಹೋಮ್ ಸ್ಕ್ರೀನ್ ಬದಲಿಗೆ ಪ್ಲೇಯಿಂಗ್ ಸ್ಕ್ರೀನ್ ಅನ್ನು ತೋರಿಸುತ್ತದೆ</string>
-    <string name="pref_summary_extra_controls">ಮಿನಿ ಪ್ಲೇಯರ್‌ಗೆ ಹೆಚ್ಚುವರಿ ನಿಯಂತ್ರಣಗಳನ್ನು ಸೇರಿಸಿ</string>
-    <string name="pref_summary_extra_song_info">ಫೈಲ್ ಫಾರ್ಮ್ಯಾಟ್, ಬಿಟ್ರೇಟ್ ಮತ್ತು ಆವರ್ತನದಂತಹ ಹೆಚ್ಚುವರಿ ಸಾಂಗ್ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_summary_gapless_playback">"ಕೆಲವು ಸಾಧನಗಳಲ್ಲಿ ಪ್ಲೇಬ್ಯಾಕ್ ಸಮಸ್ಯೆಗಳನ್ನು ಉಂಟುಮಾಡಬಹುದು."</string>
-    <string name="pref_summary_home_banner">ಹೋಮ್ ಬ್ಯಾನರ್ ಅನ್ನು ತೋರಿಸಿ ಅಥವಾ ಮರೆಮಾಡಿ</string>
-    <string name="pref_summary_ignore_media_store_artwork">ಆಲ್ಬಮ್ ಕವರ್ ಗುಣಮಟ್ಟವನ್ನು ಹೆಚ್ಚಿಸಬಹುದು, ಆದರೆ ಚಿತ್ರಗಳ ಲೋಡಿಂಗ್ ಸಮಯವನ್ನು ಹೆಚ್ಚು ಮಾಡುತ್ತದೆ. ಕಡಿಮೆ ರೆಸಲ್ಯೂಶನ್ ಕಲಾಕೃತಿಯಲ್ಲಿ ನಿಮಗೆ ಸಮಸ್ಯೆಗಳಿದ್ದರೆ ಮಾತ್ರ ಇದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
-    <string name="pref_summary_library_categories">ಸಂಗ್ರಹಣೆಯ ವರ್ಗಗಳ ಗೋಚರತೆ ಮತ್ತು ಕ್ರಮವನ್ನು ಕಾನ್ಫಿಗರ್ ಮಾಡಿ.</string>
-    <string name="pref_summary_lock_screen">Retro Music ನ ಕಸ್ಟಮ್ ಲಾಕ್ ಸ್ಕ್ರೀನ್ ನಿಯಂತ್ರಣಗಳನ್ನು ಬಳಸಿ</string>
-    <string name="pref_summary_manage_audio_focus">ಬೇರೆ ಯಾವುದನ್ನಾದರೂ ಪ್ಲೇ ಮಾಡುವುದನ್ನು ಲೆಕ್ಕಿಸದೆ ಯಾವಾಗಲೂ ಆಡಿಯೊವನ್ನು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಪ್ಲೇ ಮಾಡಿ</string>
-    <string name="pref_summary_open_source_licences">ಮುಕ್ತ ಸಂಪನ್ಮೂಲ ಸಾಫ್ಟ್‌ವೇರ್‌ಗಾಗಿ ಪರವಾನಗಿ ವಿವರಗಳು</string>
-    <string name="pref_summary_pause_history">ಸಕ್ರಿಯಗೊಳಿಸಿದಾಗ, ಹೊಸದಾಗಿ ಪ್ಲೇ ಮಾಡಿದ ಹಾಡುಗಳು ಹಿಸ್ಟರಿಯಲ್ಲಿ ಕಾಣಿಸುವುದಿಲ್ಲ</string>
-    <string name="pref_summary_remember_tab">ಪ್ರಾರಂಭದಲ್ಲಿ ಕೊನೆಯದಾಗಿ ಬಳಸಿದ ಟ್ಯಾಬ್‌ಗೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ</string>
-    <string name="pref_summary_show_lyrics">ಆಲ್ಬಮ್ ಕವರ್ ಮೇಲೆ ಸಿಂಕ್ ಮಾಡಿದ ಸಾಹಿತ್ಯವನ್ನು ಪ್ರದರ್ಶಿಸಿ</string>
-    <string name="pref_summary_suggestions">ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ಹೊಸ ಸಂಗೀತದ ಮಿಶ್ರಣವನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪರದೆಯಲ್ಲಿ ಎಲ್ಲಿಯಾದರೂ ಸ್ವೈಪ್ ಮಾಡುವ ಮೂಲಕ ಹಾಡನ್ನು ಬದಲಾಯಿಸುವುದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ</string>
-    <string name="pref_summary_swipe_to_dismiss">ಮಿನಿ ಪ್ಲೇಯರ್ ಅನ್ನು ವಜಾಗೊಳಿಸಲು ಕೆಳಗೆ ಸ್ವೈಪ್ ಮಾಡಿ</string>
-    <string name="pref_summary_toggle_full_screen">ಇಮ್ಮೆರ್ಸಿವ್‌ ಮೋಡ್</string>
-    <string name="pref_summary_toggle_headset">ಹೆಡ್‌ಫೋನ್‌ಗಳನ್ನು ಸಂಪರ್ಕಿಸಿದ ತಕ್ಷಣ ಪ್ಲೇ ಮಾಡಲು ಪ್ರಾರಂಭಿಸಿ</string>
-    <string name="pref_summary_toggle_shuffle">ಹಾಡುಗಳ ಹೊಸ ಪಟ್ಟಿಯನ್ನು ಪ್ಲೇ ಮಾಡುವಾಗ ಷಫಲ್ ಮೋಡ್ ಆಫ್ ಆಗುತ್ತದೆ</string>
-    <string name="pref_summary_toggle_volume">ಸಾಕಷ್ಟು ಸ್ಥಳಾವಕಾಶ ಲಭ್ಯವಿದ್ದರೆ, ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪರದೆಯಲ್ಲಿ ವಾಲ್ಯೂಮ್ ನಿಯಂತ್ರಣವನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_summary_wallpaper_accent">ಹಿನ್ನೆಲೆಚಿತ್ರದಿಂದ ಪ್ರಧಾನ ಬಣ್ಣವನ್ನು ಆರಿಸಿ</string>
-    <string name="pref_summary_whitelist">/ಸಂಗೀತ ಫೋಲ್ಡರ್‌ನಿಂದ ಸಂಗೀತವನ್ನು ಮಾತ್ರ ತೋರಿಸಿ</string>
-    <string name="pref_title_album_art_on_lockscreen">ಆಲ್ಬಮ್ ಕವರ್ ತೋರಿಸಿ</string>
-    <string name="pref_title_album_artists_only">ಆಲ್ಬಮ್ ಕಲಾವಿದರಿಂದ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ</string>
-    <string name="pref_title_album_cover_style">ಆಲ್ಬಮ್ ಕವರ್ ಥೀಮ್</string>
-    <string name="pref_title_album_cover_transform">ಆಲ್ಬಮ್ ಕವರ್ ಸ್ಕಿಪ್</string>
-    <string name="pref_title_app_shortcuts">ಬಣ್ಣದ ಅಪ್ಲಿಕೇಶನ್ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು</string>
-    <string name="pref_title_appbar_mode">ಹೆಡ್ಡರ್ ಶೈಲಿ</string>
-    <string name="pref_title_audio_ducking">ಫೋಕಸ್ ನಷ್ಟದ ಆಧಾರದ ಮೇಲೆ ಪರಿಮಾಣವನ್ನು ಕಡಿಮೆ ಮಾಡಿ</string>
-    <string name="pref_title_audio_fade">ಫೇಡ್ ಆಡಿಯೋ</string>
-    <string name="pref_title_auto_download_artist_images">ಕಲಾವಿದರ ಚಿತ್ರಗಳನ್ನು ಸ್ವಯಂ-ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ</string>
-    <string name="pref_title_blacklist">ಕಪ್ಪುಪಟ್ಟಿ</string>
-    <string name="pref_title_bluetooth_playback">ಬ್ಲೂಟೂತ್ ಪ್ಲೇಬ್ಯಾಕ್</string>
-    <string name="pref_title_blurred_album_art">ಆಲ್ಬಮ್ ಕವರ್ ಅನ್ನು ಮಸುಕುಗೊಳಿಸಿ</string>
-    <string name="pref_title_circle_button">ವೃತ್ತಾಕಾರದ ಪ್ಲೇ ಬಟನ್</string>
-    <string name="pref_title_classic_notification">ಕ್ಲಾಸಿಕ್ ಅಧಿಸೂಚನೆ ವಿನ್ಯಾಸ</string>
-    <string name="pref_title_colored_app">ಹೊಂದಿಕೊಳ್ಳುವ ಬಣ್ಣ</string>
-    <string name="pref_title_colored_notification">ಬಣ್ಣದ ಅಧಿಸೂಚನೆ</string>
-    <string name="pref_title_cross_fade">ಕ್ರಾಸ್ಫೇಡ್ (ಬೀಟಾ)</string>
-    <string name="pref_title_custom_font">Manrope ಫಾಂಟ್ ಬಳಸಿ</string>
-    <string name="pref_title_desaturated_color">ಅಪರ್ಯಾಪ್ತ ಬಣ್ಣ</string>
-    <string name="pref_title_expand_now_playing_panel">ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪರದೆಯನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_title_extra_controls">ಹೆಚ್ಚುವರಿ ನಿಯಂತ್ರಣಗಳು</string>
-    <string name="pref_title_extra_song_info">ಹಾಡಿನ ಮಾಹಿತಿ</string>
-    <string name="pref_title_gapless_playback">ಅಂತರವಿಲ್ಲದ ಪ್ಲೇಬ್ಯಾಕ್</string>
-    <string name="pref_title_general_theme">ಆ್ಯಪ್‌ ಥೀಮ್</string>
-    <string name="pref_title_home_album_grid_style">ಆಲ್ಬಮ್ ಗ್ರಿಡ್</string>
-    <string name="pref_title_home_artist_grid_style">ಕಲಾವಿದ ಗ್ರಿಡ್</string>
-    <string name="pref_title_home_banner">ಬ್ಯಾನರ್</string>
-    <string name="pref_title_ignore_media_store_artwork">ಮೀಡಿಯಾ ಸ್ಟೋರ್ ಕವರ್‌ಗಳನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ</string>
-    <string name="pref_title_last_added_interval">ಕೊನೆಯದಾಗಿ ಸೇರಿಸಲಾದ ಪ್ಲೇಲಿಸ್ಟ್ ಮಧ್ಯಂತರ</string>
-    <string name="pref_title_lock_screen">ಪೂರ್ಣಪರದೆ ನಿಯಂತ್ರಣಗಳು</string>
-    <string name="pref_title_lyrics_screen_on">ಸಾಹಿತ್ಯವನ್ನು ತೋರಿಸುವಾಗ ಪರದೆಯನ್ನು ಆನ್ ಆಗಿರಿಸಿ</string>
-    <string name="pref_title_lyrics_type">ಸಾಹಿತ್ಯ ಪ್ರಕಾರ</string>
-    <string name="pref_title_manage_audio_focus">ಯಾವಾಗಲೂ ಪ್ಲೇಯಾಗಲಿ</string>
-    <string name="pref_title_now_playing_screen_appearance">ನೌ ಪ್ಲೇಯಿಂಗ್ ಥೀಮ್</string>
-    <string name="pref_title_open_source_licences">ಮುಕ್ತ ಮೂಲ ಪರವಾನಗಿಗಳು</string>
-    <string name="pref_title_pause_history">ವಿರಾಮದ ಹಿಸ್ಟರಿ</string>
-    <string name="pref_title_remember_tab">ಕೊನೆಯ ಟ್ಯಾಬ್ ಅನ್ನು ನೆನಪಿಡಿ</string>
-    <string name="pref_title_show_lyrics">ಸಾಹಿತ್ಯವನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_title_suggestions">ಸಲಹೆಗಳನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_title_swipe_anywhere_now_playing">ಹಾಡನ್ನು ಬದಲಾಯಿಸಲು ಎಲ್ಲಿಯಾದರೂ ಸ್ವೈಪ್ ಮಾಡಿ</string>
-    <string name="pref_title_swipe_to_dismiss">ಕೆಳಗೆ ಸ್ವೈಪ್ ಮಾಡುವ ಮೂಲಕ ವಜಾಗೊಳಿಸಿ</string>
-    <string name="pref_title_tab_text_mode">ಟ್ಯಾಬ್ ಶೀರ್ಷಿಕೆಗಳ ಮೋಡ್</string>
-    <string name="pref_title_toggle_carousel_effect">ಏರಿಳಿಕೆ ಪರಿಣಾಮ</string>
-    <string name="pref_title_toggle_full_screen">ಪೂರ್ಣ-ಪರದೆಯ ಅಪ್ಲಿಕೇಶನ್</string>
-    <string name="pref_title_toggle_toggle_headset">ಸ್ವಚಾಲಿತ</string>
-    <string name="pref_title_toggle_toggle_shuffle">ಷಫಲ್ ಮೋಡ್</string>
-    <string name="pref_title_toggle_volume">ಧ್ವನಿ ನಿಯಂತ್ರಣ</string>
-    <string name="pref_title_wallpaper_accent">ವಾಲ್ಪೇಪರ್ನ ಪ್ರಧಾನ ಬಣ್ಣ</string>
-    <string name="pref_title_whitelist">ಶ್ವೇತಪಟ್ಟಿ ಸಂಗೀತ</string>
-    <string name="pro">ಪ್ರೊ</string>
-    <string name="pro_summary">ಕಪ್ಪು ಥೀಮ್, ನೌ ಪ್ಲೇಯಿಂಗ್ ಥೀಮ್‌ಗಳು, ಏರಿಳಿಕೆ ಪರಿಣಾಮ ಮತ್ತು ಇನ್ನಷ್ಟು..</string>
-    <string name="profile">ಪ್ರೊಫೈಲ್</string>
-    <string name="purchase">ಖರೀದಿ</string>
-    <string name="queue">ಪ್ಲೇ ಮಾಡಲಾಗುತ್ತಿರುವ ಪಟ್ಟಿ</string>
-    <string name="rate_app">ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ರೇಟ್ ಮಾಡಿ</string>
-    <string name="rate_on_google_play_summary">ಈ ಅಪ್ಲಿಕೇಶನ್ ಇಷ್ಟಪಡುತ್ತೀರಾ? ನಾವು ಅದನ್ನು ಇನ್ನಷ್ಟು ಉತ್ತಮಗೊಳಿಸುವುದು ಹೇಗೆ ಎಂಬುದನ್ನು Google Play Store ನಲ್ಲಿ ನಮಗೆ ತಿಳಿಸಿ</string>
-    <string name="recent_albums">ಇತ್ತೀಚಿನ ಆಲ್ಬಮ್‌ಗಳು</string>
-    <string name="recent_artists">ಇತ್ತೀಚಿನ ಕಲಾವಿದರು</string>
-    <string name="remove_action">ತೆಗೆದುಹಾಕಿ</string>
-    <string name="remove_cover">ಕವರ್ ತೆಗೆದುಹಾಕಿ</string>
-    <string name="remove_from_blacklist">ಕಪ್ಪುಪಟ್ಟಿಯಿಂದ ತೆಗೆದುಹಾಕಿ</string>
-    <string name="remove_image">ಚಿತ್ರವನ್ನು ತೆಗೆದುಹಾಕಿ</string>
-    <string name="remove_song_from_playlist_title">ಹಾಡನ್ನು ಪ್ಲೇಲಿಸ್ಟ್ ನಿಂದ ತೆಗೆದುಹಾಕಿ</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[ಪ್ಲೇಲಿಸ್ಟ್ ಇಂದ <b>%1$s</b> ಹಾಡನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?]]></string>
-    <string name="remove_songs_from_playlist_title">ಪ್ಲೇಲಿಸ್ಟ್ ನಿಂದ ಹಾಡುಗಳನ್ನು ತೆಗೆದುಹಾಕಿ</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[ಪ್ಲೇಲಿಸ್ಟ್ ನಿಂದ <b>%1$d</b> ಹಾಡುಗಳನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?]]></string>
-    <string name="rename_playlist_title">ಪ್ಲೇಲಿಸ್ಟ್ ಗೆ ಮರುಹೆಸರಿಸಿ</string>
-    <string name="replace_cover">ಕವರ್ ಬದಲಾಯಿಸಿ</string>
-    <string name="report_an_issue">ಸಮಸ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ</string>
-    <string name="report_bug">ದೋಷವನ್ನು ವರದಿ ಮಾಡಿ</string>
-    <string name="reset_action">ಮರುಹೊಂದಿಸಿ</string>
-    <string name="reset_artist_image">ಕಲಾವಿದರ ಚಿತ್ರವನ್ನು ಮರುಹೊಂದಿಸಿ</string>
-    <string name="restore">ಪುನಸ್ಥಾಪಿಸಿ</string>
-    <string name="restore_message">ನೀವು ಬ್ಯಾಕಪ್ ಅನ್ನು ಮರುಸ್ಥಾಪಿಸಲು ಬಯಸುವಿರಾ?</string>
-    <string name="restored_previous_purchase_please_restart">ಹಿಂದಿನ ಖರೀದಿಯನ್ನು ಮರುಸ್ಥಾಪಿಸಲಾಗಿದೆ. ಎಲ್ಲಾ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಬಳಸಲು ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ.</string>
-    <string name="restored_previous_purchases">ಹಿಂದಿನ ಖರೀದಿಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಲಾಗಿದೆ.</string>
-    <string name="restoring_purchase">ಖರೀದಿಯನ್ನು ಮರುಸ್ಥಾಪಿಸಲಾಗುತ್ತಿದೆ…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">ಸಂಗೀತವನ್ನು ರಿಂಗ್‌ಟೋನ್‌ನಂತೆ ಹೊಂದಿಸಲು ನಿಮ್ಮ ಸಾಧನದ ಸಂಯೋಜನೆಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ</string>
-    <string name="ringtone_title">ರಿಂಗ್‌ಟೋನ್‌ (ಐಚ್ಛಿಕ)</string>
-    <string name="saf_delete_failed">ಕಡತ ಅಳಿಸುವಿಕೆ ವಿಫಲವಾಗಿದೆ: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">SAF URI ಪಡೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
-    <string name="saf_guide_slide1_description">ದಿಕ್ಸೂಚಿ ಡ್ರಾಯರ್ ತೆರೆಯಿರಿ</string>
-    <string name="saf_guide_slide1_description_before_o">ಓವರ್‌ಫ್ಲೋ ಮೆನುವಿನಲ್ಲಿ \'SD ಕಾರ್ಡ್ ತೋರಿಸು\' ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s ಗೆ SD ಕಾರ್ಡ್ ಪ್ರವೇಶದ ಅಗತ್ಯವಿದೆ</string>
-    <string name="saf_guide_slide2_description">ನಿಮ್ಮ SD ಕಾರ್ಡ್ ರೂಟ್ ಡೈರೆಕ್ಟರಿಯನ್ನು ನೀವು ಆಯ್ಕೆ ಮಾಡಬೇಕಾಗುತ್ತದೆ</string>
-    <string name="saf_guide_slide2_title">ದಿಕ್ಸೂಚಿ ಡ್ರಾಯರ್‌ನಲ್ಲಿ ನಿಮ್ಮ SD ಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ</string>
-    <string name="saf_guide_slide3_description">ಯಾವುದೇ ಉಪ-ಫೋಲ್ಡರ್‌ಗಳನ್ನು ತೆರೆಯಬೇಡಿ</string>
-    <string name="saf_guide_slide3_title">ಪರದೆಯ ಕೆಳಭಾಗದಲ್ಲಿರುವ \'ಆಯ್ಕೆ\' ಬಟನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ</string>
-    <string name="saf_write_failed">ಕಡತ ಬರೆಯಲು ವಿಫಲವಾಗಿದೆ: %s</string>
-    <string name="save">ಉಳಿಸಿ</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">ಕಡತವಾಗಿ ಉಳಿಸಿ</string>
-    <string name="save_playlists_title">ಕಡತಗಳನ್ನಾಗಿ ಉಳಿಸಿ</string>
-    <string name="saved_playlist_to">%s ಪ್ಲೇಲಿಸ್ಟ್ ಗೆ ಉಳಿಸಲಾಗಿದೆ.</string>
-    <string name="saving_changes">ಬದಲಾವಣೆ ಉಳಿಸಲಾಗುತ್ತಿದೆ</string>
-    <string name="scan_media">ಮೀಡಿಯಾ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="scanned_files">%2$d ಗಳಲ್ಲಿ %1$d ಗಳನ್ನು ಹುಡುಕಲಾಗಿದೆ.</string>
-    <string name="scrobbles_label">ಸ್ಕ್ರೋಬಲ್ಸ್</string>
-    <string name="select_all">ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆಮಾಡಿ</string>
-    <string name="selected">ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ</string>
-    <string name="set">ಹೊಂದಿಸಿ</string>
-    <string name="set_artist_image">ಕಲಾವಿದರ ಚಿತ್ರವನ್ನು ಹೊಂದಿಸಿ</string>
-    <string name="share_app">ಅಪ್ಲಿಕೇಶನ್ ಹಂಚಿರಿ</string>
-    <string name="share_summary">ನಿಮ್ಮ ಸ್ನೇಹಿತರು ಮತ್ತು ಕುಟುಂಬದೊಂದಿಗೆ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
-    <string name="share_to_stories">Stories ಗೆ ಹಂಚಿಕೊಳ್ಳಿ</string>
-    <string name="show_album_artists">ಆಲ್ಬಮ್ ಕಲಾವಿದರನ್ನು ತೋರಿಸಿ</string>
-    <string name="shuffle">ಷಫಲ್</string>
-    <string name="simple">ಸರಳ</string>
-    <string name="sleep_timer_canceled">ಸ್ಲೀಪ್ ಟೈಮರ್ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ.</string>
-    <string name="sleep_timer_set">ಈಗಿನಿಂದ %d ನಿಮಿಷಗಳವರೆಗೆ ಸ್ಲೀಪ್ ಟೈಮರ್ ಹೊಂದಿಸಲಾಗಿದೆ.</string>
-    <string name="social">ಸಾಮಾಜಿಕ ಜಾಲತಾಣಗಳು</string>
-    <string name="social_stories">Story ಯನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
-    <string name="song">ಹಾಡು</string>
-    <string name="song_duration">ಹಾಡಿನ ಅವಧಿ</string>
-    <string name="songs">ಹಾಡುಗಳು</string>
-    <string name="sort_order">ವಿಂಗಡಣಾ ಕ್ರಮ</string>
-    <string name="sort_order_a_z">ಆರೋಹಣ ಕ್ರಮದಲ್ಲಿ</string>
-    <string name="sort_order_album">ಆಲ್ಬಮ್</string>
-    <string name="sort_order_artist">ಕಲಾವಿದ</string>
-    <string name="sort_order_composer">ರಚನಕಾರ</string>
-    <string name="sort_order_date">ಸೇರಿಸಿದ‌ ದಿನಾಂಕ</string>
-    <string name="sort_order_date_modified">ಮಾರ್ಪಡಿಸಿದ‌ ದಿನಾಂಕ</string>
-    <string name="sort_order_default">ಪೂರ್ವನಿಯೋಜಿತ</string>
-    <string name="sort_order_num_songs">ಹಾಡಿನ ಎಣಿಕೆ</string>
-    <string name="sort_order_num_songs_desc">ಹಾಡುಗಳ ಎಣಿಕೆ ಅವರೋಹಣ ಕ್ರಮ</string>
-    <string name="sort_order_year">ವರ್ಷ</string>
-    <string name="sort_order_z_a">ಅವರೋಹಣ ಕ್ರಮ</string>
-    <string name="speech_not_supported">ಕ್ಷಮಿಸಿ! ನಿಮ್ಮ ಸಾಧನವು ಧ್ವನಿ ಇನ್‌ಪುಟ್ ಅನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ</string>
-    <string name="speech_prompt">ನಿಮ್ಮ ಸಂಗ್ರಹವನ್ನು ಹುಡುಕಿ</string>
-    <string name="stack">ಪೇರಿಸಿ</string>
-    <string name="start_play_music">ಸಂಗೀತ‌ ಪ್ಲೇ ಮಾಡಲು ಪ್ರಾರಂಭಿಸಿ.</string>
-    <string name="suggestion_songs">ಸಲಹೆಗಳು</string>
-    <string name="support_development">ಅಭಿವೃದ್ದಿಗೆ ಬೆಂಬಲಿಸಿ</string>
-    <string name="swipe_to_unlock">ಅನ್‍ಲಾಕ್ ಮಾಡಲು ಸ್ವೈಪ್ ಮಾಡಿ</string>
-    <string name="synced_lyrics">ಸಿಂಕ್ ಮಾಡಲಾಗಿರುವ ಸಾಹಿತ್ಯ</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">ದೋಷಗಳನ್ನು ಚರ್ಚಿಸಲು, ಸಲಹೆಗಳನ್ನು ನೀಡಲು, ಪ್ರದರ್ಶಿಸಲು ಮತ್ತು ಹೆಚ್ಚಿನದನ್ನು ಮಾಡಲು Telegram ಗುಂಪಿಗೆ ಸೇರಿಕೊಳ್ಳಿ</string>
-    <string name="thank_you">ಧನ್ಯವಾದಗಳು!</string>
-    <string name="the_audio_file">ಧ್ವನಿ ಕಡತ</string>
-    <string name="this_month">ಈ ತಿಂಗಳು</string>
-    <string name="this_week">ಈ ವಾರ</string>
-    <string name="this_year">ಈ ವರ್ಷ</string>
-    <string name="tiny">ಚಿಕ್ಕ</string>
-    <string name="tiny_card_style">ಚಿಕ್ಕ ಕಾರ್ಡ್</string>
-    <string name="title">ಶೀರ್ಷಿಕೆ</string>
-    <string name="title_new_backup">ಹೊಸ ಬ್ಯಾಕಪ್</string>
-    <string name="today">ಇಂದು</string>
-    <string name="top_albums">ಉನ್ನತ ಆಲ್ಬಮ್‌ಗಳು</string>
-    <string name="top_artists">ಉನ್ನತ ಕಲಾವಿದರು</string>
-    <string name="track_hint">"ಸುರುಳಿ (ಸುರುಳಿ 2 ಕ್ಕೆ 2 ಅಥವಾ CD3 ಸುರುಳಿ 4 ಕ್ಕೆ 3004)"</string>
-    <string name="track_list">ಸುರುಳಿ ಸಂಖ್ಯೆ</string>
-    <string name="translate">ಅನುವಾದಿಸಿ</string>
-    <string name="translate_community">ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಮ್ಮ ಭಾಷೆಗೆ ಭಾಷಾಂತರಿಸಲು ನಮಗೆ ಸಹಾಯ ಮಾಡಿ</string>
-    <string name="try_retro_music_premium">Retro Music ಪ್ರೀಮಿಯಂ ಅನ್ನು ಪ್ರಯತ್ನಿಸಿ</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Retro Music ನೊಂದಿಗೆ ನಿಮ್ಮ ವಿನ್ಯಾಸವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
-    <string name="unlabeled">ಲೇಬಲ್ ಮಾಡಲಾಗಿಲ್ಲ</string>
-    <string name="unplayable_file">ಈ ಹಾಡನ್ನು ಪ್ಲೇ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.</string>
-    <string name="up_next">ಮುಂದಿನದು</string>
-    <string name="update_image">ಚಿತ್ರವನ್ನು ನವೀಕರಿಸಿ</string>
-    <string name="updating">ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ…</string>
-    <string name="user_images_description">ಬಳಕೆದಾರ ಚಿತ್ರಗಳು</string>
-    <string name="user_name">ಬಳಕೆದಾರರ ಹೆಸರು</string>
-    <string name="username">ಬಳಕೆದಾರರ ಹೆಸರು</string>
-    <string name="version">ಆವೃತ್ತಿ</string>
-    <string name="vertical_flip">ಲಂಬ ಫ್ಲಿಪ್</string>
-    <string name="view_on_telegram">Telegram ನಲ್ಲಿ ವೀಕ್ಷಿಸಿ</string>
-    <string name="volume">ಪರಿಮಾಣ</string>
-    <string name="web_search">ವೆಬ್ ಹುಡುಕಾಟ</string>
-    <string name="website">ಜಾಲತಾಣ</string>
-    <string name="website_summary">ನಮ್ಮ ಜಾಲತಾಣವನ್ನು ಪರಿಶೀಲಿಸಿ</string>
-    <string name="welcome">ಸುಸ್ವಾಗತ,</string>
-    <string name="what_do_you_want_to_share">ಏನನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಬಯಸುವಿರಿ?</string>
-    <string name="whats_new">ಹೊಸತೇನಿದೆ</string>
-    <string name="window">ಕ್ರಿಯೆಯ ಕಿಟಿಕಿ</string>
-    <string name="window_corner_edges">ದುಂಡಾದ ಮೂಲೆಗಳು</string>
-    <string name="x_has_been_set_as_ringtone">%1$s ನನ್ನು ನಿಮ್ಮ ರಿಂಗ್ಟೊನ್ ಆಗಿ ಸೆಟ್ ಮಾಡಿ.</string>
-    <string name="x_selected">%1$d‌ ಯನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ</string>
-    <string name="year">ವರ್ಷ</string>
-    <string name="you_have_to_select_at_least_one_category">ನೀವು ಕನಿಷ್ಠ ಒಂದು ವರ್ಗವನ್ನು ಆಯ್ಕೆ ಮಾಡಬೇಕು.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">ನಿಮ್ಮನ್ನು ಸಮಸ್ಯೆ ಟ್ರ್ಯಾಕರ್ ಜಾಲತಾಣಕ್ಕೆ ರವಾನಿಸಲಾಗುತ್ತದೆ.</string>
-    <string name="your_account_data_is_only_used_for_authentication">ನಿಮ್ಮ ಖಾತೆಯ ಡೇಟಾವನ್ನು ದೃಢೀಕರಣಕ್ಕಾಗಿ ಮಾತ್ರ ಬಳಸಲಾಗುತ್ತದೆ.</string>
-</resources>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 428eec4b5..2b95bdf11 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">%s에 관하여</string>
+    <string name="about_album_label">About %s</string>
     <string name="about_settings_summary">Team, social links</string>
     <string name="accent_color">강조 색상</string>
     <string name="accent_color_desc">강조 색상을 지정합니다. 기본값은 녹색입니다.</string>
     <string name="action_about">정보</string>
-    <string name="action_add_to_blacklist">블랙 리스트에 추가</string>
+    <string name="action_add_to_blacklist">Add to Blacklist</string>
     <string name="action_add_to_favorites">즐겨찾기에 추가</string>
     <string name="action_add_to_playing_queue">재생 대기열에 추가</string>
     <string name="action_add_to_playlist">재생목록에 추가...</string>
-    <string name="action_cancel">현재 타이머 취소</string>
     <string name="action_cast">Cast</string>
     <string name="action_clear_playing_queue">재생 대기열 비우기</string>
     <string name="action_cycle_repeat">Cycle repeat mode</string>
@@ -89,8 +88,6 @@
     <string name="biography">바이오그래피</string>
     <string name="black_theme_name">저스트 블랙</string>
     <string name="blacklist">블랙리스트</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
     <string name="blur">흐림 효과</string>
     <string name="blur_card">블러 카드</string>
     <string name="bug_report_failed">Unable to send report</string>
@@ -104,7 +101,6 @@
     <string name="bug_report_no_password">Please enter your valid GitHub password</string>
     <string name="bug_report_no_title">Please enter an issue title</string>
     <string name="bug_report_no_username">Please enter your valid GitHub username</string>
-    <string name="bug_report_success">Bug report successful</string>
     <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
     <string name="bug_report_use_account">Send using GitHub account</string>
     <string name="buy_now">Buy now</string>
@@ -128,7 +124,6 @@
     <string name="clear_playing_queue">Clear queue</string>
     <string name="color">색상</string>
     <string name="colors">색상</string>
-    <string name="compact">Compact</string>
     <string name="composer">Composer</string>
     <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
     <string name="could_not_create_playlist">\uc7ac\uc0dd\ubaa9\ub85d\uc744 \ub9cc\ub4e4 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.</string>
@@ -171,15 +166,8 @@
     <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
     <string name="empty">비어 있음</string>
     <string name="equalizer">이퀄라이저</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
     <string name="faq">FAQ</string>
     <string name="favorites">즐겨찾기</string>
-    <string name="file_already_exists">File already exists</string>
     <string name="finish_last_song">Finish last song</string>
     <string name="fit">Fit</string>
     <string name="flat">플랫</string>
@@ -195,7 +183,6 @@
     <string name="genres">장르</string>
     <string name="git_hub_summary">Fork the project on GitHub</string>
     <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -233,7 +220,6 @@
     <string name="labeled">Labeled</string>
     <string name="last_added">최근 추가된 목록</string>
     <string name="last_song">Last song</string>
-    <string name="lets_go">Let\'s go</string>
     <string name="library_categories">Library categories</string>
     <string name="licenses">라이선스</string>
     <string name="light_theme_name">클리어리 화이트</string>
@@ -246,12 +232,6 @@
     <string name="material">Material</string>
     <string name="md_error_label">Error</string>
     <string name="md_storage_perm_error">Permission error</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
     <string name="my_name">내 이름</string>
     <string name="my_top_tracks">자주 재생한 음악</string>
     <string name="never">아니오</string>
@@ -292,7 +272,6 @@
     <string name="paste_lyrics_here">Paste Lyrics Here</string>
     <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
     <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">외부 저장소 접근 권한이 거부되었습니다.</string>
     <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
     <string name="permission_title">Storage Access</string>
@@ -355,26 +334,25 @@
     <string name="pref_summary_ignore_media_store_artwork">앨범 커버의 품질을 향상시킬 수 있지만 이미지를 불러오는 시간이 늘어납니다. 저해상도 이미지를 불러오는 데 문제가 있는 경우에만 사용하십시오.</string>
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="pref_summary_lock_screen">Retro music에서 제공하는 자체 잠금 화면 사용</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">오픈소스 소프트웨어의 상세 라이센스 정보</string>
     <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
     <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
     <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
     <string name="pref_summary_toggle_full_screen">몰입 모드</string>
     <string name="pref_summary_toggle_headset">이어폰이 연결되면 바로 음악을 재생합니다.</string>
     <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</string>
     <string name="pref_summary_toggle_volume">음악 재생 화면에서 공간이 있을 시 볼륨 컨트롤을 보입니다</string>
     <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">앨범 커버 표시</string>
     <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
     <string name="pref_title_album_cover_style">Album cover theme</string>
     <string name="pref_title_album_cover_transform">Album cover skip</string>
     <string name="pref_title_app_shortcuts">앱 바로가기 색상 틴트</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">알림이 올 때 볼륨 감소</string>
     <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">아티스트 이미지 자동 다운로드</string>
@@ -401,7 +379,6 @@
     <string name="pref_title_lock_screen">전체 화면 컨트롤</string>
     <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pref_title_now_playing_screen_appearance">테마</string>
     <string name="pref_title_open_source_licences">오픈소스 라이선스</string>
     <string name="pref_title_pause_history">Pause history</string>
@@ -409,7 +386,6 @@
     <string name="pref_title_show_lyrics">Show lyrics</string>
     <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">Tab titles mode</string>
     <string name="pref_title_toggle_carousel_effect">회전 효과</string>
     <string name="pref_title_toggle_full_screen">전체 화면</string>
@@ -418,6 +394,7 @@
     <string name="pref_title_toggle_volume">볼륨 조절</string>
     <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
     <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
     <string name="profile">Profile</string>
@@ -496,7 +473,6 @@
     <string name="sort_order_composer">Composer</string>
     <string name="sort_order_date">Date added</string>
     <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_default">Default</string>
     <string name="sort_order_num_songs">Song count</string>
     <string name="sort_order_num_songs_desc">Song count desc</string>
     <string name="sort_order_year">Year</string>
@@ -556,4 +532,5 @@
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
     <string name="your_account_data_is_only_used_for_authentication">계정 정보는 오로지 인증 목적으로만 사용됩니다.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml
deleted file mode 100644
index 341d7a886..000000000
--- a/app/src/main/res/values-lv-rLV/strings.xml
+++ /dev/null
@@ -1,563 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Par %s</string>
-    <string name="about_settings_summary">Team, social links</string>
-    <string name="accent_color">Akcenta krāsa</string>
-    <string name="accent_color_desc">Motīva akcenta krāsa, pēc noklusējuma violets</string>
-    <string name="action_about">Par</string>
-    <string name="action_add_to_blacklist">Add to Blacklist</string>
-    <string name="action_add_to_favorites">Pievienot izlasei</string>
-    <string name="action_add_to_playing_queue">Pievienot atskaņošanas rindai</string>
-    <string name="action_add_to_playlist">Pievienot atskaņošanas sarakstam</string>
-    <string name="action_cancel">Atcelt</string>
-    <string name="action_cast">Raidīt</string>
-    <string name="action_clear_playing_queue">Noņemt visu no atskaņošanas rindas</string>
-    <string name="action_cycle_repeat">Cycle repeat mode</string>
-    <string name="action_delete">Dzēst</string>
-    <string name="action_delete_from_device">Dzēst no šīs ierīces</string>
-    <string name="action_details">Papildus informācija</string>
-    <string name="action_edit">Rediģēt</string>
-    <string name="action_go_to_album">Doties uz albumu</string>
-    <string name="action_go_to_artist">Doties uz izpildītāju</string>
-    <string name="action_go_to_genre">Doties uz žanru</string>
-    <string name="action_go_to_lyrics">Go to Lyrics</string>
-    <string name="action_go_to_start_directory">Go to start directory</string>
-    <string name="action_grant">Piešķirt</string>
-    <string name="action_grid_size">Grid size</string>
-    <string name="action_grid_size_land">Grid size (land)</string>
-    <string name="action_new_playlist">Jauns atskaņošanas saraksts</string>
-    <string name="action_next">Nākamais</string>
-    <string name="action_play">Atskaņot</string>
-    <string name="action_play_all">Atskaņot visu</string>
-    <string name="action_play_next">Atskaņot nākamo</string>
-    <string name="action_play_pause">Atskaņot/apturēt</string>
-    <string name="action_previous">Iepriekšējais</string>
-    <string name="action_remove_from_favorites">Izņemt no izlases</string>
-    <string name="action_remove_from_playing_queue">Noņemt no atskaņošanas rindas</string>
-    <string name="action_remove_from_playlist">Noņemt no atskaņošanas saraksta</string>
-    <string name="action_rename">Pārdēvēt</string>
-    <string name="action_save_playing_queue">Saglabāt atskaņošanas rindu</string>
-    <string name="action_scan">Skenēt</string>
-    <string name="action_search">Meklēt</string>
-    <string name="action_set">Sākt</string>
-    <string name="action_set_as_ringtone">Uzstādīt kā zvana signālu</string>
-    <string name="action_set_as_start_directory">Set as start directory</string>
-    <string name="action_settings">"Iestatījumi"</string>
-    <string name="action_share">Kopīgot</string>
-    <string name="action_shuffle_all">Jaukt visu</string>
-    <string name="action_shuffle_playlist">Jaukt atskaņošanas sarakstu</string>
-    <string name="action_sleep_timer">Sleep timer</string>
-    <string name="action_sort_order">Kārtošanas secība</string>
-    <string name="action_tag_editor">Atzīmju rediģēšana</string>
-    <string name="action_toggle_favorite">Toggle favorite</string>
-    <string name="action_toggle_shuffle">Toggle shuffle mode</string>
-    <string name="adaptive">Adaptīvs</string>
-    <string name="add_action">Pievienot</string>
-    <string name="add_playlist_title">"Pievienot atskaņošanas sarakstam"</string>
-    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">%1$d dziesma(s) tika pievienota(s) %2$s</string>
-    <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
-    <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
-    <string name="album">Albums</string>
-    <plurals name="albumSongs">
-        <item quantity="zero">Dziesmu</item>
-        <item quantity="one">Dziesma</item>
-        <item quantity="other">Dziesmas</item>
-    </plurals>
-    <string name="album_artist">Albuma izpildītājs</string>
-    <string name="albums">Albumi</string>
-    <plurals name="albums">
-        <item quantity="zero">Albumu</item>
-        <item quantity="one">Albums</item>
-        <item quantity="other">Albumi</item>
-    </plurals>
-    <string name="always">Vienmēr</string>
-    <string name="app_share">Hey check out this cool music player at: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Jaukt</string>
-    <string name="app_shortcut_top_tracks_short">Top dziesmas</string>
-    <string name="app_widget_big_name">Pilns attēls</string>
-    <string name="app_widget_card_name">Card</string>
-    <string name="app_widget_classic_name">Klasisks</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Kompakts</string>
-    <string name="app_widget_text_name">Minimal Text</string>
-    <string name="artist">Izpildītājs</string>
-    <string name="artists">Izpildītāji</string>
-    <string name="audio_fade_duration">Audio fade duration</string>
-    <string name="audio_focus_denied">Audio focus denied.</string>
-    <string name="audio_settings_summary">Change the sound settings and adjust the equalizer controls</string>
-    <string name="auto">Automātiski</string>
-    <string name="backup_restore_settings_summary">Dublējiet un atjaunojiet Jūsu iestatījumus un atskaņošanas sarakstus</string>
-    <string name="backup_restore_title"><![CDATA[Dublēt / atjaunot]]></string>
-    <string name="backup_title">Dublējumi</string>
-    <string name="biography">Biogrāfija</string>
-    <string name="black_theme_name">Vienkārši melns</string>
-    <string name="blacklist">Blacklist</string>
-    <string name="bluetooth_summary">Šai lietotnei nepieciešama pieeja tuvumā esošām ierīcēm, lai atrastu bluetooth ierīces</string>
-    <string name="bluetooth_title">Tuvumā esošās ierīces</string>
-    <string name="blur">Izpludināt</string>
-    <string name="blur_card">Blur Card</string>
-    <string name="bug_report_failed">Unable to send report</string>
-    <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
-    <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
-    <string name="bug_report_failed_unknown">An unexpected error occurred. Please contact the app developer.</string>
-    <string name="bug_report_failed_wrong_credentials">Nepareizs lietotājvārds vai parole</string>
-    <string name="bug_report_issue">Kļūda</string>
-    <string name="bug_report_manual">Sūtīt manuāli</string>
-    <string name="bug_report_no_description">Lūdzu, ievadiet kļūdas raksturojumu</string>
-    <string name="bug_report_no_password">Lūdzu, ievadiet Jūsu GitHub konta paroli</string>
-    <string name="bug_report_no_title">Lūdzu, uzrakstiet kļūdas virsrakstu</string>
-    <string name="bug_report_no_username">Lūdzu, ievadiet Jūsu GitHub konta lietotājvārdu</string>
-    <string name="bug_report_success">Ziņošana par kļūdu vaikta veiksmīgi</string>
-    <string name="bug_report_summary">Notika neparadzēta kļūda. Žēl, ka Jūs saskārāties ar šo problēmu, ja lietotne turpina avarēt, notīriet lietotnes datus vai sūtiet e-pasta vēstuli </string>
-    <string name="bug_report_use_account">Sūtīt, izmantojot GitHub kontu</string>
-    <string name="buy_now">Pirkt tagad</string>
-    <string name="cancel_current_timer">Atcelt</string>
-    <string name="card">Card</string>
-    <string name="card_color_style">Colored Card</string>
-    <string name="card_square">Square Card</string>
-    <string name="card_style">Card</string>
-    <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
-    <string name="cascading">Cascading</string>
-    <string name="changelog">Changelog</string>
-    <string name="changelog_summary">Check out What\'s New</string>
-    <string name="choose_image">Choose Image</string>
-    <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">Circle</string>
-    <string name="circular">Circular</string>
-    <string name="classic">Klasisks</string>
-    <string name="clear_action">Notīrīt</string>
-    <string name="clear_blacklist">Clear blacklist</string>
-    <string name="clear_history">Izdzēst vēsturi</string>
-    <string name="clear_playing_queue">Notīrīt atskaņošanas rindu</string>
-    <string name="color">Krāsa</string>
-    <string name="colors">Krāsas</string>
-    <string name="compact">Kompakts</string>
-    <string name="composer">Komponists</string>
-    <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
-    <string name="could_not_create_playlist">Neizdevās izveidot atskaņošanas sarakstu.</string>
-    <string name="could_not_download_album_cover">"Couldn\u2019t download a matching album cover."</string>
-    <string name="could_not_restore_purchase">Nevarēja atjaunot pirkumu.</string>
-    <string name="could_not_scan_files">Could not scan %d files.</string>
-    <string name="create_action">Izveidot</string>
-    <string name="create_new_backup">Izveidot</string>
-    <string name="created_playlist_x">Izveidoja atskaņošanas sarakstu %1$s.</string>
-    <string name="credit_title">Members and contributors </string>
-    <string name="currently_listening_to_x_by_x">Jūs pašlaik klausāties %1$s, kuru izpilda %2$s.</string>
-    <string name="custom_artist_images">Custom Artist Images</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
-    <string name="dark_theme_name">Nedaudz tumšs</string>
-    <string name="delete_playlist_title">Dzēst atskaņošanas sarakstu</string>
-    <string name="delete_playlist_x"><![CDATA[Dzēst atskaņošanas sarakstu <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Dzēst atskaņošanas sarakstus</string>
-    <string name="delete_song_title">Dzēst dziesmu</string>
-    <string name="delete_song_x"><![CDATA[Dzēst dziesmu <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Dzēst dziesmas</string>
-    <string name="delete_x_playlists"><![CDATA[Dzēst <b>%1$d</b> atskaņošanas sarakstus?]]></string>
-    <string name="delete_x_songs"><![CDATA[Dzēst <b>%1$d</b> dziesmas?]]></string>
-    <string name="deleted_x_songs">Tika izdzēstas %1$d dziesmas.</string>
-    <string name="deleting_songs">Dziesmas tiek dzēstas</string>
-    <string name="depth">Depth</string>
-    <string name="description">Apraksts</string>
-    <string name="device_info">Informācija par ierīci</string>
-    <string name="dialog_message_set_ringtone">Ļaut Retro Music mainīt audio iestatījumus</string>
-    <string name="dialog_title_set_ringtone">Iestatīt zvana signālu</string>
-    <string name="disc_hint">Diska numurs</string>
-    <string name="do_you_want_to_clear_the_blacklist">Do you want to clear the blacklist?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Do you want to remove <b>%1$s</b> from the blacklist?]]></string>
-    <string name="donate">Ziedot</string>
-    <string name="donate_summary">If you think I deserve to get paid for my work, you can leave some money here</string>
-    <string name="donation_header">Nopirkt man:</string>
-    <string name="done">Gatavs</string>
-    <string name="drive_mode">Braukšanas režīms</string>
-    <string name="edit_fab">Edit Button</string>
-    <string name="edit_normal_lyrics">Rediģēt vārdus</string>
-    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
-    <string name="empty">Tukšs</string>
-    <string name="equalizer">Ekvalaizers</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Neizdevās kopīgot failu</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">BUJ</string>
-    <string name="favorites">Izlase</string>
-    <string name="file_already_exists">Fails jau eksistē</string>
-    <string name="finish_last_song">Finish last song</string>
-    <string name="fit">Fit</string>
-    <string name="flat">Flat</string>
-    <string name="folders">Mapes</string>
-    <string name="follow_system">Pielāgot sistēmai</string>
-    <string name="for_you">Tikai jums</string>
-    <string name="free">Free</string>
-    <string name="full">Full</string>
-    <string name="full_card">Full card</string>
-    <string name="general_settings_summary">Change the theme and colors of the app</string>
-    <string name="general_settings_title">Izskats</string>
-    <string name="genre">Žanrs</string>
-    <string name="genres">Žanri</string>
-    <string name="git_hub_summary">Fork the project on GitHub</string>
-    <string name="gradient">Krāsu pāreja</string>
-    <string name="grant_access">Piešķirt piekļuvi</string>
-    <string name="grid_size_1">1</string>
-    <string name="grid_size_2">2</string>
-    <string name="grid_size_3">3</string>
-    <string name="grid_size_4">4</string>
-    <string name="grid_size_5">5</string>
-    <string name="grid_size_6">6</string>
-    <string name="grid_size_7">7</string>
-    <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Grid style</string>
-    <string name="help_summary">Nepieciešama papildu palīdzība?</string>
-    <string name="hinge">Hinge</string>
-    <string name="history">Vēsture</string>
-    <string name="history_cleared">Vēsture notīrīta</string>
-    <string name="history_undo_button">Atsaukt</string>
-    <string name="home">Sākums</string>
-    <string name="horizontal_flip">Horizontal flip</string>
-    <string name="image">Attēls</string>
-    <string name="image_gradient">Gradient image</string>
-    <string name="image_settings_summary">Change artist image download settings</string>
-    <string name="import_label">Importēt</string>
-    <string name="import_playlist">Import playlist</string>
-    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
-    <string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
-    <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
-    <string name="keyboard">Tastatūra</string>
-    <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Formāts</string>
-    <string name="label_file_name">Faila nosaukums</string>
-    <string name="label_file_path">File path</string>
-    <string name="label_file_size">Izmērs</string>
-    <string name="label_last_modified">Last Modified</string>
-    <string name="label_more_from">Vairāk no %s</string>
-    <string name="label_sampling_rate">Sampling rate</string>
-    <string name="label_track_length">Ilgums</string>
-    <string name="labeled">Labeled</string>
-    <string name="last_added">Pēdējie pievienotie</string>
-    <string name="last_song">Pēdējā dziesma</string>
-    <string name="lets_go">Let\'s go</string>
-    <string name="library_categories">Library categories</string>
-    <string name="licenses">Licences</string>
-    <string name="light_theme_name">Acīmredzot balts</string>
-    <string name="listeners_label">Klausītāji</string>
-    <string name="listing_files">Listing files</string>
-    <string name="loading_products">Loading products…</string>
-    <string name="login">Login</string>
-    <string name="lyrics">Vārdi</string>
-    <string name="made_with_love">Radīts Indijā ar ❤️</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Kļūda</string>
-    <string name="md_storage_perm_error">Atļauju kļūda</string>
-    <string name="message_backup_create_success">Dublējums izveidots veiksmīgi.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s ir Pro funkcija.</string>
-    <string name="message_restore_success">Atjaunošana veikta veiksmīgi.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
-    <string name="my_name">Vārds</string>
-    <string name="my_top_tracks">Visbiežāk atskaņotās</string>
-    <string name="never">Nekad</string>
-    <string name="new_music_mix">New Music Mix</string>
-    <string name="new_playlist_title">Jauns atskaņošanas saraksts</string>
-    <string name="new_start_directory">%s is the new start directory.</string>
-    <string name="next_song">Nākamā dziesma</string>
-    <string name="no_albums">Jums nav mūzikas albumu</string>
-    <string name="no_artists">You have no artists</string>
-    <string name="no_audio_ID">"Vispirms atskaņojiet kaut ko, tad mēģiniet vēlreiz."</string>
-    <string name="no_backups_found">Rezerves kopija nav atrasta</string>
-    <string name="no_equalizer">Ekvalaizeris nav atrasts</string>
-    <string name="no_genres">You have no genres</string>
-    <string name="no_lyrics_found">Dziesmas vārdi nav atrasti</string>
-    <string name="no_playing_queue">Šobrīd nekas netiek atskaņots</string>
-    <string name="no_playlists">You have no playlists</string>
-    <string name="no_purchase_found">No purchase found.</string>
-    <string name="no_results">Nav rezultātu</string>
-    <string name="no_songs">Jums nav mūzikas</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Normal lyrics</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> is not listed in the media store.]]></string>
-    <string name="not_recently_played">Nav nesen atskaņots</string>
-    <string name="nothing_to_scan">Nothing to scan.</string>
-    <string name="nothing_to_see">Nothing to see</string>
-    <string name="notification">Paziņojums</string>
-    <string name="notification_settings_summary">Mainīt paziņojuma stilu</string>
-    <string name="now_playing">Pašlaik atskaņo</string>
-    <string name="now_playing_queue">Pašreizējā atskaņošanas rinda</string>
-    <string name="now_playing_summary">Customize the now playing screen</string>
-    <string name="now_playing_themes">9+ now playing themes</string>
-    <string name="only_on_wifi">Tikai izmantojot Wi-Fi</string>
-    <string name="other_settings_summary">Advanced testing features</string>
-    <string name="others">Cits</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">Parole</string>
-    <string name="past_three_months">Past 3 months</string>
-    <string name="paste_lyrics_here">Ielīmēt vārdus šeit</string>
-    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
-    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
-    <string name="permission_title">Piekļuve krātuvei</string>
-    <string name="permissions_denied">Atļauja liegta.</string>
-    <string name="personalize">Personalizēt</string>
-    <string name="personalize_settings_summary">Customize your now playing and UI controls</string>
-    <string name="pick_from_local_storage">Pick from local storage</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-    <string name="plain">Plain</string>
-    <string name="playList_already_exits">Atskaņošanas saraksts jau pastāv</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Atskaņošnas Iestatījumi</string>
-    <string name="playback_speed">Atskaņošanas ātrums</string>
-    <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
-    <string name="playing_notification_name">Playing notification</string>
-    <string name="playlist_created_sucessfully">%s izveidots veiksmīgi</string>
-    <string name="playlist_is_empty">Atskaņošanas saraksts ir tukšs</string>
-    <string name="playlist_name_empty">Atskaņošanas saraksta nosaukums</string>
-    <string name="playlists">Atskaņošanas saraksti</string>
-    <string name="pref_blur_amount_summary">Izpludināšanas līmenis, kas tiek piemērots motīviem ar izpludinātiem elementiem. Jo zemāka vērtiba, jo ātrāk tiek izpludināts</string>
-    <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Šķirot mūziku pēc ilguma</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Advanced</string>
-    <string name="pref_header_album">Album style</string>
-    <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Pevienot melnajam sarakstam</string>
-    <string name="pref_header_controls">Vadība</string>
-    <string name="pref_header_general">Motīvs</string>
-    <string name="pref_header_images">Attēli</string>
-    <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">Bloķēšanas ekrāns</string>
-    <string name="pref_header_playlists">Atskaņošanas saraksti</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Aptur dziesmu, kad skaļums ir 0, un atsāk atskaņošanu, kad skaļums tiek palielināts. Strādā arī ārpus lietotnes</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Apturēt atskaņošanu, ja skaļums ir 0</string>
-    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
-    <string name="pref_keep_screen_on_title">Paturēt ekrānu ieslēgtu</string>
-    <string name="pref_language_name">Atlasīt valodu</string>
-    <string name="pref_snow_fall_title">Snow fall effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">Use the currently playing song album cover as the lockscreen wallpaper</string>
-    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
-    <string name="pref_summary_audio_ducking">Samazināt skaļumu, kad tiek atskaņota sistēmas skaņa vai ir saņemts paziņojums</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Sākt atskaņošanu uzreiz pēc bluetooth ierīces pievienošanas</string>
-    <string name="pref_summary_blurred_album_art">Izpludināt albuma attēlu bloķēšanas ekrānā. Var rasties problēmas ar trešo pušu lietotnēm un logrīkiem</string>
-    <string name="pref_summary_carousel_effect">Carousel effect for the album art in the now playing screen. Note that Card and Blur Card themes won\'t work</string>
-    <string name="pref_summary_classic_notification">Izmontot standarta paziņojuma dizainu</string>
-    <string name="pref_summary_colored_app">The background and control button colors change according to the album art from the now playing screen</string>
-    <string name="pref_summary_colored_app_shortcuts">Colors the app shortcuts in the accent color. Every time you change the color please toggle this to take effect</string>
-    <string name="pref_summary_colored_notification">"Colors the notification in the album cover\u2019s vibrant color"</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">Kā norādīts Material design standartos, tumšajā režīmā krāsu piesātinājumam ir jābūt mazākam</string>
-    <string name="pref_summary_expand_now_playing_panel">Uzspiežot uz paziņojumatiks rādīts tas, kas pašreiz tiek atskaņots, nevis sākuma ekrāns</string>
-    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
-    <string name="pref_summary_gapless_playback">"Dažām ierīcēm var radīt atskaņošanas problēmas."</string>
-    <string name="pref_summary_home_banner">Rādīt vai slēpt sākuma baneri</string>
-    <string name="pref_summary_ignore_media_store_artwork">Can increase the album cover quality, but causes slower image loading times. Only enable this if you have problems with low resolution artworks</string>
-    <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
-    <string name="pref_summary_lock_screen">Use Retro Music\'s custom lockscreen controls</string>
-    <string name="pref_summary_manage_audio_focus">Vienmēr atskaņot audio, pat tad, ja tajā pašā brīdī tiek atskaņots kas cits</string>
-    <string name="pref_summary_open_source_licences">Licences skaidrojums atvērtā pirmkoda programmatūrām</string>
-    <string name="pref_summary_pause_history">Kad iespējots, nesen atskaņotas dziesmas netiks rādītas vēsturē</string>
-    <string name="pref_summary_remember_tab">Atverot doties uz pēdējā reizē atvērto cilni</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Rādīt jaunās mūzikas miksli sākuma ekrānā</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">Immersive mode</string>
-    <string name="pref_summary_toggle_headset">Sākt atskaņošanu uzreiz pēc austiņu pieslēgšanas</string>
-    <string name="pref_summary_toggle_shuffle">Jaukšana tiks izslēgta atskaņojot jaunu mūziku</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_wallpaper_accent">Iegūt akcenta krāsu no ekrāna tapetes</string>
-    <string name="pref_summary_whitelist">Rādīt mūziku tikai no /Music mapes</string>
-    <string name="pref_title_album_art_on_lockscreen">Rādīt albuma vāku</string>
-    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
-    <string name="pref_title_album_cover_style">Album cover theme</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_appbar_mode">Virsraksta izskats</string>
-    <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">Automātiski lejupielādēt izpildītāju attēlus</string>
-    <string name="pref_title_blacklist">Pevienot melnajam sarakstam</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">Blur album cover</string>
-    <string name="pref_title_circle_button">Circular play button</string>
-    <string name="pref_title_classic_notification">Classic notification design</string>
-    <string name="pref_title_colored_app">Adaptive color</string>
-    <string name="pref_title_colored_notification">Iekrāsots paziņojums</string>
-    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Izmantot Manrope fontu</string>
-    <string name="pref_title_desaturated_color">Nepiesātinātas krāsas</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
-    <string name="pref_title_extra_controls">Papildus vadība</string>
-    <string name="pref_title_extra_song_info">Dziesmas info</string>
-    <string name="pref_title_gapless_playback">Bezatstarpju atskaņošana</string>
-    <string name="pref_title_general_theme">Lietotnes motīvs</string>
-    <string name="pref_title_home_album_grid_style">Album grid</string>
-    <string name="pref_title_home_artist_grid_style">Artist grid</string>
-    <string name="pref_title_home_banner">Baneris</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignore Media Store covers</string>
-    <string name="pref_title_last_added_interval">Last added playlist interval</string>
-    <string name="pref_title_lock_screen">Fullscreen controls</string>
-    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Vārdu veids</string>
-    <string name="pref_title_manage_audio_focus">Vienmēr atskaņot</string>
-    <string name="pref_title_now_playing_screen_appearance">Now playing theme</string>
-    <string name="pref_title_open_source_licences">Atvērtā pirmkoda licences</string>
-    <string name="pref_title_pause_history">Apturēt vēsturi</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">Tab titles mode</string>
-    <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_full_screen">Fullscreen app</string>
-    <string name="pref_title_toggle_toggle_headset">Auto-play</string>
-    <string name="pref_title_toggle_toggle_shuffle">Shuffle mode</string>
-    <string name="pref_title_toggle_volume">Volume controls</string>
-    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profile</string>
-    <string name="purchase">Iegādāties</string>
-    <string name="queue">Atskaņošanas rinda</string>
-    <string name="rate_app">Novērtēt lietotni</string>
-    <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>
-    <string name="recent_albums">Nesenie albumi</string>
-    <string name="recent_artists">Recent artists</string>
-    <string name="remove_action">Noņemt</string>
-    <string name="remove_cover">Noņemt albuma vāku</string>
-    <string name="remove_from_blacklist">Izņemt no melnā saraksta</string>
-    <string name="remove_image">Noņemt attēlu</string>
-    <string name="remove_song_from_playlist_title">Izņemt dziesmu no atskaņošanas saraksta</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Izņemt dziesmu <b>%1$s</b> no atskaņošanas saraksta?]]></string>
-    <string name="remove_songs_from_playlist_title">Izņemt dziesmas no atskaņošanas saraksta</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Izņemt <b>%1$d</b> dziesams no atskaņošanas saraksta?]]></string>
-    <string name="rename_playlist_title">Mainīt atskaņošanas saraksta nosaukumu</string>
-    <string name="replace_cover">Mainīt albuma vāku</string>
-    <string name="report_an_issue">Ziņot par problēmu</string>
-    <string name="report_bug">Ziņot par kļūdu</string>
-    <string name="reset_action">Atiestatīt</string>
-    <string name="reset_artist_image">Atiestatīt izpildītāja attēlu</string>
-    <string name="restore">Atjaunot</string>
-    <string name="restore_message">Vai vēlaties atjaunot no rezerves kopijas?</string>
-    <string name="restored_previous_purchase_please_restart">Iepriekšējais pirkums atjaunots. Lūdzu, restartējiet lietotni, lai varētu lietot visas funkcijas.</string>
-    <string name="restored_previous_purchases">Iepriekšējais pirkums atjaunots veiksmīgi.</string>
-    <string name="restoring_purchase">Pirkums tiek atjaunots…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
-    <string name="ringtone_title">Ringtone (Optional)</string>
-    <string name="saf_delete_failed">Faila dzēšana neizdevās: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Can\'t get SAF URI</string>
-    <string name="saf_guide_slide1_description">Open navigation drawer</string>
-    <string name="saf_guide_slide1_description_before_o">Enable \'Show SD card\' in overflow menu</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s needs SD card access</string>
-    <string name="saf_guide_slide2_description">You need to select your SD card root directory</string>
-    <string name="saf_guide_slide2_title">Select your SD card in navigation drawer</string>
-    <string name="saf_guide_slide3_description">Do not open any sub-folders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_write_failed">File write failed: %s</string>
-    <string name="save">Saglabāt</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Saglabāt kā failu</string>
-    <string name="save_playlists_title">Saglabāt kā failus</string>
-    <string name="saved_playlist_to">Saved playlist to %s.</string>
-    <string name="saving_changes">Saving changes</string>
-    <string name="scan_media">Scan media</string>
-    <string name="scanned_files">Scanned %1$d of %2$d files.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Select all</string>
-    <string name="selected">Selected</string>
-    <string name="set">Set</string>
-    <string name="set_artist_image">Set artist image</string>
-    <string name="share_app">Share app</string>
-    <string name="share_summary">Share the app with your friends and family</string>
-    <string name="share_to_stories">Share to Stories</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">Jaukt</string>
-    <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">Sleep timer canceled.</string>
-    <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
-    <string name="social">Social</string>
-    <string name="social_stories">Share story</string>
-    <string name="song">Song</string>
-    <string name="song_duration">Song duration</string>
-    <string name="songs">Songs</string>
-    <string name="sort_order">Kārtošanas secība</string>
-    <string name="sort_order_a_z">Augošā secībā</string>
-    <string name="sort_order_album">Albums</string>
-    <string name="sort_order_artist">Izpildītājs</string>
-    <string name="sort_order_composer">Komponists</string>
-    <string name="sort_order_date">Pievienošanas datums</string>
-    <string name="sort_order_date_modified">Labošanas datums</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Dziesmu skaits</string>
-    <string name="sort_order_num_songs_desc">Dziesmu skaits dilstošā secībā</string>
-    <string name="sort_order_year">Gads</string>
-    <string name="sort_order_z_a">Dilstošā secībā</string>
-    <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
-    <string name="speech_prompt">Search your library</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">Sākt atskaņot mūziku.</string>
-    <string name="suggestion_songs">Ieteikumi</string>
-    <string name="support_development">Atbalstīt izstrādi</string>
-    <string name="swipe_to_unlock">Velciet ar pirkstu, lai atbloķētu</string>
-    <string name="synced_lyrics">Synced lyrics</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Join the Telegram group to discuss bugs, make suggestions, show off and more</string>
-    <string name="thank_you">Thank you!</string>
-    <string name="the_audio_file">The audio file</string>
-    <string name="this_month">This month</string>
-    <string name="this_week">This week</string>
-    <string name="this_year">This year</string>
-    <string name="tiny">Tiny</string>
-    <string name="tiny_card_style">Tiny card</string>
-    <string name="title">Title</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">Today</string>
-    <string name="top_albums">Top albums</string>
-    <string name="top_artists">Top artists</string>
-    <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
-    <string name="track_list">Dziesmas numurs</string>
-    <string name="translate">Tulkot</string>
-    <string name="translate_community">Palīdziet mums pārtulkot lietotni Jūsu valodā</string>
-    <string name="try_retro_music_premium">Izmēģināt Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Kopīgot Jūsu dizainu ar Retro Music</string>
-    <string name="unlabeled">Unlabeled</string>
-    <string name="unplayable_file">Šo dziesmu nevarēja atskaņot.</string>
-    <string name="up_next">Up next</string>
-    <string name="update_image">Update image</string>
-    <string name="updating">Updating…</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">User Name</string>
-    <string name="username">Username</string>
-    <string name="version">Version</string>
-    <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">Skatīt Telegram</string>
-    <string name="volume">Skaļums</string>
-    <string name="web_search">Meklēt tīmeklī</string>
-    <string name="website">Mājaslapa</string>
-    <string name="website_summary">Apskatiet mūsu mājaslapu</string>
-    <string name="welcome">Sveicināti,</string>
-    <string name="what_do_you_want_to_share">What do you want to share?</string>
-    <string name="whats_new">Kas jauns</string>
-    <string name="window">Logs</string>
-    <string name="window_corner_edges">Noapaļoti stūri</string>
-    <string name="x_has_been_set_as_ringtone">Iestatīt %1$s kā zvana signālu.</string>
-    <string name="x_selected">%1$d atlasīts</string>
-    <string name="year">Gads</string>
-    <string name="you_have_to_select_at_least_one_category">Ir jāizvēlas vismaz viena sadaļa.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-</resources>
diff --git a/app/src/main/res/values-ml-rIN/strings.xml b/app/src/main/res/values-ml-rIN/strings.xml
index 6b8258ba1..a167f6da1 100644
--- a/app/src/main/res/values-ml-rIN/strings.xml
+++ b/app/src/main/res/values-ml-rIN/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">പ്രിയപ്പെട്ടവയിലേയ്ക്ക് ചേർക്കുക</string>
     <string name="action_add_to_playing_queue">ക്യൂലേക് ആഡ് ചെയ്യൂ</string>
     <string name="action_add_to_playlist">പ്ലേലിസ്റ്റിലേക്ക് ആഡ് ചെയ്യുക</string>
-    <string name="action_cancel">Cancel</string>
     <string name="action_cast">കാസ്റ്റ്</string>
     <string name="action_clear_playing_queue">നിലവിൽ ഉള്ള ക്യൂ ക്ലിയർ ചെയ്യൂ</string>
     <string name="action_cycle_repeat">Cycle repeat mode</string>
@@ -57,7 +56,7 @@
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
     <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
-    <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
+    <string name="added_x_titles_to_playing_queue">Added %d titles to the playing queue.</string>
     <string name="album">Album</string>
     <plurals name="albumSongs">
         <item quantity="one">Song</item>
@@ -91,8 +90,6 @@
     <string name="biography">Biography</string>
     <string name="black_theme_name">Just Black</string>
     <string name="blacklist">Blacklist</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
     <string name="blur">Blur</string>
     <string name="blur_card">Blur Card</string>
     <string name="bug_report_failed">Unable to send report</string>
@@ -106,7 +103,6 @@
     <string name="bug_report_no_password">Please enter your valid GitHub password</string>
     <string name="bug_report_no_title">Please enter an issue title</string>
     <string name="bug_report_no_username">Please enter your valid GitHub username</string>
-    <string name="bug_report_success">Bug report successful</string>
     <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
     <string name="bug_report_use_account">Send using GitHub account</string>
     <string name="buy_now">Buy now</string>
@@ -130,7 +126,6 @@
     <string name="clear_playing_queue">Clear queue</string>
     <string name="color">Color</string>
     <string name="colors">Colors</string>
-    <string name="compact">Compact</string>
     <string name="composer">Composer</string>
     <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
     <string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
@@ -173,15 +168,8 @@
     <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
     <string name="empty">Empty</string>
     <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
     <string name="faq">FAQ</string>
     <string name="favorites">Favorites</string>
-    <string name="file_already_exists">File already exists</string>
     <string name="finish_last_song">Finish last song</string>
     <string name="fit">Fit</string>
     <string name="flat">Flat</string>
@@ -197,7 +185,6 @@
     <string name="genres">Genres</string>
     <string name="git_hub_summary">Fork the project on GitHub</string>
     <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -235,7 +222,6 @@
     <string name="labeled">Labeled</string>
     <string name="last_added">Last added</string>
     <string name="last_song">Last song</string>
-    <string name="lets_go">Let\'s go</string>
     <string name="library_categories">Library categories</string>
     <string name="licenses">Licenses</string>
     <string name="light_theme_name">Clearly White</string>
@@ -248,12 +234,6 @@
     <string name="material">Material</string>
     <string name="md_error_label">Error</string>
     <string name="md_storage_perm_error">Permission error</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
     <string name="my_name">Name</string>
     <string name="my_top_tracks">Most played</string>
     <string name="never">Never</string>
@@ -294,7 +274,6 @@
     <string name="paste_lyrics_here">Paste Lyrics Here</string>
     <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
     <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
     <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
     <string name="permission_title">Storage Access</string>
@@ -357,26 +336,25 @@
     <string name="pref_summary_ignore_media_store_artwork">Can increase the album cover quality, but causes slower image loading times. Only enable this if you have problems with low resolution artworks</string>
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="pref_summary_lock_screen">Use Retro Music\'s custom lockscreen controls</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">License details for open source software</string>
     <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
     <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
     <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
     <string name="pref_summary_toggle_full_screen">Immersive mode</string>
     <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</string>
     <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</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_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
     <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
     <string name="pref_title_album_cover_style">Album cover theme</string>
     <string name="pref_title_album_cover_transform">Album cover skip</string>
     <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
     <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Auto-download artist images</string>
@@ -403,7 +381,6 @@
     <string name="pref_title_lock_screen">Fullscreen controls</string>
     <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pref_title_now_playing_screen_appearance">Now playing theme</string>
     <string name="pref_title_open_source_licences">Open source licences</string>
     <string name="pref_title_pause_history">Pause history</string>
@@ -411,7 +388,6 @@
     <string name="pref_title_show_lyrics">Show lyrics</string>
     <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">Tab titles mode</string>
     <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
     <string name="pref_title_toggle_full_screen">Fullscreen app</string>
@@ -420,6 +396,7 @@
     <string name="pref_title_toggle_volume">Volume controls</string>
     <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
     <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
     <string name="profile">Profile</string>
@@ -498,7 +475,6 @@
     <string name="sort_order_composer">Composer</string>
     <string name="sort_order_date">Date added</string>
     <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_default">Default</string>
     <string name="sort_order_num_songs">Song count</string>
     <string name="sort_order_num_songs_desc">Song count desc</string>
     <string name="sort_order_year">Year</string>
@@ -558,4 +534,5 @@
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-my-rMM/strings.xml b/app/src/main/res/values-my-rMM/strings.xml
index 30294269b..d66ea1ada 100644
--- a/app/src/main/res/values-my-rMM/strings.xml
+++ b/app/src/main/res/values-my-rMM/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">အကြိုက်ဆုံးသို့ထည့်မည်</string>
     <string name="action_add_to_playing_queue">နားထောင်နေသည့်စာရင်းထဲသို့ထည့်မည်</string>
     <string name="action_add_to_playlist">Playlist သို့ထည့်မည်</string>
-    <string name="action_cancel">ပယ်ဖျက်မည်</string>
     <string name="action_cast">Cast</string>
     <string name="action_clear_playing_queue">နားထောင်နေသည့်စာရင်းအားရှင်းမည်</string>
     <string name="action_cycle_repeat">Cycle repeat mode</string>
@@ -89,8 +88,6 @@
     <string name="biography">အတ္ထုပတ္တိ</string>
     <string name="black_theme_name">အနက်ရောင်သာ</string>
     <string name="blacklist">လစ်လျူရှုမည့်စာရင်း</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
     <string name="blur">Blur</string>
     <string name="blur_card">ကတ်အဝါး</string>
     <string name="bug_report_failed">သတင်းပို့၍မရနိုင်ပါ</string>
@@ -104,7 +101,6 @@
     <string name="bug_report_no_password">ကျေးဇူးပြု၍ မှန်ကန်သော Github password ကိုဖြည့်သွင်းပါ</string>
     <string name="bug_report_no_title">ကျေးဇူးပြု၍အကြောင်းအရာခေါင်းစဉ်အားဖြည့်သွင်းပါ</string>
     <string name="bug_report_no_username">ကျေးဇူးပြု၍ မှန်ကန်သော Github username ကိုဖြည့်သွင်းပါ</string>
-    <string name="bug_report_success">Bug report successful</string>
     <string name="bug_report_summary">မသိထားတဲ့ Error တစ်ခုတက်ခဲ့တယ်ဆိုပါစို့။ ဆက်ပြီး Crash ဖြစ်နေတယ်ဆိုရင် \"Clear App Data\" လုပ်ပါ (ဒါမှမဟုတ်) အီးမေးလ်ပို့ပါ။</string>
     <string name="bug_report_use_account">GitHub အကောင့်ဖြင့်ပို့မည်</string>
     <string name="buy_now">ယခုဝယ်မည်</string>
@@ -128,7 +124,6 @@
     <string name="clear_playing_queue">နားထောင်နေသည့်စာရင်းအားရှင်းမည်</string>
     <string name="color">အရောင်</string>
     <string name="colors">အရောင်များ</string>
-    <string name="compact">Compact</string>
     <string name="composer">တေးရေးဆရာ</string>
     <string name="copied_device_info_to_clipboard">Device အချက်အလက်အား Clipboard သို့ ကော်ပီကူးခဲ့ပြီး</string>
     <string name="could_not_create_playlist">Playlist ဖန်တီး၍မရပါ</string>
@@ -171,15 +166,8 @@
     <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
     <string name="empty">ဘာမှမရှိပါ</string>
     <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
     <string name="faq">မေးလေ့ရှိသောမေးခွန်းများ</string>
     <string name="favorites">အကြိုက်ဆုံး</string>
-    <string name="file_already_exists">File already exists</string>
     <string name="finish_last_song">Finish last song</string>
     <string name="fit">အနေတော်</string>
     <string name="flat">အပြားပုံစံ</string>
@@ -195,7 +183,6 @@
     <string name="genres">အမျိုးအစားများ</string>
     <string name="git_hub_summary">Project ကို GitHub မှာ Fork လုပ်ပါ</string>
     <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</string>
     <string name="grid_size_1">၁</string>
     <string name="grid_size_2">၂</string>
     <string name="grid_size_3">၃</string>
@@ -233,7 +220,6 @@
     <string name="labeled">Label ထိုးထားမည်</string>
     <string name="last_added">နောက်ဆုံးသွင်းထားသော</string>
     <string name="last_song">နောက်ဆုံးအပုဒ်</string>
-    <string name="lets_go">Let\'s go</string>
     <string name="library_categories">Tab အမျိုးအစားများ</string>
     <string name="licenses">လိုင်စင်များ</string>
     <string name="light_theme_name">အဖြူရောင်သက်သက်</string>
@@ -246,12 +232,6 @@
     <string name="material">Material</string>
     <string name="md_error_label">Error</string>
     <string name="md_storage_perm_error">Storage ခွင့်ပြုချက် error</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
     <string name="my_name">နာမည်</string>
     <string name="my_top_tracks">အများဆုံးနားထောင်ခဲ့သော</string>
     <string name="never">ဘယ်တော့မှ</string>
@@ -292,7 +272,6 @@
     <string name="paste_lyrics_here">Paste Lyrics Here</string>
     <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
     <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">External Storage ကြည့်ရှုခွင့်အားငြင်းပယ်ခဲ့သည်။</string>
     <string name="permission_summary">သီချင်းဖွင့်ရန်အတွက် ယခု App အား Storage ကြည့်ရှုခွင့်ပေးရန်လိုသည်။</string>
     <string name="permission_title">Storage ကြည့်ရှုခွင့်</string>
@@ -355,26 +334,25 @@
     <string name="pref_summary_ignore_media_store_artwork">Album cover အရည်အသွေးပိုမိုကောင်းမွန်လာနိုင်သော်လည်း Loading time ပိုကြာနိုင်သည်။ အရည်အသွေးနိမ့်သောပုံများနှင့်အဆင်မပြေမှသာလျှင် ဤခလုတ်ကိုဖွင့်ပါ။</string>
     <string name="pref_summary_library_categories">Library category များ ဖော်ခြင်း၊ ဖျောက်ခြင်းနှင့် အထားအသိုများ ချိန်ညှိမည်</string>
     <string name="pref_summary_lock_screen">Retro Music ၏ ပြင်ဆင်ထားသော Lockscreen controls များကိုသုံးမည်</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">Open Source software အတွက် လိုင်စင်အချက်အလက်များ</string>
     <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
     <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
     <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
     <string name="pref_summary_toggle_full_screen">Immersive mode</string>
     <string name="pref_summary_toggle_headset">နားကြပ်နှင့်ချိတ်ဆက်ပြီးသည့်နှင့် စတင် play မည်</string>
     <string name="pref_summary_toggle_shuffle">သီချင်းဖွင့်မည့်စာရင်း\'အသစ်\'ကို play သည့်အခါ Shuffle Mode ပိတ်သွားပါမည်</string>
     <string name="pref_summary_toggle_volume">နေရာလုံလုံလောက်လောက်ရှိပါက Now Playing screen တွင် အသံအတိုးအကျယ်ခလုတ်များပြသမည်</string>
     <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Album cover ပြသခြင်း</string>
     <string name="pref_title_album_artists_only">Album သီဆိုသူဖြင့် ရှာဖွေခြင်း</string>
     <string name="pref_title_album_cover_style">Album cover theme</string>
     <string name="pref_title_album_cover_transform">Album cover skip</string>
     <string name="pref_title_app_shortcuts">Colored App shortcuts</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
     <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">အဆိုတော်ဓာတ်ပုံများကို အလိုအလျောက်ဒေါင်းလုဒ်ဆွဲခြင်း</string>
@@ -401,7 +379,6 @@
     <string name="pref_title_lock_screen">Lockscreen အပြည့် controls</string>
     <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pref_title_now_playing_screen_appearance">Now playing theme</string>
     <string name="pref_title_open_source_licences">Open source licences</string>
     <string name="pref_title_pause_history">Pause history</string>
@@ -409,7 +386,6 @@
     <string name="pref_title_show_lyrics">Show lyrics</string>
     <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">Tab ခေါင်းစဉ်ပြသခြင်း</string>
     <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
     <string name="pref_title_toggle_full_screen">App ကို screen အပြည့်ထားမည်</string>
@@ -418,8 +394,9 @@
     <string name="pref_title_toggle_volume">အသံထိန်းချုပ်မှု</string>
     <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
+    <string name="pro_summary">Black theme ၊ Now playing themes နှင့် Carousel effect စသည်များ...</string>
     <string name="profile">Profile</string>
     <string name="purchase">ဝယ်ယူမည်</string>
     <string name="queue">နားထောင်နေသည့်စာရင်း</string>
@@ -496,7 +473,6 @@
     <string name="sort_order_composer">တေးရေးဆရာ</string>
     <string name="sort_order_date">ထည့်သွင်းသည့်ရက်</string>
     <string name="sort_order_date_modified">ပြင်ဆင်သည့်ရက်</string>
-    <string name="sort_order_default">Default</string>
     <string name="sort_order_num_songs">အပုဒ်အရေအတွက်</string>
     <string name="sort_order_num_songs_desc">အပုဒ်အရေအတွက်ပြောင်းပြန်</string>
     <string name="sort_order_year">ထွက်ရှိသည့်နှစ်</string>
@@ -556,4 +532,5 @@
     <string name="you_have_to_select_at_least_one_category">အနည်းဆုံး category တစ်ခုရွေးချယ်ရန်လိုအပ်သည်</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Issue tracker website သို့ခေါ်ဆောင်သွားပါမည်</string>
     <string name="your_account_data_is_only_used_for_authentication">သင့်အကောင့်အချက်အလက်ကို အတည်ပြုရန်အတွက်သာအသုံးပြုပါသည်။</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index 33a2b2f6b..66c2e3508 100644
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -15,7 +15,7 @@
 <resources>
 
     <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Dark</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="roundSelector">@drawable/round_selector</item>
@@ -25,6 +25,5 @@
         <item name="materialCardViewStyle">@style/Widget.MaterialComponents.CardView</item>
         <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index cd45bb5ce..b09adfb63 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -15,7 +15,7 @@
 <resources>
 
     <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Dark</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="roundSelector">@drawable/round_selector</item>
@@ -25,6 +25,7 @@
         <item name="colorSurface">@color/darkColorSurface</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
+
+    <style name="mcab_theme" parent="@style/ThemeOverlay.MaterialComponents.Dark" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 070ec270a..492fb1ffc 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Toevoegen aan favorieten</string>
     <string name="action_add_to_playing_queue">Voeg toe aan afspeel wachtrij</string>
     <string name="action_add_to_playlist">Voeg toe aan afspeellijst...</string>
-    <string name="action_cancel">Annuleer huidige timer</string>
     <string name="action_cast">Casten</string>
     <string name="action_clear_playing_queue">Afspeel wachtrij legen</string>
     <string name="action_cycle_repeat">Wissel herhalingmodus</string>
@@ -20,7 +19,7 @@
     <string name="action_go_to_album">Ga naar album </string>
     <string name="action_go_to_artist">Ga naar artiest</string>
     <string name="action_go_to_genre">Ga naar genre</string>
-    <string name="action_go_to_lyrics">Ga naar Songtekst</string>
+    <string name="action_go_to_lyrics">Go to Lyrics</string>
     <string name="action_go_to_start_directory">Ga naar begin directory</string>
     <string name="action_grant">Geef toestemming</string>
     <string name="action_grid_size">Raster grootte</string>
@@ -55,7 +54,7 @@
     <string name="add_action">Toevoegen</string>
     <string name="add_playlist_title">"Toevogen aan afspeellijst"</string>
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">%1$d nummer(s) toegevoegd aan %2$s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"1 titel aan afspeel wachtrij toegevoegd."</string>
     <string name="added_x_titles_to_playing_queue">%1$d titels toegevoegd aan afspeel wachtrij</string>
     <string name="album">Album</string>
@@ -78,26 +77,24 @@
     <string name="app_widget_classic_name">Klassiek</string>
     <string name="app_widget_md3_name">MD3</string>
     <string name="app_widget_small_name">Klein</string>
-    <string name="app_widget_text_name">Minimale tekst</string>
+    <string name="app_widget_text_name">Minimal Text</string>
     <string name="artist">Artiest</string>
     <string name="artists">Artiesten</string>
-    <string name="audio_fade_duration">Audio fade duur</string>
+    <string name="audio_fade_duration">Audio fade duration</string>
     <string name="audio_focus_denied">Geluid focus geweigerd </string>
     <string name="audio_settings_summary">Wijzig de geluidsinstellingen en pas de equalizer aan</string>
     <string name="auto">Automatisch</string>
-    <string name="backup_restore_settings_summary">Back-up en herstel je instellingen, afspeellijsten</string>
-    <string name="backup_restore_title"><![CDATA[Back-up & Herstel]]></string>
-    <string name="backup_title">Back-ups</string>
+    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
+    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
+    <string name="backup_title">Backups</string>
     <string name="biography">Biografie</string>
     <string name="black_theme_name">Gewoon zwart</string>
     <string name="blacklist">Zwarte lijst</string>
-    <string name="bluetooth_summary">De app heeft nabije toestel toestemming nodig om te checken voor bluetooth toestellen</string>
-    <string name="bluetooth_title">Apparaten in de buurt</string>
     <string name="blur">Vervagen</string>
-    <string name="blur_card">Vervaag Kaart</string>
+    <string name="blur_card">Blur Card</string>
     <string name="bug_report_failed">Mislukt om het rapport te verzenden</string>
     <string name="bug_report_failed_invalid_token">Ongeldige toegangstoken. Neem alsjeblieft contact op met de app-ontwikkelaar.</string>
-    <string name="bug_report_failed_issues_not_available">Problemen zijn niet ingeschakeld voor de geselecteerde opslagplaats. Gelieve de app ontwikkelaar te contacteren.</string>
+    <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
     <string name="bug_report_failed_unknown">Er is een onverwachte fout opgetreden. Neem alsjeblieft contact op met de app-ontwikkelaar.</string>
     <string name="bug_report_failed_wrong_credentials">Verkeerde gebruikersnaam of wachtwoord</string>
     <string name="bug_report_issue">Probleem</string>
@@ -106,44 +103,42 @@
     <string name="bug_report_no_password">Vul alsjeblieft je geldig GitHub-wachtwoord in</string>
     <string name="bug_report_no_title">Vul alsjeblieft een titel voor het probleem in</string>
     <string name="bug_report_no_username">Vul alsjeblieft je geldig GitHub-gebruikersnaam in</string>
-    <string name="bug_report_success">Fout rapporteren succesvol</string>
     <string name="bug_report_summary">Een onverwachte fout is opgetreden. Het spijt me dat je deze bug tegengekomen bent. Als het blijft crashen, kies dan \"Clear app data\" of verstuur een email </string>
     <string name="bug_report_use_account">Verstuur door middel van je GitHub-account</string>
     <string name="buy_now">Kopen</string>
     <string name="cancel_current_timer">Annuleer huidige timer</string>
     <string name="card">Kaart</string>
-    <string name="card_color_style">Gekleurde Kaart</string>
-    <string name="card_square">Vierkante Kaart</string>
+    <string name="card_color_style">Colored Card</string>
+    <string name="card_square">Square Card</string>
     <string name="card_style">Kaart</string>
-    <string name="carousal_effect_on_now_playing_screen">Carrousel effect op het nu aan het spelen scherm</string>
-    <string name="cascading">Trapsgewijs</string>
+    <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
+    <string name="cascading">Cascading</string>
     <string name="changelog">Logboek</string>
     <string name="changelog_summary">Bekijk wat er nieuw is</string>
-    <string name="choose_image">Kies Afbeelding</string>
-    <string name="choose_restore_title">Kies wat u wil herstellen</string>
+    <string name="choose_image">Choose Image</string>
+    <string name="choose_restore_title">Choose what to restore</string>
     <string name="circle">Cirkel</string>
     <string name="circular">Rond</string>
     <string name="classic">Klassiek</string>
     <string name="clear_action">Legen</string>
     <string name="clear_blacklist">Leeg zwarte lijst</string>
-    <string name="clear_history">Geschiedenis Wissen</string>
+    <string name="clear_history">Clear History</string>
     <string name="clear_playing_queue">Maak wachtrij leeg</string>
     <string name="color">Kleur</string>
     <string name="colors">Kleuren</string>
-    <string name="compact">Compact</string>
     <string name="composer">Componist</string>
     <string name="copied_device_info_to_clipboard">Apparaatinfo is naar klembord gekopiëerd.</string>
     <string name="could_not_create_playlist">Kon geen afspeellijst maken.</string>
     <string name="could_not_download_album_cover">"Kon geen matchende album cover downloaden."</string>
-    <string name="could_not_restore_purchase">Kon aankoop niet herstellen.</string>
+    <string name="could_not_restore_purchase">Could not restore purchase.</string>
     <string name="could_not_scan_files">Kon %d files niet scannen.</string>
     <string name="create_action">Aanmaken</string>
     <string name="create_new_backup">Aanmaken</string>
     <string name="created_playlist_x">Afspeellijst %1$s aangemaakt.</string>
-    <string name="credit_title">Leden en bijdragers </string>
+    <string name="credit_title">Members and contributors </string>
     <string name="currently_listening_to_x_by_x">Nu luisterend naar %1$s van %2$s.</string>
-    <string name="custom_artist_images">Aangepaste artiestenafbeeldingen</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Deel Crash Rapport</string>
+    <string name="custom_artist_images">Custom Artist Images</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
     <string name="dark_theme_name">Soort van donker</string>
     <string name="delete_playlist_title">Afspeellijst verwijderen</string>
     <string name="delete_playlist_x"><![CDATA[Afspellijst <b>%1$s</b> verwijderen?]]></string>
@@ -160,7 +155,7 @@
     <string name="device_info">Apparaatinfo</string>
     <string name="dialog_message_set_ringtone">Sta Retro Music toe om audioinstellingen te wijzigen</string>
     <string name="dialog_title_set_ringtone">Stel in als beltoon</string>
-    <string name="disc_hint">Schijfnummer</string>
+    <string name="disc_hint">Disc Number</string>
     <string name="do_you_want_to_clear_the_blacklist">Wil je de zwarte lijst leegmaken?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Wil je <b>%1$s</b> verwijderen van de zwarte lijst?]]></string>
     <string name="donate">Doneren</string>
@@ -168,36 +163,28 @@
     <string name="donation_header">Koop mij een</string>
     <string name="done">Klaar</string>
     <string name="drive_mode">Rijmodus</string>
-    <string name="edit_fab">Bewerk knop</string>
-    <string name="edit_normal_lyrics">Muziek tekst bewerken</string>
-    <string name="edit_synced_lyrics">Gesynchroniseerde muziek tekst bewerken</string>
+    <string name="edit_fab">Edit Button</string>
+    <string name="edit_normal_lyrics">Edit Lyrics</string>
+    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
     <string name="empty">Leeg</string>
     <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Kon geen back-up maken</string>
-    <string name="error_delete_backup">Kon back-up niet verwijderen</string>
-    <string name="error_empty_name">Uw naam kan niet leeg zijn!</string>
-    <string name="error_load_failed">Laden mislukt</string>
-    <string name="error_share_file">Kon bestand niet delen</string>
-    <string name="expanded">Expanded</string>
     <string name="faq">Veelgestelde vragen</string>
     <string name="favorites">Favorieten</string>
-    <string name="file_already_exists">Bestand bestaat al</string>
-    <string name="finish_last_song">Eindig laatste nummer</string>
+    <string name="finish_last_song">Finish last song</string>
     <string name="fit">Fit</string>
     <string name="flat">Plat</string>
     <string name="folders">Mappen</string>
-    <string name="follow_system">Volg systeem</string>
-    <string name="for_you">Voor jou</string>
+    <string name="follow_system">Follow system</string>
+    <string name="for_you">For you</string>
     <string name="free">Gratis</string>
     <string name="full">Vol</string>
-    <string name="full_card">Volledige kaart</string>
+    <string name="full_card">Full card</string>
     <string name="general_settings_summary">Pas het thema en de kleuren van de app aan</string>
-    <string name="general_settings_title">Look en feel</string>
+    <string name="general_settings_title">Look and feel</string>
     <string name="genre">Genre</string>
     <string name="genres">Genres</string>
-    <string name="git_hub_summary">Fork het project op GitHub</string>
-    <string name="gradient">Gradiënt</string>
-    <string name="grant_access">Verleen toegang</string>
+    <string name="git_hub_summary">Fork the project on GitHub</string>
+    <string name="gradient">Gradient</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -208,15 +195,15 @@
     <string name="grid_size_8">8</string>
     <string name="grid_style_label">Rasterstijl</string>
     <string name="help_summary">Meer hulp nodig?</string>
-    <string name="hinge">Scharnier</string>
+    <string name="hinge">Hinge</string>
     <string name="history">Geschiedenis</string>
-    <string name="history_cleared">Geschiedenis gewist</string>
-    <string name="history_undo_button">Ongedaan maken</string>
+    <string name="history_cleared">History cleared</string>
+    <string name="history_undo_button">Undo</string>
     <string name="home">Start</string>
     <string name="horizontal_flip">Flip horizontaal</string>
     <string name="image">Afbeelding</string>
-    <string name="image_gradient">Gradiënt afbeelding</string>
-    <string name="image_settings_summary">Wijzig downloadinstellingen voor artiesten afbeeldingen</string>
+    <string name="image_gradient">Gradient image</string>
+    <string name="image_settings_summary">Change artist image download settings</string>
     <string name="import_label">Importeren</string>
     <string name="import_playlist">Importeer afspeellijst</string>
     <string name="import_playlist_message">Het importeert alle afspeellijsten binnenin de Android Media Store met nummers. Als de afspeellijst al bestaat, worden de nummers samengevoegd.</string>
@@ -228,15 +215,14 @@
     <string name="label_file_name">Bestandsnaam</string>
     <string name="label_file_path">Bestandslocatie</string>
     <string name="label_file_size">Grootte</string>
-    <string name="label_last_modified">Laatst gewijzigd</string>
+    <string name="label_last_modified">Last Modified</string>
     <string name="label_more_from">Meer van %s</string>
     <string name="label_sampling_rate">Samplingfrequentie</string>
     <string name="label_track_length">Duur</string>
     <string name="labeled">Labeled</string>
     <string name="last_added">Laatst toegevoegd</string>
     <string name="last_song">Vorige nummer</string>
-    <string name="lets_go">Let\'s go</string>
-    <string name="library_categories">Bibliotheek categorieën</string>
+    <string name="library_categories">Library categories</string>
     <string name="licenses">Licenties</string>
     <string name="light_theme_name">Clearly wit</string>
     <string name="listeners_label">Luisteraars</string>
@@ -248,12 +234,6 @@
     <string name="material">Materiaal</string>
     <string name="md_error_label">Fout</string>
     <string name="md_storage_perm_error">Toegangsfout</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Niet meer dan 5 items</string>
-    <string name="message_pro_feature">%s is een Pro-functie.</string>
-    <string name="message_restore_success">Herstellen succesvol voltooid.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hallo! <br>Welkom bij %s]]></string>
     <string name="my_name">Mijn naam</string>
     <string name="my_top_tracks">Mijn top tracks</string>
     <string name="never">Nooit</string>
@@ -264,7 +244,7 @@
     <string name="no_albums">Geen albums</string>
     <string name="no_artists">Geen artiesten</string>
     <string name="no_audio_ID">"Laat eerst een liedje afspelen, probeer dan opniew."</string>
-    <string name="no_backups_found">Geen Back-ups Gevonden</string>
+    <string name="no_backups_found">No Backups Found</string>
     <string name="no_equalizer">Geen equalizer gevonden.</string>
     <string name="no_genres">Je hebt geen genres</string>
     <string name="no_lyrics_found">Geen lyrics gevonden</string>
@@ -294,7 +274,6 @@
     <string name="paste_lyrics_here">Plak tekst/lyrics hier</string>
     <string name="paste_timeframe_lyrics_here">Plak timeframe tekst/lyrics hier</string>
     <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">Permissie voor toegang tot extern opslag is afgewezen</string>
     <string name="permission_summary">De app heeft toestemming nodig tot je apparaat\'s opslag om muziek af te kunnen spelen</string>
     <string name="permission_title">Toegang tot opslag</string>
@@ -305,36 +284,36 @@
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
     <string name="plain">Vlak</string>
-    <string name="playList_already_exits">Afspeellijst bestaat al</string>
+    <string name="playList_already_exits">Playlist already exists</string>
     <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Afspeel instellingen</string>
-    <string name="playback_speed">Afspeelsnelheid</string>
+    <string name="playback_settings">Playback Settings</string>
+    <string name="playback_speed">Playback Speed</string>
     <string name="playing_notification_description">De afspeel notificatie bied acties om af te spelen/pauzeren etc.</string>
     <string name="playing_notification_name">Afspeel notificatie</string>
-    <string name="playlist_created_sucessfully">%s succesvol aangemaakt</string>
+    <string name="playlist_created_sucessfully">%s created successfully</string>
     <string name="playlist_is_empty">Afspeellijst is leeg</string>
     <string name="playlist_name_empty">Naam afspeellijst</string>
     <string name="playlists">Afspeellijsten</string>
     <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
     <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Filter nummers op lengte</string>
+    <string name="pref_filter_song_summary">Filter songs by length</string>
     <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Geavanceerd</string>
-    <string name="pref_header_album">Album stijl</string>
+    <string name="pref_header_advanced">Advanced</string>
+    <string name="pref_header_album">Album style</string>
     <string name="pref_header_audio">Geluid</string>
     <string name="pref_header_blacklist">Zwarte lijst</string>
-    <string name="pref_header_controls">Bedieningselementen</string>
-    <string name="pref_header_general">Thema</string>
+    <string name="pref_header_controls">Controls</string>
+    <string name="pref_header_general">Theme</string>
     <string name="pref_header_images">Afbeeldingen</string>
-    <string name="pref_header_library">Bibliotheek</string>
+    <string name="pref_header_library">Library</string>
     <string name="pref_header_lockscreen">Vergrendelscherm</string>
     <string name="pref_header_playlists">Afspeellijsten</string>
     <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pauzeer op nul</string>
-    <string name="pref_keep_screen_on_summary">Houd er rekening mee dat het inschakelen van deze functie de levensduur van de batterij kan beïnvloeden</string>
-    <string name="pref_keep_screen_on_title">Houd het scherm aan</string>
-    <string name="pref_language_name">Taal selecteren</string>
-    <string name="pref_snow_fall_title">Sneeuwval effect</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
+    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
+    <string name="pref_keep_screen_on_title">Keep the screen on</string>
+    <string name="pref_language_name">Select language</string>
+    <string name="pref_snow_fall_title">Snow fall effect</string>
     <string name="pref_summary_album_art_on_lockscreen">Gebruik de huidige cover als vergrendelscherm achtergrond.</string>
     <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
     <string name="pref_summary_audio_ducking">Notificaties, bediening etc.</string>
@@ -350,45 +329,44 @@
     <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
     <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
     <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
-    <string name="pref_summary_extra_controls">Extra besturingselementen voor mini speler toevoegen</string>
+    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
     <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
     <string name="pref_summary_gapless_playback">"Kan afspeelproblemen veroorzaken op sommige toestellen"</string>
     <string name="pref_summary_home_banner">Show or hide the home banner</string>
     <string name="pref_summary_ignore_media_store_artwork">Kan album cover kwaliteit verbeteren, maar veroorzaakt langere laadtijden. Alleen aanzetten als je problemen hebt met lage resolutie artworks</string>
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="pref_summary_lock_screen">Zet besturing knoppen aan op vergrendelscherm</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">Licentie details voor open source software</string>
-    <string name="pref_summary_pause_history">Wanneer ingeschakeld, zullen nieuw afgespeelde nummers niet zichtbaar zijn in de geschiedenis</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
     <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Toon Nieuwe Muziek Mix op het startscherm</string>
+    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
     <string name="pref_summary_toggle_full_screen">Zet dit aan voor immersive mode</string>
     <string name="pref_summary_toggle_headset">Wanneer headphones ingeplugd zijn, afspelen start automatisch</string>
     <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</string>
     <string name="pref_summary_toggle_volume">Als er ruimte is in het nu afspelen scherm, zet volume knoppen aan</string>
-    <string name="pref_summary_wallpaper_accent">Haal accentkleur uit achtergrond</string>
+    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Laat album cover zien</string>
-    <string name="pref_title_album_artists_only">Navigeer via Album Artiest</string>
-    <string name="pref_title_album_cover_style">Album cover thema</string>
+    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
+    <string name="pref_title_album_cover_style">Album cover theme</string>
     <string name="pref_title_album_cover_transform">Album cover skip</string>
     <string name="pref_title_app_shortcuts">Gekleurde app snelkoppelingen</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Beperk volume bij verliezen focus</string>
     <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Automatisch downloaden artisten afbeeldingen</string>
     <string name="pref_title_blacklist">Zwarte lijst</string>
     <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
     <string name="pref_title_blurred_album_art">Vervaag album cover</string>
-    <string name="pref_title_circle_button">Ronde afspeelknop</string>
+    <string name="pref_title_circle_button">Circular play button</string>
     <string name="pref_title_classic_notification">Klassiek notificatie design</string>
     <string name="pref_title_colored_app">Aangepaste kleur</string>
     <string name="pref_title_colored_notification">Gekleurde notificatie</string>
     <string name="pref_title_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Gebruik Manrope lettertype</string>
+    <string name="pref_title_custom_font">Use Manrope font</string>
     <string name="pref_title_desaturated_color">Desaturated color</string>
     <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
     <string name="pref_title_extra_controls">Extra controls</string>
@@ -403,25 +381,24 @@
     <string name="pref_title_lock_screen">Volledig scherm besturing knoppen</string>
     <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Altijd afspelen</string>
     <string name="pref_title_now_playing_screen_appearance">Uiterlijk</string>
     <string name="pref_title_open_source_licences">Open source licenties</string>
-    <string name="pref_title_pause_history">Pauzeer geschiedenis</string>
+    <string name="pref_title_pause_history">Pause history</string>
     <string name="pref_title_remember_tab">Remember last tab</string>
     <string name="pref_title_show_lyrics">Show lyrics</string>
     <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">Tab titles mode</string>
     <string name="pref_title_toggle_carousel_effect">Carrousel-effect</string>
     <string name="pref_title_toggle_full_screen">Volledig scherm app</string>
     <string name="pref_title_toggle_toggle_headset">Automatisch afspelen</string>
     <string name="pref_title_toggle_toggle_shuffle">Shufflemodus</string>
     <string name="pref_title_toggle_volume">Volume knoppen</string>
-    <string name="pref_title_wallpaper_accent">Achtergrond accentkleur</string>
+    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
+    <string name="pro_summary">Donker thema, \"speelt nu\" thema\'s, Carrousel-effect en nog veel meer..</string>
     <string name="profile">Profiel</string>
     <string name="purchase">Kopen</string>
     <string name="queue">Wachtrij</string>
@@ -432,13 +409,13 @@
     <string name="remove_action">Verwijderen</string>
     <string name="remove_cover">Verwijder cover</string>
     <string name="remove_from_blacklist">Verwijder van zwarte lijst</string>
-    <string name="remove_image">Verwijder afbeelding</string>
+    <string name="remove_image">Remove Image</string>
     <string name="remove_song_from_playlist_title">Verwijder liedje van afspeellijst</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Verwijder liedje <b>%1$s</b> van de afspeellijst?]]></string>
     <string name="remove_songs_from_playlist_title">Verwijder liedjes van afspeellijst</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Verwijder liedjes <b>%1$d</b> van de afspeellijst?]]></string>
     <string name="rename_playlist_title">Hernoem afspeellijst</string>
-    <string name="replace_cover">Vervang Cover</string>
+    <string name="replace_cover">Replace Cover</string>
     <string name="report_an_issue">Een probleem melden</string>
     <string name="report_bug">Een bug rapporteren</string>
     <string name="reset_action">Resetten</string>
@@ -454,8 +431,8 @@
     <string name="ringtone_title">Beltoon (Optioneel)</string>
     <string name="saf_delete_failed">Bestand verwijderen gefaald: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">Kan SAF URI niet ophalen</string>
-    <string name="saf_guide_slide1_description">Navigatielade openen</string>
+    <string name="saf_error_uri">Can\'t get SAF URI</string>
+    <string name="saf_guide_slide1_description">Open navigation drawer</string>
     <string name="saf_guide_slide1_description_before_o">Enable \'Show SD card\' in overflow menu</string>
     <!-- SAF guide -->
     <string name="saf_guide_slide1_title">%s heeft toegang tot de SD-kaart nodig</string>
@@ -487,7 +464,7 @@
     <string name="sleep_timer_canceled">Slaap timer geannuleerd</string>
     <string name="sleep_timer_set">Slaap timer ingesteld in %d minuten vanaf nu</string>
     <string name="social">Social</string>
-    <string name="social_stories">Verhaal delen</string>
+    <string name="social_stories">Share story</string>
     <string name="song">Liedje</string>
     <string name="song_duration">Duur liedje</string>
     <string name="songs">Nummers</string>
@@ -496,18 +473,17 @@
     <string name="sort_order_album">Album</string>
     <string name="sort_order_artist">Artiest</string>
     <string name="sort_order_composer">Componist</string>
-    <string name="sort_order_date">Datum toegevoegd</string>
-    <string name="sort_order_date_modified">Datum aangepast</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Aantal nummers</string>
+    <string name="sort_order_date">Date added</string>
+    <string name="sort_order_date_modified">Date modified</string>
+    <string name="sort_order_num_songs">Song count</string>
     <string name="sort_order_num_songs_desc">Song count desc</string>
-    <string name="sort_order_year">Jaar</string>
+    <string name="sort_order_year">Year</string>
     <string name="sort_order_z_a">Descending</string>
     <string name="speech_not_supported">Sorry! Je apparaat ondersteunt geen spraak invoer</string>
     <string name="speech_prompt">Zoek door je bibliotheek</string>
     <string name="stack">Stack</string>
-    <string name="start_play_music">Begin muziek afspelen.</string>
-    <string name="suggestion_songs">Suggesties</string>
+    <string name="start_play_music">Start playing music.</string>
+    <string name="suggestion_songs">Suggestions</string>
     <string name="support_development">Ondersteun ontwikkelaars</string>
     <string name="swipe_to_unlock">Swipe to unlock</string>
     <string name="synced_lyrics">Synced lyrics</string>
@@ -520,42 +496,43 @@
     <string name="this_year">Dit jaar</string>
     <string name="tiny">Tiny</string>
     <string name="tiny_card_style">Tiny card</string>
-    <string name="title">Titel</string>
+    <string name="title">Title</string>
     <string name="title_new_backup">New Backup</string>
     <string name="today">Vandaag</string>
     <string name="top_albums">Top albums</string>
-    <string name="top_artists">Top Artiesten</string>
+    <string name="top_artists">Top artists</string>
     <string name="track_hint">"Nummer (2 voor nummer 2 of 3004 voor CD3 nummer 4)"</string>
     <string name="track_list">Track nummer</string>
     <string name="translate">Vertalen</string>
     <string name="translate_community">Help us translate the app to your language</string>
-    <string name="try_retro_music_premium">Probeer Retro Muziek Premium</string>
+    <string name="try_retro_music_premium">Try Retro Music Premium</string>
     <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Deel jouw ontwerp met Retro Muziek</string>
-    <string name="unlabeled">Niet gelabeld</string>
+    <string name="twitter_page_summary">Share your design with Retro Music</string>
+    <string name="unlabeled">Unlabeled</string>
     <string name="unplayable_file">Kon dit nummer niet afspelen </string>
     <string name="up_next">Volgende</string>
     <string name="update_image">Update afbeelding</string>
     <string name="updating">Bijwerken...</string>
     <string name="user_images_description">User Images</string>
     <string name="user_name">User Name</string>
-    <string name="username">Gebruikersnaam</string>
+    <string name="username">Username</string>
     <string name="version">Versie</string>
     <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">Bekijk op Telegram</string>
+    <string name="view_on_telegram">View on Telegram</string>
     <string name="volume">Volume</string>
     <string name="web_search">Web zoekopdracht</string>
     <string name="website">Website</string>
     <string name="website_summary">Check out our Website</string>
-    <string name="welcome">Welkom,</string>
+    <string name="welcome">Welcome,</string>
     <string name="what_do_you_want_to_share">Wat wil je delen?</string>
-    <string name="whats_new">Wat is er nieuw</string>
-    <string name="window">Venster</string>
-    <string name="window_corner_edges">Afgeronde hoeken</string>
+    <string name="whats_new">What\'s New</string>
+    <string name="window">Window</string>
+    <string name="window_corner_edges">Rounded corners</string>
     <string name="x_has_been_set_as_ringtone">Stel %1$s in als ringtone</string>
     <string name="x_selected">%1$d geselecteerd</string>
     <string name="year">Jaar</string>
-    <string name="you_have_to_select_at_least_one_category">Je moet ten minste één categorie selecteren.</string>
+    <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index bed25c0c5..f18f06ef4 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Dodaj do ulubionych</string>
     <string name="action_add_to_playing_queue">Dodaj do kolejki</string>
     <string name="action_add_to_playlist">Dodaj do playlisty</string>
-    <string name="action_cancel">Anuluj</string>
     <string name="action_cast">Przesyłaj</string>
     <string name="action_clear_playing_queue">Wyczyść kolejkę</string>
     <string name="action_cycle_repeat">Przełącz tryb powtarzania</string>
@@ -55,7 +54,7 @@
     <string name="add_action">Dodaj</string>
     <string name="add_playlist_title">"Dodaj do playlisty"</string>
     <string name="add_time_framed_lryics">Dodaj tekst z ramką czasową</string>
-    <string name="added_song_count_to_playlist">Dodano %1$d utworów do %2$s</string>
+    <string name="added_song_count_to_playlist">Dodano %1$d utwór(y/ów) do %2$s</string>
     <string name="added_title_to_playing_queue">"Dodano tytuł do kolejki odtwarzania"</string>
     <string name="added_x_titles_to_playing_queue">Dodano %1$d tytułów do kolejki</string>
     <string name="album">Album</string>
@@ -95,8 +94,6 @@
     <string name="biography">Biografia</string>
     <string name="black_theme_name">Czarny motyw</string>
     <string name="blacklist">Lista ignorowanych</string>
-    <string name="bluetooth_summary">Aplikacja potrzebuje uprawnień urządzeń w pobliżu do sprawdzania urządzeń Bluetooth</string>
-    <string name="bluetooth_title">Urządzenia w pobliżu</string>
     <string name="blur">Rozmycie</string>
     <string name="blur_card">Rozmyta Karta</string>
     <string name="bug_report_failed">Nie udało się wysłać raportu</string>
@@ -110,7 +107,6 @@
     <string name="bug_report_no_password">Wpisz poprawne hasło serwisu GitHub</string>
     <string name="bug_report_no_title">Wpisz tytuł problemu</string>
     <string name="bug_report_no_username">Wpisz poprawną nazwę użytkownika serwisu GitHub</string>
-    <string name="bug_report_success">Zgłoszenie błędu zakończone powodzeniem</string>
     <string name="bug_report_summary">Wystąpił nieoczekiwany błąd. Przepraszamy za wystąpienie tego problemu. Jeśli nie możesz korzystać z aplikacji – wyczyść dane aplikacji lub wyślij nam e-maila </string>
     <string name="bug_report_use_account">Wyślij używając konta serwisu GitHub</string>
     <string name="buy_now">Kup teraz</string>
@@ -123,7 +119,7 @@
     <string name="cascading">Kaskadowy</string>
     <string name="changelog">Lista zmian</string>
     <string name="changelog_summary">Sprawdź, co nowego</string>
-    <string name="choose_image">Wybierz obraz</string>
+    <string name="choose_image">Choose Image</string>
     <string name="choose_restore_title">Wybierz, co przywrócić</string>
     <string name="circle">Okrąg</string>
     <string name="circular">Okrągły</string>
@@ -134,7 +130,6 @@
     <string name="clear_playing_queue">Wyczyść kolejkę</string>
     <string name="color">Kolor</string>
     <string name="colors">Kolory</string>
-    <string name="compact">Kompaktowy</string>
     <string name="composer">Kompozytor</string>
     <string name="copied_device_info_to_clipboard">Skopiowano informacje o urządzeniu do schowka</string>
     <string name="could_not_create_playlist">Nie udało się utworzyć playlisty.</string>
@@ -177,15 +172,8 @@
     <string name="edit_synced_lyrics">Edytuj zsynchronizowany tekst</string>
     <string name="empty">Pusto</string>
     <string name="equalizer">Korektor dźwięku</string>
-    <string name="error_create_backup">Nie udało się utworzyć kopii zapasowej</string>
-    <string name="error_delete_backup">Nie udało się usunąć kopii zapasowej</string>
-    <string name="error_empty_name">Imię nie może być puste!</string>
-    <string name="error_load_failed">Nie udało się załadować</string>
-    <string name="error_share_file">Nie udało się udostępnić pliku</string>
-    <string name="expanded">Rozszerzony</string>
     <string name="faq">Najczęściej zadawane pytania</string>
     <string name="favorites">Ulubione</string>
-    <string name="file_already_exists">Plik już istnieje</string>
     <string name="finish_last_song">Dokończ ostatni utwór</string>
     <string name="fit">Dopasuj</string>
     <string name="flat">Płaski</string>
@@ -201,7 +189,6 @@
     <string name="genres">Gatunki</string>
     <string name="git_hub_summary">Zobacz kod na GitHubie</string>
     <string name="gradient">Gradient</string>
-    <string name="grant_access">Przyznaj dostęp</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -239,7 +226,6 @@
     <string name="labeled">Podpisano</string>
     <string name="last_added">Ostatnio dodane</string>
     <string name="last_song">Ostatni utwór</string>
-    <string name="lets_go">Zaczynajmy</string>
     <string name="library_categories">Kategorie biblioteki</string>
     <string name="licenses">Licencje</string>
     <string name="light_theme_name">Jasny</string>
@@ -252,14 +238,8 @@
     <string name="material">Materialistyczny</string>
     <string name="md_error_label">Błąd</string>
     <string name="md_storage_perm_error">Błąd uprawnień</string>
-    <string name="message_backup_create_success">Kopia zapasowa utworzona pomyślnie.</string>
-    <string name="message_limit_tabs">Nie więcej niż 5 elementów</string>
-    <string name="message_pro_feature">%s jest funkcją wersji Pro.</string>
-    <string name="message_restore_success">Przywracanie zakończone pomyślnie.</string>
-    <string name="message_updated">Zaktualizowano</string>
-    <string name="message_welcome"><![CDATA[Witaj! <br>Zapraszamy do %s]]></string>
     <string name="my_name">Imię</string>
-    <string name="my_top_tracks">Najczęściej odtw.</string>
+    <string name="my_top_tracks">Najczęściej odtwarzane</string>
     <string name="never">Nigdy</string>
     <string name="new_music_mix">Nowy miks muzyki</string>
     <string name="new_playlist_title">Nowa playlista</string>
@@ -298,7 +278,6 @@
     <string name="paste_lyrics_here">Wklej tekst tutaj</string>
     <string name="paste_timeframe_lyrics_here">Wklej tutaj tekst utworu z ramami czasowymi</string>
     <string name="peek">Podgląd</string>
-    <string name="permission_bluetooth_denied">Odmowa dostępu do urządzeń w pobliżu.</string>
     <string name="permission_external_storage_denied">Odmowa dostępu do pamięci zewnętrznej.</string>
     <string name="permission_summary">Potrzebujemy uprawnień do pamięci urządzenia, aby odtwarzać muzykę</string>
     <string name="permission_title">Dostęp do pamięci</string>
@@ -361,26 +340,25 @@
     <string name="pref_summary_ignore_media_store_artwork">Może zwiększyć jakość okładki albumu, ale powoduje spowolnienie ładowania obrazu. Włącz tę opcję tylko jeśli masz problemy z okładkami o niskiej rozdzielczości.</string>
     <string name="pref_summary_library_categories">Dostosuj widoczność i kolejność kategorii bibliotek.</string>
     <string name="pref_summary_lock_screen">Użyj niestandardowych przycisków kontroli na ekranie blokady</string>
-    <string name="pref_summary_manage_audio_focus">Zawsze odtwarzaj dźwięk w tle niezależnie od tego, co jest odtwarzane</string>
     <string name="pref_summary_open_source_licences">Szczegóły licencji oprogramowania typu open source</string>
     <string name="pref_summary_pause_history">Gdy włączone, nowo odtworzone utwory nie będą wyświetlane w historii</string>
     <string name="pref_summary_remember_tab">Przejdź do ostatnio używanej zakładki przy starcie</string>
     <string name="pref_summary_show_lyrics">Wyświetla zsynchronizowane teksty piosenek nad okładką albumu</string>
     <string name="pref_summary_suggestions">Pokaż Nowy miks muzyki na ekranie głównym</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Włącza możliwość zmiany utworu przesuwając w dowolnym miejscu na ekranie odtwarzania</string>
-    <string name="pref_summary_swipe_to_dismiss">Przesuń w dół, aby zamknąć mini odtwarzacz</string>
     <string name="pref_summary_toggle_full_screen">Tryb imersji</string>
     <string name="pref_summary_toggle_headset">Rozpocznij odtwarzanie po podłączeniu zestawu słuchawkowego</string>
     <string name="pref_summary_toggle_shuffle">Odtwarzanie losowe zostanie wyłączone podczas odtwarzania nowej listy utworów</string>
     <string name="pref_summary_toggle_volume">Pokaż sterowanie głośnością w odtwarzaczu, gdy jest wystarczająco wolnego miejsca</string>
     <string name="pref_summary_wallpaper_accent">Wyodrębnij kolor akcentu z tapety</string>
     <string name="pref_summary_whitelist">Pokazuj muzykę tylko z folderu /Music</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Pokaż okładkę albumu</string>
     <string name="pref_title_album_artists_only">Nawiguj przez wykonawcę albumu</string>
     <string name="pref_title_album_cover_style">Wygląd okładki albumu</string>
     <string name="pref_title_album_cover_transform">Przesuwanie okładki albumu</string>
     <string name="pref_title_app_shortcuts">Kolorowe skróty aplikacji</string>
-    <string name="pref_title_appbar_mode">Styl nagłówka</string>
+    <string name="pref_title_appbar_mode">Tryb paska aplikacji</string>
     <string name="pref_title_audio_ducking">Zmniejsz głośność przy braku skupienia</string>
     <string name="pref_title_audio_fade">Zanikanie dźwięku</string>
     <string name="pref_title_auto_download_artist_images">Automatycznie pobierz grafiki wykonawców</string>
@@ -407,7 +385,6 @@
     <string name="pref_title_lock_screen">Sterowanie pełnoekranowe</string>
     <string name="pref_title_lyrics_screen_on">Pozostaw włączony ekran podczas wyświetlania tekstu utworu</string>
     <string name="pref_title_lyrics_type">Typ tekstu utworu</string>
-    <string name="pref_title_manage_audio_focus">Zawsze odtwarzaj</string>
     <string name="pref_title_now_playing_screen_appearance">Wyglądodtwarzacza</string>
     <string name="pref_title_open_source_licences">Licencje typu Open Source</string>
     <string name="pref_title_pause_history">Wstrzymaj historię</string>
@@ -415,7 +392,6 @@
     <string name="pref_title_show_lyrics">Pokaż teksty utworów</string>
     <string name="pref_title_suggestions">Pokaż sugestie</string>
     <string name="pref_title_swipe_anywhere_now_playing">Przesuń gdziekolwiek, aby zmienić utwór</string>
-    <string name="pref_title_swipe_to_dismiss">Odrzuć przesunięciem w dół</string>
     <string name="pref_title_tab_text_mode">Wygląd tytułów kart</string>
     <string name="pref_title_toggle_carousel_effect">Efekt karuzeli</string>
     <string name="pref_title_toggle_full_screen">Aplikacja pełnoekranowa</string>
@@ -424,6 +400,7 @@
     <string name="pref_title_toggle_volume">Sterowanie głośnością</string>
     <string name="pref_title_wallpaper_accent">Kolor akcentu z tapety</string>
     <string name="pref_title_whitelist">Muzyka z listy dozwolonych</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
     <string name="pro_summary">Czarny motyw, motywy teraz odtwarzanych, efekt karuzeli i wiele więcej..</string>
     <string name="profile">Profil</string>
@@ -436,7 +413,7 @@
     <string name="remove_action">Usuń</string>
     <string name="remove_cover">Usuń okładkę</string>
     <string name="remove_from_blacklist">Usuń z listy ignorowanych</string>
-    <string name="remove_image">Usuń obraz</string>
+    <string name="remove_image">Remove Image</string>
     <string name="remove_song_from_playlist_title">Usuń utwór z playlisty</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Usunąć utwór <b>%1$s</b> z playlisty?]]></string>
     <string name="remove_songs_from_playlist_title">Usuń utwory z playlisty</string>
@@ -502,7 +479,6 @@
     <string name="sort_order_composer">Kompozytor</string>
     <string name="sort_order_date">Data dodania</string>
     <string name="sort_order_date_modified">Data modyfikacji</string>
-    <string name="sort_order_default">Domyślnie</string>
     <string name="sort_order_num_songs">Liczba utworów</string>
     <string name="sort_order_num_songs_desc">Liczba utworów malejąco</string>
     <string name="sort_order_year">Rok</string>
@@ -562,4 +538,5 @@
     <string name="you_have_to_select_at_least_one_category">Zaznacz przynajmniej jedną kategorię</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Zostaniesz przekierowany do strony ze zgłoszeniami.</string>
     <string name="your_account_data_is_only_used_for_authentication">Informacje o twoim koncie są używane tylko do autoryzacji.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 95a14162e..005cdfee7 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Adicionar aos favoritos</string>
     <string name="action_add_to_playing_queue">Adicionar à fila</string>
     <string name="action_add_to_playlist">Adicionar à playlist</string>
-    <string name="action_cancel">Cancelar</string>
     <string name="action_cast">Transmitir</string>
     <string name="action_clear_playing_queue">Limpar a fila</string>
     <string name="action_cycle_repeat">Alternar entre modos de repetição</string>
@@ -55,7 +54,7 @@
     <string name="add_action">Adicionar</string>
     <string name="add_playlist_title">"Adicionar à playlist"</string>
     <string name="add_time_framed_lryics">Adicionar Letras Sincronizadas</string>
-    <string name="added_song_count_to_playlist">%1$d Música(s) adicionada(s) a %2$s</string>
+    <string name="added_song_count_to_playlist">%1$d música(s) adicionada(s) para %2$s</string>
     <string name="added_title_to_playing_queue">"1 música foi adicionada à fila."</string>
     <string name="added_x_titles_to_playing_queue">%1$d músicas foram adicionadas à fila.</string>
     <string name="album">Álbum</string>
@@ -91,8 +90,6 @@
     <string name="biography">Biografia</string>
     <string name="black_theme_name">Totalmente preto</string>
     <string name="blacklist">Lista negra</string>
-    <string name="bluetooth_summary">O aplicativo precisa de permissão de dispositivos próximos para verificar por dispositivo “bluetooth”</string>
-    <string name="bluetooth_title">Dispositivos próximos</string>
     <string name="blur">Desfoque</string>
     <string name="blur_card">Cartão Desfocado</string>
     <string name="bug_report_failed">Não é possível enviar o relatório</string>
@@ -106,7 +103,6 @@
     <string name="bug_report_no_password">Por favor, digite sua senha válida do GitHub</string>
     <string name="bug_report_no_title">Por favor, insira um título do problema</string>
     <string name="bug_report_no_username">Por favor, digite seu nome de usuário válido do GitHub</string>
-    <string name="bug_report_success">Erro reportado com sucesso</string>
     <string name="bug_report_summary">Um erro inesperado ocorreu. Se você tentar novamente e o erro persistir, use a opção \"Limpar dados do aplicativo\" ou envie-nos um e-mail</string>
     <string name="bug_report_use_account">Enviar usando uma conta do GitHub</string>
     <string name="buy_now">Comprar agora</string>
@@ -119,7 +115,7 @@
     <string name="cascading">Cascata</string>
     <string name="changelog">Lista de mudanças</string>
     <string name="changelog_summary">Veja o que há de novo</string>
-    <string name="choose_image">Chotos Imagem</string>
+    <string name="choose_image">Escolha a imagem</string>
     <string name="choose_restore_title">Selecione o que será restaurado</string>
     <string name="circle">Círculo</string>
     <string name="circular">Circular</string>
@@ -130,7 +126,6 @@
     <string name="clear_playing_queue">Limpar fila</string>
     <string name="color">Cor</string>
     <string name="colors">Cores</string>
-    <string name="compact">Compacto</string>
     <string name="composer">Compositor</string>
     <string name="copied_device_info_to_clipboard">Informações do dispositivo copiadas para a área de transferência.</string>
     <string name="could_not_create_playlist">Não foi possível criar a playlist.</string>
@@ -173,15 +168,8 @@
     <string name="edit_synced_lyrics">Editar Letras Sincronizadas</string>
     <string name="empty">Vazio</string>
     <string name="equalizer">Equalizador</string>
-    <string name="error_create_backup">Não foi possível criar um backup</string>
-    <string name="error_delete_backup">Não foi possível excluir o backup</string>
-    <string name="error_empty_name">Seu nome não pode estar em branco!</string>
-    <string name="error_load_failed">Falha ao carregar</string>
-    <string name="error_share_file">Não foi possível salvar o arquivo</string>
-    <string name="expanded">Expandido</string>
     <string name="faq">Perguntas frequentes</string>
     <string name="favorites">Favoritos</string>
-    <string name="file_already_exists">O arquivo já existe</string>
     <string name="finish_last_song">Finalizar a última música</string>
     <string name="fit">Ajustar</string>
     <string name="flat">Plano</string>
@@ -197,7 +185,6 @@
     <string name="genres">Gêneros</string>
     <string name="git_hub_summary">Bifurcação do projeto no GitHub</string>
     <string name="gradient">Degradê</string>
-    <string name="grant_access">Conceder acesso</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -235,7 +222,6 @@
     <string name="labeled">Rotulado</string>
     <string name="last_added">Adições recentes</string>
     <string name="last_song">Última música</string>
-    <string name="lets_go">Vamos lá</string>
     <string name="library_categories">Categorias da biblioteca</string>
     <string name="licenses">Licenças</string>
     <string name="light_theme_name">Claramente Branco</string>
@@ -248,12 +234,6 @@
     <string name="material">Material</string>
     <string name="md_error_label">Erro</string>
     <string name="md_storage_perm_error">Erro de permissão</string>
-    <string name="message_backup_create_success">Backup criado com sucesso.</string>
-    <string name="message_limit_tabs">Não mais do que 5 itens</string>
-    <string name="message_pro_feature">%s é um recurso Pro.</string>
-    <string name="message_restore_success">Restauração concluída com sucesso.</string>
-    <string name="message_updated">Atualizado</string>
-    <string name="message_welcome"><![CDATA[Olá! <br>Bem-vindo ao %s]]></string>
     <string name="my_name">Nome</string>
     <string name="my_top_tracks">Mais tocadas</string>
     <string name="never">Nunca</string>
@@ -294,7 +274,6 @@
     <string name="paste_lyrics_here">Colar Letras Aqui</string>
     <string name="paste_timeframe_lyrics_here">Colar letras sincronizadas aqui</string>
     <string name="peek">Espiada</string>
-    <string name="permission_bluetooth_denied">Permissão de dispositivos próximos negada.</string>
     <string name="permission_external_storage_denied">Permissão para acessar o armazenamento externo negada.</string>
     <string name="permission_summary">O aplicativo precisa de permissão para acessar o armazenamento do seu dispositivo para reproduzir músicas</string>
     <string name="permission_title">Acesso ao Armazenamento</string>
@@ -357,26 +336,25 @@
     <string name="pref_summary_ignore_media_store_artwork">Pode aumentar a qualidade da capa do álbum, mas diminui a velocidade de carregamento. Ative isso apenas se você tiver problemas com capas de baixa resolução</string>
     <string name="pref_summary_library_categories">Configurar visibilidade e ordem das categorias da biblioteca.</string>
     <string name="pref_summary_lock_screen">Usar controles personalizados do Retro Music na tela de bloqueio</string>
-    <string name="pref_summary_manage_audio_focus">Sempre reproduzir o áudio em segundo plano independentemente de qualquer coisa que esteja sendo reproduzida</string>
     <string name="pref_summary_open_source_licences">Detalhes da licença para software de código aberto</string>
     <string name="pref_summary_pause_history">Quando ativado, as músicas tocadas recentemente não serão exibidas no histórico</string>
     <string name="pref_summary_remember_tab">Navegar para a última guia usada ao iniciar</string>
     <string name="pref_summary_show_lyrics">Exibir letras sincronizadas sobre a capa do álbum</string>
     <string name="pref_summary_suggestions">Mostrar \"Mix de Novas Músicas\" na tela inicial</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Permite mudar a música deslizando em qualquer lugar na tela em reprodução</string>
-    <string name="pref_summary_swipe_to_dismiss">Deslize para baixo para dispensar o mini player</string>
     <string name="pref_summary_toggle_full_screen">Modo imersivo</string>
     <string name="pref_summary_toggle_headset">Começar a reproduzir imediatamente após os fones de ouvido forem conectados</string>
     <string name="pref_summary_toggle_shuffle">O modo aleatório será desativado ao reproduzir uma nova lista de músicas</string>
     <string name="pref_summary_toggle_volume">Se houver espaço suficiente, mostrar os controles de volume na tela de reprodução</string>
     <string name="pref_summary_wallpaper_accent">Extraia a cor de destaque do papel de parede</string>
     <string name="pref_summary_whitelist">Somente mostrar músicas da pasta /Music</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Exibir a capa do álbum</string>
     <string name="pref_title_album_artists_only">Navegar pelo Artista do Álbum</string>
     <string name="pref_title_album_cover_style">Tema da capa do álbum</string>
     <string name="pref_title_album_cover_transform">Pular a capa do álbum</string>
     <string name="pref_title_app_shortcuts">Colorir os atalhos do aplicativo</string>
-    <string name="pref_title_appbar_mode">Estilo do cabeçalho</string>
+    <string name="pref_title_appbar_mode">Modo de barra de aplicativos</string>
     <string name="pref_title_audio_ducking">Reduzir o volume durante perda de foco</string>
     <string name="pref_title_audio_fade">Desvanecer áudio</string>
     <string name="pref_title_auto_download_artist_images">Baixar automaticamente as imagens dos artistas</string>
@@ -403,7 +381,6 @@
     <string name="pref_title_lock_screen">Controles em tela cheia</string>
     <string name="pref_title_lyrics_screen_on">Manter a tela ligada ao mostrar as letras</string>
     <string name="pref_title_lyrics_type">Tipo de letra</string>
-    <string name="pref_title_manage_audio_focus">Sempre reproduzir</string>
     <string name="pref_title_now_playing_screen_appearance">Tema da tela de reprodução</string>
     <string name="pref_title_open_source_licences">Licenças de código aberto</string>
     <string name="pref_title_pause_history">Pausar histórico</string>
@@ -411,7 +388,6 @@
     <string name="pref_title_show_lyrics">Mostrar letras</string>
     <string name="pref_title_suggestions">Mostrar sugestões</string>
     <string name="pref_title_swipe_anywhere_now_playing">Deslize em qualquer lugar para mudar a música</string>
-    <string name="pref_title_swipe_to_dismiss">Dispensar com deslize para baixo</string>
     <string name="pref_title_tab_text_mode">Modo de títulos nas guias</string>
     <string name="pref_title_toggle_carousel_effect">Efeito carrossel</string>
     <string name="pref_title_toggle_full_screen">Aplicativo em tela cheia</string>
@@ -420,8 +396,9 @@
     <string name="pref_title_toggle_volume">Controles do volume</string>
     <string name="pref_title_wallpaper_accent">Cor de destaque do papel de parede</string>
     <string name="pref_title_whitelist">Lista branca</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Tema escuro, Temas na tela de reprodução, Efeito carrossel e mais..</string>
+    <string name="pro_summary">Tema escuro, temas da tela de reprodução, efeito carrossel e mais..</string>
     <string name="profile">Perfil</string>
     <string name="purchase">Comprar</string>
     <string name="queue">Fila</string>
@@ -432,7 +409,7 @@
     <string name="remove_action">Remover</string>
     <string name="remove_cover">Remover capa</string>
     <string name="remove_from_blacklist">Remover da lista negra</string>
-    <string name="remove_image">Remover Imagem</string>
+    <string name="remove_image">Remover imagem</string>
     <string name="remove_song_from_playlist_title">Remover música da playlist</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Remover a música <b>%1$s</b> da playlist?]]></string>
     <string name="remove_songs_from_playlist_title">Remover músicas da playlist</string>
@@ -498,7 +475,6 @@
     <string name="sort_order_composer">Compositor</string>
     <string name="sort_order_date">Data adicionada</string>
     <string name="sort_order_date_modified">Data de alteração</string>
-    <string name="sort_order_default">Padrão</string>
     <string name="sort_order_num_songs">Quantidade de músicas (crescente)</string>
     <string name="sort_order_num_songs_desc">Quantidade de músicas (decrescente)</string>
     <string name="sort_order_year">Ano</string>
@@ -558,4 +534,5 @@
     <string name="you_have_to_select_at_least_one_category">Você precisa selecionar ao menos uma categoria.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Você será encaminhado para o website de rastreio de problemas.</string>
     <string name="your_account_data_is_only_used_for_authentication">Os dados da sua conta são usados ​​apenas para autenticação.</string>
+    <string name="bug_report_success">Falha reportada com sucesso</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index bdd5108e6..3d704b3ae 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Adicionar aos favoritos</string>
     <string name="action_add_to_playing_queue">Adicionar à fila de reprodução</string>
     <string name="action_add_to_playlist">Adicionar à lista</string>
-    <string name="action_cancel">Cancelar</string>
     <string name="action_cast">Transmitir</string>
     <string name="action_clear_playing_queue">Limpar fila de reprodução</string>
     <string name="action_cycle_repeat">Modo de repetição</string>
@@ -20,7 +19,7 @@
     <string name="action_go_to_album">Ir para o álbum</string>
     <string name="action_go_to_artist">Ir para o artista</string>
     <string name="action_go_to_genre">Ir para género</string>
-    <string name="action_go_to_lyrics">Ir para Letras</string>
+    <string name="action_go_to_lyrics">Go to Lyrics</string>
     <string name="action_go_to_start_directory">Ir para diretoria inicial</string>
     <string name="action_grant">Conceder</string>
     <string name="action_grid_size">Tamanho da grelha</string>
@@ -55,7 +54,7 @@
     <string name="add_action">Adicionar</string>
     <string name="add_playlist_title">"Adicionar à lista"</string>
     <string name="add_time_framed_lryics">Adicionar letras do cronograma</string>
-    <string name="added_song_count_to_playlist">%1$d música(s) adicionada(s) a %2$s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Adicionada 1 música à fila."</string>
     <string name="added_x_titles_to_playing_queue">Adicionadas %1$d músicas à fila.</string>
     <string name="album">Álbum</string>
@@ -81,18 +80,16 @@
     <string name="app_widget_text_name">Texto mínimo</string>
     <string name="artist">Artista</string>
     <string name="artists">Artistas</string>
-    <string name="audio_fade_duration">Duração da transição</string>
+    <string name="audio_fade_duration">Audio fade duration</string>
     <string name="audio_focus_denied">Foco de áudio negado.</string>
     <string name="audio_settings_summary">Alterar as definições de som e ajustar o equalizador</string>
     <string name="auto">Auto</string>
-    <string name="backup_restore_settings_summary">Copiar e restaurar as suas definições, listas</string>
-    <string name="backup_restore_title"><![CDATA[Cópia e restauro]]></string>
-    <string name="backup_title">Cópias</string>
+    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
+    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
+    <string name="backup_title">Backups</string>
     <string name="biography">Biografia</string>
     <string name="black_theme_name">Apenas preto</string>
     <string name="blacklist">Lista negra</string>
-    <string name="bluetooth_summary">Esta aplicação necessita de permissão de dispositivos próximos para encontrar dispositivos Bluetooth</string>
-    <string name="bluetooth_title">Dispositivos próximos</string>
     <string name="blur">Desfocar</string>
     <string name="blur_card">Desfocar cartão</string>
     <string name="bug_report_failed">Não foi possível enviar o relatório</string>
@@ -106,7 +103,6 @@
     <string name="bug_report_no_password">Introduzir a sua palavra-passe do GitHub</string>
     <string name="bug_report_no_title">Introduzir título do problema</string>
     <string name="bug_report_no_username">Introduzir o seu utilizador do GitHub</string>
-    <string name="bug_report_success">Erro enviado com sucesso</string>
     <string name="bug_report_summary">Ocorreu um erro inesperado. Se continuar a acontecer limpe os dados da aplicação ou envie um email </string>
     <string name="bug_report_use_account">Enviar utilizando a conta GitHub</string>
     <string name="buy_now">Comprar agora</string>
@@ -119,18 +115,17 @@
     <string name="cascading">Cascata</string>
     <string name="changelog">Alterações</string>
     <string name="changelog_summary">Veja o que há de novo</string>
-    <string name="choose_image">Escolher imagem</string>
-    <string name="choose_restore_title">Escolher o que restaurar</string>
+    <string name="choose_image">Choose Image</string>
+    <string name="choose_restore_title">Choose what to restore</string>
     <string name="circle">Círculo</string>
     <string name="circular">Circular</string>
     <string name="classic">Clássico</string>
     <string name="clear_action">Limpar</string>
     <string name="clear_blacklist">Limpar lista negra</string>
-    <string name="clear_history">Limpar histórico</string>
+    <string name="clear_history">Clear History</string>
     <string name="clear_playing_queue">Limpar fila</string>
     <string name="color">Cor</string>
     <string name="colors">Cores</string>
-    <string name="compact">Compacto</string>
     <string name="composer">Compositor</string>
     <string name="copied_device_info_to_clipboard">Informações copiadas para área de transferências.</string>
     <string name="could_not_create_playlist">Não foi possível criar a lista.</string>
@@ -142,8 +137,8 @@
     <string name="created_playlist_x">Lista %1$s criada.</string>
     <string name="credit_title">Membros e contribuidores </string>
     <string name="currently_listening_to_x_by_x">A ouvir %1$s de %2$s.</string>
-    <string name="custom_artist_images">Imagens personalizadas de artistas</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Partilhar relatório de erro</string>
+    <string name="custom_artist_images">Custom Artist Images</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
     <string name="dark_theme_name">Meio escuro</string>
     <string name="delete_playlist_title">Eliminar lista</string>
     <string name="delete_playlist_x"><![CDATA[Eliminar a lista <b>%1$s</b>?]]></string>
@@ -160,7 +155,7 @@
     <string name="device_info">Info. do dispositivo</string>
     <string name="dialog_message_set_ringtone">Permitir que Música Retro modifique as definições de áudio</string>
     <string name="dialog_title_set_ringtone">Definir toque</string>
-    <string name="disc_hint">Número do disco</string>
+    <string name="disc_hint">Disc Number</string>
     <string name="do_you_want_to_clear_the_blacklist">Quer limpar a lista negra?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Quer remover <b>%1$s</b> da lista negra?]]></string>
     <string name="donate">Doar</string>
@@ -173,15 +168,8 @@
     <string name="edit_synced_lyrics">Editar letras sincronizadas</string>
     <string name="empty">Vazio</string>
     <string name="equalizer">Equalizador</string>
-    <string name="error_create_backup">Não foi possível criar cópia</string>
-    <string name="error_delete_backup">Não foi possível eliminar cópia</string>
-    <string name="error_empty_name">O nome não pode estar vazio!</string>
-    <string name="error_load_failed">O carregamento falhou</string>
-    <string name="error_share_file">Não foi possível partilhar o ficheiro</string>
-    <string name="expanded">Expandido</string>
     <string name="faq">FAQ</string>
     <string name="favorites">Favoritos</string>
-    <string name="file_already_exists">O ficheiro já existe</string>
     <string name="finish_last_song">Terminar a última música</string>
     <string name="fit">Ajustar</string>
     <string name="flat">Plano</string>
@@ -197,7 +185,6 @@
     <string name="genres">Géneros</string>
     <string name="git_hub_summary">Fork o projeto no Github</string>
     <string name="gradient">Gradiente</string>
-    <string name="grant_access">Conceder acesso</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -210,8 +197,8 @@
     <string name="help_summary">Necessita de ajuda?</string>
     <string name="hinge">Dobradiça</string>
     <string name="history">Histórico</string>
-    <string name="history_cleared">Histórico limpo</string>
-    <string name="history_undo_button">Anular</string>
+    <string name="history_cleared">History cleared</string>
+    <string name="history_undo_button">Undo</string>
     <string name="home">Início</string>
     <string name="horizontal_flip">Flip horizontal</string>
     <string name="image">Imagem</string>
@@ -228,14 +215,13 @@
     <string name="label_file_name">Nome</string>
     <string name="label_file_path">Caminho</string>
     <string name="label_file_size">Tamanho</string>
-    <string name="label_last_modified">Última modificação</string>
+    <string name="label_last_modified">Last Modified</string>
     <string name="label_more_from">Mais de %s</string>
     <string name="label_sampling_rate">Taxa de amostragem</string>
     <string name="label_track_length">Tamanho</string>
     <string name="labeled">Etiquetada</string>
     <string name="last_added">Última adicionada</string>
     <string name="last_song">Última música</string>
-    <string name="lets_go">Vamos lá</string>
     <string name="library_categories">Categorias</string>
     <string name="licenses">Licenças</string>
     <string name="light_theme_name">Claramente branco</string>
@@ -248,23 +234,17 @@
     <string name="material">Material</string>
     <string name="md_error_label">Erro</string>
     <string name="md_storage_perm_error">Erro de permissões</string>
-    <string name="message_backup_create_success">Cópia criada com sucesso</string>
-    <string name="message_limit_tabs">Não mais do que 5 itens</string>
-    <string name="message_pro_feature">%s é uma funcionalidade Pro</string>
-    <string name="message_restore_success">Restauro concluído com sucesso</string>
-    <string name="message_updated">Actualizado</string>
-    <string name="message_welcome"><![CDATA[Olá! <br>Bem-vindo a %s]]></string>
     <string name="my_name">Nome</string>
     <string name="my_top_tracks">Mais tocadas</string>
     <string name="never">Nunca</string>
-    <string name="new_music_mix">Novo mix de música</string>
+    <string name="new_music_mix">New Music Mix</string>
     <string name="new_playlist_title">Nova lista de reprodução</string>
     <string name="new_start_directory">%s é a nova directoria inicial.</string>
     <string name="next_song">Música seguinte</string>
     <string name="no_albums">Sem álbuns</string>
     <string name="no_artists">Sem artistas</string>
     <string name="no_audio_ID">"Toca uma música primeiro e tente novamente."</string>
-    <string name="no_backups_found">Sem cópias</string>
+    <string name="no_backups_found">No Backups Found</string>
     <string name="no_equalizer">Sem equalizadores</string>
     <string name="no_genres">Sem géneros</string>
     <string name="no_lyrics_found">Sem letras</string>
@@ -288,13 +268,12 @@
     <string name="only_on_wifi">Apenas em Wi-Fi</string>
     <string name="other_settings_summary">Funcionalidades avançadas</string>
     <string name="others">Outros</string>
-    <string name="over_cover">Sobre a capa</string>
+    <string name="over_cover">Over Cover</string>
     <string name="password">Palavra-passe</string>
     <string name="past_three_months">Últimos 3 meses</string>
     <string name="paste_lyrics_here">Colar letras aqui</string>
     <string name="paste_timeframe_lyrics_here">Colar letras do cronograma aqui</string>
-    <string name="peek">Espreitar</string>
-    <string name="permission_bluetooth_denied">Permissão de dispositivos próximos negada</string>
+    <string name="peek">Peek</string>
     <string name="permission_external_storage_denied">Permissão para aceder ao armazenamento externo negada.</string>
     <string name="permission_summary">Esta aplicação necessita de permissão para aceder ao armazenamento para tocar músicas</string>
     <string name="permission_title">Acesso ao armazenamento</string>
@@ -305,13 +284,13 @@
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">Seguir a página do Pinterest para inspiração de design Música Retro</string>
     <string name="plain">Plano</string>
-    <string name="playList_already_exits">A lista já existe</string>
-    <string name="playback_pitch">Tonalidade</string>
-    <string name="playback_settings">Definições de reprodução</string>
-    <string name="playback_speed">Velocidade de reprodução</string>
+    <string name="playList_already_exits">Playlist already exists</string>
+    <string name="playback_pitch">Pitch</string>
+    <string name="playback_settings">Playback Settings</string>
+    <string name="playback_speed">Playback Speed</string>
     <string name="playing_notification_description">A notificação de reprodução fornece acções para reprodução/pausa, etc.</string>
     <string name="playing_notification_name">Notificação de reprodução</string>
-    <string name="playlist_created_sucessfully">%s criado com sucesso</string>
+    <string name="playlist_created_sucessfully">%s created successfully</string>
     <string name="playlist_is_empty">A lista está vazia</string>
     <string name="playlist_name_empty">Nome da lista</string>
     <string name="playlists">Listas</string>
@@ -334,11 +313,11 @@
     <string name="pref_keep_screen_on_summary">Esta funcionalidade pode afectar a vida da bateria</string>
     <string name="pref_keep_screen_on_title">Manter o ecrã ligado</string>
     <string name="pref_language_name">Selecionar idioma</string>
-    <string name="pref_snow_fall_title">Efeito de neve caída</string>
+    <string name="pref_snow_fall_title">Snow fall effect</string>
     <string name="pref_summary_album_art_on_lockscreen">Utilizar a capa do álbum da música actual como papel de parede do ecrã de bloqueio</string>
     <string name="pref_summary_album_artists_only">Mostrar artistas do álbum na categoria do artista</string>
     <string name="pref_summary_audio_ducking">Diminuir o volume quando são reproduzidos sons de sistema ou notificações</string>
-    <string name="pref_summary_audio_fade">Transição quando a música é pausada ou reproduzida</string>
+    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
     <string name="pref_summary_blacklist">O conteúdo das pastas na lista negra está escondido da sua biblioteca.</string>
     <string name="pref_summary_bluetooth_playback">Começar a tocar assim que ligado ao dispositivo Bluetooth</string>
     <string name="pref_summary_blurred_album_art">Desfocar a capa do álbum no ecrã de bloqueio. Pode causar problemas com aplicações e widgets</string>
@@ -357,38 +336,37 @@
     <string name="pref_summary_ignore_media_store_artwork">Pode aumentar a qualidade da capa do álbum, mas aumenta o tempo de carregamento. Ligue apenas se tiver problemas com capas de baixa resolução</string>
     <string name="pref_summary_library_categories">Configurar visibilidade e ordem das categorias.</string>
     <string name="pref_summary_lock_screen">Utilizar os controlos personalizados do Música Retro</string>
-    <string name="pref_summary_manage_audio_focus">Reproduzir sempre áudio em segundo plano independentemente do que estiver a ser reproduzido</string>
     <string name="pref_summary_open_source_licences">Detalhes da licença do software open source</string>
-    <string name="pref_summary_pause_history">Quando activado, as músicas novas reproduzidas não vão aparecer no histórico</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Ir para o último separador ao iniciar</string>
-    <string name="pref_summary_show_lyrics">Mostrar letras por cima da capa do álbum</string>
-    <string name="pref_summary_suggestions">Mostrar o novo música mix no ecrã inicial</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Activar a mudança de música ao deslizar em qualquer lado no ecrã de A reproduzir agora</string>
-    <string name="pref_summary_swipe_to_dismiss">Deslizar para baixo para dispensar o mini leitor</string>
+    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
+    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
+    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
     <string name="pref_summary_toggle_full_screen">Modo imersivo</string>
     <string name="pref_summary_toggle_headset">Tocar imediatamente após ligar os auriculares</string>
     <string name="pref_summary_toggle_shuffle">O modo aleatório vai ser desligado ao reproduzir uma nova lista</string>
     <string name="pref_summary_toggle_volume">Se tiver espaço suficiente, mostrar os controlos de volume no ecrã A reproduzir</string>
-    <string name="pref_summary_wallpaper_accent">Extrair a cor através do papel de parede</string>
+    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Mostrar apenas músicas de /Music</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Mostrar capa do álbum</string>
     <string name="pref_title_album_artists_only">Navegar pelos artistas</string>
     <string name="pref_title_album_cover_style">Tema da capa do álbum</string>
     <string name="pref_title_album_cover_transform">Ignorar capa do álbum</string>
     <string name="pref_title_app_shortcuts">Atalhos coloridos</string>
-    <string name="pref_title_appbar_mode">Estilo de cabeçalho</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Reduzir volume na perda de foco</string>
-    <string name="pref_title_audio_fade">Desvanecer áudio</string>
+    <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Transferir imagens automaticamente</string>
     <string name="pref_title_blacklist">Lista negra</string>
     <string name="pref_title_bluetooth_playback">Reprodução Bluetooth</string>
     <string name="pref_title_blurred_album_art">Desfocar capa do álbum</string>
-    <string name="pref_title_circle_button">Botão circular de reprodução</string>
+    <string name="pref_title_circle_button">Circular play button</string>
     <string name="pref_title_classic_notification">Design de notificações clássico</string>
     <string name="pref_title_colored_app">Cor adaptável</string>
     <string name="pref_title_colored_notification">Notificações coloridas</string>
     <string name="pref_title_cross_fade">Crossfade (beta)</string>
-    <string name="pref_title_custom_font">Utilizar tipo de letra Manrope</string>
+    <string name="pref_title_custom_font">Use Manrope font</string>
     <string name="pref_title_desaturated_color">Cores não saturadas</string>
     <string name="pref_title_expand_now_playing_panel">Mostrar ecrã A reproduzir</string>
     <string name="pref_title_extra_controls">Controlos adicionais</string>
@@ -401,25 +379,24 @@
     <string name="pref_title_ignore_media_store_artwork">Ignorar capas da Media Store</string>
     <string name="pref_title_last_added_interval">Intervalo da última lista adicionada</string>
     <string name="pref_title_lock_screen">Controlos de ecrã inteiro</string>
-    <string name="pref_title_lyrics_screen_on">Manter o ecrã ligada ao mostrar letras</string>
-    <string name="pref_title_lyrics_type">Tipo de letras</string>
-    <string name="pref_title_manage_audio_focus">Reproduzir sempre</string>
+    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
+    <string name="pref_title_lyrics_type">Lyrics type</string>
     <string name="pref_title_now_playing_screen_appearance">Tema A reproduzir</string>
     <string name="pref_title_open_source_licences">Licenças open source</string>
-    <string name="pref_title_pause_history">Pausar histórico</string>
-    <string name="pref_title_remember_tab">Memorizar separador</string>
-    <string name="pref_title_show_lyrics">Mostrar letras</string>
-    <string name="pref_title_suggestions">Mostrar sugestões</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Deslizar em qualquer lado para alterar a música</string>
-    <string name="pref_title_swipe_to_dismiss">Dispensar ao deslizar para baixo</string>
+    <string name="pref_title_pause_history">Pause history</string>
+    <string name="pref_title_remember_tab">Remember last tab</string>
+    <string name="pref_title_show_lyrics">Show lyrics</string>
+    <string name="pref_title_suggestions">Show suggestions</string>
+    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
     <string name="pref_title_tab_text_mode">Títulos nos separadores</string>
     <string name="pref_title_toggle_carousel_effect">Efeito carrossel</string>
     <string name="pref_title_toggle_full_screen">Aplicação em ecrã inteiro</string>
     <string name="pref_title_toggle_toggle_headset">Reprod. automática</string>
     <string name="pref_title_toggle_toggle_shuffle">Modo aleatório</string>
     <string name="pref_title_toggle_volume">Controlos de volume</string>
-    <string name="pref_title_wallpaper_accent">Cor do papel de parede</string>
-    <string name="pref_title_whitelist">Lista segura de música</string>
+    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
+    <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
     <string name="pro_summary">Tema escuro, temas A reproduzir, efeito carrossel e muito mais..</string>
     <string name="profile">Perfil</string>
@@ -432,19 +409,19 @@
     <string name="remove_action">Remover</string>
     <string name="remove_cover">Remover capa</string>
     <string name="remove_from_blacklist">Remover da lista negra</string>
-    <string name="remove_image">Remover imagem</string>
+    <string name="remove_image">Remove Image</string>
     <string name="remove_song_from_playlist_title">Remover música da lista de reprodução</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Remover a música <b>%1$s</b> da lista de reprodução?]]></string>
     <string name="remove_songs_from_playlist_title">Remover músicas da lista de reprodução</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Remover <b>%1$d</b> músicas da lista de reprodução?]]></string>
     <string name="rename_playlist_title">Renomear lista</string>
-    <string name="replace_cover">Substituir capa</string>
+    <string name="replace_cover">Replace Cover</string>
     <string name="report_an_issue">Reportar um erro</string>
     <string name="report_bug">Reportar erro</string>
     <string name="reset_action">Repor</string>
     <string name="reset_artist_image">Repor imagem do artista</string>
     <string name="restore">Restaurar</string>
-    <string name="restore_message">Deseja restaurar a cópia?</string>
+    <string name="restore_message">Do you want to restore backup?</string>
     <string name="restored_previous_purchase_please_restart">Compra anterior restaurada. Reinicie a aplicação para utilizar todas as funcionalidades.</string>
     <string name="restored_previous_purchases">Compras anteriores restauradas.</string>
     <string name="restoring_purchase">A restaurar compras…</string>
@@ -498,7 +475,6 @@
     <string name="sort_order_composer">Compositor</string>
     <string name="sort_order_date">Data adicionado</string>
     <string name="sort_order_date_modified">Data modificado</string>
-    <string name="sort_order_default">Predefinido</string>
     <string name="sort_order_num_songs">Contagem de músicas</string>
     <string name="sort_order_num_songs_desc">Contagem decrescente</string>
     <string name="sort_order_year">Ano</string>
@@ -521,7 +497,7 @@
     <string name="tiny">Pequeno</string>
     <string name="tiny_card_style">Cartão pequeno</string>
     <string name="title">Título</string>
-    <string name="title_new_backup">Nova cópia</string>
+    <string name="title_new_backup">New Backup</string>
     <string name="today">Hoje</string>
     <string name="top_albums">Top álbuns</string>
     <string name="top_artists">Top artistas</string>
@@ -537,7 +513,7 @@
     <string name="up_next">A seguir</string>
     <string name="update_image">Actualizar imagem</string>
     <string name="updating">A actualizar…</string>
-    <string name="user_images_description">Imagens do utilizador</string>
+    <string name="user_images_description">User Images</string>
     <string name="user_name">Utilizador</string>
     <string name="username">Utilizador</string>
     <string name="version">Versão</string>
@@ -558,4 +534,5 @@
     <string name="you_have_to_select_at_least_one_category">Tem que seleccionar pelo menos uma categoria.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Vai ser reencaminhado para o site de rastreio de problemas.</string>
     <string name="your_account_data_is_only_used_for_authentication">As informações da sua conta são utilizadas apenas autenticação.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index e04b164dd..bfeb3bebb 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Adaugă la favorite</string>
     <string name="action_add_to_playing_queue">Adaugă la coada de redare</string>
     <string name="action_add_to_playlist">Adaugă la un playlist</string>
-    <string name="action_cancel">Anulează cronometrul curent</string>
     <string name="action_cast">Transmite</string>
     <string name="action_clear_playing_queue">Curăță coada de redare</string>
     <string name="action_cycle_repeat">Mod repetare ciclu</string>
@@ -35,11 +34,11 @@
     <string name="action_remove_from_favorites">Șterge din favorite</string>
     <string name="action_remove_from_playing_queue">Șterge din coada de redare</string>
     <string name="action_remove_from_playlist">Șterge din playlist</string>
-    <string name="action_rename">Redenumiți</string>
+    <string name="action_rename">redenumiți</string>
     <string name="action_save_playing_queue">Salvează coada de redare</string>
     <string name="action_scan">Scanează</string>
     <string name="action_search">Căutare</string>
-    <string name="action_set">Pornește</string>
+    <string name="action_set">Setare</string>
     <string name="action_set_as_ringtone">Setează ca ton de apel</string>
     <string name="action_set_as_start_directory">Setează ca registru principal</string>
     <string name="action_settings">"Setări"</string>
@@ -48,14 +47,14 @@
     <string name="action_shuffle_playlist">Amestecă playlist</string>
     <string name="action_sleep_timer">Cronometru de somn</string>
     <string name="action_sort_order">Ordine de sortare</string>
-    <string name="action_tag_editor">Detalii piesă</string>
+    <string name="action_tag_editor">Redactor info</string>
     <string name="action_toggle_favorite">Comutare favorite</string>
-    <string name="action_toggle_shuffle">Comutare amestecare</string>
+    <string name="action_toggle_shuffle">Toggle shuffle mode</string>
     <string name="adaptive">Adaptiv</string>
     <string name="add_action">Adaugă</string>
     <string name="add_playlist_title">"Adaugă la playlist"</string>
-    <string name="add_time_framed_lryics">Adaugă versuri încadrate în timp</string>
-    <string name="added_song_count_to_playlist">S-au adăugat %1$d melodii la %2$s</string>
+    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Adăugat 1 titlu la coada de redare."</string>
     <string name="added_x_titles_to_playing_queue">Adăugate %1$d titluri la coada de redare</string>
     <string name="album">Album</string>
@@ -87,54 +86,50 @@
     <string name="audio_focus_denied">Folcalizarea audio a fost respinsă.</string>
     <string name="audio_settings_summary">Ajustați setările de sunet și comenzile egalizatorului</string>
     <string name="auto">Automat</string>
-    <string name="backup_restore_settings_summary">Salvează și restaurează setările, listele de redare</string>
-    <string name="backup_restore_title"><![CDATA[Copie de rezervă și restaurare]]></string>
-    <string name="backup_title">Copii de rezervă</string>
+    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
+    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
+    <string name="backup_title">Backups</string>
     <string name="biography">Biografie</string>
     <string name="black_theme_name">Negru</string>
     <string name="blacklist">Lista neagră</string>
-    <string name="bluetooth_summary">Aplicația are nevoie de permisiunea dispozitive din apropiere pentru a verifica dacă există dispozitive bluetooth</string>
-    <string name="bluetooth_title">Dispozitive în apropiere</string>
-    <string name="blur">Estompare</string>
-    <string name="blur_card">Estompare card</string>
-    <string name="bug_report_failed">Imposibil de trimis raportul</string>
-    <string name="bug_report_failed_invalid_token">Jeton de acces nevalid. Vă rugăm să contactați dezvoltatorul aplicației.</string>
-    <string name="bug_report_failed_issues_not_available">Trimiterea problemelor nu este disponibilă pentru repertoriul selectat. Te rugăm să contactezi dezvoltatorul aplicației.</string>
-    <string name="bug_report_failed_unknown">A apărut o eroare neașteptată. Te rugăm să contactezi dezvoltatorul aplicației.</string>
+    <string name="blur">Blur</string>
+    <string name="blur_card">Blur Card</string>
+    <string name="bug_report_failed">Unable to send report</string>
+    <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
+    <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
+    <string name="bug_report_failed_unknown">An unexpected error occurred. Please contact the app developer.</string>
     <string name="bug_report_failed_wrong_credentials">Nume de utilizator sau parolă greșită</string>
     <string name="bug_report_issue">Problemă</string>
     <string name="bug_report_manual">Trimite manual</string>
     <string name="bug_report_no_description">Introduceți o descriere a problemei</string>
-    <string name="bug_report_no_password">Te rugăm să introduci parola ta validă de GitHub</string>
-    <string name="bug_report_no_title">Te rugăm să introduci un titlu pentru problemă</string>
-    <string name="bug_report_no_username">Te rugăm să introduci numele tău de utilizator valid</string>
-    <string name="bug_report_success">Raportul de erori s-a încheiat cu succes</string>
-    <string name="bug_report_summary">A apărut o eroare neașteptată. Ne pare rău că ai întâmpinat această problemă. Dacă aplicația continuă să se închidă, șterge datele acesteia din setări sau trimite-ne un email </string>
-    <string name="bug_report_use_account">Trimiteți utilizând contul GitHub</string>
-    <string name="buy_now">Cumpărați acum</string>
+    <string name="bug_report_no_password">Please enter your valid GitHub password</string>
+    <string name="bug_report_no_title">Please enter an issue title</string>
+    <string name="bug_report_no_username">Please enter your valid GitHub username</string>
+    <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
+    <string name="bug_report_use_account">Send using GitHub account</string>
+    <string name="buy_now">Buy now</string>
     <string name="cancel_current_timer">Anulează cronometrul curent</string>
     <string name="card">Card</string>
-    <string name="card_color_style">Card colorat</string>
-    <string name="card_square">Card pătrat</string>
+    <string name="card_color_style">Colored Card</string>
+    <string name="card_square">Square Card</string>
     <string name="card_style">Card</string>
-    <string name="carousal_effect_on_now_playing_screen">Efect de carusel pe ecranul de redare acum</string>
-    <string name="cascading">În cascadă</string>
+    <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
+    <string name="cascading">Cascading</string>
     <string name="changelog">Modificări</string>
-    <string name="changelog_summary">Vezi ce este nou</string>
-    <string name="choose_image">Alege imaginea</string>
-    <string name="choose_restore_title">Alege ce să restaurezi</string>
+    <string name="changelog_summary">Check out What\'s New</string>
+    <string name="choose_image">Choose Image</string>
+    <string name="choose_restore_title">Choose what to restore</string>
     <string name="circle">Cerc</string>
     <string name="circular">Circular</string>
     <string name="classic">Clasic</string>
     <string name="clear_action">Șterge</string>
     <string name="clear_blacklist">Șterge \"Lista neagră\"</string>
     <string name="clear_history">Goliți istoricul</string>
-    <string name="clear_playing_queue">Curăță coada</string>
+    <string name="clear_playing_queue">Clear queue</string>
     <string name="color">Culoare</string>
     <string name="colors">Culori</string>
-    <string name="compact">Compact</string>
-    <string name="composer">Compozitor</string>
-    <string name="copied_device_info_to_clipboard">Informațiile dispozitivului au fost copiate în clipboard.</string>
+    <string name="composer">Composer</string>
+    <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
     <string name="could_not_create_playlist">Nu s-a putut crea playlist.</string>
     <string name="could_not_download_album_cover">"Nu s-a putut desc\u0103rca o copert\u0103 de album corespunz\u0103toare."</string>
     <string name="could_not_restore_purchase">Nu a putut fi restabilită achiziția.</string>
@@ -142,64 +137,56 @@
     <string name="create_action">Crează</string>
     <string name="create_new_backup">Crează</string>
     <string name="created_playlist_x">S-a creat playlist-ul %1$s.</string>
-    <string name="credit_title">Membri și contribuitori </string>
+    <string name="credit_title">Members and contributors </string>
     <string name="currently_listening_to_x_by_x">Acum ascultați %1$s de %2$s.</string>
-    <string name="custom_artist_images">Imagini personalizate pentru Artist</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Distribuie raportul de defecțiuni</string>
+    <string name="custom_artist_images">Custom Artist Images</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
     <string name="dark_theme_name">Suriu</string>
     <string name="delete_playlist_title">Șterge playlist</string>
     <string name="delete_playlist_x"><![CDATA[Doriți să ștergeți playlist-ul <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Șterge playlist-uri</string>
-    <string name="delete_song_title">Șterge melodia</string>
+    <string name="delete_song_title">Delete song</string>
     <string name="delete_song_x"><![CDATA[Doriți să ștergeți cântecul <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Șterge melodiile</string>
+    <string name="delete_songs_title">Delete songs</string>
     <string name="delete_x_playlists"><![CDATA[Doriți să ștergeți <b>%1$d</b> playlist-uri?]]></string>
     <string name="delete_x_songs"><![CDATA[Doriți să ștergeți <b>%1$d</b> cântece?]]></string>
     <string name="deleted_x_songs">Au fost șterse %1$d cântece.</string>
-    <string name="deleting_songs">Se șterg melodiile</string>
-    <string name="depth">Profunzime</string>
-    <string name="description">Descriere</string>
-    <string name="device_info">Informații dispozitiv</string>
-    <string name="dialog_message_set_ringtone">Permite aplicației Retro Music să modifice setările audio</string>
-    <string name="dialog_title_set_ringtone">Setare ton apel</string>
-    <string name="disc_hint">Număr disc</string>
+    <string name="deleting_songs">Deleting Songs</string>
+    <string name="depth">Depth</string>
+    <string name="description">Description</string>
+    <string name="device_info">Device info</string>
+    <string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
+    <string name="dialog_title_set_ringtone">Set ringtone</string>
+    <string name="disc_hint">Disc Number</string>
     <string name="do_you_want_to_clear_the_blacklist">Doriți să ștergeți lista neagră?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Doriți să ștergeți <b>%1$s</b> din lista neagră?]]></string>
     <string name="donate">Donează</string>
     <string name="donate_summary">Dacă ești de părere că merit să fiu plătit pentru munca mea,  poți să donezi aici.</string>
     <string name="donation_header">Cumpăraţi-mi o(un)</string>
-    <string name="done">Finalizat</string>
-    <string name="drive_mode">Mod condus</string>
-    <string name="edit_fab">Buton editare</string>
-    <string name="edit_normal_lyrics">Editare versuri</string>
-    <string name="edit_synced_lyrics">Editare versuri sincronizate</string>
+    <string name="done">Done</string>
+    <string name="drive_mode">Drive mode</string>
+    <string name="edit_fab">Edit Button</string>
+    <string name="edit_normal_lyrics">Edit Lyrics</string>
+    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
     <string name="empty">Gol</string>
     <string name="equalizer">Egalizator</string>
-    <string name="error_create_backup">Nu s-a putut crea copia de rezervă</string>
-    <string name="error_delete_backup">Nu s-a putut șterge copia de rezervă</string>
-    <string name="error_empty_name">Numele dvs. nu poate fi gol!</string>
-    <string name="error_load_failed">Încărcare eșuată</string>
-    <string name="error_share_file">Nu s-a putut partaja fișierul</string>
-    <string name="expanded">Extins</string>
-    <string name="faq">Întrebări frecvente</string>
+    <string name="faq">FAQ</string>
     <string name="favorites">Favorite</string>
-    <string name="file_already_exists">Fișierul există deja</string>
-    <string name="finish_last_song">Finalizează ultima melodie</string>
-    <string name="fit">Potrivire</string>
+    <string name="finish_last_song">Finish last song</string>
+    <string name="fit">Fit</string>
     <string name="flat">Uniform</string>
     <string name="folders">Mape</string>
-    <string name="follow_system">Urmărește sistemul</string>
+    <string name="follow_system">Follow system</string>
     <string name="for_you">Pentru dvs.</string>
-    <string name="free">Gratuit</string>
+    <string name="free">Free</string>
     <string name="full">Plin</string>
     <string name="full_card">Card complet</string>
     <string name="general_settings_summary">Schimbați culorile generale ale aplicației</string>
     <string name="general_settings_title">Aspect</string>
     <string name="genre">Gen muzical</string>
     <string name="genres">Genuri</string>
-    <string name="git_hub_summary">Creează o copie a repertoriului pe GitHub</string>
+    <string name="git_hub_summary">Fork the project on GitHub</string>
     <string name="gradient">Gradient</string>
-    <string name="grant_access">Acordare acces</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -208,223 +195,213 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Stil grilă</string>
-    <string name="help_summary">Aveți nevoie de mai mult ajutor?</string>
-    <string name="hinge">Balama</string>
+    <string name="grid_style_label">Grid style</string>
+    <string name="help_summary">Need more help?</string>
+    <string name="hinge">Hinge</string>
     <string name="history">Istoric</string>
-    <string name="history_cleared">Istoric șters</string>
-    <string name="history_undo_button">Anulare</string>
+    <string name="history_cleared">History cleared</string>
+    <string name="history_undo_button">Undo</string>
     <string name="home">Acasă</string>
-    <string name="horizontal_flip">Întoarcere pe orizontală</string>
-    <string name="image">Imagine</string>
-    <string name="image_gradient">Imagine gradient</string>
-    <string name="image_settings_summary">Schimbă setările de descărcare a imaginii artistului</string>
-    <string name="import_label">Importare</string>
-    <string name="import_playlist">Importare listă de redare</string>
-    <string name="import_playlist_message">Importă toate listele de redare listate în Android Media Store cu melodii, dacă listele de redare există deja, melodiile vor fi îmbinate.</string>
+    <string name="horizontal_flip">Horizontal flip</string>
+    <string name="image">Image</string>
+    <string name="image_gradient">Gradient image</string>
+    <string name="image_settings_summary">Change artist image download settings</string>
+    <string name="import_label">Import</string>
+    <string name="import_playlist">Import playlist</string>
+    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
     <string name="inserted_x_songs_into_playlist_x">Au fost insertate %1$d cântece în playlist-ul %2$s.</string>
-    <string name="instagram_page_summary">Partajați configurația Retro Music pentru a o publica pe Instagram</string>
-    <string name="keyboard">Tastatură</string>
-    <string name="label_bit_rate">Rată de biți</string>
+    <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="label_bit_rate">Bitrate</string>
     <string name="label_file_format">Format</string>
     <string name="label_file_name">Numele fișierului</string>
     <string name="label_file_path">Dosarul fișierului</string>
     <string name="label_file_size">Mărime</string>
-    <string name="label_last_modified">Ultima modificare</string>
-    <string name="label_more_from">Mai multe de la %s</string>
+    <string name="label_last_modified">Last Modified</string>
+    <string name="label_more_from">More from %s</string>
     <string name="label_sampling_rate">Rata de eșantionare</string>
     <string name="label_track_length">Lungime</string>
-    <string name="labeled">Etichetat</string>
+    <string name="labeled">Labeled</string>
     <string name="last_added">Adăugate recent</string>
-    <string name="last_song">Ultima melodie</string>
-    <string name="lets_go">Să începem</string>
-    <string name="library_categories">Categorii bibliotecă</string>
+    <string name="last_song">Last song</string>
+    <string name="library_categories">Library categories</string>
     <string name="licenses">Licențe</string>
     <string name="light_theme_name">Alb</string>
-    <string name="listeners_label">Ascultători</string>
+    <string name="listeners_label">Listeners</string>
     <string name="listing_files">Listarea fișierelor</string>
     <string name="loading_products">Se încarcă produsele...</string>
-    <string name="login">Autentificare</string>
+    <string name="login">Login</string>
     <string name="lyrics">Versuri</string>
-    <string name="made_with_love">Creat cu ❤️ în India</string>
+    <string name="made_with_love">Made with ❤️ in India</string>
     <string name="material">Material</string>
-    <string name="md_error_label">Eroare</string>
-    <string name="md_storage_perm_error">Eroare de permisiune</string>
-    <string name="message_backup_create_success">Copie de rezervă creată cu succes.</string>
-    <string name="message_limit_tabs">Cel mult 5 elemente</string>
-    <string name="message_pro_feature">%s este o caracteristică Pro.</string>
-    <string name="message_restore_success">Restaurare finalizată cu succes.</string>
-    <string name="message_updated">Actualizat</string>
-    <string name="message_welcome"><![CDATA[Salut! <br>Bun venit la %s]]></string>
+    <string name="md_error_label">Error</string>
+    <string name="md_storage_perm_error">Permission error</string>
     <string name="my_name">Numele Meu</string>
     <string name="my_top_tracks">Top cântece redate</string>
     <string name="never">Niciodată</string>
-    <string name="new_music_mix">Mixare muzică nouă</string>
+    <string name="new_music_mix">New Music Mix</string>
     <string name="new_playlist_title">Playlist nou</string>
     <string name="new_start_directory">%s a fost setat ca noul registru principal.</string>
-    <string name="next_song">Următoarea melodie</string>
+    <string name="next_song">Next Song</string>
     <string name="no_albums">Niciun album</string>
     <string name="no_artists">Niciun artist</string>
     <string name="no_audio_ID">"Mai întâi redă un cântec, apoi incearcă din nou."</string>
-    <string name="no_backups_found">Nicio copie de rezervă găsită</string>
+    <string name="no_backups_found">No Backups Found</string>
     <string name="no_equalizer">Nu a fost găsit nici un equalizer.</string>
     <string name="no_genres">Niciun gen</string>
     <string name="no_lyrics_found">Nu a fost găsite versuri.</string>
-    <string name="no_playing_queue">Nicio melodie redată</string>
+    <string name="no_playing_queue">No songs playing</string>
     <string name="no_playlists">Niciun playlist</string>
     <string name="no_purchase_found">Nu s-a găsit nicio achiziție.</string>
     <string name="no_results">Niciun rezultat</string>
     <string name="no_songs">Niciun cântec</string>
     <string name="normal">Normal</string>
-    <string name="normal_lyrics">Versuri normale</string>
+    <string name="normal_lyrics">Normal lyrics</string>
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> nu este litsat în magazinul media.]]></string>
-    <string name="not_recently_played">Nu s-a redat recent</string>
+    <string name="not_recently_played">Not recently played</string>
     <string name="nothing_to_scan">Nimic de scanat.</string>
-    <string name="nothing_to_see">Nimic de văzut</string>
+    <string name="nothing_to_see">Nothing to see</string>
     <string name="notification">Notificare</string>
     <string name="notification_settings_summary">Personalizează stil de notificare</string>
     <string name="now_playing">Se redă</string>
     <string name="now_playing_queue">Coada de redare</string>
-    <string name="now_playing_summary">Personalizează ecranul de redare acum</string>
-    <string name="now_playing_themes">9+ teme</string>
+    <string name="now_playing_summary">Customize the now playing screen</string>
+    <string name="now_playing_themes">9+ now playing themes</string>
     <string name="only_on_wifi">Doar pe Wi-Fi</string>
-    <string name="other_settings_summary">Funcții avansate de testare</string>
+    <string name="other_settings_summary">Advanced testing features</string>
     <string name="others">Altele</string>
-    <string name="over_cover">Peste copertă</string>
-    <string name="password">Parolă</string>
+    <string name="over_cover">Over Cover</string>
+    <string name="password">Password</string>
     <string name="past_three_months">Ultimele 3 luni</string>
-    <string name="paste_lyrics_here">Lipește versuri aici</string>
-    <string name="paste_timeframe_lyrics_here">Lipiți versurile temporale aici</string>
-    <string name="peek">Vizualizare</string>
-    <string name="permission_bluetooth_denied">Permisiunea pentru dispozitivele din apropiere a fost refuzată.</string>
+    <string name="paste_lyrics_here">Paste Lyrics Here</string>
+    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
+    <string name="peek">Peek</string>
     <string name="permission_external_storage_denied">Accesul la stocarea externă este respinsă.</string>
-    <string name="permission_summary">Aplicația are nevoie de permisiunea de a accesa spațiul de stocare al dispozitivului pentru a reda muzica</string>
-    <string name="permission_title">Acces la stocare</string>
+    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
+    <string name="permission_title">Storage Access</string>
     <string name="permissions_denied">Permisiunile au fost respinse.</string>
     <string name="personalize">Personalizare</string>
     <string name="personalize_settings_summary">Personalizează UI si pagina de redare</string>
     <string name="pick_from_local_storage">Alegeți din spațiul de stocare local</string>
     <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Urmărește pagina Pinterest pentru inspirație de design Retro Music</string>
+    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
     <string name="plain">Simplu</string>
-    <string name="playList_already_exits">Lista de redare există deja</string>
-    <string name="playback_pitch">Pas</string>
-    <string name="playback_settings">Setări de redare</string>
-    <string name="playback_speed">Viteză de redare</string>
+    <string name="playList_already_exits">Playlist already exists</string>
+    <string name="playback_pitch">Pitch</string>
+    <string name="playback_settings">Playback Settings</string>
+    <string name="playback_speed">Playback Speed</string>
     <string name="playing_notification_description">Notificarea de redare oferă acțiuni de redare / pauză etc.</string>
     <string name="playing_notification_name">Notificarea de redare</string>
-    <string name="playlist_created_sucessfully">%s creată cu succes</string>
+    <string name="playlist_created_sucessfully">%s created successfully</string>
     <string name="playlist_is_empty">Playlist-ul este gol</string>
     <string name="playlist_name_empty">Numele playlist-ului</string>
     <string name="playlists">Playlist-uri</string>
-    <string name="pref_blur_amount_summary">Cantitatea de blur aplicată temelor din această categorie, o valoare mai mică redă performanțe mai bune</string>
-    <string name="pref_blur_amount_title">Cantitatea de blur</string>
-    <string name="pref_filter_song_summary">Filtrează melodiile după lungime</string>
-    <string name="pref_filter_song_title">Filtrează durata melodiei</string>
-    <string name="pref_header_advanced">Avansat</string>
-    <string name="pref_header_album">Stil album</string>
+    <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
+    <string name="pref_blur_amount_title">Blur amount</string>
+    <string name="pref_filter_song_summary">Filter songs by length</string>
+    <string name="pref_filter_song_title">Filter song duration</string>
+    <string name="pref_header_advanced">Advanced</string>
+    <string name="pref_header_album">Album style</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_blacklist">Lista neagră</string>
-    <string name="pref_header_controls">Comenzi</string>
+    <string name="pref_header_controls">Controls</string>
     <string name="pref_header_general">General</string>
     <string name="pref_header_images">Imagini</string>
-    <string name="pref_header_library">Bibliotecă</string>
+    <string name="pref_header_library">Library</string>
     <string name="pref_header_lockscreen">Ecran de blocare</string>
     <string name="pref_header_playlists">Playlist-uri</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pune pe pauză melodia când volumul scade la zero și reia redarea când volumul crește. De asemenea această funcție funcționează și în afara aplicației</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pauză la zero</string>
-    <string name="pref_keep_screen_on_summary">Rețineți că activarea acestei funcții poate afecta durata bateriei</string>
-    <string name="pref_keep_screen_on_title">Păstrează ecranul pornit</string>
-    <string name="pref_language_name">Selectați limba</string>
-    <string name="pref_snow_fall_title">Efectul de cădere a zăpezii</string>
+    <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
+    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
+    <string name="pref_keep_screen_on_title">Keep the screen on</string>
+    <string name="pref_language_name">Select language</string>
+    <string name="pref_snow_fall_title">Snow fall effect</string>
     <string name="pref_summary_album_art_on_lockscreen">Folosește coperta de album curentă ca imagine de fundal pe ecranul de blocare.</string>
-    <string name="pref_summary_album_artists_only">Arată și albumul artiștilor în categoria Artist</string>
+    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
     <string name="pref_summary_audio_ducking">Notificațiile, navigarea etc.</string>
-    <string name="pref_summary_audio_fade">Estompare audio atunci când melodia este oprită sau redată</string>
-    <string name="pref_summary_blacklist">Conținutul dosarelor din lista neagră este ascuns în bibliotecă.</string>
-    <string name="pref_summary_bluetooth_playback">Începe redarea imediat ce este conectat un dispozitiv Bluetooth</string>
+    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
+    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
+    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
     <string name="pref_summary_blurred_album_art">Spălăcește coperta de album pe ecranul de blocare. Poate cauza probleme cu alte aplcicatii sau widget-uri.</string>
     <string name="pref_summary_carousel_effect">Efectul carusel pentru coperţile de album în ecranul de redare. Rețineți că tema Card și Blur Card nu va funcționa</string>
     <string name="pref_summary_classic_notification">Folosește designul classic de notificare.</string>
     <string name="pref_summary_colored_app">Culoarea fundalului și a butonului de control se schimbă în dependență de coperta albumului din ecranul de redare</string>
     <string name="pref_summary_colored_app_shortcuts">Colorează comenzile rapide în culoarea de accent. De fiecare dată cînd schimbați culoarea, comutați această opțiune pentru effect</string>
     <string name="pref_summary_colored_notification">"Coloreaz\u0103 notificarea dup\u0103 culoarea copertei de album."</string>
-    <string name="pref_summary_cross_fade">Durata de intersectare între melodii</string>
-    <string name="pref_summary_desaturated_color">Conform schemei folosite, Material Design, în modul întunecat, culorile ar trebui să fie mai desaturate</string>
-    <string name="pref_summary_expand_now_playing_panel">Apăsând pe notificare se va afișa ecranul cu actuala melodia redată, în locul ecranului principal</string>
-    <string name="pref_summary_extra_controls">Adaugă controale suplementare pentru mini player</string>
-    <string name="pref_summary_extra_song_info">Afișează informații suplimentare despre piesă, cum ar fi formatul fișierului, rata de biți și frecvența</string>
+    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
+    <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
+    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
+    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
+    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
     <string name="pref_summary_gapless_playback">"Poate cauza probleme de redare pe unele dispozitive."</string>
-    <string name="pref_summary_home_banner">Arată sau ascunde banner-ul acasă</string>
+    <string name="pref_summary_home_banner">Show or hide the home banner</string>
     <string name="pref_summary_ignore_media_store_artwork">Poate mări calitatea copertei de album, dar cauzează încărcarea mai lentă a imaginilor. Activați această opțiune doar dacă aveți probleme cu coperta de album cu rezoluție mică.</string>
-    <string name="pref_summary_library_categories">Configurează vizibilitatea și ordinea categoriilor de librării.</string>
+    <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="pref_summary_lock_screen">Comenzi pe ecranul de blocare pentru Retro music.</string>
-    <string name="pref_summary_manage_audio_focus">Redă mereu audio în fundal, indiferent dacă altceva este redat</string>
     <string name="pref_summary_open_source_licences">Detalii privind licența pentru software open source</string>
-    <string name="pref_summary_pause_history">Când este activată, melodiile noi recent redate, nu vor apărea în istoric</string>
-    <string name="pref_summary_remember_tab">Navigați la ultima filă folosită la pornire</string>
-    <string name="pref_summary_show_lyrics">Afișează versurile sincronizate peste coperta de album</string>
-    <string name="pref_summary_suggestions">Arată Noul Mix de Muzică pe ecranul principal</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Activează schimbarea melodiei prin glisare oriunde pe ecranul cu melodia redată actuală</string>
-    <string name="pref_summary_swipe_to_dismiss">Glisează în jos pentru a închide mini player-ul</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
+    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
+    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
+    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
+    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
     <string name="pref_summary_toggle_full_screen">Mod imersiv</string>
     <string name="pref_summary_toggle_headset">Începe redarea imediat ce sunt conectate căștile.</string>
-    <string name="pref_summary_toggle_shuffle">Modul de amestecare se va dezactiva atunci când vei asculta o nouă listă de melodii</string>
+    <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</string>
     <string name="pref_summary_toggle_volume">Dacă aveți spațiu pe ecranul de redare, activați controalele de volum</string>
-    <string name="pref_summary_wallpaper_accent">Extrage accentul de culoare din fundal</string>
-    <string name="pref_summary_whitelist">Arată doar melodiile din folderul de muzică</string>
+    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
+    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Afișați coperta albumului</string>
-    <string name="pref_title_album_artists_only">Navighează după Artistul de album</string>
-    <string name="pref_title_album_cover_style">Temă pentru coperta albumului</string>
-    <string name="pref_title_album_cover_transform">Ignoră coperta de album</string>
+    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
+    <string name="pref_title_album_cover_style">Album cover theme</string>
+    <string name="pref_title_album_cover_transform">Album cover skip</string>
     <string name="pref_title_app_shortcuts">Comenzi rapide colorate</string>
-    <string name="pref_title_appbar_mode">Stil antet</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Reduce volumul la pierderea focalizării</string>
-    <string name="pref_title_audio_fade">Estompare audio</string>
+    <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Descărcați automat imagini ale artistului</string>
     <string name="pref_title_blacklist">Lista neagră</string>
-    <string name="pref_title_bluetooth_playback">Redare prin Bluetooth</string>
+    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
     <string name="pref_title_blurred_album_art">Spălăcește coperta albumului</string>
-    <string name="pref_title_circle_button">Butonul de redare circulară</string>
+    <string name="pref_title_circle_button">Circular play button</string>
     <string name="pref_title_classic_notification">Design classic de notificare</string>
     <string name="pref_title_colored_app">Culoare adaptivă</string>
     <string name="pref_title_colored_notification">Notificare colorată</string>
-    <string name="pref_title_cross_fade">Suprapunere între piese (Beta)</string>
-    <string name="pref_title_custom_font">Utilizează fontul Manrope</string>
-    <string name="pref_title_desaturated_color">Culoare desaturată</string>
-    <string name="pref_title_expand_now_playing_panel">Arată ecranul de redare actuală</string>
-    <string name="pref_title_extra_controls">Comenzi suplimentare</string>
-    <string name="pref_title_extra_song_info">Informații melodie</string>
+    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
+    <string name="pref_title_custom_font">Use Manrope font</string>
+    <string name="pref_title_desaturated_color">Desaturated color</string>
+    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
+    <string name="pref_title_extra_controls">Extra controls</string>
+    <string name="pref_title_extra_song_info">Song info</string>
     <string name="pref_title_gapless_playback">Redare \"Gapless\"</string>
     <string name="pref_title_general_theme">Temă</string>
-    <string name="pref_title_home_album_grid_style">Grilă album</string>
-    <string name="pref_title_home_artist_grid_style">Grila Artist</string>
+    <string name="pref_title_home_album_grid_style">Album grid</string>
+    <string name="pref_title_home_artist_grid_style">Artist grid</string>
     <string name="pref_title_home_banner">Banner</string>
     <string name="pref_title_ignore_media_store_artwork">Ignoră copertele de pe Magazinul Media</string>
     <string name="pref_title_last_added_interval">Ultimul interval de playlist adăugat</string>
     <string name="pref_title_lock_screen">Comenzi ecran complet</string>
-    <string name="pref_title_lyrics_screen_on">Menține ecranul aprins când se afișează versurile</string>
-    <string name="pref_title_lyrics_type">Tipul versurilor</string>
-    <string name="pref_title_manage_audio_focus">Redare întotdeauna</string>
+    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
+    <string name="pref_title_lyrics_type">Lyrics type</string>
     <string name="pref_title_now_playing_screen_appearance">Aspect</string>
     <string name="pref_title_open_source_licences">Licențe open source</string>
-    <string name="pref_title_pause_history">Istoric de pauze</string>
-    <string name="pref_title_remember_tab">Reține ultima filă</string>
-    <string name="pref_title_show_lyrics">Arată versurile</string>
-    <string name="pref_title_suggestions">Arată sugestiile</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Glisează oriunde pentru a schimba melodia</string>
-    <string name="pref_title_swipe_to_dismiss">Respinge prin glisare în jos</string>
-    <string name="pref_title_tab_text_mode">Mod titlu filă</string>
+    <string name="pref_title_pause_history">Pause history</string>
+    <string name="pref_title_remember_tab">Remember last tab</string>
+    <string name="pref_title_show_lyrics">Show lyrics</string>
+    <string name="pref_title_suggestions">Show suggestions</string>
+    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
+    <string name="pref_title_tab_text_mode">Tab titles mode</string>
     <string name="pref_title_toggle_carousel_effect">Efect de carusel</string>
     <string name="pref_title_toggle_full_screen">Ecran complet</string>
     <string name="pref_title_toggle_toggle_headset">Redare automată</string>
-    <string name="pref_title_toggle_toggle_shuffle">Mod redare aleatorie</string>
+    <string name="pref_title_toggle_toggle_shuffle">Shuffle mode</string>
     <string name="pref_title_toggle_volume">Controale volum</string>
-    <string name="pref_title_wallpaper_accent">Culoare de accent fundal</string>
-    <string name="pref_title_whitelist">Lista albă de muzică</string>
+    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
+    <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Temă neagră, teme pentru ecranul de redare, efectul Carusel și multe altele..</string>
-    <string name="profile">Profil</string>
+    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
+    <string name="profile">Profile</string>
     <string name="purchase">Procurare</string>
     <string name="queue">Coadă</string>
     <string name="rate_app">Evaluaţi aplicaţia</string>
@@ -434,130 +411,130 @@
     <string name="remove_action">Eliminare</string>
     <string name="remove_cover">Eliminare copertă</string>
     <string name="remove_from_blacklist">Eliminare din lista neagră</string>
-    <string name="remove_image">Ștergeți imaginea</string>
+    <string name="remove_image">Remove Image</string>
     <string name="remove_song_from_playlist_title">Eliminați melodia din lista de redare</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Eliminaţi melodia <b>%1$s</b> din lista de redare?]]></string>
     <string name="remove_songs_from_playlist_title">Eliminare melodii din lista de redare</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Eliminaţi <b>%1$d</b> melodii din lista de redare?]]></string>
     <string name="rename_playlist_title">Redenumiţi lista de redare</string>
-    <string name="replace_cover">Înlocuiește coperta</string>
-    <string name="report_an_issue">Raportați o problemă</string>
-    <string name="report_bug">Raportare bug</string>
-    <string name="reset_action">Resetare</string>
+    <string name="replace_cover">Replace Cover</string>
+    <string name="report_an_issue">Report an issue</string>
+    <string name="report_bug">Report bug</string>
+    <string name="reset_action">Reset</string>
     <string name="reset_artist_image">Reseteţi imaginea artistului</string>
     <string name="restore">Restabilire</string>
-    <string name="restore_message">Doriți să restaurați copia de rezervă?</string>
+    <string name="restore_message">Do you want to restore backup?</string>
     <string name="restored_previous_purchase_please_restart">A fost restaurată achiziția anterioară. Reporniți aplicația pentru a utiliza toate funcțiile.</string>
     <string name="restored_previous_purchases">Au fost restabilite achizițiile anterioare.</string>
     <string name="restoring_purchase">Se restabilește achiziția...</string>
     <string name="retro_music_player">Retro Music Player</string>
     <string name="retro_music_pro">Cumpărați RetroMusic Pro</string>
-    <string name="ringtone_summary">Aplicația are nevoie de permisiunea de a accesa setările dispozitivului pentru a seta muzica ca ton de apel</string>
-    <string name="ringtone_title">Ton sonerie (opțional)</string>
-    <string name="saf_delete_failed">Ștergerea fișierului a eșuat: %s</string>
+    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
+    <string name="ringtone_title">Ringtone (Optional)</string>
+    <string name="saf_delete_failed">File delete failed: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">Nu se poate obține SAF URI</string>
-    <string name="saf_guide_slide1_description">Deschide sertarul de navigare</string>
-    <string name="saf_guide_slide1_description_before_o">Activează opțiunea \"Arată cardul de memorie\" în meniu</string>
+    <string name="saf_error_uri">Can\'t get SAF URI</string>
+    <string name="saf_guide_slide1_description">Open navigation drawer</string>
+    <string name="saf_guide_slide1_description_before_o">Enable \'Show SD card\' in overflow menu</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s are nevoie de acces la cardul SD</string>
-    <string name="saf_guide_slide2_description">Trebuie să selectezi directorul root al cardului SD</string>
-    <string name="saf_guide_slide2_title">Selectează cardul SD în meniul de navigare</string>
-    <string name="saf_guide_slide3_description">Nu deschide niciun subdirector</string>
-    <string name="saf_guide_slide3_title">Apasă butonul \'selectează\' din partea de jos a ecranului</string>
-    <string name="saf_write_failed">Scrierea fișierului a eșuat: %s</string>
-    <string name="save">Salvare</string>
+    <string name="saf_guide_slide1_title">%s needs SD card access</string>
+    <string name="saf_guide_slide2_description">You need to select your SD card root directory</string>
+    <string name="saf_guide_slide2_title">Select your SD card in navigation drawer</string>
+    <string name="saf_guide_slide3_description">Do not open any sub-folders</string>
+    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
+    <string name="saf_write_failed">File write failed: %s</string>
+    <string name="save">Save</string>
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">Salvare ca fişier</string>
-    <string name="save_playlists_title">Salvează ca fișiere</string>
+    <string name="save_playlists_title">Save as files</string>
     <string name="saved_playlist_to">Salvaţi lista de redare în %s.</string>
     <string name="saving_changes">Salvare modificări</string>
-    <string name="scan_media">Scanare media</string>
+    <string name="scan_media">Scan media</string>
     <string name="scanned_files">Au fost scanate %1$d din %2$d fişiere.</string>
-    <string name="scrobbles_label">Monitorizare timp muzică</string>
-    <string name="select_all">Selectează tot</string>
-    <string name="selected">Selectat</string>
-    <string name="set">Setare</string>
+    <string name="scrobbles_label">Scrobbles</string>
+    <string name="select_all">Select all</string>
+    <string name="selected">Selected</string>
+    <string name="set">Set</string>
     <string name="set_artist_image">Setaţi imaginea artistului</string>
-    <string name="share_app">Distribuie aplicația</string>
-    <string name="share_summary">Distribuie aplicația prietenilor și familiei</string>
-    <string name="share_to_stories">Distribuie în Poveste</string>
-    <string name="show_album_artists">Arată artiștii albumului</string>
+    <string name="share_app">Share app</string>
+    <string name="share_summary">Share the app with your friends and family</string>
+    <string name="share_to_stories">Share to Stories</string>
+    <string name="show_album_artists">Show Album Artists</string>
     <string name="shuffle">Amestecare</string>
     <string name="simple">Simplu</string>
     <string name="sleep_timer_canceled">Temporizatorul a fost anulat.</string>
     <string name="sleep_timer_set">Temporizatorul este setat pentru %d minute de acum.</string>
     <string name="social">Social</string>
-    <string name="social_stories">Partajează povestea</string>
+    <string name="social_stories">Share story</string>
     <string name="song">Melodie</string>
     <string name="song_duration">Durată</string>
     <string name="songs">Melodii</string>
     <string name="sort_order">ordinea de sortare</string>
-    <string name="sort_order_a_z">Ascendent</string>
+    <string name="sort_order_a_z">Ascending</string>
     <string name="sort_order_album">Album</string>
     <string name="sort_order_artist">Artist</string>
-    <string name="sort_order_composer">Compozitor</string>
-    <string name="sort_order_date">Data adăugării</string>
-    <string name="sort_order_date_modified">Data modificării</string>
-    <string name="sort_order_default">Implicit</string>
-    <string name="sort_order_num_songs">Numărul pieselor</string>
-    <string name="sort_order_num_songs_desc">Numărul descrierilor de melodii</string>
-    <string name="sort_order_year">An</string>
-    <string name="sort_order_z_a">Descrescător</string>
+    <string name="sort_order_composer">Composer</string>
+    <string name="sort_order_date">Date added</string>
+    <string name="sort_order_date_modified">Date modified</string>
+    <string name="sort_order_num_songs">Song count</string>
+    <string name="sort_order_num_songs_desc">Song count desc</string>
+    <string name="sort_order_year">Year</string>
+    <string name="sort_order_z_a">Descending</string>
     <string name="speech_not_supported">Scuze! Dispozitivul tau nu suporta comenzi vocale</string>
     <string name="speech_prompt">Caută în colecția ta</string>
-    <string name="stack">Stivă</string>
-    <string name="start_play_music">Începe să redai muzică.</string>
-    <string name="suggestion_songs">Sugestii</string>
+    <string name="stack">Stack</string>
+    <string name="start_play_music">Start playing music.</string>
+    <string name="suggestion_songs">Suggestions</string>
     <string name="support_development">Susţineţi dezvoltarea</string>
-    <string name="swipe_to_unlock">Glisează pentru a debloca</string>
-    <string name="synced_lyrics">Versuri sincronizate</string>
+    <string name="swipe_to_unlock">Swipe to unlock</string>
+    <string name="synced_lyrics">Synced lyrics</string>
     <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Alătură-te grupului de Telegram pentru a discuta despre erori, a face sugestii și mai multe</string>
+    <string name="telegram_group_summary">Join the Telegram group to discuss bugs, make suggestions, show off and more</string>
     <string name="thank_you">Mulțumesc!</string>
     <string name="the_audio_file">Fișier audio</string>
     <string name="this_month">Luna aceasta</string>
     <string name="this_week">Săptămâna aceasta</string>
     <string name="this_year">Anul acesta</string>
     <string name="tiny">Mic</string>
-    <string name="tiny_card_style">Card mic</string>
-    <string name="title">Titlu</string>
-    <string name="title_new_backup">Copie de rezervă nouă</string>
+    <string name="tiny_card_style">Tiny card</string>
+    <string name="title">Title</string>
+    <string name="title_new_backup">New Backup</string>
     <string name="today">Astăzi</string>
     <string name="top_albums">Albume de top</string>
     <string name="top_artists">Artişti de top</string>
     <string name="track_hint">"Melodie (2 pentru melodia 2 sau 3004 pentru CD3 melodia 4)"</string>
     <string name="track_list">Numărul piesei</string>
     <string name="translate">Traducere</string>
-    <string name="translate_community">Ajută-ne să traducem aplicația</string>
-    <string name="try_retro_music_premium">Încearcă Retro Muzică Premium</string>
+    <string name="translate_community">Help us translate the app to your language</string>
+    <string name="try_retro_music_premium">Try Retro Music Premium</string>
     <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Împărtășește design-ul tău cu Retro Music</string>
-    <string name="unlabeled">Neetichetat</string>
+    <string name="twitter_page_summary">Share your design with Retro Music</string>
+    <string name="unlabeled">Unlabeled</string>
     <string name="unplayable_file">Nu s-a putut reda aceast\u0103 melodie.</string>
     <string name="up_next">Urmează</string>
     <string name="update_image">Actualizare imagine</string>
     <string name="updating">Se actualizează...</string>
-    <string name="user_images_description">Imaginile utilizatorului</string>
-    <string name="user_name">Nume utilizator</string>
-    <string name="username">Nume utilizator</string>
+    <string name="user_images_description">User Images</string>
+    <string name="user_name">User Name</string>
+    <string name="username">Username</string>
     <string name="version">Versiune</string>
-    <string name="vertical_flip">Rotire răsturnată</string>
-    <string name="view_on_telegram">Vezi pe Telegram</string>
-    <string name="volume">Volum</string>
+    <string name="vertical_flip">Vertical flip</string>
+    <string name="view_on_telegram">View on Telegram</string>
+    <string name="volume">Volume</string>
     <string name="web_search">Căutare pe internet</string>
-    <string name="website">Pagină web</string>
-    <string name="website_summary">Vizitați site-ul nostru</string>
-    <string name="welcome">Bun venit,</string>
+    <string name="website">Website</string>
+    <string name="website_summary">Check out our Website</string>
+    <string name="welcome">Welcome,</string>
     <string name="what_do_you_want_to_share">Ce doriți să expediați?</string>
-    <string name="whats_new">Ce e nou</string>
+    <string name="whats_new">What\'s New</string>
     <string name="window">Fereastră</string>
-    <string name="window_corner_edges">Colțuri rotunjite</string>
+    <string name="window_corner_edges">Rounded corners</string>
     <string name="x_has_been_set_as_ringtone">Setează %1$s ca ton de apel</string>
     <string name="x_selected">%1$d selectat</string>
     <string name="year">Anul</string>
-    <string name="you_have_to_select_at_least_one_category">Trebuie să selectezi cel puțin o categorie.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">O să fii redirecționat spre un site pentru monitorizarea erorilor.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Datele contului tău sunt folosite doar pentru autentificare.</string>
+    <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
+    <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 40177b115..adfded31c 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
     <string name="about_album_label">Об альбоме %s</string>
-    <string name="about_settings_summary">Команда, ссылки на социальные сети</string>
-    <string name="accent_color">Цвет акцента</string>
-    <string name="accent_color_desc">Акцентный цвет, по умолчанию фиолетовый</string>
+    <string name="about_settings_summary">Команда, ссылки на соц. сети</string>
+    <string name="accent_color">Основной цвет</string>
+    <string name="accent_color_desc">Основной цвет, по умолчанию фиолетовый</string>
     <string name="action_about">О программe</string>
     <string name="action_add_to_blacklist">Добавить в чёрный список</string>
-    <string name="action_add_to_favorites">Добавить в любимые</string>
+    <string name="action_add_to_favorites">Добавить в избранное</string>
     <string name="action_add_to_playing_queue">Добавить в очередь воспроизведения</string>
     <string name="action_add_to_playlist">Добавить в плейлист</string>
-    <string name="action_cancel">Отменить</string>
     <string name="action_cast">Трансляция</string>
     <string name="action_clear_playing_queue">Очистить очередь воспроизведения</string>
     <string name="action_cycle_repeat">Режим циклического повтора</string>
     <string name="action_delete">Удалить</string>
     <string name="action_delete_from_device">Удалить с устройства</string>
-    <string name="action_details">Информация о файле</string>
+    <string name="action_details">Подробности</string>
     <string name="action_edit">Изменить</string>
     <string name="action_go_to_album">Перейти к альбому</string>
     <string name="action_go_to_artist">Перейти к исполнителю</string>
     <string name="action_go_to_genre">Перейти к жанру</string>
-    <string name="action_go_to_lyrics">Перейти к тексту песни</string>
+    <string name="action_go_to_lyrics">К тексту песни</string>
     <string name="action_go_to_start_directory">В начало</string>
     <string name="action_grant">Разрешить</string>
     <string name="action_grid_size">Размер сетки</string>
@@ -28,11 +27,11 @@
     <string name="action_new_playlist">Новый плейлист</string>
     <string name="action_next">Далее</string>
     <string name="action_play">Играть</string>
-    <string name="action_play_all">Играть все</string>
-    <string name="action_play_next">Играть следующим</string>
+    <string name="action_play_all">Воспроизвести всё</string>
+    <string name="action_play_next">Играть далее</string>
     <string name="action_play_pause">Воспроизведение/Пауза</string>
-    <string name="action_previous">Предыдущий</string>
-    <string name="action_remove_from_favorites">Удалить из любимых</string>
+    <string name="action_previous">Предыдуший</string>
+    <string name="action_remove_from_favorites">Удалить из избранного</string>
     <string name="action_remove_from_playing_queue">Удалить из очереди воспроизведения</string>
     <string name="action_remove_from_playlist">Удалить из плейлиста</string>
     <string name="action_rename">Переименовать</string>
@@ -40,11 +39,11 @@
     <string name="action_scan">Сканировать</string>
     <string name="action_search">Поиск</string>
     <string name="action_set">Запустить</string>
-    <string name="action_set_as_ringtone">Установить в качества мелодии звонка</string>
+    <string name="action_set_as_ringtone">Задать в качества рингтона</string>
     <string name="action_set_as_start_directory">Установить как стартовый каталог</string>
     <string name="action_settings">"Настройки"</string>
     <string name="action_share">Поделиться</string>
-    <string name="action_shuffle_all">Перемешать все</string>
+    <string name="action_shuffle_all">Перемешать всё</string>
     <string name="action_shuffle_playlist">Перемешать плейлист</string>
     <string name="action_sleep_timer">Таймер сна</string>
     <string name="action_sort_order">Порядок сортировки</string>
@@ -55,48 +54,46 @@
     <string name="add_action">Добавить</string>
     <string name="add_playlist_title">"Добавить в плейлист"</string>
     <string name="add_time_framed_lryics">Добавить синхронизированный текст</string>
-    <string name="added_song_count_to_playlist">Добавлено(-а) %1$d песня (-и, -ен) в %2$s</string>
+    <string name="added_song_count_to_playlist">Добавлено %1$d песни в %2$s</string>
     <string name="added_title_to_playing_queue">"В очередь добавлен 1 трек"</string>
-    <string name="added_x_titles_to_playing_queue">В очередь добавлен(-о) %1$d трек(-а, -ов).</string>
+    <string name="added_x_titles_to_playing_queue">В очередь добавлено  %1$d треков.</string>
     <string name="album">Альбом</string>
     <plurals name="albumSongs">
         <item quantity="one">Песня</item>
         <item quantity="few">Песни</item>
-        <item quantity="many">Песен</item>
-        <item quantity="other">Треков</item>
+        <item quantity="many">Песни</item>
+        <item quantity="other">Песни</item>
     </plurals>
     <string name="album_artist">Исполнитель альбома</string>
     <string name="albums">Альбомы</string>
     <plurals name="albums">
         <item quantity="one">Альбом</item>
-        <item quantity="few">Альбома</item>
-        <item quantity="many">Альбомов</item>
-        <item quantity="other">Альбомов</item>
+        <item quantity="few">Альбомы</item>
+        <item quantity="many">Альбомы</item>
+        <item quantity="other">Альбомы</item>
     </plurals>
     <string name="always">Всегда</string>
-    <string name="app_share">Привет, попробуй этот классный музыкальный плеер для Android: https://play.google.com/store/apps/details?id=%s</string>
+    <string name="app_share">Эй, попробуй этот крутой музыкальный плеер на Android: https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">Перемешать</string>
     <string name="app_shortcut_top_tracks_short">Лучшие треки</string>
-    <string name="app_widget_big_name">Заполнение</string>
+    <string name="app_widget_big_name">Полное Изображение</string>
     <string name="app_widget_card_name">Компактный</string>
     <string name="app_widget_classic_name">Классический</string>
     <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Небольшой</string>
-    <string name="app_widget_text_name">Текстовый</string>
+    <string name="app_widget_small_name">Маленькое изображение</string>
+    <string name="app_widget_text_name">Минималистичный текст</string>
     <string name="artist">Исполнитель</string>
     <string name="artists">Исполнители</string>
     <string name="audio_fade_duration">Длительность затухания аудио</string>
     <string name="audio_focus_denied">Фокус на аудио отключен.</string>
     <string name="audio_settings_summary">Измените настройки звука и отрегулируйте настройки эквалайзера</string>
-    <string name="auto">Автоматически</string>
-    <string name="backup_restore_settings_summary">Резервирование и восстановление настроек, плейлисты</string>
-    <string name="backup_restore_title"><![CDATA[Резервирование и восстановление]]></string>
+    <string name="auto">Авто</string>
+    <string name="backup_restore_settings_summary">Резервное копирование, восстановление ваших настроек и плейлистов</string>
+    <string name="backup_restore_title"><![CDATA[Резервное копирование и восстановление]]></string>
     <string name="backup_title">Резервные копии</string>
     <string name="biography">Биография</string>
-    <string name="black_theme_name">Чёрное оформление</string>
+    <string name="black_theme_name">Чёрная</string>
     <string name="blacklist">Черный список</string>
-    <string name="bluetooth_summary">Приложению требуется разрешение на поиск ближайших устройств Bluetooth</string>
-    <string name="bluetooth_title">Ближайшие устройства</string>
     <string name="blur">Размытие</string>
     <string name="blur_card">Карточка с размытием</string>
     <string name="bug_report_failed">Невозможно отправить отчет</string>
@@ -110,8 +107,7 @@
     <string name="bug_report_no_password">Пожалуйста, введите ваш корректный пароль GitHub</string>
     <string name="bug_report_no_title">Пожалуйста, введите название отчета о проблеме</string>
     <string name="bug_report_no_username">Пожалуйста, введите корректно ваше имя пользователя GitHub</string>
-    <string name="bug_report_success">Отчёт об ошибке создан</string>
-    <string name="bug_report_summary">Произошла непредвиденная ошибка. Приносим извинения за предоставленные неудобства. Если проблемы не исчезают, очистите данные приложения или свяжитесь с нами по электронной почте </string>
+    <string name="bug_report_summary">Произошла непредвиденная ошибка. Извините, если это продолжится то \"Очистите данные приложения\" или отправьте сообщение на электронную почту </string>
     <string name="bug_report_use_account">Отправить с помощью учетной записи GitHub</string>
     <string name="buy_now">Купить сейчас</string>
     <string name="cancel_current_timer">Отменить</string>
@@ -134,7 +130,6 @@
     <string name="clear_playing_queue">Очистить очередь</string>
     <string name="color">Цветная</string>
     <string name="colors">Цвета</string>
-    <string name="compact">Компактный</string>
     <string name="composer">Композитор</string>
     <string name="copied_device_info_to_clipboard">Скопировать информацию об устройстве в буфер обмена.</string>
     <string name="could_not_create_playlist">Не удалось создать плейлист.</string>
@@ -146,9 +141,9 @@
     <string name="created_playlist_x">Создан плейлист %1$s.</string>
     <string name="credit_title">Участники и помощники</string>
     <string name="currently_listening_to_x_by_x">Сейчас играет %1$s от %2$s.</string>
-    <string name="custom_artist_images">Пользовательские изображения исполнителей</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Отправить отчет о крахе</string>
-    <string name="dark_theme_name">Тёмное оформление</string>
+    <string name="custom_artist_images">Пользовательские изображения</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Отправить отчет о неполадке</string>
+    <string name="dark_theme_name">Тёмная</string>
     <string name="delete_playlist_title">Удалить плейлист</string>
     <string name="delete_playlist_x"><![CDATA[Удалить плейлист <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Удалить плейлисты</string>
@@ -159,49 +154,41 @@
     <string name="delete_x_songs"><![CDATA[Удалить <b>%1$d</b> песен?]]></string>
     <string name="deleted_x_songs">Удалено %1$d песен.</string>
     <string name="deleting_songs">Удаление песен</string>
-    <string name="depth">Масштабирование</string>
+    <string name="depth">Глубина</string>
     <string name="description">Описание</string>
     <string name="device_info">Информация об устройстве</string>
     <string name="dialog_message_set_ringtone">Разрешить Retro Music изменять настройки звука</string>
-    <string name="dialog_title_set_ringtone">Выбрать мелодию звонка</string>
+    <string name="dialog_title_set_ringtone">Выбрать рингтон</string>
     <string name="disc_hint">Номер диска</string>
-    <string name="do_you_want_to_clear_the_blacklist">Очистить черный список?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Удалить <b>%1$s</b> из черного списка?]]></string>
+    <string name="do_you_want_to_clear_the_blacklist">Вы хотите очистить черный список?</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Вы хотите удалить <b>%1$s</b> из черного списка?]]></string>
     <string name="donate">Пожертвовать</string>
-    <string name="donate_summary">Если вы считаете, что я заслуживаю награды за свой труд, можете отправить мне определённую сумму</string>
+    <string name="donate_summary">Если вы считаете, что я заслуживаю награды за свой труд, можете отправить мне несколько рублей здесь</string>
     <string name="donation_header">Купить мне:</string>
-    <string name="done">Готово</string>
+    <string name="done">Готов</string>
     <string name="drive_mode">Режим вождения</string>
     <string name="edit_fab">Кнопка редактирования</string>
     <string name="edit_normal_lyrics">Редактировать текст</string>
     <string name="edit_synced_lyrics">Редактировать синхронизированный текст</string>
     <string name="empty">Пусто</string>
     <string name="equalizer">Эквалайзер</string>
-    <string name="error_create_backup">Не удалось создать резервную копию</string>
-    <string name="error_delete_backup">Не удалось удалить резервную копию</string>
-    <string name="error_empty_name">Ваше имя не может быть пустым!</string>
-    <string name="error_load_failed">Ошибка загрузки</string>
-    <string name="error_share_file">Не удалось просканировать файл</string>
-    <string name="expanded">Увеличенная</string>
     <string name="faq">ЧаВО</string>
-    <string name="favorites">Любимые</string>
-    <string name="file_already_exists">Файл уже существует</string>
-    <string name="finish_last_song">Закончить вопсроизведение последнего трека</string>
+    <string name="favorites">Избранное</string>
+    <string name="finish_last_song">Закончить вопсроизведение последней песни</string>
     <string name="fit">По размеру</string>
-    <string name="flat">Плоское</string>
+    <string name="flat">Плоская</string>
     <string name="folders">Папки</string>
-    <string name="follow_system">Системное</string>
+    <string name="follow_system">Системная</string>
     <string name="for_you">Для вас</string>
     <string name="free">Доступно</string>
     <string name="full">Заполнение</string>
     <string name="full_card">Заполненная карточка</string>
-    <string name="general_settings_summary">Изменение оформления и цвета приложения</string>
-    <string name="general_settings_title">Внешний вид</string>
+    <string name="general_settings_summary">Измените тему и цвет в приложении</string>
+    <string name="general_settings_title">Внешний вид интерфейса</string>
     <string name="genre">Жанр</string>
     <string name="genres">Жанры</string>
     <string name="git_hub_summary">Развивайте проект на GitHub</string>
     <string name="gradient">Градиент</string>
-    <string name="grant_access">Предоставить доступ</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -212,7 +199,7 @@
     <string name="grid_size_8">8</string>
     <string name="grid_style_label">Стиль сетки</string>
     <string name="help_summary">Нужна ещё помощь?</string>
-    <string name="hinge">Петля</string>
+    <string name="hinge">Пластинки</string>
     <string name="history">История</string>
     <string name="history_cleared">История очищена</string>
     <string name="history_undo_button">Отменить</string>
@@ -220,10 +207,10 @@
     <string name="horizontal_flip">Горизонтальный поворот</string>
     <string name="image">Изображение</string>
     <string name="image_gradient">Градиентное изображение</string>
-    <string name="image_settings_summary">Изменение настроек загрузки изображений исполнителей</string>
+    <string name="image_settings_summary">Изменение настроек загрузки изображения артиста</string>
     <string name="import_label">Импорт</string>
     <string name="import_playlist">Импорт плейлиста</string>
-    <string name="import_playlist_message">Импортирует все плейлисты с песнями, находящиеся в Android Media Store. Если плейлисты уже существуют, песни будут объединены.</string>
+    <string name="import_playlist_message">Импортирует все плейлисты, перечисленные в Android Media Store с песнями, если плейлисты уже существуют, песни будут объединены.</string>
     <string name="inserted_x_songs_into_playlist_x">В плейлист %2$s внесено %1$d  песен.</string>
     <string name="instagram_page_summary">Поделитесь своим обзором на приложение Retro Music в Instagram</string>
     <string name="keyboard">Клавиатура</string>
@@ -235,171 +222,162 @@
     <string name="label_last_modified">Последнее изменение</string>
     <string name="label_more_from">Больше от %s</string>
     <string name="label_sampling_rate">Частота дискретизации</string>
-    <string name="label_track_length">Длительность</string>
+    <string name="label_track_length">Длина</string>
     <string name="labeled">Показывать всегда</string>
     <string name="last_added">Последние добавленные</string>
-    <string name="last_song">Последний трек</string>
-    <string name="lets_go">Вперед</string>
+    <string name="last_song">Последняя песня</string>
     <string name="library_categories">Разделы библиотеки</string>
     <string name="licenses">Лицензии</string>
-    <string name="light_theme_name">Белое</string>
+    <string name="light_theme_name">Белая</string>
     <string name="listeners_label">Слушатели</string>
     <string name="listing_files">Список файлов</string>
-    <string name="loading_products">Загрузка товаров…</string>
+    <string name="loading_products">Загрузка товаров...</string>
     <string name="login">Войти</string>
     <string name="lyrics">Текст песни</string>
     <string name="made_with_love">Сделано с ❤️ в Индии</string>
     <string name="material">Material</string>
     <string name="md_error_label">Ошибка</string>
     <string name="md_storage_perm_error">Ошибка разрешения</string>
-    <string name="message_backup_create_success">Резервная копия успешно создана.</string>
-    <string name="message_limit_tabs">Должно быть не более 5 элементов</string>
-    <string name="message_pro_feature">%s является Pro функцией.</string>
-    <string name="message_restore_success">Восстановление успешно завершено.</string>
-    <string name="message_updated">Обновлено</string>
-    <string name="message_welcome"><![CDATA[Здравствуйте! <br>Добро пожаловать в %s]]></string>
-    <string name="my_name">Имя</string>
-    <string name="my_top_tracks">Часто воспроизводимые</string>
+    <string name="my_name">Моё имя</string>
+    <string name="my_top_tracks">Любимые треки</string>
     <string name="never">Никогда</string>
-    <string name="new_music_mix">Новый Микс</string>
+    <string name="new_music_mix">Новый Музыкальный Микс</string>
     <string name="new_playlist_title">Новый плейлист</string>
-    <string name="new_start_directory">%s - новая стартовая директория.</string>
-    <string name="next_song">Следующий трек</string>
-    <string name="no_albums">У вас нет альбомов</string>
-    <string name="no_artists">У вас нет исполнителей</string>
-    <string name="no_audio_ID">"Сначала проиграйте песню, затем попробуйте ещё раз."</string>
+    <string name="new_start_directory">%s новая стартовая директория.</string>
+    <string name="next_song">Следующая песня</string>
+    <string name="no_albums">Альбомы отсутствуют</string>
+    <string name="no_artists">Исполнители отсутствуют</string>
+    <string name="no_audio_ID">"Сначала проиграйте песню, затем попробуйте заново."</string>
     <string name="no_backups_found">Резервные копии не найдены</string>
     <string name="no_equalizer">Эквалайзер не найден</string>
-    <string name="no_genres">У вас нет жанров</string>
-    <string name="no_lyrics_found">Текст не найден</string>
+    <string name="no_genres">Жанры отсутствуют</string>
+    <string name="no_lyrics_found">Текст отсутствует</string>
     <string name="no_playing_queue">Нет проигрываемых песен</string>
-    <string name="no_playlists">У вас нет плейлистов</string>
+    <string name="no_playlists">Плейлисты отсутствуют</string>
     <string name="no_purchase_found">Покупки отсутствуют.</string>
     <string name="no_results">Нет результатов</string>
-    <string name="no_songs">У вас нет песен</string>
+    <string name="no_songs">Нет песен</string>
     <string name="normal">Обычная</string>
     <string name="normal_lyrics">Обычный текст</string>
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> не найден в хранилище медиа.]]></string>
-    <string name="not_recently_played">Нет недавно воспроизведенных треков</string>
+    <string name="not_recently_played">Сейчас не проигрывается</string>
     <string name="nothing_to_scan">Нет файлов для сканирования.</string>
     <string name="nothing_to_see">Нет файлов для сканирования</string>
-    <string name="notification">Уведомление</string>
-    <string name="notification_settings_summary">Настроить стиль уведомления</string>
+    <string name="notification">Уведомления</string>
+    <string name="notification_settings_summary">Настроить стиль уведомлений</string>
     <string name="now_playing">Экран воспроизведения</string>
-    <string name="now_playing_queue">Очередь в экране воспроизведения</string>
-    <string name="now_playing_summary">Настройка экрана воспроизведения</string>
-    <string name="now_playing_themes">9 новых оформлений экрана воспроизведения</string>
+    <string name="now_playing_queue">Очередь в \"Экране воспроизведения\"</string>
+    <string name="now_playing_summary">Настроить экран воспроизведения</string>
+    <string name="now_playing_themes">9+ тем экрана текущего воспроизведения</string>
     <string name="only_on_wifi">Только по Wi-Fi</string>
-    <string name="other_settings_summary">Экспериментальные возможности</string>
-    <string name="others">Другие</string>
-    <string name="over_cover">Поверх обложки</string>
+    <string name="other_settings_summary">Эксперементальные возможности</string>
+    <string name="others">Другое</string>
+    <string name="over_cover">За обложкой</string>
     <string name="password">Пароль</string>
     <string name="past_three_months">Последние 3 месяца</string>
     <string name="paste_lyrics_here">Вставьте текст песни</string>
     <string name="paste_timeframe_lyrics_here">Вставьте синхронизированный текст песни</string>
     <string name="peek">Просмотр</string>
-    <string name="permission_bluetooth_denied">Отказано в доступе к поиску устройств поблизости.</string>
-    <string name="permission_external_storage_denied">Разрешение для доступа к внешнему хранилищу не получено.</string>
+    <string name="permission_external_storage_denied">Разрешение для доступа у внешнему хранилищу не получено.</string>
     <string name="permission_summary">Приложению требуется разрешение на доступ к внутренней памяти вашего устройства для воспроизведения музыки.</string>
-    <string name="permission_title">Доступ к хранилищу</string>
+    <string name="permission_title">Доступ к внутренней памяти</string>
     <string name="permissions_denied">Разрешения не получены.</string>
     <string name="personalize">Персонализация</string>
-    <string name="personalize_settings_summary">Настройка экрана воспроизведения и интерфейса управления музыкой</string>
+    <string name="personalize_settings_summary">Настройте управление экрана воспроизведения и интерфейс управления музыкой</string>
     <string name="pick_from_local_storage">Выбрать из хранилища</string>
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">Подпишитесь на страницу Retro Music в Pinterest</string>
-    <string name="plain">Гладкое</string>
+    <string name="plain">Гладкая</string>
     <string name="playList_already_exits">Плейлист уже существует</string>
     <string name="playback_pitch">Высота</string>
     <string name="playback_settings">Параметры воспроизведения</string>
     <string name="playback_speed">Скорость воспроизведения</string>
-    <string name="playing_notification_description">Уведомление в виде плеера позволяет управлять воспроизведением музыки</string>
-    <string name="playing_notification_name">Уведомление в виде плеера</string>
+    <string name="playing_notification_description">Уведомление о песне предоставляет действия для воспроизведения/паузы и т.д.</string>
+    <string name="playing_notification_name">Уведомления воспроизведения</string>
     <string name="playlist_created_sucessfully">%s успешно создан</string>
     <string name="playlist_is_empty">Плейлист пуст</string>
     <string name="playlist_name_empty">Название плейлиста</string>
     <string name="playlists">Плейлисты</string>
-    <string name="pref_blur_amount_summary">Степень размытия в соответствующих темах. Чем ниже значение размытия, тем выше быстродействие устройства</string>
+    <string name="pref_blur_amount_summary">Степень размытия в соответствующих темах; чем ниже, тем быстрее работает устройство</string>
     <string name="pref_blur_amount_title">Степень размытия</string>
-    <string name="pref_filter_song_summary">Убрать из списка песни, длительность которых ниже выбранного значения</string>
+    <string name="pref_filter_song_summary">Фильтровать песни по длине</string>
     <string name="pref_filter_song_title">Фильтровать песни по длительности</string>
     <string name="pref_header_advanced">Расширенные настройки</string>
     <string name="pref_header_album">Стиль альбома</string>
     <string name="pref_header_audio">Звук</string>
     <string name="pref_header_blacklist">Черный список</string>
     <string name="pref_header_controls">Управление</string>
-    <string name="pref_header_general">Оформление</string>
+    <string name="pref_header_general">Тема</string>
     <string name="pref_header_images">Изображения</string>
     <string name="pref_header_library">Библиотека</string>
     <string name="pref_header_lockscreen">Экран блокировки</string>
     <string name="pref_header_playlists">Плейлисты</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Ставить музыку на паузу при уменьшении громкости до нуля и продолжать воспроизведение после увеличения громкости. Предупреждение: при увеличении громкости вне приложения, Retro Music также начнёт воспроизведение</string>
+    <string name="pref_keep_pause_on_zero_volume_summary">Ставит музыку на паузу при уменьшении громкости до нуля и играет после увеличения громкости. Предупреждение, когда вы увеличиваете громкость не в приложении, то Retro Music также начнёт воспроизведение</string>
     <string name="pref_keep_pause_on_zero_volume_title">Пауза при нулевой громкости</string>
-    <string name="pref_keep_screen_on_summary">Имейте в виду, что включение этой функции может повлиять время работы от батареи</string>
-    <string name="pref_keep_screen_on_title">Оставлять экран включенным</string>
+    <string name="pref_keep_screen_on_summary">Имейте в виду, что включение этой функции может повлиять на заряд батареи</string>
+    <string name="pref_keep_screen_on_title">Оставить экран включенным</string>
     <string name="pref_language_name">Выберите язык</string>
     <string name="pref_snow_fall_title">Эффект снегопада</string>
     <string name="pref_summary_album_art_on_lockscreen">Использовать обложку альбома текущей песни в качестве обоев на экране блокировки.</string>
-    <string name="pref_summary_album_artists_only">Показывать исполнителей альбомов во вкладке \"Исполнители\"</string>
-    <string name="pref_summary_audio_ducking">Снижать громкость воспроизведения когда играет системный звук или приходит уведомление</string>
+    <string name="pref_summary_album_artists_only">Только альбомы исполнителей</string>
+    <string name="pref_summary_audio_ducking">Снизить громкость воспроизведения когда приходит звуковое уведомление</string>
     <string name="pref_summary_audio_fade">Затухать звук, когда песня приостановлена или воспроизведена</string>
     <string name="pref_summary_blacklist">Содержимое черного списка скрыто из вашей библиотеки.</string>
-    <string name="pref_summary_bluetooth_playback">Начать воспроизведение сразу же после подключения устройства Bluetooth</string>
-    <string name="pref_summary_blurred_album_art">Размыть обложку альбома на экране блокировки. Может вызвать проблемы со сторонними приложениями и виджетами</string>
-    <string name="pref_summary_carousel_effect">Эффект карусели для обложек альбома на экране воспроизведения. Эффект не работает для тем \"Карточка\" и \"Карточка с размытием\"</string>
-    <string name="pref_summary_classic_notification">Использовать классический дизайн уведомления</string>
-    <string name="pref_summary_colored_app">Цвет фона и кнопок управления изменяется в соответствии с обложкой альбома с экрана воспроизведения</string>
-    <string name="pref_summary_colored_app_shortcuts">Окрашивает ярлыки приложения в акцентный цвет. Каждый раз, когда вы меняете цвет, вкл-выкл эту настройку, чтобы изменение вступило в силу</string>
-    <string name="pref_summary_colored_notification">"Окрашивает уведомление в доминирующий цвет обложки альбома"</string>
-    <string name="pref_summary_cross_fade">Продолжительность кроссфейда между песнями</string>
-    <string name="pref_summary_desaturated_color">Согласно стилю Material Design, в темном режиме цвета должны быть немного обесцвечены</string>
+    <string name="pref_summary_bluetooth_playback">Начать воспроизведение сразу же после подключения Bluetooth-устройства</string>
+    <string name="pref_summary_blurred_album_art">Размыть обложку альбома на экране блокировки. Может вызывать проблемы со сторонними приложениями и виджетами.</string>
+    <string name="pref_summary_carousel_effect">Эффект карусели для обложек альбома на экране воспроизведения. Учтите, что темы \"Карточка\" и \"Карточка с размытием\" не будут работать</string>
+    <string name="pref_summary_classic_notification">Использовать классический дизайн уведомлений.</string>
+    <string name="pref_summary_colored_app">Цвет кнопок фона и кнопок управления изменяется в соответствии с обложкой альбома с экрана воспроизведения</string>
+    <string name="pref_summary_colored_app_shortcuts">Окрашивает ярлыки в основной цвет. Каждый раз, когда вы меняете цвет, вкл-выкл эту настройку, чтобы изменение вступило в силу</string>
+    <string name="pref_summary_colored_notification">"Окрашивает уведомление в доминирубщий цвет обложки альбома"</string>
+    <string name="pref_summary_cross_fade">Продолжительность crossfade между песнями</string>
+    <string name="pref_summary_desaturated_color">Согласно Material Design в темном режиме цвета должны быть немного обесцвечены</string>
     <string name="pref_summary_expand_now_playing_panel">Нажатие на уведомление будет показывать экран воспроизведения вместо домашнего экрана</string>
     <string name="pref_summary_extra_controls">Добавить дополнительные элементы управления для мини-плеера</string>
-    <string name="pref_summary_extra_song_info">Показывать дополнительную информацию о песне, такую как формат файла, битрейт и частота</string>
+    <string name="pref_summary_extra_song_info">Показать дополнительную информацию о песне, такую как формат файла, битрейт и частота</string>
     <string name="pref_summary_gapless_playback">"Может вызвать проблемы с воспроизведением на некоторых устройствах."</string>
     <string name="pref_summary_home_banner">Показывать кнопку Домой</string>
-    <string name="pref_summary_ignore_media_store_artwork">Может повысить качество обложки альбома, но привести к более медленной загрузке изображения. Включайте это только в том случае, если у вас есть проблемы с картинками низкого разрешения</string>
-    <string name="pref_summary_library_categories">Настроить вид и порядок вкладок в библиотеке.</string>
+    <string name="pref_summary_ignore_media_store_artwork">Может повысить качество обложки альбома, но привести к более медленной загрузки изображения. Включите это только в том случае, если у вас есть картинки с низким разрешением</string>
+    <string name="pref_summary_library_categories">Настроить вид и порядок категорий в библиотеке.</string>
     <string name="pref_summary_lock_screen">Используйте собственный экран блокировки Retro Music</string>
-    <string name="pref_summary_manage_audio_focus">Всегда воспроизводить звук в фоне вне зависимости от других источников звука</string>
     <string name="pref_summary_open_source_licences">Сведения о лицензии для программного обеспечения с открытым исходным кодом</string>
     <string name="pref_summary_pause_history">Если включено, то новые песни не будут отображаться в истории</string>
-    <string name="pref_summary_remember_tab">При открытии приложения переходить на последнюю использованную вкладку</string>
+    <string name="pref_summary_remember_tab">Перейдите к последней использованной вкладке при запуске</string>
     <string name="pref_summary_show_lyrics">Показывать синхронизированный текст песни поверх обложки альбома</string>
-    <string name="pref_summary_suggestions">Показывать Новый Микс на главном экране</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Включает смену песни по свайпу в любом месте на экране воспроизведения</string>
-    <string name="pref_summary_swipe_to_dismiss">Проведите вниз, чтобы закрыть мини-плеер</string>
+    <string name="pref_summary_suggestions">Показывать Новый Музыкальный Микс на главном экране</string>
+    <string name="pref_summary_swipe_anywhere_now_playing">Включает смену песни, свайпом в любом месте на текущем экране</string>
     <string name="pref_summary_toggle_full_screen">Полноэкранный режим</string>
     <string name="pref_summary_toggle_headset">Начать воспроизведение музыки сразу после подключения наушников</string>
     <string name="pref_summary_toggle_shuffle">Режим перемешивания выключится при проигрывании нового списка песен</string>
-    <string name="pref_summary_toggle_volume">Если места на экране достаточно, показывать панель регулировки громкости на экране воспроизведения</string>
-    <string name="pref_summary_wallpaper_accent">Использовать цвет акцента из обоев</string>
+    <string name="pref_summary_toggle_volume">Если доступно достаточно места, показывать регулировку громкости на экране воспроизведения</string>
+    <string name="pref_summary_wallpaper_accent">Использовать цветовое оформление из обоев</string>
     <string name="pref_summary_whitelist">Показывать музыку только из папки /Music</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Показать обложку альбома</string>
     <string name="pref_title_album_artists_only">Показывать обложку альбома в разделе исполнители</string>
-    <string name="pref_title_album_cover_style">Оформление обложки альбома</string>
-    <string name="pref_title_album_cover_transform">Эффект смены обложки альбома</string>
+    <string name="pref_title_album_cover_style">Тема обложки альбома</string>
+    <string name="pref_title_album_cover_transform">Стиль смены обложки альбома</string>
     <string name="pref_title_app_shortcuts">Цветные ярлыки</string>
-    <string name="pref_title_appbar_mode">Стиль верхней панели</string>
-    <string name="pref_title_audio_ducking">Уменьшать громкость при получении уведомления</string>
+    <string name="pref_title_appbar_mode">Режим панели приложения</string>
+    <string name="pref_title_audio_ducking">Уменьшить громкость при получении уведомлении</string>
     <string name="pref_title_audio_fade">Затухание аудио</string>
     <string name="pref_title_auto_download_artist_images">Автозагрузка изображений исполнителя</string>
     <string name="pref_title_blacklist">Черный список</string>
     <string name="pref_title_bluetooth_playback">Воспроизведение при подключении Bluetooth</string>
-    <string name="pref_title_blurred_album_art">Размывать обложку альбома</string>
+    <string name="pref_title_blurred_album_art">Размытие обложки альбома</string>
     <string name="pref_title_circle_button">Круглая кнопка воспроизведения</string>
     <string name="pref_title_classic_notification">Классический дизайн уведомлений</string>
-    <string name="pref_title_colored_app">Адаптивный цвет</string>
-    <string name="pref_title_colored_notification">Окрашенное уведомление</string>
-    <string name="pref_title_cross_fade">Кроссфейд (бета-версия)</string>
+    <string name="pref_title_colored_app">Адаптированный цвет</string>
+    <string name="pref_title_colored_notification">Цветное уведомление</string>
+    <string name="pref_title_cross_fade">Crossfade (бета)</string>
     <string name="pref_title_custom_font">Использовать шрифт Manrope</string>
-    <string name="pref_title_desaturated_color">Обесцвеченный цвет</string>
-    <string name="pref_title_expand_now_playing_panel">Показывать экран воспроизведения</string>
+    <string name="pref_title_desaturated_color">Немного обесцвеченный цвет </string>
+    <string name="pref_title_expand_now_playing_panel">Показать экран воспроизведения</string>
     <string name="pref_title_extra_controls">Дополнительные элементы управления</string>
     <string name="pref_title_extra_song_info">Информация о песне</string>
     <string name="pref_title_gapless_playback">Непрерывное воспроизведение</string>
-    <string name="pref_title_general_theme">Оформление приложения</string>
-    <string name="pref_title_home_album_grid_style">Сетка альбомов</string>
+    <string name="pref_title_general_theme">Тема приложения</string>
+    <string name="pref_title_home_album_grid_style">Сетка альбома на Главной странице</string>
     <string name="pref_title_home_artist_grid_style">Сетка исполнителей</string>
     <string name="pref_title_home_banner">Кнопка Домой</string>
     <string name="pref_title_ignore_media_store_artwork">Игнорировать обложки из хранилища</string>
@@ -407,32 +385,31 @@
     <string name="pref_title_lock_screen">Полноэкранное управление</string>
     <string name="pref_title_lyrics_screen_on">Не выключать экран при показе текста</string>
     <string name="pref_title_lyrics_type">Тип текста песни</string>
-    <string name="pref_title_manage_audio_focus">Всегда проигрывать</string>
-    <string name="pref_title_now_playing_screen_appearance">Оформление экрана воспроизведения</string>
-    <string name="pref_title_open_source_licences">Лицензии с открытым исходным кодом</string>
+    <string name="pref_title_now_playing_screen_appearance">Тема экрана воспроизведения</string>
+    <string name="pref_title_open_source_licences">Лицензии с открытым кодом</string>
     <string name="pref_title_pause_history">Приостановить историю</string>
-    <string name="pref_title_remember_tab">Запоманать последнюю использованную вкладку</string>
+    <string name="pref_title_remember_tab">Запомнить последнюю вкладку</string>
     <string name="pref_title_show_lyrics">Показать текст песни</string>
     <string name="pref_title_suggestions">Показывать предложения</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Проведите пальцем в любом месте, чтобы сменить песню</string>
-    <string name="pref_title_swipe_to_dismiss">Скрывать мини-плеер свайпом</string>
-    <string name="pref_title_tab_text_mode">Отображение названия вкладок</string>
+    <string name="pref_title_swipe_anywhere_now_playing">Проведите пальцем где угодно, чтобы сменить песню</string>
+    <string name="pref_title_tab_text_mode">Название нижних кнопок</string>
     <string name="pref_title_toggle_carousel_effect">Эффект карусели</string>
-    <string name="pref_title_toggle_full_screen">Полноэкранный режим приложения</string>
+    <string name="pref_title_toggle_full_screen">Полноэкранное приложение</string>
     <string name="pref_title_toggle_toggle_headset">Автовоспроизведение</string>
     <string name="pref_title_toggle_toggle_shuffle">Режим перемешивания</string>
     <string name="pref_title_toggle_volume">Регулировка громкости</string>
     <string name="pref_title_wallpaper_accent">Цвет акцента обоев</string>
     <string name="pref_title_whitelist">Музыка из белого списка</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Черное офромление, больше стилей экрана воспроизведения, эффект карусели и многое другое..</string>
+    <string name="pro_summary">Черная тема, Темы экрана воспроизведения, Эффект карусели и многое другое..</string>
     <string name="profile">Профиль</string>
     <string name="purchase">Купить</string>
-    <string name="queue">Очередь воспроизведения</string>
+    <string name="queue">Очередь</string>
     <string name="rate_app">Оценить приложение</string>
-    <string name="rate_on_google_play_summary">Понравилось приложение? Напишите нам в Google Play Store о том, как мы можем сделать его еще лучше</string>
-    <string name="recent_albums">Недавние альбомы</string>
-    <string name="recent_artists">Недавние исполнители</string>
+    <string name="rate_on_google_play_summary">Понравилось это приложение? Напишите нам в Google Play Store о том, как мы можем сделать его еще лучше</string>
+    <string name="recent_albums">Последние альбомы</string>
+    <string name="recent_artists">Последние исполнители</string>
     <string name="remove_action">Удалить</string>
     <string name="remove_cover">Удалить обложку</string>
     <string name="remove_from_blacklist">Удалить из черного списка</string>
@@ -440,7 +417,7 @@
     <string name="remove_song_from_playlist_title">Удалить песню из плейлиста</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Удалить песню <b>%1$s</b> из плейлиста?]]></string>
     <string name="remove_songs_from_playlist_title">Удалить песни из плейлиста</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Удалить %1$d песен(-и) из плейлиста?]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[Удалить %1$d песни(ю) из плейлиста?]]></string>
     <string name="rename_playlist_title">Переименовать плейлист</string>
     <string name="replace_cover">Заменить обложку</string>
     <string name="report_an_issue">Сообщить об ошибке</string>
@@ -449,17 +426,17 @@
     <string name="reset_artist_image">Сбросить изображение исполнителя</string>
     <string name="restore">Восстановить</string>
     <string name="restore_message">Вы уверены, что хотите восстановить резервную копию?</string>
-    <string name="restored_previous_purchase_please_restart">Предыдущая покупка восстановлена. Перезагрузите приложение, чтобы воспользоваться всеми функциями.</string>
-    <string name="restored_previous_purchases">Предыдущие покупки восстановлены.</string>
-    <string name="restoring_purchase">Восстановление покупки…</string>
+    <string name="restored_previous_purchase_please_restart">Предыдущая покупка восстановлена. Перезагрузите приложение, чтобы использовать все функции.</string>
+    <string name="restored_previous_purchases">Восстановленные предыдущие покупки.</string>
+    <string name="restoring_purchase">Восстановление покупки ...</string>
     <string name="retro_music_player">Retro Music Player</string>
     <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Приложению требуется разрешение на доступ к изменению настроек вашего устройства, чтобы установливать музыку в качестве мелодии звонка</string>
+    <string name="ringtone_summary">Приложению требуется разрешение на доступ к настройкам вашего устройства, чтобы установить музыку в качестве рингтона.</string>
     <string name="ringtone_title">Мелодия звонка (необязательно)</string>
     <string name="saf_delete_failed">Ошибка при удалении файла: %s</string>
     <!-- SAF -->
     <string name="saf_error_uri">Не удается получить SAF URI</string>
-    <string name="saf_guide_slide1_description">Открыть меню навигации</string>
+    <string name="saf_guide_slide1_description">Открыть навигационное меню</string>
     <string name="saf_guide_slide1_description_before_o">Включите «Показать SD-карту» в всплывающем меню</string>
     <!-- SAF guide -->
     <string name="saf_guide_slide1_title">%s необходим доступ к SD-карте</string>
@@ -473,51 +450,50 @@
     <!-- SAF guide -->
     <string name="save_playlist_title">Сохранить как...</string>
     <string name="save_playlists_title">Сохранить как...</string>
-    <string name="saved_playlist_to">Плейлист сохранён в %s.</string>
+    <string name="saved_playlist_to">Сохраненный список воспроизведения в %s.</string>
     <string name="saving_changes">Сохранение изменений</string>
     <string name="scan_media">Сканировать медиа-файлы</string>
     <string name="scanned_files">Просканировано %1$d из %2$d файлов.</string>
     <string name="scrobbles_label">Скробблинг</string>
     <string name="select_all">Выбрать все</string>
-    <string name="selected">Выбрано</string>
+    <string name="selected">Выбранная кнопка</string>
     <string name="set">Установить</string>
     <string name="set_artist_image">Установить изображение исполнителя</string>
     <string name="share_app">Поделиться приложением</string>
     <string name="share_summary">Поделитесь приложением со своими друзьями и родственниками</string>
     <string name="share_to_stories">Поделиться в Историях</string>
-    <string name="show_album_artists">Не показывать исполнителей альбомов</string>
+    <string name="show_album_artists">Показать исполнителей альбома</string>
     <string name="shuffle">Перемешать</string>
-    <string name="simple">Простой</string>
+    <string name="simple">Простая</string>
     <string name="sleep_timer_canceled">Таймер отключения отменен.</string>
     <string name="sleep_timer_set">Таймер сна установлен на %d минут.</string>
     <string name="social">Социальный</string>
-    <string name="social_stories">Поделиться в историях</string>
-    <string name="song">Трек</string>
-    <string name="song_duration">Продолжительность трека</string>
-    <string name="songs">Треки</string>
+    <string name="social_stories">Поделиться историей</string>
+    <string name="song">Песня</string>
+    <string name="song_duration">Длительность песни</string>
+    <string name="songs">Песни</string>
     <string name="sort_order">Порядок сортировки</string>
     <string name="sort_order_a_z">По возрастанию</string>
     <string name="sort_order_album">Альбом</string>
     <string name="sort_order_artist">Исполнитель</string>
     <string name="sort_order_composer">Композитор</string>
-    <string name="sort_order_date">Дата добавления</string>
+    <string name="sort_order_date">Дата</string>
     <string name="sort_order_date_modified">Дата изменения</string>
-    <string name="sort_order_default">По умолчанию</string>
-    <string name="sort_order_num_songs">Количество треков</string>
-    <string name="sort_order_num_songs_desc">Количество треков по убыванию</string>
+    <string name="sort_order_num_songs">Колличество песен</string>
+    <string name="sort_order_num_songs_desc">Количество композиций по убыванию</string>
     <string name="sort_order_year">Год</string>
     <string name="sort_order_z_a">По убыванию</string>
-    <string name="speech_not_supported">Извините! Ваше устройство не поддерживает голосовой ввод</string>
+    <string name="speech_not_supported">Извините! Ваше устройство не поддерживает ввод с помощью речи</string>
     <string name="speech_prompt">Поиск в вашей библиотеке</string>
-    <string name="stack">Стопка</string>
+    <string name="stack">Стэк</string>
     <string name="start_play_music">Начать воспроизведение музыки.</string>
     <string name="suggestion_songs">Предложения</string>
     <string name="support_development">Поддержать разработку</string>
     <string name="swipe_to_unlock">Проведите, чтобы разблокировать</string>
-    <string name="synced_lyrics">Синхронизированный текст</string>
+    <string name="synced_lyrics">Синхронизируемый текст</string>
     <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Присоединяйтесь в нашу группу в Telegram, чтобы обсуждать ошибки, предлагать улучшения, хвастаться и т.д.</string>
-    <string name="thank_you">Спасибо!</string>
+    <string name="telegram_group_summary">Присоединяйтесь к группе Telegram, чтобы обсуждать ошибки, предлагать улучшения, хвастаться и т.д.</string>
+    <string name="thank_you">Спасибо !</string>
     <string name="the_audio_file">Аудиофайл</string>
     <string name="this_month">Этот месяц</string>
     <string name="this_week">Это неделя</string>
@@ -529,37 +505,38 @@
     <string name="today">Сегодня</string>
     <string name="top_albums">Топ альбомов</string>
     <string name="top_artists">Топ исполнителей</string>
-    <string name="track_hint">"Трек (2 для трека 2 или 3004 для трека 4 диска 3)"</string>
+    <string name="track_hint">"Трек (2 для трека 2 или 3004 для CD3 трека 4)"</string>
     <string name="track_list">Номер трека</string>
-    <string name="translate">Помочь с переводом</string>
+    <string name="translate">Переведите</string>
     <string name="translate_community">Помогите нам перевести приложение на ваш язык</string>
     <string name="try_retro_music_premium">Попробуйте Retro Music Premium</string>
     <string name="twitter_page">Твиттер</string>
     <string name="twitter_page_summary">Поделитесь своим дизайном Retro Music</string>
     <string name="unlabeled">Не показывать</string>
-    <string name="unplayable_file">Невозможно проиграть этот трек.</string>
-    <string name="up_next">Следующие треки</string>
+    <string name="unplayable_file">Невозможно проиграть эту песню</string>
+    <string name="up_next">Следующие песни</string>
     <string name="update_image">Обновить изображение</string>
-    <string name="updating">Обновление…</string>
+    <string name="updating">Обновляется…</string>
     <string name="user_images_description">Пользовательские изображения</string>
     <string name="user_name">Имя Пользователя</string>
     <string name="username">Имя пользователя</string>
     <string name="version">Версия</string>
     <string name="vertical_flip">Вертикальный поворт</string>
-    <string name="view_on_telegram">Посмотреть в Telegram</string>
+    <string name="view_on_telegram">Смотреть в Telegram</string>
     <string name="volume">Громкость</string>
     <string name="web_search">Поиск в интернете</string>
-    <string name="website">Наш сайт</string>
+    <string name="website">Сайт</string>
     <string name="website_summary">Посмотрите наш веб-сайт</string>
     <string name="welcome">Добро пожаловать,</string>
     <string name="what_do_you_want_to_share">Чем вы хотите поделиться?</string>
-    <string name="whats_new">Что нового:</string>
+    <string name="whats_new">Что нового :</string>
     <string name="window">Окно</string>
     <string name="window_corner_edges">Закругленные углы</string>
-    <string name="x_has_been_set_as_ringtone">Установить %1$s в качестве мелодии звонка.</string>
+    <string name="x_has_been_set_as_ringtone">Установите %1$s в качестве мелодии звонка.</string>
     <string name="x_selected">Выбрано %1$d</string>
     <string name="year">Год</string>
     <string name="you_have_to_select_at_least_one_category">Выберите хотя бы одну категорию.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Вы будете перенаправлены на сайт системы отслеживания ошибок.</string>
     <string name="your_account_data_is_only_used_for_authentication">Данные вашей учетной записи используются только для аутентификации.</string>
+    <string name="bug_report_success">Отчёт об ошибке создан</string>
 </resources>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index 276a5ef20..29eb44cc6 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">О %s</string>
-    <string name="about_settings_summary">Тим и платформе</string>
+    <string name="about_album_label">About %s</string>
+    <string name="about_settings_summary">Team, social links</string>
     <string name="accent_color">Boja detalja</string>
     <string name="accent_color_desc">Boja plejera, uobičajena je zelena</string>
-    <string name="action_about">О апликацији</string>
+    <string name="action_about">O programerima</string>
     <string name="action_add_to_blacklist">Add to Blacklist</string>
     <string name="action_add_to_favorites">Dodaj u omiljene</string>
     <string name="action_add_to_playing_queue">Dodaj u listu za pustanje</string>
     <string name="action_add_to_playlist">Dodaj na plejlistu</string>
-    <string name="action_cancel">Otkazi trenutni tajmer</string>
     <string name="action_cast">Cast</string>
     <string name="action_clear_playing_queue">Izbrisi trenutnu plejlistu za pustanje</string>
-    <string name="action_cycle_repeat">Понављај</string>
+    <string name="action_cycle_repeat">Cycle repeat mode</string>
     <string name="action_delete">Obrisi</string>
     <string name="action_delete_from_device">Izbrisi sa uredjaja</string>
     <string name="action_details">Detalji</string>
-    <string name="action_edit">Уреди</string>
+    <string name="action_edit">Edit</string>
     <string name="action_go_to_album">Vidi album</string>
     <string name="action_go_to_artist">Vidi izvodjaca</string>
-    <string name="action_go_to_genre">Иди на Жанр</string>
-    <string name="action_go_to_lyrics">Иди на текст</string>
+    <string name="action_go_to_genre">Go to genre</string>
+    <string name="action_go_to_lyrics">Go to Lyrics</string>
     <string name="action_go_to_start_directory">Idi u pocetni direktorijum</string>
     <string name="action_grant">.</string>
     <string name="action_grid_size">Velicina kartica</string>
     <string name="action_grid_size_land">.</string>
-    <string name="action_new_playlist">Нова Плејлиста</string>
+    <string name="action_new_playlist">New playlist</string>
     <string name="action_next">Sledece</string>
     <string name="action_play">Pusti</string>
-    <string name="action_play_all">Пусти све</string>
+    <string name="action_play_all">Play all</string>
     <string name="action_play_next">Pusti sledeće</string>
     <string name="action_play_pause">Pusti/pauziraj</string>
     <string name="action_previous">Prethodno</string>
@@ -42,97 +41,93 @@
     <string name="action_set">Postavi</string>
     <string name="action_set_as_ringtone">Postavi kao melodiju zvona</string>
     <string name="action_set_as_start_directory">Postavi kao pocetni direktorijum</string>
-    <string name="action_settings">"Подешавања"</string>
+    <string name="action_settings">"Podesavanja"</string>
     <string name="action_share">Podeli</string>
     <string name="action_shuffle_all">Nasumicno pusti</string>
     <string name="action_shuffle_playlist">Nasumicno pusti plejlistu</string>
     <string name="action_sleep_timer">Tajmer za iskljucivanje</string>
-    <string name="action_sort_order">Сортирање</string>
+    <string name="action_sort_order">Sort order</string>
     <string name="action_tag_editor">Uredjivac tagova</string>
-    <string name="action_toggle_favorite">Укључи омиљење</string>
-    <string name="action_toggle_shuffle">Укључи насумично пуштање</string>
-    <string name="adaptive">Прилагодљиво</string>
-    <string name="add_action">Додај</string>
+    <string name="action_toggle_favorite">Toggle favorite</string>
+    <string name="action_toggle_shuffle">Toggle shuffle mode</string>
+    <string name="adaptive">Adaptive</string>
+    <string name="add_action">Dodaj</string>
     <string name="add_playlist_title">"Dodaj na plejlistu"</string>
     <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
     <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Dodata je 1 pesma na plejlistu"</string>
     <string name="added_x_titles_to_playing_queue">Dodato %1$d pesama na plejlistu</string>
-    <string name="album">Албум</string>
+    <string name="album">Album</string>
     <plurals name="albumSongs">
-        <item quantity="one">Нумера</item>
-        <item quantity="few">Нумере</item>
-        <item quantity="other">Нумера</item>
+        <item quantity="one">Song</item>
+        <item quantity="few">Songs</item>
+        <item quantity="other">Songs</item>
     </plurals>
-    <string name="album_artist">Извођач албума</string>
-    <string name="albums">Албуми</string>
+    <string name="album_artist">Album Artist</string>
+    <string name="albums">Albumi</string>
     <plurals name="albums">
-        <item quantity="one">Албум</item>
-        <item quantity="few">Албумa</item>
-        <item quantity="other">Албумa</item>
+        <item quantity="one">Album</item>
+        <item quantity="few">Albums</item>
+        <item quantity="other">Albums</item>
     </plurals>
-    <string name="always">Увек</string>
+    <string name="always">Uvek</string>
     <string name="app_share">Isprobaj ovaj fantastican plejer na: https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">Reprodukuj nasumicno</string>
     <string name="app_shortcut_top_tracks_short">Najvise slusano</string>
-    <string name="app_widget_big_name">Цела слика</string>
+    <string name="app_widget_big_name">Full Image</string>
     <string name="app_widget_card_name">Card</string>
     <string name="app_widget_classic_name">Classic</string>
     <string name="app_widget_md3_name">MD3</string>
     <string name="app_widget_small_name">Small</string>
     <string name="app_widget_text_name">Minimal Text</string>
-    <string name="artist">Извођач</string>
-    <string name="artists">Извођач</string>
+    <string name="artist">Izvodjac</string>
+    <string name="artists">Izvodjac</string>
     <string name="audio_fade_duration">Audio fade duration</string>
     <string name="audio_focus_denied">Zvuk se vec reprodukuje</string>
     <string name="audio_settings_summary">Change the sound settings and adjust the equalizer controls</string>
-    <string name="auto">Аутоматски</string>
+    <string name="auto">Auto</string>
     <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
-    <string name="backup_restore_title"><![CDATA[Направи резерву и обнови песму]]></string>
-    <string name="backup_title">Резервне копије</string>
+    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
+    <string name="backup_title">Backups</string>
     <string name="biography">Biografija</string>
     <string name="black_theme_name">Perfektno crna</string>
     <string name="blacklist">Ne trazi muziku u...</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Уређаји у близини</string>
-    <string name="blur">Замагли</string>
+    <string name="blur">Blur</string>
     <string name="blur_card">Blur Card</string>
-    <string name="bug_report_failed">Немогуће је послати извештај</string>
+    <string name="bug_report_failed">Unable to send report</string>
     <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
     <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
     <string name="bug_report_failed_unknown">An unexpected error occurred. Please contact the app developer.</string>
-    <string name="bug_report_failed_wrong_credentials">Погрешно корисничко име или лозинка</string>
-    <string name="bug_report_issue">Проблем</string>
-    <string name="bug_report_manual">Пошаљи ручно</string>
+    <string name="bug_report_failed_wrong_credentials">Wrong username or password</string>
+    <string name="bug_report_issue">Issue</string>
+    <string name="bug_report_manual">Send manually</string>
     <string name="bug_report_no_description">Please enter an issue description</string>
     <string name="bug_report_no_password">Please enter your valid GitHub password</string>
     <string name="bug_report_no_title">Please enter an issue title</string>
-    <string name="bug_report_no_username">Унесите исправно корисничко име на GitHub-у</string>
-    <string name="bug_report_success">Bug report successful</string>
+    <string name="bug_report_no_username">Please enter your valid GitHub username</string>
     <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
     <string name="bug_report_use_account">Send using GitHub account</string>
-    <string name="buy_now">Купи сада</string>
+    <string name="buy_now">Buy now</string>
     <string name="cancel_current_timer">Otkazi trenutni tajmer</string>
-    <string name="card">Картица</string>
-    <string name="card_color_style">Обојена картица</string>
-    <string name="card_square">Квадратна картица</string>
-    <string name="card_style">Картица</string>
+    <string name="card">Card</string>
+    <string name="card_color_style">Colored Card</string>
+    <string name="card_square">Square Card</string>
+    <string name="card_style">Card</string>
     <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
     <string name="cascading">Cascading</string>
     <string name="changelog">Izmene</string>
     <string name="changelog_summary">Check out What\'s New</string>
-    <string name="choose_image">Изабери слику</string>
+    <string name="choose_image">Choose Image</string>
     <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">Круг</string>
-    <string name="circular">Кружно</string>
+    <string name="circle">Circle</string>
+    <string name="circular">Circular</string>
     <string name="classic">Classic</string>
     <string name="clear_action">Ocisti</string>
     <string name="clear_blacklist">Ocisti listu za ignorisanje foldera</string>
     <string name="clear_history">Clear History</string>
     <string name="clear_playing_queue">Clear queue</string>
-    <string name="color">Боја</string>
+    <string name="color">Color</string>
     <string name="colors">Boje</string>
-    <string name="compact">Compact</string>
     <string name="composer">Composer</string>
     <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
     <string name="could_not_create_playlist">Nemoguce je napraviti plejlistu</string>
@@ -150,9 +145,9 @@
     <string name="delete_playlist_title">Izbrisi plejlistu</string>
     <string name="delete_playlist_x"><![CDATA[Izbrisi <b>%1$s</b> plejlistu?]]></string>
     <string name="delete_playlists_title">Izbrisi plejlistu</string>
-    <string name="delete_song_title">Обриши нумеру</string>
+    <string name="delete_song_title">Delete song</string>
     <string name="delete_song_x"><![CDATA[Izbrisi <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Обриши нумере</string>
+    <string name="delete_songs_title">Delete songs</string>
     <string name="delete_x_playlists"><![CDATA[Izbrisi <b>%1$d</b> plejliste?]]></string>
     <string name="delete_x_songs"><![CDATA[Izbrisi <b>%1$d</b> numere?]]></string>
     <string name="deleted_x_songs">Izbrisi %1$d numere.</string>
@@ -175,31 +170,23 @@
     <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
     <string name="empty">Nema pesama</string>
     <string name="equalizer">Ekvilajzer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Име мора постојати</string>
-    <string name="error_load_failed">Учитавање неуспешно</string>
-    <string name="error_share_file">Неуспешно дељење песме</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">ЧП и О</string>
+    <string name="faq">FAQ</string>
     <string name="favorites">Favoriti</string>
-    <string name="file_already_exists">Песма већ постоји</string>
     <string name="finish_last_song">Finish last song</string>
     <string name="fit">Fit</string>
     <string name="flat">Ravno</string>
     <string name="folders">Folderi</string>
     <string name="follow_system">Follow system</string>
     <string name="for_you">Za tebe</string>
-    <string name="free">Бесплатно</string>
+    <string name="free">Free</string>
     <string name="full">Ispunjen</string>
     <string name="full_card">Full card</string>
-    <string name="general_settings_summary">Прилагоди тему и боју</string>
-    <string name="general_settings_title">Изглед и утисак</string>
+    <string name="general_settings_summary">Change the theme and colors of the app</string>
+    <string name="general_settings_title">Look and feel</string>
     <string name="genre">Zanr</string>
-    <string name="genres">Жанра</string>
+    <string name="genres">Genres</string>
     <string name="git_hub_summary">Fork the project on GitHub</string>
-    <string name="gradient">Прелаз</string>
-    <string name="grant_access">Grant access</string>
+    <string name="gradient">Gradient</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -209,60 +196,53 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="grid_style_label">Grid style</string>
-    <string name="help_summary">Треба помоћ?</string>
+    <string name="help_summary">Need more help?</string>
     <string name="hinge">Hinge</string>
     <string name="history">Istorija reprodukovanja</string>
     <string name="history_cleared">History cleared</string>
-    <string name="history_undo_button">Опозови</string>
+    <string name="history_undo_button">Undo</string>
     <string name="home">Pocetak</string>
     <string name="horizontal_flip">Horizontal flip</string>
-    <string name="image">Слика</string>
+    <string name="image">Image</string>
     <string name="image_gradient">Gradient image</string>
     <string name="image_settings_summary">Change artist image download settings</string>
-    <string name="import_label">Увези</string>
-    <string name="import_playlist">Увези плејлисту</string>
+    <string name="import_label">Import</string>
+    <string name="import_playlist">Import playlist</string>
     <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
     <string name="inserted_x_songs_into_playlist_x">Ubaceno %1$d pesama u plejlistu %2$s.</string>
     <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
-    <string name="keyboard">Тастатура</string>
+    <string name="keyboard">Keyboard</string>
     <string name="label_bit_rate">Bitrate</string>
     <string name="label_file_format">Formatiraj</string>
     <string name="label_file_name">Naziv datoteke</string>
     <string name="label_file_path">Lokacija datoteke</string>
     <string name="label_file_size">Velicina</string>
-    <string name="label_last_modified">Задње додирнуто</string>
+    <string name="label_last_modified">Last Modified</string>
     <string name="label_more_from">More from %s</string>
     <string name="label_sampling_rate">Brzina uzorkovanja</string>
     <string name="label_track_length">Duzina trajanja</string>
-    <string name="labeled">Названо</string>
+    <string name="labeled">Labeled</string>
     <string name="last_added">Poslednje dodato</string>
-    <string name="last_song">Задња песма</string>
-    <string name="lets_go">Хајдемо!</string>
+    <string name="last_song">Last song</string>
     <string name="library_categories">Library categories</string>
     <string name="licenses">Licence</string>
     <string name="light_theme_name">Perfektno bela</string>
-    <string name="listeners_label">Слушаоци</string>
+    <string name="listeners_label">Listeners</string>
     <string name="listing_files">Pronalazenje pesama</string>
     <string name="loading_products">Ucitavanje datoteka...</string>
-    <string name="login">Пријава</string>
+    <string name="login">Login</string>
     <string name="lyrics">Tekst pesme</string>
-    <string name="made_with_love">Направљено с љубављу из Индије</string>
-    <string name="material">Материјал</string>
-    <string name="md_error_label">Грешка</string>
-    <string name="md_storage_perm_error">Немогуће приступити песмама</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
+    <string name="made_with_love">Made with ❤️ in India</string>
+    <string name="material">Material</string>
+    <string name="md_error_label">Error</string>
+    <string name="md_storage_perm_error">Permission error</string>
     <string name="my_name">Moje ime je</string>
     <string name="my_top_tracks">Najslusanije numere</string>
     <string name="never">Nikada</string>
     <string name="new_music_mix">New Music Mix</string>
     <string name="new_playlist_title">Nova plejlista</string>
     <string name="new_start_directory">%s je novi pocetni direktorijum.</string>
-    <string name="next_song">Следећа Песма</string>
+    <string name="next_song">Next Song</string>
     <string name="no_albums">Nema albuma</string>
     <string name="no_artists">Nema izvodjaca</string>
     <string name="no_audio_ID">"Prvo pusti pesmu, a onda pokusaj opet"</string>
@@ -276,14 +256,14 @@
     <string name="no_results">Nema rezultata</string>
     <string name="no_songs">Nema pesama</string>
     <string name="normal">Normalno</string>
-    <string name="normal_lyrics">Нормални текстови</string>
+    <string name="normal_lyrics">Normal lyrics</string>
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> nije pronadjen u prodavnici pesama]]></string>
     <string name="not_recently_played">Not recently played</string>
     <string name="nothing_to_scan">Nema se sta skenirati</string>
     <string name="nothing_to_see">Nothing to see</string>
     <string name="notification">Obavestenja</string>
     <string name="notification_settings_summary">Customize the notification style</string>
-    <string name="now_playing">Репродукује се</string>
+    <string name="now_playing">Now playing</string>
     <string name="now_playing_queue">Lista za trenutno pustanje</string>
     <string name="now_playing_summary">Customize the now playing screen</string>
     <string name="now_playing_themes">9+ now playing themes</string>
@@ -296,12 +276,11 @@
     <string name="paste_lyrics_here">Paste Lyrics Here</string>
     <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
     <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">Dozvola za pristup spoljasnjem skladistu je odbijena</string>
     <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
-    <string name="permission_title">Приступ складишту</string>
+    <string name="permission_title">Storage Access</string>
     <string name="permissions_denied">Dozvola odbijena.</string>
-    <string name="personalize">Персонализуј</string>
+    <string name="personalize">Personalize</string>
     <string name="personalize_settings_summary">Customize your now playing and UI controls</string>
     <string name="pick_from_local_storage">Izaberi iz unutrasnjeg skladista</string>
     <string name="pinterest_page">Pinterest</string>
@@ -310,7 +289,7 @@
     <string name="playList_already_exits">Playlist already exists</string>
     <string name="playback_pitch">Pitch</string>
     <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Брзина репродукције</string>
+    <string name="playback_speed">Playback Speed</string>
     <string name="playing_notification_description">Obavestenja obezbedjuju komande za pustanje/pauziranje itd.</string>
     <string name="playing_notification_name">Obavestenja o reprodukciji</string>
     <string name="playlist_created_sucessfully">%s created successfully</string>
@@ -325,17 +304,17 @@
     <string name="pref_header_album">Album style</string>
     <string name="pref_header_audio">Zvuk</string>
     <string name="pref_header_blacklist">Ne trazi muziku u...</string>
-    <string name="pref_header_controls">Контроле</string>
-    <string name="pref_header_general">Тема</string>
+    <string name="pref_header_controls">Controls</string>
+    <string name="pref_header_general">Theme</string>
     <string name="pref_header_images">Slike</string>
-    <string name="pref_header_library">Библиотека</string>
+    <string name="pref_header_library">Library</string>
     <string name="pref_header_lockscreen">Zakljucan ekran</string>
     <string name="pref_header_playlists">Plejliste</string>
     <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
     <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
     <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
-    <string name="pref_keep_screen_on_title">Задржи укључен екран</string>
-    <string name="pref_language_name">Изабери језик</string>
+    <string name="pref_keep_screen_on_title">Keep the screen on</string>
+    <string name="pref_language_name">Select language</string>
     <string name="pref_snow_fall_title">Snow fall effect</string>
     <string name="pref_summary_album_art_on_lockscreen">Koristi omot albuma kao pozadinu kada se reprodukuje muzika</string>
     <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
@@ -359,26 +338,25 @@
     <string name="pref_summary_ignore_media_store_artwork">oze poboljsati kvalitet omota albuma ali uzrokuje njegovo sporije ucitavanje. Omoguci ovo samo ukoliko imas problema sa losim kvalitetom slike omota albuma.</string>
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="pref_summary_lock_screen">Prikazuj kontrole na zakljucanom ekranu</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">Detalji o licencama za softver otvorenog izvora</string>
     <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
     <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
     <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
     <string name="pref_summary_toggle_full_screen">Omoguci ovo za impresivan mod.</string>
     <string name="pref_summary_toggle_headset">Kada se prikljuce slusalice automatki pusti pesme</string>
     <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</string>
     <string name="pref_summary_toggle_volume">Ukoliko imas prostora na ekranu za pustanje omoguci kontroler jacine zvuka.</string>
     <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Prikazi omot albuma</string>
     <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
     <string name="pref_title_album_cover_style">Album cover theme</string>
     <string name="pref_title_album_cover_transform">Album cover skip</string>
     <string name="pref_title_app_shortcuts">Obojene ikone aplikacije</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Utisaj zvuk prilikom poziva i drugih obavestenja.</string>
     <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Automatski preuzmi sliku izvodjaca</string>
@@ -405,7 +383,6 @@
     <string name="pref_title_lock_screen">Kontrole preko celog ekrana</string>
     <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pref_title_now_playing_screen_appearance">Izgled</string>
     <string name="pref_title_open_source_licences">Otvoren izvor licenca</string>
     <string name="pref_title_pause_history">Pause history</string>
@@ -413,7 +390,6 @@
     <string name="pref_title_show_lyrics">Show lyrics</string>
     <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">Tab titles mode</string>
     <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
     <string name="pref_title_toggle_full_screen">Aplikacija preko celog ekrana</string>
@@ -422,6 +398,7 @@
     <string name="pref_title_toggle_volume">Kontroler jacine zvuka</string>
     <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
     <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
     <string name="profile">Profile</string>
@@ -494,17 +471,16 @@
     <string name="song_duration">Trajanje pesme</string>
     <string name="songs">Pesme</string>
     <string name="sort_order">Nacin sortiranja</string>
-    <string name="sort_order_a_z">Растуће</string>
-    <string name="sort_order_album">Албум</string>
+    <string name="sort_order_a_z">Ascending</string>
+    <string name="sort_order_album">Album</string>
     <string name="sort_order_artist">Izvodjac</string>
-    <string name="sort_order_composer">Композитор</string>
+    <string name="sort_order_composer">Composer</string>
     <string name="sort_order_date">Date added</string>
     <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_default">Default</string>
     <string name="sort_order_num_songs">Song count</string>
     <string name="sort_order_num_songs_desc">Song count desc</string>
-    <string name="sort_order_year">Година</string>
-    <string name="sort_order_z_a">Опадајуће</string>
+    <string name="sort_order_year">Year</string>
+    <string name="sort_order_z_a">Descending</string>
     <string name="speech_not_supported">Izvini! Tvoj uredjaj ne podrzava unos govorom</string>
     <string name="speech_prompt">Pretrazi svoju biblioteku</string>
     <string name="stack">Stack</string>
@@ -532,7 +508,7 @@
     <string name="translate">Prevod</string>
     <string name="translate_community">Help us translate the app to your language</string>
     <string name="try_retro_music_premium">Try Retro Music Premium</string>
-    <string name="twitter_page">Твитер</string>
+    <string name="twitter_page">Twitter</string>
     <string name="twitter_page_summary">Share your design with Retro Music</string>
     <string name="unlabeled">Unlabeled</string>
     <string name="unplayable_file">Nije moguce pustiti pesmu.</string>
@@ -560,4 +536,5 @@
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 406bee4a5..97ef11496 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Lägg till i favoriter</string>
     <string name="action_add_to_playing_queue">Lägg till i spelkön</string>
     <string name="action_add_to_playlist">Lägg till i spellista</string>
-    <string name="action_cancel">Avbryt</string>
     <string name="action_cast">Cast</string>
     <string name="action_clear_playing_queue">Rensa spelkön</string>
     <string name="action_cycle_repeat">Loopläge</string>
@@ -91,8 +90,6 @@
     <string name="biography">Biografi</string>
     <string name="black_theme_name">Helt svart</string>
     <string name="blacklist">Svartlista</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
     <string name="blur">Oskärpa</string>
     <string name="blur_card">Kort med oskärpa</string>
     <string name="bug_report_failed">Det gick inte att skicka rapport</string>
@@ -106,7 +103,6 @@
     <string name="bug_report_no_password">Please enter your valid GitHub password</string>
     <string name="bug_report_no_title">Please enter an issue title</string>
     <string name="bug_report_no_username">Please enter your valid GitHub username</string>
-    <string name="bug_report_success">Bug report successful</string>
     <string name="bug_report_summary">Ett oväntat fel uppstod. Tråkigt att du hittade denna bug, om det fortsätter att krascha, testa att \"Rensa appdata\" eller skicka ett e-postmeddelande</string>
     <string name="bug_report_use_account">Send using GitHub account</string>
     <string name="buy_now">Köp nu</string>
@@ -130,7 +126,6 @@
     <string name="clear_playing_queue">Rensa spelkö</string>
     <string name="color">Färg</string>
     <string name="colors">Färger</string>
-    <string name="compact">Compact</string>
     <string name="composer">Kompositör</string>
     <string name="copied_device_info_to_clipboard">Kopierade enhetsinfo till urklipp.</string>
     <string name="could_not_create_playlist">Det gick inte att skapa spellista.</string>
@@ -173,15 +168,8 @@
     <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
     <string name="empty">Tom</string>
     <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
     <string name="faq">FAQ</string>
     <string name="favorites">Favoriter</string>
-    <string name="file_already_exists">File already exists</string>
     <string name="finish_last_song">Spela färdigt sista låten</string>
     <string name="fit">Passa</string>
     <string name="flat">Platt</string>
@@ -197,7 +185,6 @@
     <string name="genres">Genrer</string>
     <string name="git_hub_summary">Gör en fork av projektet på GitHub</string>
     <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -235,7 +222,6 @@
     <string name="labeled">Labeled</string>
     <string name="last_added">Senast tillagd</string>
     <string name="last_song">Sista låten</string>
-    <string name="lets_go">Let\'s go</string>
     <string name="library_categories">Bibliotekskategorier</string>
     <string name="licenses">Licenser</string>
     <string name="light_theme_name">Snövitt</string>
@@ -248,12 +234,6 @@
     <string name="material">Material</string>
     <string name="md_error_label">Fel</string>
     <string name="md_storage_perm_error">Behörighetsfel</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
     <string name="my_name">Namn</string>
     <string name="my_top_tracks">Mest spelade</string>
     <string name="never">Aldrig</string>
@@ -294,7 +274,6 @@
     <string name="paste_lyrics_here">Paste Lyrics Here</string>
     <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
     <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">Behörighet att få tillgång till extern lagring nekas.</string>
     <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
     <string name="permission_title">Storage Access</string>
@@ -357,26 +336,25 @@
     <string name="pref_summary_ignore_media_store_artwork">Kan öka albumomslagens kvalitet, men orsakar långsammare laddningstider för bilder. Aktivera endast om du har problem med lågupplösta bilder</string>
     <string name="pref_summary_library_categories">Konfigurera synlighet och ordning för bibliotekskategorier.</string>
     <string name="pref_summary_lock_screen">Använd Retro Music:s anpassade låsskärmskontroller</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">Licensinformation för programvara med öppen källkod</string>
     <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
     <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
     <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
     <string name="pref_summary_toggle_full_screen">Uppslukande läge</string>
     <string name="pref_summary_toggle_headset">Börja spela direkt då hörlurar ansluts</string>
     <string name="pref_summary_toggle_shuffle">Shuffleläget stängs av när du spelar en ny lista med låtar</string>
     <string name="pref_summary_toggle_volume">Visa volymkontroller på spelarskärmen, om det finns tillräckligt med utrymme </string>
     <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Visa albumomslag</string>
     <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
     <string name="pref_title_album_cover_style">Tema för albumomslag</string>
     <string name="pref_title_album_cover_transform">Nästa albumomslag</string>
     <string name="pref_title_app_shortcuts">Färgade appgenvägar</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Minska volymen vid fokusförlust</string>
     <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Ladda ner artistbilder automatiskt</string>
@@ -403,7 +381,6 @@
     <string name="pref_title_lock_screen">Helskärmskontroller</string>
     <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pref_title_now_playing_screen_appearance">Spelartema</string>
     <string name="pref_title_open_source_licences">Licenser för öppen källkod</string>
     <string name="pref_title_pause_history">Pause history</string>
@@ -411,7 +388,6 @@
     <string name="pref_title_show_lyrics">Show lyrics</string>
     <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">Fliktitlar</string>
     <string name="pref_title_toggle_carousel_effect">Karuselleffekt</string>
     <string name="pref_title_toggle_full_screen">Helskärmsapp</string>
@@ -420,8 +396,9 @@
     <string name="pref_title_toggle_volume">Volymkontroller</string>
     <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
+    <string name="pro_summary">Helt svart tema, spelarteman, karuselleffekt med mera…</string>
     <string name="profile">Profil</string>
     <string name="purchase">Köp</string>
     <string name="queue">Spelkö</string>
@@ -498,7 +475,6 @@
     <string name="sort_order_composer">Kompositör</string>
     <string name="sort_order_date">Tilläggningsdatum</string>
     <string name="sort_order_date_modified">Ändringsdatum</string>
-    <string name="sort_order_default">Default</string>
     <string name="sort_order_num_songs">Song count</string>
     <string name="sort_order_num_songs_desc">Song count desc</string>
     <string name="sort_order_year">År</string>
@@ -558,4 +534,5 @@
     <string name="you_have_to_select_at_least_one_category">Du måste välja minst en kategori.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
     <string name="your_account_data_is_only_used_for_authentication">Dina kontodata används endast för verifiering.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-ta-rIN/strings.xml b/app/src/main/res/values-ta-rIN/strings.xml
index 921d409ba..eed361c0c 100644
--- a/app/src/main/res/values-ta-rIN/strings.xml
+++ b/app/src/main/res/values-ta-rIN/strings.xml
@@ -5,11 +5,10 @@
     <string name="accent_color">பொத்தான் நிறம்</string>
     <string name="accent_color_desc">பொத்தான்_நிறம்_பற்றி</string>
     <string name="action_about">எங்களை பற்றி</string>
-    <string name="action_add_to_blacklist">பிடிக்காதவையில் சேர்</string>
+    <string name="action_add_to_blacklist">Add to Blacklist</string>
     <string name="action_add_to_favorites">பிடித்தவையில் சேமி</string>
     <string name="action_add_to_playing_queue">பாடல் வரிசையில் சேர்</string>
     <string name="action_add_to_playlist">பாடல் வரிசையில் சேர்</string>
-    <string name="action_cancel">நிராகரி</string>
     <string name="action_cast">ஒப்பனை</string>
     <string name="action_clear_playing_queue">பாடல் வரிசையை நீக்கு</string>
     <string name="action_cycle_repeat">திரும்பச் செய்</string>
@@ -20,7 +19,7 @@
     <string name="action_go_to_album">பாடல் படப்பட்டியல் செல்</string>
     <string name="action_go_to_artist">கலைஞரை காணவும்</string>
     <string name="action_go_to_genre">தொகுப்பு செல்</string>
-    <string name="action_go_to_lyrics">பாடல் வரிகள்</string>
+    <string name="action_go_to_lyrics">Go to Lyrics</string>
     <string name="action_go_to_start_directory">துவக்கப் பட்டியல் செல்</string>
     <string name="action_grant">அனுமதி</string>
     <string name="action_grid_size">பகுதி அளவு</string>
@@ -49,155 +48,143 @@
     <string name="action_sleep_timer">உறக்க கடிகாரம்</string>
     <string name="action_sort_order">வரிசை பட்டியல்</string>
     <string name="action_tag_editor">பாடல் அமைப்பை மாற்று</string>
-    <string name="action_toggle_favorite">பிடித்தவை</string>
-    <string name="action_toggle_shuffle">குழப்பி இயக்கு</string>
-    <string name="adaptive">தகவமை</string>
+    <string name="action_toggle_favorite">Toggle favorite</string>
+    <string name="action_toggle_shuffle">Toggle shuffle mode</string>
+    <string name="adaptive">Adaptive</string>
     <string name="add_action">சேர்</string>
     <string name="add_playlist_title">"பாடல் வரிசையில் சேர்"</string>
-    <string name="add_time_framed_lryics">இன்றைக்கும் பட்ட பாடல் வரிகளைச் சேர்</string>
-    <string name="added_song_count_to_playlist">%1$d பாடல்கள் %2$sயில் சேர்க்கப்பட்டுள்ளது</string>
-    <string name="added_title_to_playing_queue">"ஒரு பாடல் வரிசையில் சேர்க்கப்பட்டது."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d பாடல்கள் வரிசையில் சேர்க்கப்பட்டுள்ளது.</string>
-    <string name="album">தொகுப்பு</string>
+    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
+    <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
+    <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
+    <string name="album">Album</string>
     <plurals name="albumSongs">
         <item quantity="one">Song</item>
         <item quantity="other">பாடல்கள்</item>
     </plurals>
-    <string name="album_artist">பாடல் ஆசிரியர்</string>
-    <string name="albums">தொகுப்புகள்</string>
+    <string name="album_artist">Album Artist</string>
+    <string name="albums">Albums</string>
     <plurals name="albums">
-        <item quantity="one">தொகுப்பு</item>
-        <item quantity="other">தொகுப்புகள்</item>
+        <item quantity="one">Album</item>
+        <item quantity="other">Albums</item>
     </plurals>
-    <string name="always">எப்பொழுதும்</string>
-    <string name="app_share">இந்தச் செயலியைக் காண: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">குழப்பு</string>
-    <string name="app_shortcut_top_tracks_short">சிறந்த பாடல்கள்</string>
-    <string name="app_widget_big_name">முழு படம்</string>
-    <string name="app_widget_card_name">அட்டை</string>
-    <string name="app_widget_classic_name">பழமையான</string>
+    <string name="always">Always</string>
+    <string name="app_share">Hey check out this cool music player at: https://play.google.com/store/apps/details?id=%s</string>
+    <string name="app_shortcut_shuffle_all_short">Shuffle</string>
+    <string name="app_shortcut_top_tracks_short">Top Tracks</string>
+    <string name="app_widget_big_name">Full Image</string>
+    <string name="app_widget_card_name">Card</string>
+    <string name="app_widget_classic_name">Classic</string>
     <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">சிறிய</string>
-    <string name="app_widget_text_name">சிறிய சொல்</string>
-    <string name="artist">பாடகர்</string>
-    <string name="artists">பாடகர்கள்</string>
-    <string name="audio_fade_duration">பாடல் மறையும் நேரம்</string>
-    <string name="audio_focus_denied">ஒலி அனுமதி மறுக்கப்பட்டுள்ளது.</string>
-    <string name="audio_settings_summary">ஒலி அமைப்புகளை மாற்று</string>
-    <string name="auto">தானியங்கி</string>
-    <string name="backup_restore_settings_summary">அமைப்புக்கள் மற்றும் பாடல் கோப்புகளைச் சேமி</string>
-    <string name="backup_restore_title"><![CDATA[மீட்டெடு & பேக்கப்]]></string>
-    <string name="backup_title">பேக்கப்</string>
-    <string name="biography">வாழ்க்கை வரலாறு</string>
-    <string name="black_theme_name">இருட்டு மட்டும்</string>
-    <string name="blacklist">தேவையானவை</string>
-    <string name="bluetooth_summary">இந்தச் செயலிக்குப் பக்கத்தில் உல்ல புலுடூத் சாதனங்களைக் கண்டறிய அனுமதி வேண்டும்</string>
-    <string name="bluetooth_title">பக்கத்தில் உள்ள சாதனங்கள்</string>
-    <string name="blur">மங்குதல்</string>
-    <string name="blur_card">தெளிவற்ற அட்டை</string>
-    <string name="bug_report_failed">அறிக்கையை அனுப்ப முடியவில்லை</string>
-    <string name="bug_report_failed_invalid_token">தவறான டோக்கன். இந்தச் செயலியின் வடிவமைப்பாளரை அனுகவும்.</string>
-    <string name="bug_report_failed_issues_not_available">இப்பிரச்சனை இந்தக் கோப்பிற்கு இல்லை. இந்தச் செய்தியின் வடிவமைப்பாளரை அனுகவும்.</string>
-    <string name="bug_report_failed_unknown">எதிர்பாராத பிழை ஏற்பட்டது. தயவுசெய்து சிறிது நேரம் கழித்து முயற்சிக்கவும்.</string>
-    <string name="bug_report_failed_wrong_credentials">தவறான பயனாளர் பெயர் அல்லது கடவுச்சொல்</string>
-    <string name="bug_report_issue">பிரச்சனை</string>
-    <string name="bug_report_manual">தானாக அனுப்பு</string>
-    <string name="bug_report_no_description">பிரச்சனையை விவரி</string>
-    <string name="bug_report_no_password">சரியான கிட்கப் கடவுச்சொல்லை உள்ளிடவும்</string>
-    <string name="bug_report_no_title">பிரச்சினைக்கான தலைப்பை உள்ளிடு</string>
-    <string name="bug_report_no_username">சரியான கிட்கப் பயனர் பெயரை உள்ளிடவும்</string>
-    <string name="bug_report_success">பிரச்சனை வெற்றிகரமாகத் தெரிவிக்கப்பட்டது</string>
-    <string name="bug_report_summary">தெரியாத தவறு ஏற்ப்பட்டுள்ளது. இடையூறுக்கு மன்னிக்கவும், இவ்வாறு மீண்டும் ஏற்பட்டால் \"தகவல்களை அழிக்கவும்\" அல்லது வடிவமைப்பாளரிடம் தெரிவிக்கலாம் </string>
-    <string name="bug_report_use_account">கிட்கப்பை பயன்படுத்தி அனுப்பவும்</string>
-    <string name="buy_now">இப்போது வாங்கு</string>
-    <string name="cancel_current_timer">இரத்து செய்</string>
-    <string name="card">அட்டை</string>
-    <string name="card_color_style">வண்ண அட்டை</string>
-    <string name="card_square">சதுர அட்டை</string>
-    <string name="card_style">அட்டை</string>
-    <string name="carousal_effect_on_now_playing_screen">படம் மாற்றும் அமைப்பு</string>
-    <string name="cascading">ஒன்றின் மேல் ஒன்று</string>
-    <string name="changelog">மாற்றங்களின் பதிவு</string>
-    <string name="changelog_summary">புதியவை</string>
-    <string name="choose_image">படத்தைத் தேர்வுசெய்</string>
-    <string name="choose_restore_title">மீட்டெடுக்க தேர்வு செய்</string>
-    <string name="circle">வட்டம்</string>
-    <string name="circular">வட்ட</string>
-    <string name="classic">பழமையான</string>
-    <string name="clear_action">அழி</string>
-    <string name="clear_blacklist">தடுப்புப் பட்டியலை நீக்கு</string>
-    <string name="clear_history">வரலாற்றை நீக்கு</string>
-    <string name="clear_playing_queue">வரிசையை அழி</string>
-    <string name="color">வண்ணம்</string>
-    <string name="colors">வண்ணங்கள்</string>
-    <string name="compact">அடக்கமான</string>
-    <string name="composer">இசையமைப்பாளர்</string>
-    <string name="copied_device_info_to_clipboard">சாதனத்தின் விவரங்கள் நகல் எடுக்கப்பட்டுள்ளது.</string>
-    <string name="could_not_create_playlist">இசைப் பட்டியலை உருவாக்க முடியவில்லை.</string>
-    <string name="could_not_download_album_cover">"சரியான படத்தைப் பதிவேற்ற முடியவில்லை."</string>
-    <string name="could_not_restore_purchase">மீட்டெடுத்தல் தோல்வி.</string>
-    <string name="could_not_scan_files">கோப்பு %d\'யைத் தேட இயலவில்லை.</string>
-    <string name="create_action">உருவாக்கு</string>
-    <string name="create_new_backup">உருவாக்கு</string>
-    <string name="created_playlist_x">இசைப்பட்டியலை உருவாக்கு %1$s.</string>
-    <string name="credit_title">உருப்பினர் மற்றும் உதவியவர்கள் </string>
-    <string name="currently_listening_to_x_by_x">தற்போது கேட்கும் பாடல் %1$s கலைஞர் %2$s.</string>
-    <string name="custom_artist_images">சுயட்சி கலைஞர் படம்</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">தவற்றின் விவரத்தை பகிர்</string>
-    <string name="dark_theme_name">இலங்கருப்பு</string>
-    <string name="delete_playlist_title">இசைப் பட்டியலை நீக்கு</string>
-    <string name="delete_playlist_x"><![CDATA[இசைப்பட்டியல் <b>%1$s</b>யை நீக்கு?]]></string>
-    <string name="delete_playlists_title">இசைப்பட்டியல்களை நீக்கு</string>
-    <string name="delete_song_title">பாடலை நீக்கு</string>
-    <string name="delete_song_x"><![CDATA[பாடல் <b>%1$s</b>யை நீக்கு?]]></string>
-    <string name="delete_songs_title">பாடல்களை நீக்கு</string>
-    <string name="delete_x_playlists"><![CDATA[இசைப்பட்டியல் <b>%1$d</b>யை நீக்கு?]]></string>
-    <string name="delete_x_songs"><![CDATA[பாடல்கள் <b>%1$d</b> நீக்கு?]]></string>
-    <string name="deleted_x_songs">நீக்கப்பட்ட பாடல்கள் %1$d</string>
-    <string name="deleting_songs">பாடல்கள் நீக்கப்படுகிறது</string>
-    <string name="depth">ஆழம்</string>
-    <string name="description">விளக்கம்</string>
-    <string name="device_info">சாதனத்தின் விவரம்</string>
-    <string name="dialog_message_set_ringtone">ஒலி அமைப்புகளை மாற்ற Retro Musicஐ அனுமதி</string>
-    <string name="dialog_title_set_ringtone">அலைபேசி ஒலியாக அமை</string>
-    <string name="disc_hint">பெட்டியின் எண்</string>
-    <string name="do_you_want_to_clear_the_blacklist">தடுப்புப் பட்டியலை நீக்க வேண்டுமா?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[<b>%1$s</b>ஐ தடுப்புப் பட்டியலிருந்து நீக்க வேண்டுமா?]]></string>
-    <string name="donate">நன்கொடை செய்க</string>
-    <string name="donate_summary">எங்கள் உழைப்பு பிடித்திருந்ததால், சிறிதளவு பணம் அளித்த ஆதரிக்கலாம்</string>
-    <string name="donation_header">எனக்கு வாங்கு:</string>
-    <string name="done">முடிந்தது</string>
-    <string name="drive_mode">ஊர்தி பயனர்</string>
-    <string name="edit_fab">திருத்து</string>
-    <string name="edit_normal_lyrics">பாடல் வரிகளைத் திருத்து</string>
-    <string name="edit_synced_lyrics">இனைக்கப்பட்ட பாடல் வரிகளைத் திருத்து</string>
-    <string name="empty">ஒன்றும் இல்லை</string>
-    <string name="equalizer">சமமாக்கி</string>
-    <string name="error_create_backup">பேக்கப் உருவாக்க முடியவில்லை</string>
-    <string name="error_delete_backup">மேக்கப்பை நீக்க முடியவில்லை</string>
-    <string name="error_empty_name">பெயர் வெறுமையாக இருக்க இயலாது!</string>
-    <string name="error_load_failed">தடங்கள் ஏற்பட்டுள்ளது</string>
-    <string name="error_share_file">கோப்பை பகிர இயலவில்லை</string>
-    <string name="expanded">விரிவாக்கப்பட்டது</string>
-    <string name="faq">வினாக்கள்</string>
-    <string name="favorites">விருப்பமானவை</string>
-    <string name="file_already_exists">இந்த கோப்பு ஏற்கனவே உள்ளது</string>
-    <string name="finish_last_song">கடைசி பாடலுடன் நிருத்திக்கொள்</string>
-    <string name="fit">பொருத்தம்</string>
-    <string name="flat">தட்டையான</string>
-    <string name="folders">கோப்புறைகள்</string>
-    <string name="follow_system">சாதனத்தின் அமைப்பை பின்பற்றவும்</string>
-    <string name="for_you">தங்களுக்காக</string>
-    <string name="free">இலவசம்</string>
-    <string name="full">முழு</string>
-    <string name="full_card">முழு அட்டை</string>
-    <string name="general_settings_summary">செயலியின் வண்ணம் மற்றும் தீமை மாற்றவும்</string>
-    <string name="general_settings_title">திரை அமைப்புகள்</string>
-    <string name="genre">வகைகள்</string>
-    <string name="genres">வகைகள்</string>
-    <string name="git_hub_summary">செயலியை நகலெடுத்து மேம்படுத்து</string>
-    <string name="gradient">க்ரேடியன்ட்டுகள்</string>
-    <string name="grant_access">அனுமதி</string>
+    <string name="app_widget_small_name">Small</string>
+    <string name="app_widget_text_name">Minimal Text</string>
+    <string name="artist">Artist</string>
+    <string name="artists">Artists</string>
+    <string name="audio_fade_duration">Audio fade duration</string>
+    <string name="audio_focus_denied">Audio focus denied.</string>
+    <string name="audio_settings_summary">Change the sound settings and adjust the equalizer controls</string>
+    <string name="auto">Auto</string>
+    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
+    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
+    <string name="backup_title">Backups</string>
+    <string name="biography">Biography</string>
+    <string name="black_theme_name">Just Black</string>
+    <string name="blacklist">Blacklist</string>
+    <string name="blur">Blur</string>
+    <string name="blur_card">Blur Card</string>
+    <string name="bug_report_failed">Unable to send report</string>
+    <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
+    <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
+    <string name="bug_report_failed_unknown">An unexpected error occurred. Please contact the app developer.</string>
+    <string name="bug_report_failed_wrong_credentials">Wrong username or password</string>
+    <string name="bug_report_issue">Issue</string>
+    <string name="bug_report_manual">Send manually</string>
+    <string name="bug_report_no_description">Please enter an issue description</string>
+    <string name="bug_report_no_password">Please enter your valid GitHub password</string>
+    <string name="bug_report_no_title">Please enter an issue title</string>
+    <string name="bug_report_no_username">Please enter your valid GitHub username</string>
+    <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
+    <string name="bug_report_use_account">Send using GitHub account</string>
+    <string name="buy_now">Buy now</string>
+    <string name="cancel_current_timer">Cancel</string>
+    <string name="card">Card</string>
+    <string name="card_color_style">Colored Card</string>
+    <string name="card_square">Square Card</string>
+    <string name="card_style">Card</string>
+    <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
+    <string name="cascading">Cascading</string>
+    <string name="changelog">Changelog</string>
+    <string name="changelog_summary">Check out What\'s New</string>
+    <string name="choose_image">Choose Image</string>
+    <string name="choose_restore_title">Choose what to restore</string>
+    <string name="circle">Circle</string>
+    <string name="circular">Circular</string>
+    <string name="classic">Classic</string>
+    <string name="clear_action">Clear</string>
+    <string name="clear_blacklist">Clear blacklist</string>
+    <string name="clear_history">Clear History</string>
+    <string name="clear_playing_queue">Clear queue</string>
+    <string name="color">Color</string>
+    <string name="colors">Colors</string>
+    <string name="composer">Composer</string>
+    <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
+    <string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
+    <string name="could_not_download_album_cover">"Couldn\u2019t download a matching album cover."</string>
+    <string name="could_not_restore_purchase">Could not restore purchase.</string>
+    <string name="could_not_scan_files">Could not scan %d files.</string>
+    <string name="create_action">Create</string>
+    <string name="create_new_backup">Create</string>
+    <string name="created_playlist_x">Created playlist %1$s.</string>
+    <string name="credit_title">Members and contributors </string>
+    <string name="currently_listening_to_x_by_x">Currently listening to %1$s by %2$s.</string>
+    <string name="custom_artist_images">Custom Artist Images</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
+    <string name="dark_theme_name">Kinda Dark</string>
+    <string name="delete_playlist_title">Delete playlist</string>
+    <string name="delete_playlist_x"><![CDATA[Delete the playlist <b>%1$s</b>?]]></string>
+    <string name="delete_playlists_title">Delete playlists</string>
+    <string name="delete_song_title">Delete song</string>
+    <string name="delete_song_x"><![CDATA[Delete the song <b>%1$s</b>?]]></string>
+    <string name="delete_songs_title">Delete songs</string>
+    <string name="delete_x_playlists"><![CDATA[Delete <b>%1$d</b> playlists?]]></string>
+    <string name="delete_x_songs"><![CDATA[Delete <b>%1$d</b> songs?]]></string>
+    <string name="deleted_x_songs">Deleted %1$d songs.</string>
+    <string name="deleting_songs">Deleting Songs</string>
+    <string name="depth">Depth</string>
+    <string name="description">Description</string>
+    <string name="device_info">Device info</string>
+    <string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
+    <string name="dialog_title_set_ringtone">Set ringtone</string>
+    <string name="disc_hint">Disc Number</string>
+    <string name="do_you_want_to_clear_the_blacklist">Do you want to clear the blacklist?</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Do you want to remove <b>%1$s</b> from the blacklist?]]></string>
+    <string name="donate">Donate</string>
+    <string name="donate_summary">If you think I deserve to get paid for my work, you can leave some money here</string>
+    <string name="donation_header">Buy me a:</string>
+    <string name="done">Done</string>
+    <string name="drive_mode">Drive mode</string>
+    <string name="edit_fab">Edit Button</string>
+    <string name="edit_normal_lyrics">Edit Lyrics</string>
+    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
+    <string name="empty">Empty</string>
+    <string name="equalizer">Equalizer</string>
+    <string name="faq">FAQ</string>
+    <string name="favorites">Favorites</string>
+    <string name="finish_last_song">Finish last song</string>
+    <string name="fit">Fit</string>
+    <string name="flat">Flat</string>
+    <string name="folders">Folders</string>
+    <string name="follow_system">Follow system</string>
+    <string name="for_you">For you</string>
+    <string name="free">Free</string>
+    <string name="full">Full</string>
+    <string name="full_card">Full card</string>
+    <string name="general_settings_summary">Change the theme and colors of the app</string>
+    <string name="general_settings_title">Look and feel</string>
+    <string name="genre">Genre</string>
+    <string name="genres">Genres</string>
+    <string name="git_hub_summary">Fork the project on GitHub</string>
+    <string name="gradient">Gradient</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -206,65 +193,58 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">பகுதி அளவு</string>
-    <string name="help_summary">மேலும் உதவி வேண்டுமா?</string>
-    <string name="hinge">ஒட்டு</string>
-    <string name="history">வரலாறு</string>
-    <string name="history_cleared">வரலாறு அழிக்கப்பட்டது</string>
-    <string name="history_undo_button">செயல்தவிர்</string>
-    <string name="home">முகப்பு</string>
-    <string name="horizontal_flip">சமமாக சுழற்று</string>
-    <string name="image">படம்</string>
-    <string name="image_gradient">படம் வண்ணம்</string>
-    <string name="image_settings_summary">கலைஞர் படம் தரவுகள் அமைப்பு</string>
-    <string name="import_label">இறக்குமதி</string>
-    <string name="import_playlist">பாடல் வரிசைகளை எடு</string>
-    <string name="import_playlist_message">சாதனத்தில் உள்ள அனைத்து பாடல்களும் இனைக்கப்படும்.</string>
-    <string name="inserted_x_songs_into_playlist_x">%2$s\'யில் %1$d பாடல்கள் சேர்க்கப்பட்டுள்ளது.</string>
-    <string name="instagram_page_summary">தங்களின் Retro Music அமைப்பை Instagramயில் பகிரவும்</string>
-    <string name="keyboard">விசைப்பலகை</string>
-    <string name="label_bit_rate">துடிப்பளவு</string>
-    <string name="label_file_format">வடிவமைப்பு</string>
-    <string name="label_file_name">கோப்புப் பெயர்</string>
-    <string name="label_file_path">கோப்புப் பாதை</string>
-    <string name="label_file_size">அளவு</string>
-    <string name="label_last_modified">கடைசியாக மாற்றப்பட்டது</string>
-    <string name="label_more_from">இன்னும் பல %s</string>
-    <string name="label_sampling_rate">மாதிரி விகிதம்</string>
-    <string name="label_track_length">நீளம்</string>
-    <string name="labeled">முத்திரை</string>
-    <string name="last_added">கடைசியாக சேர்த்தது</string>
-    <string name="last_song">இறுதியாகக் கேட்டப் பாடல்</string>
-    <string name="lets_go">வாருங்கள் துவங்கலாம்</string>
-    <string name="library_categories">நூலக வகைகள்</string>
-    <string name="licenses">உரிமங்கள்</string>
-    <string name="light_theme_name">முழுமையான வெள்ளை</string>
-    <string name="listeners_label">கேட்பவர்கள்</string>
-    <string name="listing_files">கேட்கும் கோப்புகள்</string>
-    <string name="loading_products">Loading product…</string>
-    <string name="login">உள்நுழை</string>
-    <string name="lyrics">பாடல் வரிகள்</string>
-    <string name="made_with_love">அன்புடன் இந்தியாவில் உருவாக்கப்பட்டது</string>
-    <string name="material">பொருள்</string>
-    <string name="md_error_label">பிழை</string>
-    <string name="md_storage_perm_error">அனுமதி பிழை</string>
-    <string name="message_backup_create_success">செயலிகள் மறுபிரதிஎடுத்தல் வெற்றி.</string>
-    <string name="message_limit_tabs">5 பொருட்கள் மட்டும்</string>
-    <string name="message_pro_feature">%s ஒரு ப்ரோ அம்சமாகும்.</string>
-    <string name="message_restore_success">மீட்டெடுப்பு வெற்றிகரமாக முடிந்தது.</string>
-    <string name="message_updated">புதுப்பிக்கப்பட்டது</string>
-    <string name="message_welcome"><![CDATA[வணக்கம்! <br>, %sக்கு வரவேற்கிறோம்]]></string>
-    <string name="my_name">பெயர்</string>
-    <string name="my_top_tracks">அதிகம் விளையாடியது</string>
-    <string name="never">ஒருபோதும்</string>
-    <string name="new_music_mix">புதிய இசை கலவை</string>
+    <string name="grid_style_label">Grid style</string>
+    <string name="help_summary">Need more help?</string>
+    <string name="hinge">Hinge</string>
+    <string name="history">History</string>
+    <string name="history_cleared">History cleared</string>
+    <string name="history_undo_button">Undo</string>
+    <string name="home">Home</string>
+    <string name="horizontal_flip">Horizontal flip</string>
+    <string name="image">Image</string>
+    <string name="image_gradient">Gradient image</string>
+    <string name="image_settings_summary">Change artist image download settings</string>
+    <string name="import_label">Import</string>
+    <string name="import_playlist">Import playlist</string>
+    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
+    <string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
+    <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="label_bit_rate">Bitrate</string>
+    <string name="label_file_format">Format</string>
+    <string name="label_file_name">File name</string>
+    <string name="label_file_path">File path</string>
+    <string name="label_file_size">Size</string>
+    <string name="label_last_modified">Last Modified</string>
+    <string name="label_more_from">More from %s</string>
+    <string name="label_sampling_rate">Sampling rate</string>
+    <string name="label_track_length">Length</string>
+    <string name="labeled">Labeled</string>
+    <string name="last_added">Last added</string>
+    <string name="last_song">Last song</string>
+    <string name="library_categories">Library categories</string>
+    <string name="licenses">Licenses</string>
+    <string name="light_theme_name">Clearly White</string>
+    <string name="listeners_label">Listeners</string>
+    <string name="listing_files">Listing files</string>
+    <string name="loading_products">Loading products…</string>
+    <string name="login">Login</string>
+    <string name="lyrics">Lyrics</string>
+    <string name="made_with_love">Made with ❤️ in India</string>
+    <string name="material">Material</string>
+    <string name="md_error_label">Error</string>
+    <string name="md_storage_perm_error">Permission error</string>
+    <string name="my_name">Name</string>
+    <string name="my_top_tracks">Most played</string>
+    <string name="never">Never</string>
+    <string name="new_music_mix">New Music Mix</string>
     <string name="new_playlist_title">புதிய இசைப்பட்டியல்</string>
-    <string name="new_start_directory">%s என்பது புதிய தொடக்க கோப்பகம்.</string>
-    <string name="next_song">அடுத்த பாடல்</string>
-    <string name="no_albums">உங்களிடம் ஆல்பம் இல்லை</string>
-    <string name="no_artists">உங்களிடம் இசையமைப்பாளர் குறிப்புடு இல்லை</string>
-    <string name="no_audio_ID">"முதலில் பாட்டைத் தொடக்கவும், அதன் பின்பு மீண்டும் முயற்சிக்கவும்."</string>
-    <string name="no_backups_found">மறுபிரதி காணவில்லை</string>
+    <string name="new_start_directory">%s is the new start directory.</string>
+    <string name="next_song">Next Song</string>
+    <string name="no_albums">You have no albums</string>
+    <string name="no_artists">You have no artists</string>
+    <string name="no_audio_ID">"Play a song first, then try again."</string>
+    <string name="no_backups_found">No Backups Found</string>
     <string name="no_equalizer">No equalizer found</string>
     <string name="no_genres">You have no genres</string>
     <string name="no_lyrics_found">No lyrics found</string>
@@ -294,7 +274,6 @@
     <string name="paste_lyrics_here">Paste Lyrics Here</string>
     <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
     <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
     <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
     <string name="permission_title">Storage Access</string>
@@ -322,7 +301,7 @@
     <string name="pref_header_advanced">Advanced</string>
     <string name="pref_header_album">Album style</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">தேவையானவை</string>
+    <string name="pref_header_blacklist">Blacklist</string>
     <string name="pref_header_controls">Controls</string>
     <string name="pref_header_general">Theme</string>
     <string name="pref_header_images">Images</string>
@@ -357,30 +336,29 @@
     <string name="pref_summary_ignore_media_store_artwork">Can increase the album cover quality, but causes slower image loading times. Only enable this if you have problems with low resolution artworks</string>
     <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="pref_summary_lock_screen">Use Retro Music\'s custom lockscreen controls</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">License details for open source software</string>
     <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
     <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
     <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
     <string name="pref_summary_toggle_full_screen">Immersive mode</string>
     <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</string>
     <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</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_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
     <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
     <string name="pref_title_album_cover_style">Album cover theme</string>
     <string name="pref_title_album_cover_transform">Album cover skip</string>
     <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
     <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Auto-download artist images</string>
-    <string name="pref_title_blacklist">தேவையானவை</string>
+    <string name="pref_title_blacklist">Blacklist</string>
     <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
     <string name="pref_title_blurred_album_art">Blur album cover</string>
     <string name="pref_title_circle_button">Circular play button</string>
@@ -403,7 +381,6 @@
     <string name="pref_title_lock_screen">Fullscreen controls</string>
     <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pref_title_now_playing_screen_appearance">Now playing theme</string>
     <string name="pref_title_open_source_licences">Open source licences</string>
     <string name="pref_title_pause_history">Pause history</string>
@@ -411,7 +388,6 @@
     <string name="pref_title_show_lyrics">Show lyrics</string>
     <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">Tab titles mode</string>
     <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
     <string name="pref_title_toggle_full_screen">Fullscreen app</string>
@@ -420,6 +396,7 @@
     <string name="pref_title_toggle_volume">Volume controls</string>
     <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
     <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
     <string name="profile">Profile</string>
@@ -482,7 +459,7 @@
     <string name="share_summary">Share the app with your friends and family</string>
     <string name="share_to_stories">Share to Stories</string>
     <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">குழப்பு</string>
+    <string name="shuffle">Shuffle</string>
     <string name="simple">Simple</string>
     <string name="sleep_timer_canceled">Sleep timer canceled.</string>
     <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
@@ -493,12 +470,11 @@
     <string name="songs">Songs</string>
     <string name="sort_order">வரிசை பட்டியல்</string>
     <string name="sort_order_a_z">Ascending</string>
-    <string name="sort_order_album">தொகுப்பு</string>
-    <string name="sort_order_artist">பாடகர்</string>
-    <string name="sort_order_composer">இசையமைப்பாளர்</string>
+    <string name="sort_order_album">Album</string>
+    <string name="sort_order_artist">Artist</string>
+    <string name="sort_order_composer">Composer</string>
     <string name="sort_order_date">Date added</string>
     <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_default">Default</string>
     <string name="sort_order_num_songs">Song count</string>
     <string name="sort_order_num_songs_desc">Song count desc</string>
     <string name="sort_order_year">Year</string>
@@ -558,4 +534,5 @@
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-te-rIN/strings.xml b/app/src/main/res/values-te-rIN/strings.xml
index 129bf9039..267e00c22 100644
--- a/app/src/main/res/values-te-rIN/strings.xml
+++ b/app/src/main/res/values-te-rIN/strings.xml
@@ -114,7 +114,7 @@
     <string name="create_action">సృష్టించు</string>
     <string name="created_playlist_x">ప్లేజాబితా%1$sసృష్టించబడింది.</string>
     <string name="credit_title">సభ్యులు మరియు సహాయకులు</string>
-    <string name="currently_listening_to_x_by_x">ప్రస్తుతం %2$s ద్వారా %1$s వింటున్నారు.</string>
+    <string name="currently_listening_to_x_by_x">ప్రస్తుతం %2$s ద్వారా %1$d వింటున్నారు.</string>
     <string name="dark_theme_name">కైండా డార్క్</string>
     <string name="delete_playlist_title">ప్లేజాబితాను తొలగించండి</string>
     <string name="delete_playlist_x"><![CDATA[<b>%1$s</b> ప్లేజాబితాను తొలగించాలా?]]></string>
diff --git a/app/src/main/res/values-th-rTH/strings.xml b/app/src/main/res/values-th-rTH/strings.xml
index 026766416..ee386ec56 100644
--- a/app/src/main/res/values-th-rTH/strings.xml
+++ b/app/src/main/res/values-th-rTH/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">เพิ่มเข้าเพลงโปรด</string>
     <string name="action_add_to_playing_queue">เพิ่มเข้าคิวเพลง</string>
     <string name="action_add_to_playlist">เพิ่มเข้าเพลย์ลิสต์</string>
-    <string name="action_cancel">ยกเลิก</string>
     <string name="action_cast">แคสต์</string>
     <string name="action_clear_playing_queue">ล้างคิวเพลง</string>
     <string name="action_cycle_repeat">เปิดเล่นซ้ำ</string>
@@ -89,8 +88,6 @@
     <string name="biography">ประวัติ</string>
     <string name="black_theme_name">Just Black</string>
     <string name="blacklist">แบล็คลิสต์</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
     <string name="blur">Blur</string>
     <string name="blur_card">Blur Card</string>
     <string name="bug_report_failed">ไม่สามารถส่งรายการได้</string>
@@ -104,7 +101,6 @@
     <string name="bug_report_no_password">กรุณากรอกรหัสผ่านที่ถูกต้องของ Github</string>
     <string name="bug_report_no_title">กรุณากรอกหัวข้อของปัญหา</string>
     <string name="bug_report_no_username">กรุณากรอกชื่อผู้ใช้งานที่ถูกต้องของ Github</string>
-    <string name="bug_report_success">Bug report successful</string>
     <string name="bug_report_summary">เกิดข้อผิดพลาดบางประการ, ขออภัยในความผิดพลาด, ถ้ายังคงเกิดปัญหาอยู่กรุณา \"Clear app data\" หรือ ส่งอีเมลหาผู้พัฒนา</string>
     <string name="bug_report_use_account">ส่งโดยใช้บัญชี Github</string>
     <string name="buy_now">ซื้อทันที</string>
@@ -128,7 +124,6 @@
     <string name="clear_playing_queue">ล้างคิวเพลง</string>
     <string name="color">สี</string>
     <string name="colors">สี</string>
-    <string name="compact">Compact</string>
     <string name="composer">ผู้แต่ง</string>
     <string name="copied_device_info_to_clipboard">คัดลอกข้อมูลเครื่อง</string>
     <string name="could_not_create_playlist">ไม่สามารถสร้างเพลย์ลิสได้</string>
@@ -171,15 +166,8 @@
     <string name="edit_synced_lyrics">ปุ่มซิงค์เนื้อเพลง</string>
     <string name="empty">ว่างเปล่า</string>
     <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
     <string name="faq">คำถามที่พบบ่อย</string>
     <string name="favorites">เพลงโปรด</string>
-    <string name="file_already_exists">File already exists</string>
     <string name="finish_last_song">ปิดเมื่อเพลงสุดท้ายจบ</string>
     <string name="fit">Fit</string>
     <string name="flat">Flat</string>
@@ -195,7 +183,6 @@
     <string name="genres">ประเภทเพลง</string>
     <string name="git_hub_summary">Fork โปรเจคจาก GitHub</string>
     <string name="gradient">การไล่ระดับสี</string>
-    <string name="grant_access">Grant access</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -233,7 +220,6 @@
     <string name="labeled">แสดงตัวหนังสือ</string>
     <string name="last_added">เพิ่มล่าสุด</string>
     <string name="last_song">เพลงล่าสุด</string>
-    <string name="lets_go">Let\'s go</string>
     <string name="library_categories">หมวดหมู่คลังเพลง</string>
     <string name="licenses">Licenses</string>
     <string name="light_theme_name">Clearly White</string>
@@ -246,12 +232,6 @@
     <string name="material">Material</string>
     <string name="md_error_label">เกิดข้อผิดพลาด</string>
     <string name="md_storage_perm_error">ไม่มีสิทธิ์ในการเข้าถึง</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
     <string name="my_name">ชื่อ</string>
     <string name="my_top_tracks">ฟังบ่อย</string>
     <string name="never">ไม่ต้อง</string>
@@ -292,7 +272,6 @@
     <string name="paste_lyrics_here">วางเนื้อเพลงที่นี่</string>
     <string name="paste_timeframe_lyrics_here">วางเนื้อเพลงในกรอบเวลาที่นี่</string>
     <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">สิทธิ์ในการเข้าถึงถูกปฏิเสธ</string>
     <string name="permission_summary">ต้องการสิทธิ์ในการเข้าถึงข้อมูลในเครื่องเพื่อเล่นเพลง</string>
     <string name="permission_title">เข้าถึงการจัดเก็บข้อมูล</string>
@@ -355,26 +334,25 @@
     <string name="pref_summary_ignore_media_store_artwork">เพิ่มคุณภาพของรูปปกอัลบัม แต่จะส่งผลให้โหลดรูปภาพช้าขึ้น</string>
     <string name="pref_summary_library_categories">ตั้งค่าการแสดงผลและจัดเรียงของหมวดหมู่คลังเพลง</string>
     <string name="pref_summary_lock_screen">ใช้ Retro Music ในหน้าล็อคสกรีน</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">รายละเอียด License สำหรับ open source software</string>
     <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">ไปที่แท็บที่ใช้งานล่าสุดเมื่อเริ่มใช้งาน</string>
     <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
     <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
     <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
     <string name="pref_summary_toggle_full_screen">โหมด Immersive</string>
     <string name="pref_summary_toggle_headset">เล่นทันทีเมื่อเชื่อมต่อกับหูฟัง</string>
     <string name="pref_summary_toggle_shuffle">โหมดการสุ่มจะถูกปิดเมื่อเล่นรายการเพลงใหม่</string>
     <string name="pref_summary_toggle_volume">หากพื้นที่ในการแสดงผลเพียงพอให้แสดงปุ่มเพิ่ม/ลดเสียงบนหน้าจอ Now playing </string>
     <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">แสดงเฉพาะเพลงจาก Music โฟลเดอร์</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">แสดงรูปปกอัลบัม</string>
     <string name="pref_title_album_artists_only">นำทางโดยอัลบัมศิลปิน</string>
     <string name="pref_title_album_cover_style">ธีมของรูปปกอัลบัม</string>
     <string name="pref_title_album_cover_transform">ข้ามรูปปกอัลบัม</string>
     <string name="pref_title_app_shortcuts">สีของทางลัดเข้าแอป</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">ลบเสียงเมื่อหลุดโฟกัส</string>
     <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">ดาวน์โหลดรูปศิลปินอัตโนมัติ</string>
@@ -401,7 +379,6 @@
     <string name="pref_title_lock_screen">แสดงผลเต็มจอ</string>
     <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pref_title_now_playing_screen_appearance">ธีมของ Now Playing</string>
     <string name="pref_title_open_source_licences">สัญญาอนุญาตสำหรับโอเพนซอร์ส</string>
     <string name="pref_title_pause_history">Pause history</string>
@@ -409,7 +386,6 @@
     <string name="pref_title_show_lyrics">Show lyrics</string>
     <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">โหมดการแสดงผลแท็ป</string>
     <string name="pref_title_toggle_carousel_effect">การใช้งาน Carousel</string>
     <string name="pref_title_toggle_full_screen">แสดงผลเต็มจอ</string>
@@ -418,8 +394,9 @@
     <string name="pref_title_toggle_volume">ปุ่มควบคุมเสียง</string>
     <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">โปร</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
+    <string name="pro_summary">ธีม Black, ธีม Now playing, การแสดงผลแบบ Carousel และอื่นๆ</string>
     <string name="profile">โปรไฟล์</string>
     <string name="purchase">สั่งซื้อ</string>
     <string name="queue">คิวเพลง</string>
@@ -434,7 +411,7 @@
     <string name="remove_song_from_playlist_title">ลบเพลงออกจากเพลย์ลิสต์</string>
     <string name="remove_song_x_from_playlist"><![CDATA[ลบเพลง <b>%1$s</b> ออกจากเพลย์ลิสต์?]]></string>
     <string name="remove_songs_from_playlist_title">ลบเพลงออกจากเพลย์ลิสต์</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[ลบเพลง <b>%1$d</b> ออกจากเพลย์ลิสต์?]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[ลบเพลง <b>%1$s</b> ออกจากเพลย์ลิสต์?]]></string>
     <string name="rename_playlist_title">เปลี่ยนขื่อเพลย์ลิสต์</string>
     <string name="replace_cover">Replace Cover</string>
     <string name="report_an_issue">รายการปัญหา</string>
@@ -496,7 +473,6 @@
     <string name="sort_order_composer">ผู้แต่ง</string>
     <string name="sort_order_date">วันที่เพิ่ม</string>
     <string name="sort_order_date_modified">วันที่แก้ไข</string>
-    <string name="sort_order_default">Default</string>
     <string name="sort_order_num_songs">จำนวนเพลง</string>
     <string name="sort_order_num_songs_desc">จำนวนเพลง (มากไปน้อย)</string>
     <string name="sort_order_year">ปี</string>
@@ -556,4 +532,5 @@
     <string name="you_have_to_select_at_least_one_category">คุณต้องเลือกอย่างน้อยหนึ่งหมวดหมู่</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">ท่านจะติดตามการรายงานปัญหาจากเว็บไซต์</string>
     <string name="your_account_data_is_only_used_for_authentication">ข้อมูลบัญชีของท่านจะใช้สำหรับการเข้าสู่ระบบเท่านั้น</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 5dbac01b4..88705c83a 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">Favorilere ekle</string>
     <string name="action_add_to_playing_queue">Oynatma kuyruğuna ekle</string>
     <string name="action_add_to_playlist">Oynatma listesine ekle</string>
-    <string name="action_cancel">İptal et</string>
     <string name="action_cast">Yayınla</string>
     <string name="action_clear_playing_queue">Oynatma kuyruğunu temizle</string>
     <string name="action_cycle_repeat">Tekrarlı oynatma modu</string>
@@ -55,7 +54,7 @@
     <string name="add_action">Ekle</string>
     <string name="add_playlist_title">"Oynatma listesine ekle"</string>
     <string name="add_time_framed_lryics">Zaman Dilimli Sözleri Ekle</string>
-    <string name="added_song_count_to_playlist">%2$s listesine %1$d parça eklendi</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Kuyruğa 1 parça eklendi."</string>
     <string name="added_x_titles_to_playing_queue">%1$d şarkı kuyruğuna eklendi.</string>
     <string name="album">Albüm</string>
@@ -91,8 +90,6 @@
     <string name="biography">Yaşam öyküsü</string>
     <string name="black_theme_name">Sade Siyah</string>
     <string name="blacklist">Kara Liste</string>
-    <string name="bluetooth_summary">Uygulamanın bluetooth cihazlarını kontrol etmek için yakındaki cihazlara erişim iznine ihtiyacı var</string>
-    <string name="bluetooth_title">Yakındaki cihazlar</string>
     <string name="blur">Bulanıklık</string>
     <string name="blur_card">Bulanık kart</string>
     <string name="bug_report_failed">Bildiri gönderilemiyor</string>
@@ -106,7 +103,6 @@
     <string name="bug_report_no_password">Lütfen geçerli GitHub şifrenizi girin</string>
     <string name="bug_report_no_title">Lütfen bir sorun başlığı girin</string>
     <string name="bug_report_no_username">Lütfen geçerli GitHub kullanıcı adınızı girin</string>
-    <string name="bug_report_success">Hata raporlama başarılı</string>
     <string name="bug_report_summary">Beklenmedik bir hata oluştu. Bu hatayı bulduğunuz için üzgünüz, eğer durmadan hata veriyorsa \"Verileri Temizleyin\" ya da bir E-posta yollayın </string>
     <string name="bug_report_use_account">GitHub hesabını kullanarak gönder</string>
     <string name="buy_now">Şimdi satın alın</string>
@@ -119,7 +115,7 @@
     <string name="cascading">Basamaklı</string>
     <string name="changelog">Değişim kayıt günlüğü</string>
     <string name="changelog_summary">Yeniliklere göz at</string>
-    <string name="choose_image">Resim Seçin</string>
+    <string name="choose_image">Choose Image</string>
     <string name="choose_restore_title">Neyi geri yükleyeceğinizi seçin</string>
     <string name="circle">Çember</string>
     <string name="circular">Dairesel</string>
@@ -130,7 +126,6 @@
     <string name="clear_playing_queue">Kuyruğu temizle</string>
     <string name="color">Renk</string>
     <string name="colors">Renkler</string>
-    <string name="compact">Kompakt</string>
     <string name="composer">Besteci</string>
     <string name="copied_device_info_to_clipboard">Cihaz bilgileri panoya kopyalandı.</string>
     <string name="could_not_create_playlist">Oynatma listesi oluşturulamadı\u2019.</string>
@@ -173,15 +168,8 @@
     <string name="edit_synced_lyrics">Senkronize Edilmiş Sözleri Düzenle</string>
     <string name="empty">Boş</string>
     <string name="equalizer">Ekolayzır</string>
-    <string name="error_create_backup">Yedek oluşturulamadı</string>
-    <string name="error_delete_backup">Yedek silinemedi</string>
-    <string name="error_empty_name">İsmin boş olamaz!</string>
-    <string name="error_load_failed">Yükleme başarısız</string>
-    <string name="error_share_file">Dosya paylaşılamadı</string>
-    <string name="expanded">Genişletilmiş</string>
     <string name="faq">SSS</string>
     <string name="favorites">Favoriler</string>
-    <string name="file_already_exists">Dosya zaten mevcut</string>
     <string name="finish_last_song">Son şarkıyı sonlandır</string>
     <string name="fit">Uydur</string>
     <string name="flat">Düz</string>
@@ -197,7 +185,6 @@
     <string name="genres">Janrlar</string>
     <string name="git_hub_summary">Projeyi GitHub\'da çatalla</string>
     <string name="gradient">Gradyan</string>
-    <string name="grant_access">Erişim izni ver</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -228,14 +215,13 @@
     <string name="label_file_name">Dosya adı</string>
     <string name="label_file_path">Dosya yolu</string>
     <string name="label_file_size">Boyut</string>
-    <string name="label_last_modified">Son Değiştirme</string>
+    <string name="label_last_modified">Last Modified</string>
     <string name="label_more_from">%s\'dan daha fazla</string>
     <string name="label_sampling_rate">Örnekleme oranı</string>
     <string name="label_track_length">Uzunluk</string>
     <string name="labeled">Etiketli</string>
     <string name="last_added">Son eklenen</string>
     <string name="last_song">Son şarkı</string>
-    <string name="lets_go">Hadi başlayalım</string>
     <string name="library_categories">Kütüphane kategorileri</string>
     <string name="licenses">Lisanslar</string>
     <string name="light_theme_name">Açık Beyaz</string>
@@ -248,12 +234,6 @@
     <string name="material">Materyal</string>
     <string name="md_error_label">Hata</string>
     <string name="md_storage_perm_error">İzin hatası</string>
-    <string name="message_backup_create_success">Yedekleme başarılı bir şekilde oluşturuldu.</string>
-    <string name="message_limit_tabs">En fazla 5 öğe</string>
-    <string name="message_pro_feature">%s bir Pro özelliğidir.</string>
-    <string name="message_restore_success">Geri yükleme başarıyla tamamlandı.</string>
-    <string name="message_updated">Güncellendi</string>
-    <string name="message_welcome"><![CDATA[Merhaba! <br>%s\'e<br> hoşgeldin]]></string>
     <string name="my_name">İsim</string>
     <string name="my_top_tracks">Sık oynatılanlar</string>
     <string name="never">Asla</string>
@@ -288,13 +268,12 @@
     <string name="only_on_wifi">Sadece Wi-Fi\'da</string>
     <string name="other_settings_summary">Gelişmiş test özellikleri</string>
     <string name="others">Diğer</string>
-    <string name="over_cover">Kapağın Üstüne</string>
+    <string name="over_cover">Over Cover</string>
     <string name="password">Şifre</string>
     <string name="past_three_months">Son 3 ay</string>
     <string name="paste_lyrics_here">Sözleri buraya yapıştır</string>
     <string name="paste_timeframe_lyrics_here">Zaman dilimli şarkı sözlerini buraya yapıştır</string>
     <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Yakındaki cihazlara erişim izni reddedildi.</string>
     <string name="permission_external_storage_denied">Harici depolama izni reddedildi.</string>
     <string name="permission_summary">Uygulamanın müzik çalması için cihazınızın depolama erişimine ihtiyacı var</string>
     <string name="permission_title">Depolama Erişimi</string>
@@ -334,7 +313,7 @@
     <string name="pref_keep_screen_on_summary">Bu özelliği etkinleştirmenin pil ömrünü etkileyebileceğini unutmayın.</string>
     <string name="pref_keep_screen_on_title">Ekranı açık tut</string>
     <string name="pref_language_name">Dil seçiniz</string>
-    <string name="pref_snow_fall_title">Kar yağışı efekti</string>
+    <string name="pref_snow_fall_title">Snow fall effect</string>
     <string name="pref_summary_album_art_on_lockscreen">Çalmakta olan şarkı albüm kapağını kilit ekranı duvar kağıdı olarak kullanın</string>
     <string name="pref_summary_album_artists_only">Sanatçı kategorisinde Albüm Sanatçılarını göster</string>
     <string name="pref_summary_audio_ducking">Sistem sesi çalındığında veya bir bildirim alındığında sesi kısın</string>
@@ -357,33 +336,32 @@
     <string name="pref_summary_ignore_media_store_artwork">Albüm kapağı kalitesini artırabilir, ancak fotoğrafın yavaş yüklenmesine neden olur. Bunu, yalnızca düşük çözünürlüklü resimlerle ilgili sorunlarınız varsa etkinleştirin.</string>
     <string name="pref_summary_library_categories">Kütüphane kategorilerinin görünürlük ve sırasını yapılandırın</string>
     <string name="pref_summary_lock_screen">Retro Müzik\'in özel kilit ekranı kontrollerini kullanın</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">Açık kaynaklı yazılım için lisans detayları</string>
-    <string name="pref_summary_pause_history">Etkinleştirildiğinde, yeni çalınan şarkılar geçmişte gösterilmez</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Başlangıçta son kullanılan sekmeye git</string>
-    <string name="pref_summary_show_lyrics">Albüm kapağının üstünde senkronize edilmiş sözleri göster</string>
-    <string name="pref_summary_suggestions">Ana Ekranda Yeni Müzik Karışımını Göster</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Şu anda oynatılan ekranda herhangi bir yere kaydırarak şarkı değiştirmeyi sağlar</string>
-    <string name="pref_summary_swipe_to_dismiss">Mini oynatıcıyı kapatmak için aşağı kaydırın</string>
+    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
+    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
+    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
     <string name="pref_summary_toggle_full_screen">Sürükleyici modu</string>
     <string name="pref_summary_toggle_headset">Kulaklık bağlandıktan hemen sonra çalmaya başla</string>
     <string name="pref_summary_toggle_shuffle">Yeni bir şarkı listesi çalınırken karıştırma modu kapanacak</string>
     <string name="pref_summary_toggle_volume">Eğer yeterli alan varsa ses kontrollerini şimdi oynatılıyor ekranında göster</string>
     <string name="pref_summary_wallpaper_accent">Vurgu rengini duvar kağıdından al</string>
     <string name="pref_summary_whitelist">Sadece /Music dosyasından müzik göster</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Albüm kapağını göster</string>
     <string name="pref_title_album_artists_only">Albüm Sanatçısına göre belirle</string>
     <string name="pref_title_album_cover_style">Albüm kapağı teması</string>
     <string name="pref_title_album_cover_transform">Albüm kapağını atla</string>
     <string name="pref_title_app_shortcuts">Renkli uygulama kısayolları</string>
-    <string name="pref_title_appbar_mode">Başlık stili</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Odak kaybında ses hacmini azaltın</string>
     <string name="pref_title_audio_fade">Soluk Ses</string>
     <string name="pref_title_auto_download_artist_images">Sanatçı resimlerini otomatik indir</string>
     <string name="pref_title_blacklist">Kara Liste</string>
     <string name="pref_title_bluetooth_playback">Bluetooth ile oynatma</string>
     <string name="pref_title_blurred_album_art">Albüm kapağını bulanıklaştır</string>
-    <string name="pref_title_circle_button">Dairesel oynatma düğmesi</string>
+    <string name="pref_title_circle_button">Circular play button</string>
     <string name="pref_title_classic_notification">Klasik bildirim tasarımı</string>
     <string name="pref_title_colored_app">Adaptif renk</string>
     <string name="pref_title_colored_notification">Renkli bildirim</string>
@@ -403,7 +381,6 @@
     <string name="pref_title_lock_screen">Tam ekran kontrolleri</string>
     <string name="pref_title_lyrics_screen_on">Şarkı sözlerini gösterirken ekranı açık tut</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Her zaman oynat</string>
     <string name="pref_title_now_playing_screen_appearance">Şimdi oynatılıyor teması</string>
     <string name="pref_title_open_source_licences">Açık kaynak lisansları</string>
     <string name="pref_title_pause_history">Geçmişi duraklat</string>
@@ -411,7 +388,6 @@
     <string name="pref_title_show_lyrics">Şarkı sözlerini göster</string>
     <string name="pref_title_suggestions">Önerileri göster</string>
     <string name="pref_title_swipe_anywhere_now_playing">Şarkıyı değiştirmek için herhangi bir yere kaydırın</string>
-    <string name="pref_title_swipe_to_dismiss">Aşağı kaydırarak kapatın</string>
     <string name="pref_title_tab_text_mode">Sekme başlıkları modu</string>
     <string name="pref_title_toggle_carousel_effect">Atlıkarınca efekti</string>
     <string name="pref_title_toggle_full_screen">Uygulamayı tam ekran yapın</string>
@@ -419,9 +395,10 @@
     <string name="pref_title_toggle_toggle_shuffle">Karıştır modu</string>
     <string name="pref_title_toggle_volume">Ses kontrolleri</string>
     <string name="pref_title_wallpaper_accent">Duvar kağıdı vurgu rengi</string>
-    <string name="pref_title_whitelist">Beyaz liste müziği</string>
+    <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
+    <string name="pro_summary">Şimdi Oynatılıyor temaları, Atlıkarınca efekti, Renkli tema ve daha fazlası..</string>
     <string name="profile">Profil</string>
     <string name="purchase">Satın al</string>
     <string name="queue">Kuyruk</string>
@@ -438,7 +415,7 @@
     <string name="remove_songs_from_playlist_title">Şarkıları oynatma listesinden kaldır</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[<b>%1$d</b> adlı şarkılar oynatma listesinden kaldırılsın mı?]]></string>
     <string name="rename_playlist_title">Oynatma listesini yeniden adlandır</string>
-    <string name="replace_cover">Kapağı Değiştir</string>
+    <string name="replace_cover">Replace Cover</string>
     <string name="report_an_issue">Sorun Bildir</string>
     <string name="report_bug">Hata bildir</string>
     <string name="reset_action">Sıfırla</string>
@@ -498,7 +475,6 @@
     <string name="sort_order_composer">Besteci</string>
     <string name="sort_order_date">Tarih eklendi</string>
     <string name="sort_order_date_modified">Zaman ayarlandı</string>
-    <string name="sort_order_default">Varsayılan</string>
     <string name="sort_order_num_songs">Şarkı sayısı</string>
     <string name="sort_order_num_songs_desc">Şarkı sayısı açıklaması</string>
     <string name="sort_order_year">Yıl</string>
@@ -558,4 +534,5 @@
     <string name="you_have_to_select_at_least_one_category">En az bir kategori seçmek zorundasınız.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Sorun izleyici web sitesine yönlendirileceksiniz.</string>
     <string name="your_account_data_is_only_used_for_authentication">Hesap verileriniz sadece kimlik doğrulama için kullanılır.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 74255debc..21e15a645 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">Про застосунок %s</string>
+    <string name="about_album_label">Про додаток %s</string>
     <string name="about_settings_summary">Команда, посилання на соц. мережі</string>
     <string name="accent_color">Акцентний колір</string>
     <string name="accent_color_desc">Акцентний колір, за замовчуванням фіолетовий</string>
-    <string name="action_about">Про застосунок</string>
+    <string name="action_about">Про додаток</string>
     <string name="action_add_to_blacklist">Додати до чорного списку</string>
     <string name="action_add_to_favorites">Додати в обране</string>
     <string name="action_add_to_playing_queue">Додати до черги відтворення</string>
     <string name="action_add_to_playlist">Додати до списку відтворення</string>
-    <string name="action_cancel">Скасовувати</string>
     <string name="action_cast">Трансляція на іншому дисплеї</string>
     <string name="action_clear_playing_queue">Очистити чергу відтворення</string>
     <string name="action_cycle_repeat">Циклічне повторення</string>
@@ -41,7 +40,7 @@
     <string name="action_search">Пошук</string>
     <string name="action_set">Розпочати</string>
     <string name="action_set_as_ringtone">Встановити як мелодію дзвінка</string>
-    <string name="action_set_as_start_directory">Встановити як початкову теку</string>
+    <string name="action_set_as_start_directory">Встановити в якості початкової теки</string>
     <string name="action_settings">"Налаштування"</string>
     <string name="action_share">Поділитися</string>
     <string name="action_shuffle_all">Перемішати всі</string>
@@ -55,7 +54,7 @@
     <string name="add_action">Додати</string>
     <string name="add_playlist_title">"Додати до списку відтворення"</string>
     <string name="add_time_framed_lryics">Додати часові розмежування тексту</string>
-    <string name="added_song_count_to_playlist">Додано %1$d пісень(ів) до %2$s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Додано 1 композицію до черги відтворення."</string>
     <string name="added_x_titles_to_playing_queue">Додано %1$d композицій до черги відтворення.</string>
     <string name="album">Альбом</string>
@@ -70,39 +69,37 @@
     <plurals name="albums">
         <item quantity="one">Альбом</item>
         <item quantity="few">Альбоми</item>
-        <item quantity="many">Альбомів</item>
+        <item quantity="many">Альбоми</item>
         <item quantity="other">Альбоми</item>
     </plurals>
     <string name="always">Завжди</string>
     <string name="app_share">Привіт, перегляньте цей крутий музичний плеєр за адресою: https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">Перемішати</string>
     <string name="app_shortcut_top_tracks_short">Кращі треки</string>
-    <string name="app_widget_big_name">Повне зображення</string>
+    <string name="app_widget_big_name">Full Image</string>
     <string name="app_widget_card_name">Ретро музика - Картка</string>
     <string name="app_widget_classic_name">Ретро-музика - Класичний</string>
     <string name="app_widget_md3_name">MD3</string>
     <string name="app_widget_small_name">Ретро-музика - Малий</string>
-    <string name="app_widget_text_name">Мінімум тексту</string>
+    <string name="app_widget_text_name">Minimal Text</string>
     <string name="artist">Виконавець</string>
     <string name="artists">Виконавці</string>
-    <string name="audio_fade_duration">Тривалість затухання звуку</string>
+    <string name="audio_fade_duration">Audio fade duration</string>
     <string name="audio_focus_denied">В отриманні аудіофокусу відмовлено.</string>
     <string name="audio_settings_summary">Змінити налаштування звуку та налаштувати параметри еквалайзера</string>
     <string name="auto">Автоматично</string>
-    <string name="backup_restore_settings_summary">Резервне копіювання та відновлення налаштувань, плейлистів</string>
-    <string name="backup_restore_title"><![CDATA[Резервне копіювання та відновлення]]></string>
-    <string name="backup_title">Резервні копії</string>
+    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
+    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
+    <string name="backup_title">Backups</string>
     <string name="biography">Життєпис</string>
     <string name="black_theme_name">Чорний</string>
     <string name="blacklist">Чорний список</string>
-    <string name="bluetooth_summary">Застосунку потрібен дозвіл на пристрої поблизу, щоб перевірити наявність пристроїв Bluetooth</string>
-    <string name="bluetooth_title">Пристрої поруч</string>
     <string name="blur">Розмиття</string>
     <string name="blur_card">Розмита картка</string>
     <string name="bug_report_failed">Не вдалося надіслати звіт</string>
-    <string name="bug_report_failed_invalid_token">Недійсний токен доступу. Зв’яжіться з розробником застосунку.</string>
-    <string name="bug_report_failed_issues_not_available">Проблеми не включені для вибраного сховища. Зверніться до розробника застосунку.</string>
-    <string name="bug_report_failed_unknown">Виникла несподівана помилка. Зв\'яжіться з розробником застосунку.</string>
+    <string name="bug_report_failed_invalid_token">Недійсний токен доступу. Зв’яжіться з розробником додатка.</string>
+    <string name="bug_report_failed_issues_not_available">Проблеми не включені для вибраного сховища. Зверніться до розробника програми.</string>
+    <string name="bug_report_failed_unknown">Виникла несподівана помилка. Зв\'яжіться з розробником додатку.</string>
     <string name="bug_report_failed_wrong_credentials">Неправильне ім\'я користувача або пароль</string>
     <string name="bug_report_issue">Помилка</string>
     <string name="bug_report_manual">Надіслати вручну</string>
@@ -110,31 +107,29 @@
     <string name="bug_report_no_password">Введіть свій дійсний пароль користувача GitHub</string>
     <string name="bug_report_no_title">Введіть заголовок проблеми</string>
     <string name="bug_report_no_username">Введіть своє дійсне ім’я користувача GitHub</string>
-    <string name="bug_report_success">Повідомлення про помилку успішне</string>
-    <string name="bug_report_summary">Сталася неочікувана помилка. Вибачте, що натрапили на цю помилку, якщо вона постійно повторюється, спробуйте \"Очистити дані застосунку\" або надішліть лист на ел. пошту </string>
+    <string name="bug_report_summary">Сталася неочікувана помилка. Вибачте, що натрапили на цю помилку, якщо вона постійно повторюється, спробуйте \"Очистити дані додатка\" або надішліть лист на ел. пошту </string>
     <string name="bug_report_use_account">Надіслати через обліковий запис GitHub</string>
     <string name="buy_now">Придбайте вже</string>
     <string name="cancel_current_timer">Відмінити</string>
     <string name="card">Картка</string>
     <string name="card_color_style">Кольорова картка</string>
-    <string name="card_square">Квадратна картка</string>
+    <string name="card_square">Square Card</string>
     <string name="card_style">Картка</string>
     <string name="carousal_effect_on_now_playing_screen">Карусель на екрані відтворення</string>
     <string name="cascading">Каскад</string>
     <string name="changelog">Історія змін</string>
-    <string name="changelog_summary">Перевірте, що нового</string>
-    <string name="choose_image">Виберіть зображення</string>
-    <string name="choose_restore_title">Обирайте, що відновлювати</string>
+    <string name="changelog_summary">Check out What\'s New</string>
+    <string name="choose_image">Choose Image</string>
+    <string name="choose_restore_title">Choose what to restore</string>
     <string name="circle">Коло</string>
     <string name="circular">Круглий</string>
     <string name="classic">Класичний</string>
     <string name="clear_action">Очистити</string>
     <string name="clear_blacklist">Очистити чорний список</string>
-    <string name="clear_history">Очистити історію</string>
+    <string name="clear_history">Clear History</string>
     <string name="clear_playing_queue">Очистити чергу</string>
     <string name="color">Колір</string>
     <string name="colors">Кольори</string>
-    <string name="compact">Компактний</string>
     <string name="composer">Композитор</string>
     <string name="copied_device_info_to_clipboard">Скопійовано інформацію про пристрій у буфер обміну.</string>
     <string name="could_not_create_playlist">Не вдалося створити список відтворення.</string>
@@ -146,8 +141,8 @@
     <string name="created_playlist_x">Створено список відтворення %1$s.</string>
     <string name="credit_title">Учасники та меценати </string>
     <string name="currently_listening_to_x_by_x">Зараз грає %1$s від %2$s.</string>
-    <string name="custom_artist_images">Індивідуальні зображення художників</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Поділитися звітом про помилку</string>
+    <string name="custom_artist_images">Custom Artist Images</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
     <string name="dark_theme_name">Майже темна</string>
     <string name="delete_playlist_title">Видалити список відтворення</string>
     <string name="delete_playlist_x"><![CDATA[Видалити список відтворення <b>%1$s</b>?]]></string>
@@ -158,34 +153,27 @@
     <string name="delete_x_playlists"><![CDATA[Видалити <b>%1$d</b> списки відтворення?]]></string>
     <string name="delete_x_songs"><![CDATA[Видалити <b>%1$d</b> пісень?]]></string>
     <string name="deleted_x_songs">Видалено %1$d пісень.</string>
-    <string name="deleting_songs">Видалити пісні</string>
+    <string name="deleting_songs">Deleting Songs</string>
     <string name="depth">Глибина</string>
     <string name="description">Опис</string>
     <string name="device_info">Інформація про пристрій</string>
     <string name="dialog_message_set_ringtone">Дозволити Retro Music змінювати налаштування звуку</string>
     <string name="dialog_title_set_ringtone">Встановити як мелодію дзвінка</string>
-    <string name="disc_hint">Номер диску</string>
+    <string name="disc_hint">Disc Number</string>
     <string name="do_you_want_to_clear_the_blacklist">Ви хочете очистити чорний список?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Вилучити <b>%1$s</b> з чорного списку?]]></string>
     <string name="donate">Підтримати</string>
     <string name="donate_summary">Якщо ви вважаєте, що я заслуговую на оплату своєї праці, ви можете залишити гроші тут</string>
     <string name="donation_header">Купіть мені:</string>
-    <string name="done">Готово</string>
+    <string name="done">Done</string>
     <string name="drive_mode">Режим водія</string>
-    <string name="edit_fab">Кнопка редагування</string>
-    <string name="edit_normal_lyrics">Змінити текст пісні</string>
-    <string name="edit_synced_lyrics">Редагувати синхронізовані тексти</string>
+    <string name="edit_fab">Edit Button</string>
+    <string name="edit_normal_lyrics">Edit Lyrics</string>
+    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
     <string name="empty">Порожньо</string>
     <string name="equalizer">Еквалайзер</string>
-    <string name="error_create_backup">Не вдалося створити резервну копію</string>
-    <string name="error_delete_backup">Не можливо\u2019t видалити резервну копію</string>
-    <string name="error_empty_name">Ваше ім\'я не може бути порожнім!</string>
-    <string name="error_load_failed">Не вдалося завантажити</string>
-    <string name="error_share_file">Не вдалося поділитися файлом</string>
-    <string name="expanded">Розширений</string>
     <string name="faq">ЧаП</string>
     <string name="favorites">Обране</string>
-    <string name="file_already_exists">Файл вже існує</string>
     <string name="finish_last_song">Закінчити останню пісню</string>
     <string name="fit">Вмістити</string>
     <string name="flat">Плоский</string>
@@ -195,13 +183,12 @@
     <string name="free">Безкоштовно</string>
     <string name="full">Повний</string>
     <string name="full_card">Повна картка</string>
-    <string name="general_settings_summary">Змінити тему і кольори застосунку</string>
+    <string name="general_settings_summary">Змінити тему і кольори додатку</string>
     <string name="general_settings_title">Вигляд</string>
     <string name="genre">Жанр</string>
     <string name="genres">Жанри</string>
-    <string name="git_hub_summary">Форк проєкту на GitHub</string>
-    <string name="gradient">Градієнт</string>
-    <string name="grant_access">Надати доступ</string>
+    <string name="git_hub_summary">Розгалужити проект на GitHub</string>
+    <string name="gradient">Gradient</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -211,19 +198,19 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="grid_style_label">Стиль сітки</string>
-    <string name="help_summary">Необхідна додаткова допомога?</string>
+    <string name="help_summary">Need more help?</string>
     <string name="hinge">Завіса</string>
     <string name="history">Історія</string>
-    <string name="history_cleared">Історію очищено</string>
-    <string name="history_undo_button">Скасувати</string>
+    <string name="history_cleared">History cleared</string>
+    <string name="history_undo_button">Undo</string>
     <string name="home">Домашня сторінка</string>
     <string name="horizontal_flip">Горизонтальне перевернення</string>
     <string name="image">Зображення</string>
     <string name="image_gradient">Градієнтне зображення</string>
     <string name="image_settings_summary">Змінити параметри завантаження зображення виконавця</string>
-    <string name="import_label">Імпорт</string>
-    <string name="import_playlist">Імпортувати плейліст</string>
-    <string name="import_playlist_message">Імпортує всі плейлісти, перелічені в Android Media Store з піснями, якщо в списках відтворення вже є і пісні будуть об\'єднані.</string>
+    <string name="import_label">Import</string>
+    <string name="import_playlist">Import playlist</string>
+    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
     <string name="inserted_x_songs_into_playlist_x">Додано %1$d пісень до списку відтворення %2$s.</string>
     <string name="instagram_page_summary">Похизуйтеся вашими налаштуваннями Retro Music у Instagram</string>
     <string name="keyboard">Клавіатура</string>
@@ -232,14 +219,13 @@
     <string name="label_file_name">Назва файлу</string>
     <string name="label_file_path">Шлях до файлу</string>
     <string name="label_file_size">Розмір</string>
-    <string name="label_last_modified">Дата останньої зміни</string>
+    <string name="label_last_modified">Last Modified</string>
     <string name="label_more_from">Більше від %s</string>
     <string name="label_sampling_rate">Частота дискретизації</string>
     <string name="label_track_length">Довжина</string>
     <string name="labeled">З відміткою</string>
     <string name="last_added">Нещодавно додане</string>
     <string name="last_song">Остання пісня</string>
-    <string name="lets_go">Вперед!</string>
     <string name="library_categories">Категорії бібліотеки</string>
     <string name="licenses">Ліцензії</string>
     <string name="light_theme_name">Яскраво-білий</string>
@@ -252,23 +238,17 @@
     <string name="material">Матеріал</string>
     <string name="md_error_label">Помилка</string>
     <string name="md_storage_perm_error">Помилка дозволу</string>
-    <string name="message_backup_create_success">Резервну копію успішно створено.</string>
-    <string name="message_limit_tabs">Не більше 5 елементів</string>
-    <string name="message_pro_feature">%s є Pro функцією.</string>
-    <string name="message_restore_success">Відновлення успішно завершено.</string>
-    <string name="message_updated">Оновлено</string>
-    <string name="message_welcome"><![CDATA[Привіт! <br>Вітаємо в %s]]></string>
     <string name="my_name">Назва</string>
     <string name="my_top_tracks">Найчастіше відтворювані</string>
     <string name="never">Ніколи</string>
-    <string name="new_music_mix">Новий мікс</string>
+    <string name="new_music_mix">New Music Mix</string>
     <string name="new_playlist_title">Новий список відтворення</string>
     <string name="new_start_directory">%s є новим початковим каталогом.</string>
     <string name="next_song">Наступна пісня</string>
     <string name="no_albums">Немає жодного альбому</string>
     <string name="no_artists">Немає жодного виконавця</string>
     <string name="no_audio_ID">"Спочатку відтворіть пісню, а потім спробуйте ще раз."</string>
-    <string name="no_backups_found">Не знайдено резервних копій</string>
+    <string name="no_backups_found">No Backups Found</string>
     <string name="no_equalizer">Еквалайзер не знайдено</string>
     <string name="no_genres">У вас немає жанрів</string>
     <string name="no_lyrics_found">Текст не знайдено</string>
@@ -280,7 +260,7 @@
     <string name="normal">Нормальний</string>
     <string name="normal_lyrics">Стандартний текст</string>
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> не вказано в медіа сховищі.]]></string>
-    <string name="not_recently_played">Нещодавно відтворені</string>
+    <string name="not_recently_played">Not recently played</string>
     <string name="nothing_to_scan">Нічого сканувати.</string>
     <string name="nothing_to_see">Порожньо</string>
     <string name="notification">Сповіщення</string>
@@ -292,16 +272,15 @@
     <string name="only_on_wifi">Лише через Wi-Fi</string>
     <string name="other_settings_summary">Розширені функції тестування</string>
     <string name="others">Інше</string>
-    <string name="over_cover">Обкладинка</string>
+    <string name="over_cover">Over Cover</string>
     <string name="password">Пароль</string>
     <string name="past_three_months">Останні 3 місяці</string>
-    <string name="paste_lyrics_here">Вставити текст сюди</string>
-    <string name="paste_timeframe_lyrics_here">Вставити текст пісні тут</string>
-    <string name="peek">Погляд</string>
-    <string name="permission_bluetooth_denied">Доступ до пристроїв поблизу заборонено.</string>
+    <string name="paste_lyrics_here">Paste Lyrics Here</string>
+    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
+    <string name="peek">Peek</string>
     <string name="permission_external_storage_denied">Відмовлено у доступі до зовнішнього сховища.</string>
-    <string name="permission_summary">Застосунку потрібен дозвіл на доступ до пам\'яті пристрою для відтворення музики</string>
-    <string name="permission_title">Доступ до сховища</string>
+    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
+    <string name="permission_title">Storage Access</string>
     <string name="permissions_denied">У доступі відмовлено.</string>
     <string name="personalize">Персоналізація</string>
     <string name="personalize_settings_summary">Налаштуйте екран відтворення та зовнішній вигляд</string>
@@ -309,13 +288,13 @@
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">Слідкуйте за сторінкою Pinterest від Retro Music для натхнення дизайну</string>
     <string name="plain">Звичайний</string>
-    <string name="playList_already_exits">Список відтворення вже існує</string>
-    <string name="playback_pitch">Тон</string>
-    <string name="playback_settings">Налаштування відтворення</string>
-    <string name="playback_speed">Швидкість Відтворення</string>
+    <string name="playList_already_exits">Playlist already exists</string>
+    <string name="playback_pitch">Pitch</string>
+    <string name="playback_settings">Playback Settings</string>
+    <string name="playback_speed">Playback Speed</string>
     <string name="playing_notification_description">Сповіщення про відтворення надає дії для відтворення/паузи тощо.</string>
     <string name="playing_notification_name">Сповіщення про відтворення</string>
-    <string name="playlist_created_sucessfully">%s успішно створено</string>
+    <string name="playlist_created_sucessfully">%s created successfully</string>
     <string name="playlist_is_empty">Список відтворення порожній</string>
     <string name="playlist_name_empty">Назва списку відтворення</string>
     <string name="playlists">Списки відтворення</string>
@@ -333,25 +312,25 @@
     <string name="pref_header_library">Бібліотека</string>
     <string name="pref_header_lockscreen">Екран блокування</string>
     <string name="pref_header_playlists">Списки відтворення</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Призупиняє пісню, коли гучність зменшується до нуля і починає грати під час підвищення гучності. Також працює поза застосунком</string>
+    <string name="pref_keep_pause_on_zero_volume_summary">Призупиняє пісню, коли гучність зменшується до нуля і починає грати під час підвищення гучності. Також працює поза додатком</string>
     <string name="pref_keep_pause_on_zero_volume_title">Пауза при нулі</string>
     <string name="pref_keep_screen_on_summary">Майте на увазі, що увімкнення цієї функції може вплинути на заряд акумулятора</string>
     <string name="pref_keep_screen_on_title">Не вимикати екран</string>
     <string name="pref_language_name">Обрати мову</string>
-    <string name="pref_snow_fall_title">Ефект снігопаду</string>
+    <string name="pref_snow_fall_title">Snow fall effect</string>
     <string name="pref_summary_album_art_on_lockscreen">Використовувати обкладинку альбому пісні як шпалери екрана блокування</string>
-    <string name="pref_summary_album_artists_only">Показувати виконавців альбому в категорії виконавця</string>
+    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
     <string name="pref_summary_audio_ducking">Зменшення гучності при відтворенні системного звуку або сповіщення</string>
-    <string name="pref_summary_audio_fade">Приглушити звуку під час паузи або відтворення пісні</string>
+    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
     <string name="pref_summary_blacklist">Вміст тек чорного списку приховано з вашої бібліотеки.</string>
     <string name="pref_summary_bluetooth_playback">Почати відтворення відразу при під\'єднанні до Bluetooth пристрою</string>
-    <string name="pref_summary_blurred_album_art">Розмивати обкладинку альбому на екрані блокування. Можуть виникнути проблеми зі сторонніми застосунками та віджетами</string>
+    <string name="pref_summary_blurred_album_art">Розмивати обкладинку альбому на екрані блокування. Можуть виникнути проблеми з сторонніми додатками та віджетами</string>
     <string name="pref_summary_carousel_effect">Ефект каруселі для обкладинок альбомів на екрані відтворення. Теми \"Картка\" та \"Розмита картка\" не працюватимуть</string>
     <string name="pref_summary_classic_notification">Використовувати класичне оформлення сповіщення</string>
     <string name="pref_summary_colored_app">Тло і кольори кнопок керування міняються в залежності від обкладинки екрана відтворення</string>
-    <string name="pref_summary_colored_app_shortcuts">Фарбує ярлики застосунків у колір акценту. Кожного разу, коли ви змінюєте колір, будь ласка, перемкніть його, щоб зміни набрали чинності</string>
+    <string name="pref_summary_colored_app_shortcuts">Фарбує ярлики додатків у колір акценту. Кожного разу, коли ви змінюєте колір, будь ласка, перемкніть його, щоб зміни вступили в силу</string>
     <string name="pref_summary_colored_notification">"Фарбує повідомлення в обкладинці альбому яскравим кольором"</string>
-    <string name="pref_summary_cross_fade">Тривалість переходу між піснями</string>
+    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
     <string name="pref_summary_desaturated_color">Для Material Design лінії в темному режимі мають бути ненасичені</string>
     <string name="pref_summary_expand_now_playing_panel">При натисканні на сповіщення буде показано екран відтворення замість домашнього екрану</string>
     <string name="pref_summary_extra_controls">Додати додаткові елементи керування до міні-програвача</string>
@@ -361,101 +340,99 @@
     <string name="pref_summary_ignore_media_store_artwork">Може збільшити якість обкладинки альбому, але збільшує час завантаження зображення. Використовуйте тільки якщо у вас проблеми з обкладинками низької роздільної здатності</string>
     <string name="pref_summary_library_categories">Налаштувати видимість та порядок категорій бібліотеки.</string>
     <string name="pref_summary_lock_screen">Використовувати керування музикою на екрані блокування від Retro Music</string>
-    <string name="pref_summary_manage_audio_focus">Завжди відтворювати аудіо у фоновому режимі, незважаючи на інше відтворення </string>
     <string name="pref_summary_open_source_licences">Деталі ліцензії для програмного забезпечення з відкритим кодом</string>
-    <string name="pref_summary_pause_history">Коли увімкнено, нові пісні не відображатимуться в історії</string>
-    <string name="pref_summary_remember_tab">Перейдіть до останньої використаної вкладки при старті</string>
-    <string name="pref_summary_show_lyrics">Відображати текст пісні над обкладинкою альбому</string>
-    <string name="pref_summary_suggestions">Показати новий мікс музики на домашньому екрані</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Дозволяє змінювати пісню, проводячи пальцем по екрану відтворення</string>
-    <string name="pref_summary_swipe_to_dismiss">Проведіть вниз, щоб відхилити міні плеєр</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
+    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
+    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
+    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
+    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
     <string name="pref_summary_toggle_full_screen">Режим занурення</string>
     <string name="pref_summary_toggle_headset">Почати відтворення відразу після підключення навушників</string>
     <string name="pref_summary_toggle_shuffle">Випадковий режим вимкнеться при відтворенні нового списку пісень</string>
     <string name="pref_summary_toggle_volume">Якщо вистачає місця, показувати панель гучності на екрані відтворення</string>
-    <string name="pref_summary_wallpaper_accent">Використовувати колір акцентів зі шпалери</string>
-    <string name="pref_summary_whitelist">Відображувати музику лише з /Music Folder</string>
+    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
+    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Показати обкладинку альбому</string>
-    <string name="pref_title_album_artists_only">Перейти за виконавцем альбому</string>
+    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
     <string name="pref_title_album_cover_style">Тема обкладинки альбому</string>
     <string name="pref_title_album_cover_transform">Пропустити обкладинку альбому</string>
-    <string name="pref_title_app_shortcuts">Кольорові ярлики застосунків</string>
-    <string name="pref_title_appbar_mode">Стиль заголовку</string>
+    <string name="pref_title_app_shortcuts">Кольорові ярлики додатків</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Зменшити гучність при сторонніх звуках</string>
-    <string name="pref_title_audio_fade">Затухання аудіо</string>
+    <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Автоматично завантажувати зображення виконавців</string>
     <string name="pref_title_blacklist">Чорний список</string>
     <string name="pref_title_bluetooth_playback">Відтворення Bluetooth</string>
     <string name="pref_title_blurred_album_art">Розмити обкладинку альбому</string>
-    <string name="pref_title_circle_button">Кнопка кругового відтворення</string>
+    <string name="pref_title_circle_button">Circular play button</string>
     <string name="pref_title_classic_notification">Класичне оформлення сповіщень</string>
     <string name="pref_title_colored_app">Адаптивний колір</string>
     <string name="pref_title_colored_notification">Кольорове сповіщення</string>
-    <string name="pref_title_cross_fade">Плавний перехід (бета-версія)</string>
-    <string name="pref_title_custom_font">Використовувати шрифт Manrope</string>
+    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
+    <string name="pref_title_custom_font">Use Manrope font</string>
     <string name="pref_title_desaturated_color">Ненасичений колір</string>
     <string name="pref_title_expand_now_playing_panel">Показувати на екрані відтворення</string>
     <string name="pref_title_extra_controls">Додаткові елементи керування</string>
     <string name="pref_title_extra_song_info">Інформація про пісню</string>
     <string name="pref_title_gapless_playback">Безперервне відтворення</string>
-    <string name="pref_title_general_theme">Тема застосунку</string>
-    <string name="pref_title_home_album_grid_style">Сітка альбому</string>
+    <string name="pref_title_general_theme">Тема додатку</string>
+    <string name="pref_title_home_album_grid_style">Album grid</string>
     <string name="pref_title_home_artist_grid_style">Домашня сітка виконавця</string>
     <string name="pref_title_home_banner">Головний банер</string>
     <string name="pref_title_ignore_media_store_artwork">Ігнорувати обкладинки з Медіасховища</string>
     <string name="pref_title_last_added_interval">Інтервал останнього доданого списку відтворення</string>
     <string name="pref_title_lock_screen">Повноекранне керування</string>
-    <string name="pref_title_lyrics_screen_on">Не вимикати екран при відображенні тексту</string>
-    <string name="pref_title_lyrics_type">Тип тексту</string>
-    <string name="pref_title_manage_audio_focus">Завжди грати</string>
+    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
+    <string name="pref_title_lyrics_type">Lyrics type</string>
     <string name="pref_title_now_playing_screen_appearance">Тема відтворення</string>
     <string name="pref_title_open_source_licences">Ліцензії з відкритим кодом</string>
-    <string name="pref_title_pause_history">Призупинити історію</string>
-    <string name="pref_title_remember_tab">Запам‘ятати останню вкладку</string>
-    <string name="pref_title_show_lyrics">Показати текст</string>
-    <string name="pref_title_suggestions">Показувати пропозиції</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Проведіть де завгодно, щоб змінити пісню</string>
-    <string name="pref_title_swipe_to_dismiss">Прибрати свайпом вниз</string>
+    <string name="pref_title_pause_history">Pause history</string>
+    <string name="pref_title_remember_tab">Remember last tab</string>
+    <string name="pref_title_show_lyrics">Show lyrics</string>
+    <string name="pref_title_suggestions">Show suggestions</string>
+    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
     <string name="pref_title_tab_text_mode">Режим назв вкладок</string>
     <string name="pref_title_toggle_carousel_effect">Ефект Каруселі</string>
     <string name="pref_title_toggle_full_screen">На весь екран</string>
     <string name="pref_title_toggle_toggle_headset">Автоматичне відтворення</string>
     <string name="pref_title_toggle_toggle_shuffle">Режим перемішування</string>
     <string name="pref_title_toggle_volume">Регулювання гучності</string>
-    <string name="pref_title_wallpaper_accent">Колір акцентів шпалер</string>
-    <string name="pref_title_whitelist">Білий список музики</string>
+    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
+    <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
     <string name="pro_summary">Чорна тема, теми відтворення, ефект каруселі та інше..</string>
     <string name="profile">Профіль</string>
     <string name="purchase">Придбати</string>
     <string name="queue">Черга</string>
-    <string name="rate_app">Оцініть застосунок</string>
-    <string name="rate_on_google_play_summary">Подобається цей застосунок? Напишіть відгук нам у Google Play Store, як ми можемо зробити його ще кращим</string>
+    <string name="rate_app">Оцініть додаток</string>
+    <string name="rate_on_google_play_summary">Подобається цей додаток? Напишіть відгук нам у Google Play Store, як ми можемо зробити його ще кращим</string>
     <string name="recent_albums">Останні альбоми</string>
     <string name="recent_artists">Останні виконавці</string>
     <string name="remove_action">Вилучити</string>
     <string name="remove_cover">Видалити обкладинку</string>
     <string name="remove_from_blacklist">Видалити з чорного списку</string>
-    <string name="remove_image">Видалити зображення</string>
+    <string name="remove_image">Remove Image</string>
     <string name="remove_song_from_playlist_title">Видалити пісню зі списку відтворення</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Видалити пісню <b>%1$s</b> зі списку відтворення?]]></string>
     <string name="remove_songs_from_playlist_title">Видалити пісні зі списку відтворення</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Видалити <b>%1$d</b> пісень зі списку відтворення?]]></string>
     <string name="rename_playlist_title">Перейменувати список відтворення</string>
-    <string name="replace_cover">Змінити обкладинку</string>
+    <string name="replace_cover">Replace Cover</string>
     <string name="report_an_issue">Повідомити про помилку</string>
     <string name="report_bug">Повідомити про помилку</string>
     <string name="reset_action">Скинути</string>
     <string name="reset_artist_image">Скинути зображення виконавця</string>
     <string name="restore">Відновити</string>
-    <string name="restore_message">Бажаєте відновити резервну копію?</string>
-    <string name="restored_previous_purchase_please_restart">Відновлено попередню покупку. Перезапустіть застосунок, щоб скористатися всіма функціями.</string>
+    <string name="restore_message">Do you want to restore backup?</string>
+    <string name="restored_previous_purchase_please_restart">Відновлено попередню покупку. Перезапустіть додаток, щоб скористатися всіма функціями.</string>
     <string name="restored_previous_purchases">Відновлені попередні покупки.</string>
     <string name="restoring_purchase">Відновлення покупки…</string>
     <string name="retro_music_player">Retro Music плеєр</string>
     <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Застосунку потрібен дозвіл на доступ до налаштувань вашого пристрою для того, щоб встановити музику як рингтон</string>
-    <string name="ringtone_title">Мелодія (Необов\'язково)</string>
+    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
+    <string name="ringtone_title">Ringtone (Optional)</string>
     <string name="saf_delete_failed">Помилка видалення файлу: %s</string>
     <!-- SAF -->
     <string name="saf_error_uri">Неможливо отримати URI SAF</string>
@@ -482,10 +459,10 @@
     <string name="selected">Обрано</string>
     <string name="set">Встановити</string>
     <string name="set_artist_image">Встановити зображення виконавця</string>
-    <string name="share_app">Поділитися застосунком</string>
-    <string name="share_summary">Поділитися застосунком із друзями та сім\'єю</string>
+    <string name="share_app">Поділитися додатком</string>
+    <string name="share_summary">Share the app with your friends and family</string>
     <string name="share_to_stories">Поділитися в Історії</string>
-    <string name="show_album_artists">Показати виконавців альбому</string>
+    <string name="show_album_artists">Show Album Artists</string>
     <string name="shuffle">Перемішати</string>
     <string name="simple">Простий</string>
     <string name="sleep_timer_canceled">Таймер сну скасовано.</string>
@@ -502,9 +479,8 @@
     <string name="sort_order_composer">Композитор</string>
     <string name="sort_order_date">Дата додавання</string>
     <string name="sort_order_date_modified">Дата змінення</string>
-    <string name="sort_order_default">За замовчуванням</string>
-    <string name="sort_order_num_songs">Кількість пісень</string>
-    <string name="sort_order_num_songs_desc">Опис кількості пісень</string>
+    <string name="sort_order_num_songs">Song count</string>
+    <string name="sort_order_num_songs_desc">Song count desc</string>
     <string name="sort_order_year">Рік</string>
     <string name="sort_order_z_a">За спаданням</string>
     <string name="speech_not_supported">Вибачте! Ваш пристрій не підтримує введення мови</string>
@@ -525,14 +501,14 @@
     <string name="tiny">Дрібний</string>
     <string name="tiny_card_style">Крихітна картка</string>
     <string name="title">Назва</string>
-    <string name="title_new_backup">Нова резервна копія</string>
+    <string name="title_new_backup">New Backup</string>
     <string name="today">Сьогодні</string>
     <string name="top_albums">Топ альбомів</string>
     <string name="top_artists">Топ виконавців</string>
     <string name="track_hint">"Доріжка (2 для доріжки 2 або 3004 для CD3 доріжки 4)"</string>
     <string name="track_list">Номер пісні</string>
     <string name="translate">Перекласти</string>
-    <string name="translate_community">Допоможіть нам перекласти застосунок на вашу мову</string>
+    <string name="translate_community">Допоможіть нам перекласти додаток на вашу мову</string>
     <string name="try_retro_music_premium">Спробуйте Retro Music Преміум</string>
     <string name="twitter_page">Твіттер</string>
     <string name="twitter_page_summary">Поділіться своїм дизайном із Retro Music</string>
@@ -541,16 +517,16 @@
     <string name="up_next">Наступне</string>
     <string name="update_image">Оновити зображення</string>
     <string name="updating">Оновлення…</string>
-    <string name="user_images_description">Зображення користувача</string>
-    <string name="user_name">Ім\'я користувача</string>
+    <string name="user_images_description">User Images</string>
+    <string name="user_name">User Name</string>
     <string name="username">Ім\'я користувача</string>
     <string name="version">Версія додатку</string>
     <string name="vertical_flip">Вертикальне сальто</string>
-    <string name="view_on_telegram">Переглянути в Telegram</string>
+    <string name="view_on_telegram">View on Telegram</string>
     <string name="volume">Гучність</string>
     <string name="web_search">Пошук в інтернеті</string>
-    <string name="website">Сайт</string>
-    <string name="website_summary">Відвідайте наш веб-сайт</string>
+    <string name="website">Website</string>
+    <string name="website_summary">Check out our Website</string>
     <string name="welcome">Вітаємо вас,</string>
     <string name="what_do_you_want_to_share">Чим ви хочете поділитися?</string>
     <string name="whats_new">Що нового</string>
@@ -562,4 +538,5 @@
     <string name="you_have_to_select_at_least_one_category">Виберіть принаймні одну категорію.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Вас буде перенаправлено на сайт відстеження проблем.</string>
     <string name="your_account_data_is_only_used_for_authentication">Дані вашого облікового запису використовуються лише для автентифікації.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-v23/bools.xml b/app/src/main/res/values-v26/bools.xml
similarity index 59%
rename from app/src/main/res/values-v23/bools.xml
rename to app/src/main/res/values-v26/bools.xml
index 0a9fcbada..e557d81d8 100644
--- a/app/src/main/res/values-v23/bools.xml
+++ b/app/src/main/res/values-v26/bools.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="isMarshmallow">true</bool>
+    <bool name="isNotOreo">false</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/bools.xml b/app/src/main/res/values-v27/bools.xml
new file mode 100644
index 000000000..a3eb593f3
--- /dev/null
+++ b/app/src/main/res/values-v27/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="wallpaper_accent_visible">true</bool>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles_parents.xml b/app/src/main/res/values-v27/styles_parents.xml
index c6b398c57..e50cf022c 100644
--- a/app/src/main/res/values-v27/styles_parents.xml
+++ b/app/src/main/res/values-v27/styles_parents.xml
@@ -15,7 +15,7 @@
 <resources>
 
     <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Light</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
@@ -24,11 +24,10 @@
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="elevationOverlayColor">@color/elevationOverlay</item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 
     <style name="Theme.RetroMusic.Base" parent="Theme.Material3.Dark.NoActionBar">
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Dark</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
@@ -40,13 +39,12 @@
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="elevationOverlayColor">@color/elevationOverlay</item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Light</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
@@ -54,6 +52,5 @@
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="elevationOverlayColor">@color/elevationOverlayLight</item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/bools.xml b/app/src/main/res/values-v31/bools.xml
index e9ef74c3c..51349c34e 100644
--- a/app/src/main/res/values-v31/bools.xml
+++ b/app/src/main/res/values-v31/bools.xml
@@ -2,4 +2,6 @@
 <resources>
     <bool name="md3_available">true</bool>
     <bool name="md3_enabled">true</bool>
+
+    <bool name="wallpaper_accent_visible">false</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml
index 0ebd16650..7437a1528 100644
--- a/app/src/main/res/values-v31/styles.xml
+++ b/app/src/main/res/values-v31/styles.xml
@@ -9,7 +9,6 @@
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
         <item name="android:windowBackground">?attr/colorSurface</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 
     <style name="Theme.RetroMusic.MD3.Black" parent="@style/Theme.RetroMusic.MD3" />
@@ -18,8 +17,9 @@
         <item name="colorSurface">@android:color/system_accent1_50</item>
     </style>
 
-    <style name="Theme.RetroMusic.SplashScreen" parent="Theme.SplashScreen">
-        <item name="android:windowSplashScreenAnimatedIcon">@drawable/avd_splash</item>
+    <style name="SplashTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_splash_anim</item>
         <item name="android:windowSplashScreenAnimationDuration">1000</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index 307c696d1..e1e7d9a60 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -9,8 +9,7 @@
     <string name="action_add_to_favorites">Thêm vào yêu thích</string>
     <string name="action_add_to_playing_queue">Thêm vào danh sách chờ phát</string>
     <string name="action_add_to_playlist">Thêm vào danh sách phát</string>
-    <string name="action_cancel">Hủy</string>
-    <string name="action_cast">Truyền tới</string>
+    <string name="action_cast">Truyền màn hình</string>
     <string name="action_clear_playing_queue">Xoá danh sách chờ phát</string>
     <string name="action_cycle_repeat">Chế độ lặp lại chu kỳ</string>
     <string name="action_delete">Xoá</string>
@@ -20,7 +19,7 @@
     <string name="action_go_to_album">Đi đến album</string>
     <string name="action_go_to_artist">Đi đến nghệ sĩ</string>
     <string name="action_go_to_genre">Chuyển đến thể loại</string>
-    <string name="action_go_to_lyrics">Đi tới lời bài hát</string>
+    <string name="action_go_to_lyrics">Go to Lyrics</string>
     <string name="action_go_to_start_directory">Đến trang bắt đầu</string>
     <string name="action_grant">Cho phép</string>
     <string name="action_grid_size">Kích thước lưới</string>
@@ -55,7 +54,7 @@
     <string name="add_action">Thêm</string>
     <string name="add_playlist_title">"Thêm vào danh sách phát"</string>
     <string name="add_time_framed_lryics">Thêm lời theo thời gian</string>
-    <string name="added_song_count_to_playlist">Thêm %1$d bài hát vào %2$s</string>
+    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
     <string name="added_title_to_playing_queue">"Đã thêm 1 bài vào danh sách chờ phát."</string>
     <string name="added_x_titles_to_playing_queue">Đã thêm %1$d bài vào danh sách chờ phát.</string>
     <string name="album">Album</string>
@@ -79,18 +78,16 @@
     <string name="app_widget_text_name">Văn bản nhỏ nhất</string>
     <string name="artist">Nghệ sĩ</string>
     <string name="artists">Nghệ sĩ</string>
-    <string name="audio_fade_duration">Thời lượng làm mượt âm thanh</string>
+    <string name="audio_fade_duration">Audio fade duration</string>
     <string name="audio_focus_denied">Tập trung âm thanh bị từ chối</string>
     <string name="audio_settings_summary">Thay đổi cài đặt âm thanh và điều chỉnh các điều khiển bộ chỉnh âm</string>
     <string name="auto">Tự động</string>
-    <string name="backup_restore_settings_summary">Lưu trữ và khôi phục lại tùy chọn, danh sách phát của bạn</string>
-    <string name="backup_restore_title"><![CDATA[Sao lưu & Khôi phục]]></string>
-    <string name="backup_title">Bản sao lưu</string>
+    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
+    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
+    <string name="backup_title">Backups</string>
     <string name="biography">Tiểu sử</string>
     <string name="black_theme_name">Đen hoàn toàn</string>
     <string name="blacklist">Danh sách đen</string>
-    <string name="bluetooth_summary">Ứng dụng cần quyền các thiết bị lân cận để kiểm tra các thiết bị bluetooth</string>
-    <string name="bluetooth_title">Thiết bị lân cận</string>
     <string name="blur">Làm mờ</string>
     <string name="blur_card">Thẻ mờ</string>
     <string name="bug_report_failed">Không thể gửi báo cáo</string>
@@ -104,7 +101,6 @@
     <string name="bug_report_no_password">Vui lòng nhập đúng mật khẩu dùng Github của bạn</string>
     <string name="bug_report_no_title">Vui lòng nhập tiêu đề vấn đề</string>
     <string name="bug_report_no_username">Vui lòng nhập đúng tên người dùng Github của bạn</string>
-    <string name="bug_report_success">Báo cáo lỗi thành công</string>
     <string name="bug_report_summary">Đã xảy ra lỗi không mong muốn. Xin lỗi bạn vì lỗi này, nếu nó
 tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="bug_report_use_account">Gửi bằng tài khoản GitHub </string>
@@ -118,18 +114,17 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="cascading">Xếp tầng</string>
     <string name="changelog">Thay đổi</string>
     <string name="changelog_summary">Xem có gì mới</string>
-    <string name="choose_image">Chọn hình ảnh</string>
-    <string name="choose_restore_title">Chọn mục để khôi phục</string>
+    <string name="choose_image">Choose Image</string>
+    <string name="choose_restore_title">Choose what to restore</string>
     <string name="circle">Vòng tròn</string>
     <string name="circular">Dạng tròn</string>
     <string name="classic">Cổ điển</string>
     <string name="clear_action">Xóa</string>
     <string name="clear_blacklist">Xóa danh sách đen</string>
-    <string name="clear_history">Xóa Lịch sử</string>
+    <string name="clear_history">Clear History</string>
     <string name="clear_playing_queue">Xoá danh sách</string>
     <string name="color">Màu sắc</string>
     <string name="colors">Màu sắc</string>
-    <string name="compact">Nhỏ gọn</string>
     <string name="composer">Tác giả</string>
     <string name="copied_device_info_to_clipboard">Đã sao chép thông tin thiết bị vào clipboard.</string>
     <string name="could_not_create_playlist">Kh\u00f4ng th\u1ec3 t\u1ea1o danh s\u00e1ch ph\u00e1t</string>
@@ -141,8 +136,8 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="created_playlist_x">Đã tạo danh sách phát %1$s.</string>
     <string name="credit_title">Thành viên và cộng tác viên </string>
     <string name="currently_listening_to_x_by_x">Đang nghe %1$s bởi %2$s.</string>
-    <string name="custom_artist_images">Tùy chỉnh ảnh nghệ sĩ</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Chia sẽ báo cáo lỗi</string>
+    <string name="custom_artist_images">Custom Artist Images</string>
+    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
     <string name="dark_theme_name">Xám đen</string>
     <string name="delete_playlist_title">Xoá danh sách phát</string>
     <string name="delete_playlist_x"><![CDATA[Xoá danh sách phát <b>%1$s</b>?]]></string>
@@ -159,7 +154,7 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="device_info">Thông tin thiết bị</string>
     <string name="dialog_message_set_ringtone">Cho phép Retro Music cấu hình cài đặt âm thanh</string>
     <string name="dialog_title_set_ringtone">Cài làm nhạc chuông</string>
-    <string name="disc_hint">Số đĩa</string>
+    <string name="disc_hint">Disc Number</string>
     <string name="do_you_want_to_clear_the_blacklist">Bạn có muốn xóa danh sách đen?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Bạn có muốn gỡ <b>%1$s</b> khỏi danh sách đen?]]></string>
     <string name="donate">Ủng hộ</string>
@@ -172,15 +167,8 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="edit_synced_lyrics">Sửa Lời Đồng bộ</string>
     <string name="empty">Trống</string>
     <string name="equalizer">Bộ chỉnh âm</string>
-    <string name="error_create_backup">Không thể tạo bản sao lưu</string>
-    <string name="error_delete_backup">Không thể xóa bản sao lưu</string>
-    <string name="error_empty_name">Tên của bạn không được để trống!</string>
-    <string name="error_load_failed">Không thể tải</string>
-    <string name="error_share_file">Không thể chia sẽ tập tin</string>
-    <string name="expanded">Mở rộng</string>
     <string name="faq">Câu hỏi thường gặp</string>
     <string name="favorites">Yêu thích</string>
-    <string name="file_already_exists">Tập tin đã tồn tại</string>
     <string name="finish_last_song">Kết thúc bài cuối</string>
     <string name="fit">Phù hợp</string>
     <string name="flat">Phẳng</string>
@@ -196,7 +184,6 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="genres">Thể loại</string>
     <string name="git_hub_summary">Tham gia phát triển dự án trên Github</string>
     <string name="gradient">Gradient</string>
-    <string name="grant_access">Trao quyền truy cập</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -209,8 +196,8 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="help_summary">Bạn cần hỗ trợ thêm?</string>
     <string name="hinge">Bản lề</string>
     <string name="history">Lịch sử</string>
-    <string name="history_cleared">Đã xóa lịch sử</string>
-    <string name="history_undo_button">Hoàn tác</string>
+    <string name="history_cleared">History cleared</string>
+    <string name="history_undo_button">Undo</string>
     <string name="home">Trang chủ</string>
     <string name="horizontal_flip">Lật ngang</string>
     <string name="image">Hình ảnh</string>
@@ -227,14 +214,13 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="label_file_name">Tên tệp</string>
     <string name="label_file_path">Đường dẫn tệp</string>
     <string name="label_file_size">Kích thước</string>
-    <string name="label_last_modified">Lần chỉnh sửa cuối</string>
+    <string name="label_last_modified">Last Modified</string>
     <string name="label_more_from">Thêm thông tin từ %s</string>
     <string name="label_sampling_rate">Tần số lấy mẫu</string>
     <string name="label_track_length">Độ dài</string>
     <string name="labeled">Được dán nhãn</string>
     <string name="last_added">Đã thêm gần đây</string>
     <string name="last_song">Bài cuối</string>
-    <string name="lets_go">Hãy bắt đầu</string>
     <string name="library_categories">Danh mục thư viện</string>
     <string name="licenses">Giấy phép</string>
     <string name="light_theme_name">Hoàn toàn trắng</string>
@@ -247,23 +233,17 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="material">Material</string>
     <string name="md_error_label">Lỗi</string>
     <string name="md_storage_perm_error">Lỗi quyền truy cập</string>
-    <string name="message_backup_create_success">Đã tạo thành công bản sao lưu.</string>
-    <string name="message_limit_tabs">Không nhiều hơn 5 tùy chọn</string>
-    <string name="message_pro_feature">%s là một tính năng Pro.</string>
-    <string name="message_restore_success">Khôi phục thành công.</string>
-    <string name="message_updated">Đã cập nhật</string>
-    <string name="message_welcome"><![CDATA[Xin chào! <br>Chào mừng bạn đến với %s]]></string>
     <string name="my_name">Tên</string>
     <string name="my_top_tracks">Phát nhiều nhất</string>
     <string name="never">Không bao giờ</string>
-    <string name="new_music_mix">Bản phối nhạc mới</string>
+    <string name="new_music_mix">New Music Mix</string>
     <string name="new_playlist_title">Danh sách phát mới</string>
     <string name="new_start_directory">%s là trang bắt đầu mới.</string>
     <string name="next_song">Bài tiếp theo</string>
     <string name="no_albums">Không có album</string>
     <string name="no_artists">Không có nghệ sĩ</string>
     <string name="no_audio_ID">"Phát một bài hát trước, sau đó thử lại."</string>
-    <string name="no_backups_found">Không tìm thấy bản sao lưu</string>
+    <string name="no_backups_found">No Backups Found</string>
     <string name="no_equalizer">Không tìm thấy bộ chỉnh âm</string>
     <string name="no_genres">Không có thể loại</string>
     <string name="no_lyrics_found">Không tìm thấy lời bài hát</string>
@@ -292,8 +272,7 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="past_three_months">Mỗi tháng</string>
     <string name="paste_lyrics_here">Dán lời ở đây</string>
     <string name="paste_timeframe_lyrics_here">Dán lời theo thời gian ở đây</string>
-    <string name="peek">Nhìn trước</string>
-    <string name="permission_bluetooth_denied">Quyền truy cập thiết bị lân cận bị từ chối.</string>
+    <string name="peek">Peek</string>
     <string name="permission_external_storage_denied">Quyền truy cập bộ nhớ ngoài bị từ chối.</string>
     <string name="permission_summary">Ứng dụng cần quyền truy cập bộ nhớ thiết bị của bạn để phát nhạc</string>
     <string name="permission_title">Truy cập bộ nhớ</string>
@@ -304,13 +283,13 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">Theo dõi trang Pinterest để lấy cảm hứng thiết kế Retro Music</string>
     <string name="plain">Giản dị</string>
-    <string name="playList_already_exits">Danh sách phát đã tồn tại</string>
-    <string name="playback_pitch">Cao độ</string>
-    <string name="playback_settings">Cài đặt phát lại</string>
-    <string name="playback_speed">Tốc độ phát lại</string>
+    <string name="playList_already_exits">Playlist already exists</string>
+    <string name="playback_pitch">Pitch</string>
+    <string name="playback_settings">Playback Settings</string>
+    <string name="playback_speed">Playback Speed</string>
     <string name="playing_notification_description">Thanh thông báo đang phát sẽ cho phép bạn phát/tạm dừng, chuyển bài, v.v.</string>
     <string name="playing_notification_name">Thông báo đang phát</string>
-    <string name="playlist_created_sucessfully">%s đã tạo thành công</string>
+    <string name="playlist_created_sucessfully">%s created successfully</string>
     <string name="playlist_is_empty">Danh sách phát trống</string>
     <string name="playlist_name_empty">Tên danh sách phát</string>
     <string name="playlists">Danh sách phát</string>
@@ -333,11 +312,11 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="pref_keep_screen_on_summary">Lưu ý rằng việc bật tính năng này có thể ảnh hưởng đến tuổi thọ pin</string>
     <string name="pref_keep_screen_on_title">Giữ màn hình luôn bật</string>
     <string name="pref_language_name">Chọn ngôn ngữ</string>
-    <string name="pref_snow_fall_title">Hiệu ứng tuyết rơi</string>
+    <string name="pref_snow_fall_title">Snow fall effect</string>
     <string name="pref_summary_album_art_on_lockscreen">Sử dụng ảnh bìa album bài hát đang phát làm ảnh nền màn hình khóa.</string>
     <string name="pref_summary_album_artists_only">Hiển thị Album Nghệ sĩ trong danh mục Nghệ sĩ</string>
     <string name="pref_summary_audio_ducking">Giảm âm lượng khi có âm báo hệ thống hoặc khi bạn có thông báo</string>
-    <string name="pref_summary_audio_fade">Làm mượt âm thanh khi tạm dừng hoặc phát bài hát</string>
+    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
     <string name="pref_summary_blacklist">Nội dung của các thư mục trong danh sách đen được ẩn khỏi thư viện của bạn.</string>
     <string name="pref_summary_bluetooth_playback">Tự động phát nhạc sau khi kết nối với thiết bị Bluetooth</string>
     <string name="pref_summary_blurred_album_art">Làm mờ ảnh bìa album trên màn hình khóa. Có thể gây ra sự cố với các ứng dụng và tiện ích của bên thứ ba</string>
@@ -356,26 +335,25 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="pref_summary_ignore_media_store_artwork">Có thể tăng chất lượng hiển thị ảnh bìa album, nhưng sẽ làm thời gian tải hình ảnh chậm hơn. Chỉ bật tính năng này nếu bạn không thích chất lượng ảnh gốc</string>
     <string name="pref_summary_library_categories">Khả năng hiển thị và thứ tự của các danh mục trong thư viện.</string>
     <string name="pref_summary_lock_screen">Sử dụng các điều khiển màn hình khóa tùy chỉnh của Retro Music</string>
-    <string name="pref_summary_manage_audio_focus">Luôn phát âm thanh trong nền bất kể các nguồn âm thanh đang phát khác</string>
     <string name="pref_summary_open_source_licences">Chi tiết giấy phép của phần mềm mã nguồn mở</string>
-    <string name="pref_summary_pause_history">Khi được bật, những bài hát mới phát sẽ không xuất hiện trong lịch sử</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_summary_remember_tab">Điều hướng đến tab được sử dụng gần nhất lúc bắt đầu</string>
-    <string name="pref_summary_show_lyrics">Hiển thị lời bài hát đã đồng bộ trên bìa album</string>
-    <string name="pref_summary_suggestions">Hiện bản phối nhạc mới trên trang chủ</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Cho phép chuyển bài bằng cách vuốt ở bất kì đâu tại màn hình phát</string>
-    <string name="pref_summary_swipe_to_dismiss">Trượt xuống để ẩn trình phát nhỏ</string>
+    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
+    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
+    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
     <string name="pref_summary_toggle_full_screen">Chế độ hoà nhập</string>
     <string name="pref_summary_toggle_headset">Tự động phát nhạc khi kết nối tai nghe</string>
     <string name="pref_summary_toggle_shuffle">Chế độ phát ngẫu nhiên sẽ tắt khi phát danh sách bài hát mới</string>
     <string name="pref_summary_toggle_volume">Hiện thanh điều chỉnh âm lượng nếu có không gian trống trong màn hình phát</string>
     <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Chỉ hiện thị nhạc từ /Thư mục Nhạc</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">Hiện ảnh bìa album</string>
     <string name="pref_title_album_artists_only">Điều hướng theo Album Nghệ sĩ</string>
     <string name="pref_title_album_cover_style">Chủ đề bìa album</string>
     <string name="pref_title_album_cover_transform">Kiểu bìa album đang phát</string>
     <string name="pref_title_app_shortcuts">Đổi màu lối tắt ứng dụng</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_appbar_mode">App bar mode</string>
     <string name="pref_title_audio_ducking">Giảm âm lượng khi có âm báo</string>
     <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Tự động tải xuống hình ảnh nghệ sĩ</string>
@@ -387,7 +365,7 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="pref_title_colored_app">Màu sắc thích nghi</string>
     <string name="pref_title_colored_notification">Đổi màu thông báo</string>
     <string name="pref_title_cross_fade">Khoảng lặng (Beta)</string>
-    <string name="pref_title_custom_font">Sử dụng font chữ Manrope</string>
+    <string name="pref_title_custom_font">Use Manrope font</string>
     <string name="pref_title_desaturated_color">Màu sắc tương thích</string>
     <string name="pref_title_expand_now_playing_panel">Hiển thị màn hình phát nhạc</string>
     <string name="pref_title_extra_controls">Điều khiển bổ sung</string>
@@ -402,15 +380,13 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="pref_title_lock_screen">Điều khiển toàn màn hình.</string>
     <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
     <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Luôn luôn phát</string>
     <string name="pref_title_now_playing_screen_appearance">Giao diện màn hình phát</string>
     <string name="pref_title_open_source_licences">Giấy phép nguồn mở</string>
     <string name="pref_title_pause_history">Pause history</string>
     <string name="pref_title_remember_tab">Remember last tab</string>
     <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Hiển thị đề xuất</string>
+    <string name="pref_title_suggestions">Show suggestions</string>
     <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
     <string name="pref_title_tab_text_mode">Chế độ tiêu đề thẻ</string>
     <string name="pref_title_toggle_carousel_effect">Hiệu ứng quay vòng</string>
     <string name="pref_title_toggle_full_screen">Toàn màn hình</string>
@@ -419,8 +395,9 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="pref_title_toggle_volume">Điều khiển âm lượng</string>
     <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
+    <string name="pro_summary">Chủ đề đen, Chủ đề màn hình phát, Hiệu ứng băng chuyền, v.v.</string>
     <string name="profile">Hồ sơ</string>
     <string name="purchase">Mua</string>
     <string name="queue">Danh sách chờ phát</string>
@@ -437,7 +414,7 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="remove_songs_from_playlist_title">Xoá bài hát khỏi danh sách phát</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Xóa <b>%1$d</b> bài hát khỏi danh sách phát?]]></string>
     <string name="rename_playlist_title">Đổi tên danh sách phát</string>
-    <string name="replace_cover">Thay thế Ảnh bìa Album</string>
+    <string name="replace_cover">Replace Cover</string>
     <string name="report_an_issue">Báo cáo vấn đề</string>
     <string name="report_bug">Báo cáo lỗi</string>
     <string name="reset_action">Cài lại</string>
@@ -497,7 +474,6 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="sort_order_composer">Tác giả</string>
     <string name="sort_order_date">Ngày</string>
     <string name="sort_order_date_modified">Ngày chỉnh sửa</string>
-    <string name="sort_order_default">Default</string>
     <string name="sort_order_num_songs">Số bài hát</string>
     <string name="sort_order_num_songs_desc">Số bài hát giảm</string>
     <string name="sort_order_year">Năm</string>
@@ -557,4 +533,5 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="you_have_to_select_at_least_one_category">Bạn phải chọn ít nhất một danh mục.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Bạn sẽ được chuyển tiếp đến trang web theo dõi vấn đề.</string>
     <string name="your_account_data_is_only_used_for_authentication">Dữ liệu tài khoản của bạn chỉ được sử dụng để xác thực.</string>
+    <string name="bug_report_success">Bug report successful</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e5dfcc050..d35752872 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_favorites">加入收藏夹</string>
     <string name="action_add_to_playing_queue">加入播放队列</string>
     <string name="action_add_to_playlist">加入播放列表</string>
-    <string name="action_cancel">取消</string>
     <string name="action_cast">投射</string>
     <string name="action_clear_playing_queue">清空播放队列</string>
     <string name="action_cycle_repeat">循环重复模式</string>
@@ -89,8 +88,6 @@
     <string name="biography">简介</string>
     <string name="black_theme_name">纯黑</string>
     <string name="blacklist">黑名单</string>
-    <string name="bluetooth_summary">应用需要附近设备权限才能检查蓝牙设备</string>
-    <string name="bluetooth_title">附近设备</string>
     <string name="blur">模糊</string>
     <string name="blur_card">模糊卡片</string>
     <string name="bug_report_failed">无法提交报告</string>
@@ -104,7 +101,6 @@
     <string name="bug_report_no_password">请您输入有效的 GitHub 密码</string>
     <string name="bug_report_no_title">请输入问题标题</string>
     <string name="bug_report_no_username">请您输入有效的 GitHub 用户名</string>
-    <string name="bug_report_success">错误报告成功</string>
     <string name="bug_report_summary">发生未知错误。很抱歉让您遇到此错误，如一直崩溃，请尝试“清除应用数据”或发送邮件</string>
     <string name="bug_report_use_account">使用 GitHub 帐户发送</string>
     <string name="buy_now">立即购买</string>
@@ -115,9 +111,9 @@
     <string name="card_style">卡片</string>
     <string name="carousal_effect_on_now_playing_screen">在播放页使用轮播效果</string>
     <string name="cascading">层叠</string>
-    <string name="changelog">变更日志</string>
+    <string name="changelog">更新日志</string>
     <string name="changelog_summary">看看新变化</string>
-    <string name="choose_image">选择图片</string>
+    <string name="choose_image">选择图像</string>
     <string name="choose_restore_title">选择要还原的内容</string>
     <string name="circle">唱盘</string>
     <string name="circular">圆形</string>
@@ -128,7 +124,6 @@
     <string name="clear_playing_queue">清空队列</string>
     <string name="color">颜色</string>
     <string name="colors">更多颜色</string>
-    <string name="compact">紧凑</string>
     <string name="composer">作曲家</string>
     <string name="copied_device_info_to_clipboard">已复制设备信息到剪贴板。</string>
     <string name="could_not_create_playlist">无法创建播放列表。</string>
@@ -171,15 +166,8 @@
     <string name="edit_synced_lyrics">编辑同步歌词</string>
     <string name="empty">空空如也</string>
     <string name="equalizer">均衡器</string>
-    <string name="error_create_backup">无法创建备份</string>
-    <string name="error_delete_backup">无法删除备份</string>
-    <string name="error_empty_name">您的名字不能为空！</string>
-    <string name="error_load_failed">加载失败</string>
-    <string name="error_share_file">无法分享文件</string>
-    <string name="expanded">展开</string>
     <string name="faq">常见问题和解答</string>
     <string name="favorites">收藏夹</string>
-    <string name="file_already_exists">文件已存在</string>
     <string name="finish_last_song">播放完最后一首歌曲</string>
     <string name="fit">填充</string>
     <string name="flat">扁平</string>
@@ -195,7 +183,6 @@
     <string name="genres">流派</string>
     <string name="git_hub_summary">在 GitHub 上克隆项目</string>
     <string name="gradient">渐变</string>
-    <string name="grant_access">允许访问</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -233,7 +220,6 @@
     <string name="labeled">有标签</string>
     <string name="last_added">最近添加</string>
     <string name="last_song">最后一首</string>
-    <string name="lets_go">让我们开始吧</string>
     <string name="library_categories">媒体库分类</string>
     <string name="licenses">许可</string>
     <string name="light_theme_name">浅色</string>
@@ -246,12 +232,6 @@
     <string name="material">质感</string>
     <string name="md_error_label">错误</string>
     <string name="md_storage_perm_error">权限错误</string>
-    <string name="message_backup_create_success">备份创建成功。</string>
-    <string name="message_limit_tabs">不超过 5 项</string>
-    <string name="message_pro_feature">%s 是高级版功能。</string>
-    <string name="message_restore_success">还原成功完成。</string>
-    <string name="message_updated">已更新</string>
-    <string name="message_welcome"><![CDATA[您好！ <br>欢迎使用 %s]]></string>
     <string name="my_name">我的名字</string>
     <string name="my_top_tracks">最常播放</string>
     <string name="never">从不</string>
@@ -291,8 +271,7 @@
     <string name="past_three_months">最近三个月</string>
     <string name="paste_lyrics_here">在此粘贴歌词</string>
     <string name="paste_timeframe_lyrics_here">在此粘贴时段歌词</string>
-    <string name="peek">预览</string>
-    <string name="permission_bluetooth_denied">附近设备权限被拒绝。</string>
+    <string name="peek">Peek</string>
     <string name="permission_external_storage_denied">访问外部存储权限被拒绝。</string>
     <string name="permission_summary">应用需要设备存储访问权限来播放音乐</string>
     <string name="permission_title">存储空间权限</string>
@@ -340,8 +319,7 @@
     <string name="pref_summary_blacklist">在媒体库中隐藏列入黑名单的文件夹内容。</string>
     <string name="pref_summary_bluetooth_playback">连接到蓝牙设备后立即开始播放</string>
     <string name="pref_summary_blurred_album_art">模糊化显示锁屏上的专辑封面。可能与第三方应用或微件产生冲突。</string>
-    <string name="pref_summary_carousel_effect">在播放页为专辑图片使用轮播效果。
-使用时卡片和模糊卡片主题不会生效。</string>
+    <string name="pref_summary_carousel_effect">在播放页使用轮播效果。在使用卡片和模糊卡片主题时无效 。</string>
     <string name="pref_summary_classic_notification">使用经典通知样式</string>
     <string name="pref_summary_colored_app">背景及控件颜色跟随专辑封面变化</string>
     <string name="pref_summary_colored_app_shortcuts">将快捷方式颜色更改为强调色，每次颜色更改后需要切换一下该设置才能生效</string>
@@ -349,27 +327,26 @@
     <string name="pref_summary_cross_fade">曲目间淡入淡出的时长</string>
     <string name="pref_summary_desaturated_color">根据质感设计规范，深色模式下应使用低饱和度颜色</string>
     <string name="pref_summary_expand_now_playing_panel">点击通知将显示正在播放页，而不是主页</string>
-    <string name="pref_summary_extra_controls">给播放栏添加额外控件</string>
+    <string name="pref_summary_extra_controls">给迷你播放器添加额外控件</string>
     <string name="pref_summary_extra_song_info">显示额外的歌曲信息，例如文件格式、比特率和频率</string>
     <string name="pref_summary_gapless_playback">"在一些设备上可能会播放异常"</string>
     <string name="pref_summary_home_banner">是否显示主页横幅</string>
     <string name="pref_summary_ignore_media_store_artwork">可以提高封面质量，但加载时间较慢。请仅在图片分辨率过低时开启。</string>
     <string name="pref_summary_library_categories">配置媒体库的可见性和顺序</string>
     <string name="pref_summary_lock_screen">使用 Retro Music 的自定义锁屏</string>
-    <string name="pref_summary_manage_audio_focus">其他内容播放时，在后台继续播放音频</string>
     <string name="pref_summary_open_source_licences">开源许可详情</string>
     <string name="pref_summary_pause_history">启用后，新播放的歌曲不会显示在历史记录中</string>
     <string name="pref_summary_remember_tab">启动时打开上次使用的页面</string>
     <string name="pref_summary_show_lyrics">在专辑封面上显示同步歌词</string>
     <string name="pref_summary_suggestions">在主屏上显示新歌混烧</string>
     <string name="pref_summary_swipe_anywhere_now_playing">在正在播放界面中启用任意位置滑动切歌</string>
-    <string name="pref_summary_swipe_to_dismiss">向下滑动以关闭播放栏</string>
     <string name="pref_summary_toggle_full_screen">沉浸模式</string>
     <string name="pref_summary_toggle_headset">连接耳机后立即开始播放</string>
     <string name="pref_summary_toggle_shuffle">播放新列表时关闭随机播放</string>
     <string name="pref_summary_toggle_volume">空间充足时，在播放页显示音量控制</string>
     <string name="pref_summary_wallpaper_accent">从壁纸中提取主题色</string>
     <string name="pref_summary_whitelist">仅显示 /Music 目录的音乐</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">显示专辑封面</string>
     <string name="pref_title_album_artists_only">按专辑艺术家排序</string>
     <string name="pref_title_album_cover_style">专辑封面主题</string>
@@ -402,7 +379,6 @@
     <string name="pref_title_lock_screen">全屏控件</string>
     <string name="pref_title_lyrics_screen_on">显示歌词时屏幕常亮</string>
     <string name="pref_title_lyrics_type">歌词类型</string>
-    <string name="pref_title_manage_audio_focus">始终播放</string>
     <string name="pref_title_now_playing_screen_appearance">正在播放主题</string>
     <string name="pref_title_open_source_licences">开源许可</string>
     <string name="pref_title_pause_history">暂停历史记录</string>
@@ -410,7 +386,6 @@
     <string name="pref_title_show_lyrics">显示歌词</string>
     <string name="pref_title_suggestions">显示建议</string>
     <string name="pref_title_swipe_anywhere_now_playing">任意位置滑动切歌</string>
-    <string name="pref_title_swipe_to_dismiss">下滑关闭</string>
     <string name="pref_title_tab_text_mode">标签页标题模式</string>
     <string name="pref_title_toggle_carousel_effect">轮播效果</string>
     <string name="pref_title_toggle_full_screen">全屏应用</string>
@@ -419,8 +394,9 @@
     <string name="pref_title_toggle_volume">音量控件</string>
     <string name="pref_title_wallpaper_accent">壁纸主题色</string>
     <string name="pref_title_whitelist">白名单音乐</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">高级版</string>
-    <string name="pro_summary">黑色主题、播放页主题、轮播效果以及更多功能…</string>
+    <string name="pro_summary">黑色主题，正在播放主题，轮播效果和更多...</string>
     <string name="profile">个人信息</string>
     <string name="purchase">购买</string>
     <string name="queue">播放队列</string>
@@ -447,7 +423,7 @@
     <string name="restored_previous_purchase_please_restart">恢复以前的购买。请重新启动应用以使用所有功能。</string>
     <string name="restored_previous_purchases">恢复之前的购买。</string>
     <string name="restoring_purchase">正在恢复购买…</string>
-    <string name="retro_music_player">Retro Music 播放器</string>
+    <string name="retro_music_player">Retro Music Player</string>
     <string name="retro_music_pro">Retro Music 高级版</string>
     <string name="ringtone_summary">应用需要系统设置访问权限，才能将音乐设置为为铃声</string>
     <string name="ringtone_title">铃声（可选）</string>
@@ -497,7 +473,6 @@
     <string name="sort_order_composer">作曲家</string>
     <string name="sort_order_date">日期</string>
     <string name="sort_order_date_modified">修改日期</string>
-    <string name="sort_order_default">默认</string>
     <string name="sort_order_num_songs">歌曲数量</string>
     <string name="sort_order_num_songs_desc">歌曲数量降序</string>
     <string name="sort_order_year">年份</string>
@@ -511,7 +486,7 @@
     <string name="swipe_to_unlock">滑动以解锁</string>
     <string name="synced_lyrics">滚动歌词</string>
     <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">加入 Telegram 群组，讨论错误，提出建议，水群聊天等等</string>
+    <string name="telegram_group_summary">加入 Telegram 群组，讨论错误，提出建议，吹水聊天等等</string>
     <string name="thank_you">谢谢您！</string>
     <string name="the_audio_file">音频文件</string>
     <string name="this_month">本月</string>
@@ -557,4 +532,5 @@
     <string name="you_have_to_select_at_least_one_category">请至少选择一个分类。</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">将跳转至问题追踪网站。</string>
     <string name="your_account_data_is_only_used_for_authentication">您的账户数据仅用于验证。</string>
+    <string name="bug_report_success">错误报告成功</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index af56e2b1d..d735a6243 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
     <string name="about_album_label">關於 %s</string>
-    <string name="about_settings_summary">團隊和社群連結</string>
-    <string name="accent_color">強調色</string>
-    <string name="accent_color_desc">強調色，預設為紫色</string>
+    <string name="about_settings_summary">團隊與社群連結</string>
+    <string name="accent_color">強調色彩</string>
+    <string name="accent_color_desc">強調色彩，預設為紫色</string>
     <string name="action_about">關於</string>
-    <string name="action_add_to_blacklist">新增至黑名單</string>
-    <string name="action_add_to_favorites">新增至最愛</string>
-    <string name="action_add_to_playing_queue">新增至播放佇列</string>
-    <string name="action_add_to_playlist">新增至播放清單</string>
-    <string name="action_cancel">取消</string>
+    <string name="action_add_to_blacklist">新增到黑名單</string>
+    <string name="action_add_to_favorites">新增到最愛</string>
+    <string name="action_add_to_playing_queue">新增到播放佇列</string>
+    <string name="action_add_to_playlist">新增到播放清單</string>
     <string name="action_cast">投放</string>
     <string name="action_clear_playing_queue">清除播放佇列</string>
     <string name="action_cycle_repeat">循環重複模式</string>
     <string name="action_delete">刪除</string>
-    <string name="action_delete_from_device">從裝置刪除</string>
+    <string name="action_delete_from_device">從裝置中刪除</string>
     <string name="action_details">詳細資訊</string>
     <string name="action_edit">編輯</string>
     <string name="action_go_to_album">前往專輯頁面</string>
-    <string name="action_go_to_artist">前往藝人頁面</string>
+    <string name="action_go_to_artist">前往演唱者頁面</string>
     <string name="action_go_to_genre">前往風格類型</string>
     <string name="action_go_to_lyrics">前往歌詞頁面</string>
     <string name="action_go_to_start_directory">前往起始目錄</string>
@@ -32,9 +31,9 @@
     <string name="action_play_next">接下來播放</string>
     <string name="action_play_pause">播放/暫停</string>
     <string name="action_previous">上一首</string>
-    <string name="action_remove_from_favorites">從最愛移除</string>
-    <string name="action_remove_from_playing_queue">從播放佇列移除</string>
-    <string name="action_remove_from_playlist">從播放清單移除</string>
+    <string name="action_remove_from_favorites">從最愛中移除</string>
+    <string name="action_remove_from_playing_queue">從播放佇列中移除</string>
+    <string name="action_remove_from_playlist">從播放清單中移除</string>
     <string name="action_rename">重新命名</string>
     <string name="action_save_playing_queue">儲存播放佇列</string>
     <string name="action_scan">掃描</string>
@@ -46,23 +45,23 @@
     <string name="action_share">分享</string>
     <string name="action_shuffle_all">隨機播放</string>
     <string name="action_shuffle_playlist">隨機播放清單</string>
-    <string name="action_sleep_timer">睡眠計時器</string>
+    <string name="action_sleep_timer">睡眠定時器</string>
     <string name="action_sort_order">排序</string>
     <string name="action_tag_editor">編輯音樂資訊</string>
     <string name="action_toggle_favorite">新增/移除最愛</string>
     <string name="action_toggle_shuffle">開啟/關閉隨機播放模式</string>
     <string name="adaptive">適應風</string>
     <string name="add_action">新增</string>
-    <string name="add_playlist_title">"新增至播放清單"</string>
-    <string name="add_time_framed_lryics">新增動態歌詞</string>
-    <string name="added_song_count_to_playlist">已新增 %1$d 首歌至 %2$s</string>
-    <string name="added_title_to_playing_queue">"已新增 1 首歌至播放佇列。"</string>
-    <string name="added_x_titles_to_playing_queue">已新增 %1$d 首歌至播放佇列。</string>
+    <string name="add_playlist_title">"新增到播放清單"</string>
+    <string name="add_time_framed_lryics">新增同步歌詞</string>
+    <string name="added_song_count_to_playlist">新增 %1$d 首歌到 %2$s</string>
+    <string name="added_title_to_playing_queue">"已新增 1 首歌到播放佇列。"</string>
+    <string name="added_x_titles_to_playing_queue">已新增 %1$d 首歌到播放佇列。</string>
     <string name="album">專輯</string>
     <plurals name="albumSongs">
         <item quantity="other">歌曲</item>
     </plurals>
-    <string name="album_artist">專輯藝人</string>
+    <string name="album_artist">專輯演唱者</string>
     <string name="albums">專輯</string>
     <plurals name="albums">
         <item quantity="other">專輯</item>
@@ -77,8 +76,8 @@
     <string name="app_widget_md3_name">MD3</string>
     <string name="app_widget_small_name">小型</string>
     <string name="app_widget_text_name">少字型</string>
-    <string name="artist">藝人</string>
-    <string name="artists">藝人</string>
+    <string name="artist">演唱者</string>
+    <string name="artists">演唱者</string>
     <string name="audio_fade_duration">音訊淡出/淡入的持續時間</string>
     <string name="audio_focus_denied">音訊焦點被拒。</string>
     <string name="audio_settings_summary">變更音效設定和調整等化器</string>
@@ -89,32 +88,29 @@
     <string name="biography">簡介</string>
     <string name="black_theme_name">純黑色</string>
     <string name="blacklist">黑名單</string>
-    <string name="bluetooth_summary">應用程式必須取得鄰近裝置權限以檢查藍芽裝置</string>
-    <string name="bluetooth_title">鄰近裝置</string>
     <string name="blur">模糊風</string>
     <string name="blur_card">模糊卡牌風</string>
     <string name="bug_report_failed">無法傳送報告</string>
     <string name="bug_report_failed_invalid_token">存取權杖無效。請聯絡應用程式開發人員。</string>
-    <string name="bug_report_failed_issues_not_available">選取之存取庫並未啟用議題。請聯絡應用程式開發人員。</string>
+    <string name="bug_report_failed_issues_not_available">已選取的存取庫並未啟用議題。請聯絡應用程式開發人員。</string>
     <string name="bug_report_failed_unknown">發生意外錯誤。請聯絡應用程式開發人員。</string>
-    <string name="bug_report_failed_wrong_credentials">使用者名稱或密碼錯誤</string>
+    <string name="bug_report_failed_wrong_credentials">帳號或密碼錯誤</string>
     <string name="bug_report_issue">問題</string>
     <string name="bug_report_manual">手動傳送</string>
     <string name="bug_report_no_description">請輸入問題敘述</string>
     <string name="bug_report_no_password">請輸入有效的 GitHub 密碼</string>
     <string name="bug_report_no_title">請輸入問題標題</string>
-    <string name="bug_report_no_username">請輸入有效的 GitHub 使用者名稱</string>
-    <string name="bug_report_success">成功回報錯誤</string>
+    <string name="bug_report_no_username">請輸入有效的 GitHub 帳號</string>
     <string name="bug_report_summary">發生意外錯誤。很抱歉讓您遇到這項錯誤，若應用程式仍處在當機狀態，請「清除應用程式儲存空間」或透過電子郵件與我們聯繫 </string>
     <string name="bug_report_use_account">透過 GitHub 帳戶傳送</string>
-    <string name="buy_now">立即購買</string>
+    <string name="buy_now">立刻購買</string>
     <string name="cancel_current_timer">取消</string>
     <string name="card">卡牌風</string>
     <string name="card_color_style">彩色卡牌風</string>
     <string name="card_square">方形卡牌風</string>
     <string name="card_style">卡牌風</string>
     <string name="carousal_effect_on_now_playing_screen">現正播放的輪播效果</string>
-    <string name="cascading">層疊風</string>
+    <string name="cascading">層疊</string>
     <string name="changelog">更新日誌</string>
     <string name="changelog_summary">檢視最新動向</string>
     <string name="choose_image">選擇圖片</string>
@@ -124,23 +120,22 @@
     <string name="classic">經典風</string>
     <string name="clear_action">清除</string>
     <string name="clear_blacklist">清除黑名單</string>
-    <string name="clear_history">清除歷史記錄</string>
+    <string name="clear_history">清除歷程</string>
     <string name="clear_playing_queue">清除佇列</string>
     <string name="color">彩色風</string>
-    <string name="colors">顏色</string>
-    <string name="compact">壓縮</string>
+    <string name="colors">色彩</string>
     <string name="composer">作曲者</string>
-    <string name="copied_device_info_to_clipboard">已複製裝置資訊至剪貼簿。</string>
+    <string name="copied_device_info_to_clipboard">已複製裝置資訊到剪貼簿。</string>
     <string name="could_not_create_playlist">無法建立播放清單。</string>
     <string name="could_not_download_album_cover">"無法下載相應的專輯封面。"</string>
     <string name="could_not_restore_purchase">無法復原購買。</string>
     <string name="could_not_scan_files">無法掃描 %d。</string>
     <string name="create_action">建立</string>
     <string name="create_new_backup">建立</string>
-    <string name="created_playlist_x">已建立播放清單 %1$s。</string>
+    <string name="created_playlist_x">已新增播放清單 %1$s。</string>
     <string name="credit_title">成員和貢獻者 </string>
     <string name="currently_listening_to_x_by_x">正在收聽 %2$s 的 %1$s。</string>
-    <string name="custom_artist_images">自訂藝人圖片</string>
+    <string name="custom_artist_images">自訂演唱者圖片</string>
     <string name="customactivityoncrash_error_activity_error_details_share">回報當機記錄</string>
     <string name="dark_theme_name">深色</string>
     <string name="delete_playlist_title">刪除播放清單</string>
@@ -153,33 +148,26 @@
     <string name="delete_x_songs"><![CDATA[確定要刪除 <b>%1$d</b> 首歌嗎？]]></string>
     <string name="deleted_x_songs">已刪除 %1$d 首歌。</string>
     <string name="deleting_songs">正在刪除歌曲</string>
-    <string name="depth">深度風</string>
+    <string name="depth">深度</string>
     <string name="description">描述</string>
     <string name="device_info">裝置資訊</string>
     <string name="dialog_message_set_ringtone">允許 Retro Music 修改音訊設定</string>
     <string name="dialog_title_set_ringtone">設定鈴聲</string>
     <string name="disc_hint">光碟編號</string>
     <string name="do_you_want_to_clear_the_blacklist">確定要清除黑名單嗎？</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[確定要將 <b>%1$s</b> 從黑名單移除嗎？]]></string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[確定要將 <b>%1$s</b> 自黑名單中移除嗎？]]></string>
     <string name="donate">捐助</string>
     <string name="donate_summary">若您認為我的努力值得回報，歡迎您以金錢鼓勵我的付出</string>
     <string name="donation_header">為我買一個:</string>
     <string name="done">完成</string>
     <string name="drive_mode">駕駛模式</string>
     <string name="edit_fab">編輯按鈕</string>
-    <string name="edit_normal_lyrics">編輯歌詞</string>
-    <string name="edit_synced_lyrics">編輯動態歌詞</string>
+    <string name="edit_normal_lyrics">歌詞編輯</string>
+    <string name="edit_synced_lyrics">編輯同步歌詞</string>
     <string name="empty">沒有內容</string>
     <string name="equalizer">等化器</string>
-    <string name="error_create_backup">無法建立備份</string>
-    <string name="error_delete_backup">無法刪除備份</string>
-    <string name="error_empty_name">名稱不得為空！</string>
-    <string name="error_load_failed">載入失敗</string>
-    <string name="error_share_file">無法分享檔案</string>
-    <string name="expanded">展開</string>
     <string name="faq">常見問題</string>
     <string name="favorites">最愛</string>
-    <string name="file_already_exists">檔案已存在</string>
     <string name="finish_last_song">播放完最後一首歌曲</string>
     <string name="fit">緊貼風</string>
     <string name="flat">方角風</string>
@@ -189,13 +177,12 @@
     <string name="free">免費</string>
     <string name="full">全景風</string>
     <string name="full_card">全景卡牌風</string>
-    <string name="general_settings_summary">變更應用程式的佈景主題和顏色</string>
-    <string name="general_settings_title">介面和外觀</string>
+    <string name="general_settings_summary">變更應用程式的佈景主題和色彩</string>
+    <string name="general_settings_title">介面與外觀</string>
     <string name="genre">風格類型</string>
     <string name="genres">風格類型</string>
     <string name="git_hub_summary">在 GitHub 上分支這項專案</string>
     <string name="gradient">漸層風</string>
-    <string name="grant_access">授予權限</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -206,19 +193,19 @@
     <string name="grid_size_8">8</string>
     <string name="grid_style_label">網格樣式</string>
     <string name="help_summary">需要更多幫助嗎？</string>
-    <string name="hinge">旋轉風</string>
-    <string name="history">歷史記錄</string>
-    <string name="history_cleared">已清除歷史記錄</string>
+    <string name="hinge">旋轉</string>
+    <string name="history">記錄</string>
+    <string name="history_cleared">清除歷程</string>
     <string name="history_undo_button">復原</string>
     <string name="home">首頁</string>
-    <string name="horizontal_flip">水平翻轉風</string>
-    <string name="image">圖片風</string>
-    <string name="image_gradient">漸變圖片風</string>
-    <string name="image_settings_summary">變更下載藝人圖片設定</string>
+    <string name="horizontal_flip">水平翻轉</string>
+    <string name="image">圖片</string>
+    <string name="image_gradient">漸變圖片</string>
+    <string name="image_settings_summary">變更下載演唱者圖片設定</string>
     <string name="import_label">匯入</string>
     <string name="import_playlist">匯入播放清單</string>
     <string name="import_playlist_message">這將匯入於 Android 媒體商店內全部的播放清單和歌曲，若播放清單已存在，相關的歌曲將會被合併。</string>
-    <string name="inserted_x_songs_into_playlist_x">已插入 %1$d 首歌至播放清單 %2$s 。</string>
+    <string name="inserted_x_songs_into_playlist_x">已插入 %1$d 首歌到播放清單 %2$s 中。</string>
     <string name="instagram_page_summary">在 Instagram 上分享 Retro Music 的配置消息</string>
     <string name="keyboard">鍵盤</string>
     <string name="label_bit_rate">位元率</string>
@@ -227,53 +214,46 @@
     <string name="label_file_path">檔案路徑</string>
     <string name="label_file_size">檔案大小</string>
     <string name="label_last_modified">最後修改</string>
-    <string name="label_more_from">更多來自 %s 的內容</string>
+    <string name="label_more_from">來自 %s 更多內容</string>
     <string name="label_sampling_rate">取樣率</string>
     <string name="label_track_length">長度</string>
     <string name="labeled">顯示標籤</string>
     <string name="last_added">最後新增</string>
     <string name="last_song">最後一首</string>
-    <string name="lets_go">開始吧</string>
     <string name="library_categories">音樂庫類別</string>
     <string name="licenses">原始碼授權</string>
     <string name="light_theme_name">淺色</string>
-    <string name="listeners_label">全球聽眾</string>
+    <string name="listeners_label">聽眾</string>
     <string name="listing_files">清單文件</string>
     <string name="loading_products">正在載入…</string>
     <string name="login">登入</string>
     <string name="lyrics">歌詞</string>
-    <string name="made_with_love">Made with ❤️ in India</string>
+    <string name="made_with_love">在印度用 ❤️ 開發</string>
     <string name="material">材質風</string>
     <string name="md_error_label">錯誤</string>
     <string name="md_storage_perm_error">權限錯誤</string>
-    <string name="message_backup_create_success">已成功建立備份。</string>
-    <string name="message_limit_tabs">不得多於 5 個項目</string>
-    <string name="message_pro_feature">%s 為 Pro 版功能。</string>
-    <string name="message_restore_success">已成功完成復原。</string>
-    <string name="message_updated">已更新</string>
-    <string name="message_welcome"><![CDATA[嗨！<br> 歡迎使用 %s]]></string>
     <string name="my_name">名稱</string>
     <string name="my_top_tracks">最佳單曲</string>
     <string name="never">永不</string>
-    <string name="new_music_mix">新歌快選</string>
+    <string name="new_music_mix">新歌曲快選</string>
     <string name="new_playlist_title">新增播放清單</string>
     <string name="new_start_directory">%s 為新起始目錄。</string>
     <string name="next_song">下一首</string>
     <string name="no_albums">沒有專輯</string>
-    <string name="no_artists">沒有藝人</string>
+    <string name="no_artists">沒有演唱者</string>
     <string name="no_audio_ID">"請先播放一首歌後，然後再試一次。"</string>
     <string name="no_backups_found">找不到備份</string>
     <string name="no_equalizer">找不到等化器</string>
     <string name="no_genres">沒有風格類型</string>
-    <string name="no_lyrics_found">找不到歌詞</string>
-    <string name="no_playing_queue">沒有現正播放的歌曲</string>
+    <string name="no_lyrics_found">沒有歌詞</string>
+    <string name="no_playing_queue">沒有播放歌曲</string>
     <string name="no_playlists">沒有播放清單</string>
-    <string name="no_purchase_found">找不到購買記錄。</string>
+    <string name="no_purchase_found">沒有購買記錄。</string>
     <string name="no_results">沒有搜尋結果</string>
     <string name="no_songs">沒有歌曲</string>
     <string name="normal">普通風</string>
     <string name="normal_lyrics">一般歌詞</string>
-    <string name="not_listed_in_media_store"><![CDATA[媒體商店未收錄 <b>%s</b> 。]]></string>
+    <string name="not_listed_in_media_store"><![CDATA[媒體商店中未收錄 <b>%s</b> 。]]></string>
     <string name="not_recently_played">鮮少播放</string>
     <string name="nothing_to_scan">沒有可掃描的內容。</string>
     <string name="nothing_to_see">沒有內容</string>
@@ -286,20 +266,19 @@
     <string name="only_on_wifi">只在 Wi-Fi 連線時</string>
     <string name="other_settings_summary">進階測試功能</string>
     <string name="others">其他</string>
-    <string name="over_cover">於封面上層顯示</string>
+    <string name="over_cover">封面</string>
     <string name="password">密碼</string>
     <string name="past_three_months">過去 3 個月</string>
     <string name="paste_lyrics_here">在此貼上歌詞</string>
-    <string name="paste_timeframe_lyrics_here">在此貼上動態歌詞</string>
+    <string name="paste_timeframe_lyrics_here">在此貼上同步歌詞</string>
     <string name="peek">懸浮風</string>
-    <string name="permission_bluetooth_denied">鄰近裝置存取被拒。</string>
     <string name="permission_external_storage_denied">無法取得存取外部儲存空間的權限。</string>
     <string name="permission_summary">應用程式必須取得權限以存取您的裝置和媒體</string>
     <string name="permission_title">檔案和媒體權限</string>
     <string name="permissions_denied">存取被拒。</string>
     <string name="personalize">個人化</string>
     <string name="personalize_settings_summary">自訂現正播放畫面 UI</string>
-    <string name="pick_from_local_storage">從裝置選擇</string>
+    <string name="pick_from_local_storage">從裝置中選擇</string>
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">追蹤我們的 Pinterest 專頁以興起 Retro Music 設計靈感</string>
     <string name="plain">簡潔風</string>
@@ -310,7 +289,7 @@
     <string name="playing_notification_description">播放通知欄可提供您進行播放/暫停等操作。</string>
     <string name="playing_notification_name">播放通知</string>
     <string name="playlist_created_sucessfully">已成功建立 %s</string>
-    <string name="playlist_is_empty">播放清單為空</string>
+    <string name="playlist_is_empty">播放列表為空</string>
     <string name="playlist_name_empty">播放清單名稱</string>
     <string name="playlists">播放清單</string>
     <string name="pref_blur_amount_summary">模糊程度用於「模糊風」主題。數值越低，載入越快</string>
@@ -318,7 +297,7 @@
     <string name="pref_filter_song_summary">依長度篩選歌曲</string>
     <string name="pref_filter_song_title">依時長篩選歌曲</string>
     <string name="pref_header_advanced">進階</string>
-    <string name="pref_header_album">專輯風格</string>
+    <string name="pref_header_album">專輯標題</string>
     <string name="pref_header_audio">音訊</string>
     <string name="pref_header_blacklist">黑名單</string>
     <string name="pref_header_controls">控制</string>
@@ -328,121 +307,119 @@
     <string name="pref_header_lockscreen">鎖定螢幕</string>
     <string name="pref_header_playlists">播放清單</string>
     <string name="pref_keep_pause_on_zero_volume_summary">當音量降至靜音時自動暫停播放，音量升高時反之。支援背景播放</string>
-    <string name="pref_keep_pause_on_zero_volume_title">靜音時暫停</string>
+    <string name="pref_keep_pause_on_zero_volume_title">於靜音暫停</string>
     <string name="pref_keep_screen_on_summary">請注意，這項功能可能影響電池續航力</string>
     <string name="pref_keep_screen_on_title">保持螢幕開啟</string>
     <string name="pref_language_name">選取語言</string>
     <string name="pref_snow_fall_title">下雪效果</string>
     <string name="pref_summary_album_art_on_lockscreen">以現正播放的歌曲專輯封面作為鎖定螢幕桌布</string>
-    <string name="pref_summary_album_artists_only">於藝人分類中顯示專輯藝人</string>
+    <string name="pref_summary_album_artists_only">於演唱者分類中顯示專輯演唱者</string>
     <string name="pref_summary_audio_ducking">於系統音效響鈴或接收到通知時降低音量</string>
     <string name="pref_summary_audio_fade">當歌曲暫停/播放時，淡入/淡出音效</string>
     <string name="pref_summary_blacklist">於黑名單內的資料夾將從音樂庫中隱藏。</string>
     <string name="pref_summary_bluetooth_playback">當連線至藍芽裝置時，自動播放音樂</string>
     <string name="pref_summary_blurred_album_art">在鎖定畫面上模糊化專輯圖片。第三方程式和小工具可能不正常運作</string>
-    <string name="pref_summary_carousel_effect">現正播放畫面的專輯封面輪播效果。請注意，卡牌風和模糊卡牌風佈景主題不會有此效果</string>
+    <string name="pref_summary_carousel_effect">現正播放畫面中的專輯封面輪播效果。請注意，卡牌風和模糊卡牌風佈景主題不會有此效果</string>
     <string name="pref_summary_classic_notification">使用經典通知樣式</string>
-    <string name="pref_summary_colored_app">於現正播放畫面中，背景和控制鍵的顏色將依專輯封面色調而變化</string>
-    <string name="pref_summary_colored_app_shortcuts">以強調色作為應用程式的捷徑色調。每變更強調顏色後，請重新切換此功能開關以生效</string>
-    <string name="pref_summary_colored_notification">"以鮮豔的專輯封面色調作為通知欄顏色"</string>
+    <string name="pref_summary_colored_app">於現正播放畫面中，背景和控制鍵的色彩將依專輯封面色調而變化</string>
+    <string name="pref_summary_colored_app_shortcuts">以強調色彩作為應用程式的捷徑色調。每變更強調色彩後，請重新切換此功能開關以生效</string>
+    <string name="pref_summary_colored_notification">"以鮮豔的專輯封面色調作為通知欄色彩"</string>
     <string name="pref_summary_cross_fade">歌曲淡化/淡出的持續時間</string>
-    <string name="pref_summary_desaturated_color">根據 Material Design 指引，於深色模式時，顏色應不飽和</string>
+    <string name="pref_summary_desaturated_color">根據 Material Design 指引，於深色模式時，色彩應不飽和</string>
     <string name="pref_summary_expand_now_playing_panel">按兩下通知欄以顯示現正播放畫面，而非首頁</string>
-    <string name="pref_summary_extra_controls">於迷你播放列顯示更多控制鍵</string>
+    <string name="pref_summary_extra_controls">新增更多控制鍵於播放列</string>
     <string name="pref_summary_extra_song_info">顯示更多歌曲資訊，例如檔案格式、位元速率、頻率</string>
     <string name="pref_summary_gapless_playback">"可能會在某些裝置上發生播放問題。"</string>
     <string name="pref_summary_home_banner">顯示或隱藏首頁橫幅</string>
     <string name="pref_summary_ignore_media_store_artwork">可提升專輯封面的成像品質，但會造成較長的讀取時間。建議只有在低畫質專輯封面發生問題時再啟用此選項</string>
-    <string name="pref_summary_library_categories">調整音樂庫類別的顯示和排序。</string>
+    <string name="pref_summary_library_categories">調整音樂庫類別的顯示與排序。</string>
     <string name="pref_summary_lock_screen">使用 Retro Music 自訂化鎖定畫面</string>
-    <string name="pref_summary_manage_audio_focus">無論其他應用程式正在播放為何，永遠於背景播放音訊</string>
-    <string name="pref_summary_open_source_licences">開源軟體授權詳細資訊</string>
-    <string name="pref_summary_pause_history">啟用此選項後，新播放的歌曲將不再顯示於歷史記錄</string>
+    <string name="pref_summary_open_source_licences">開放原始碼軟體的授權詳細資料</string>
+    <string name="pref_summary_pause_history">啟用此選項後，新播放的歌曲將不再顯示於歷程</string>
     <string name="pref_summary_remember_tab">開啟應用程式後，自動顯示最後瀏覽的畫面</string>
-    <string name="pref_summary_show_lyrics">於專輯封面上顯示動態歌詞</string>
-    <string name="pref_summary_suggestions">於主畫面顯示新歌快選</string>
+    <string name="pref_summary_show_lyrics">於專輯封面上顯示同步歌詞</string>
+    <string name="pref_summary_suggestions">於主畫面中顯示新歌曲快選</string>
     <string name="pref_summary_swipe_anywhere_now_playing">啟用於現正播放畫面，可隨意滑動以切換歌曲</string>
-    <string name="pref_summary_swipe_to_dismiss">向下滑動以關閉迷你播放器</string>
     <string name="pref_summary_toggle_full_screen">沉浸模式</string>
     <string name="pref_summary_toggle_headset">當連接耳機後，自動播放音樂</string>
     <string name="pref_summary_toggle_shuffle">當播放新播放清單時，關閉隨機模式</string>
     <string name="pref_summary_toggle_volume">若螢幕仍有充足空間，則在現正播放畫面，顯示音量控制欄</string>
-    <string name="pref_summary_wallpaper_accent">從桌布上擷取主題顏色</string>
+    <string name="pref_summary_wallpaper_accent">從桌布上擷取主題色彩</string>
     <string name="pref_summary_whitelist">僅顯示來自 /Music 資料夾內的歌曲</string>
+    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_title_album_art_on_lockscreen">顯示專輯封面</string>
-    <string name="pref_title_album_artists_only">依專輯藝人導覽</string>
+    <string name="pref_title_album_artists_only">按專輯演唱者導覽</string>
     <string name="pref_title_album_cover_style">專輯封面主題</string>
     <string name="pref_title_album_cover_transform">略過專輯封面</string>
     <string name="pref_title_app_shortcuts">彩色應用程式捷徑</string>
-    <string name="pref_title_appbar_mode">標題樣式</string>
+    <string name="pref_title_appbar_mode">應用程式列模式</string>
     <string name="pref_title_audio_ducking">於焦點音訊響起時降低音量</string>
     <string name="pref_title_audio_fade">淡入/淡出音訊</string>
-    <string name="pref_title_auto_download_artist_images">自動下載藝人圖片</string>
+    <string name="pref_title_auto_download_artist_images">自動下載演唱者圖片</string>
     <string name="pref_title_blacklist">黑名單</string>
     <string name="pref_title_bluetooth_playback">藍牙播放</string>
-    <string name="pref_title_blurred_album_art">模糊化專輯圖片</string>
+    <string name="pref_title_blurred_album_art">將專輯圖片模糊化</string>
     <string name="pref_title_circle_button">圓形播放鍵</string>
     <string name="pref_title_classic_notification">經典通知樣式</string>
-    <string name="pref_title_colored_app">自動調整顏色</string>
+    <string name="pref_title_colored_app">自動調整色彩</string>
     <string name="pref_title_colored_notification">彩色狀態列</string>
     <string name="pref_title_cross_fade">淡入/淡出 (測試中)</string>
     <string name="pref_title_custom_font">使用 Manrope 字型</string>
-    <string name="pref_title_desaturated_color">不飽和顏色</string>
+    <string name="pref_title_desaturated_color">不飽和色彩</string>
     <string name="pref_title_expand_now_playing_panel">顯示現正播放畫面</string>
-    <string name="pref_title_extra_controls">更多控制項</string>
+    <string name="pref_title_extra_controls">更多控制選項</string>
     <string name="pref_title_extra_song_info">音樂資訊</string>
     <string name="pref_title_gapless_playback">無縫播放</string>
     <string name="pref_title_general_theme">佈景主題</string>
     <string name="pref_title_home_album_grid_style">專輯網格</string>
-    <string name="pref_title_home_artist_grid_style">藝人網格</string>
+    <string name="pref_title_home_artist_grid_style">演唱者網格</string>
     <string name="pref_title_home_banner">橫幅</string>
     <string name="pref_title_ignore_media_store_artwork">略過媒體商店的專輯封面</string>
-    <string name="pref_title_last_added_interval">最後新增播放清單的時間範圍</string>
+    <string name="pref_title_last_added_interval">最後新增列表的時間範圍</string>
     <string name="pref_title_lock_screen">全螢幕控制</string>
     <string name="pref_title_lyrics_screen_on">顯示歌詞時不關閉螢幕</string>
     <string name="pref_title_lyrics_type">歌詞類型</string>
-    <string name="pref_title_manage_audio_focus">永遠播放</string>
     <string name="pref_title_now_playing_screen_appearance">現正播放佈景主題</string>
     <string name="pref_title_open_source_licences">開源授權協議</string>
-    <string name="pref_title_pause_history">暫停記錄</string>
-    <string name="pref_title_remember_tab">記住最後一個類別畫面</string>
+    <string name="pref_title_pause_history">暫停記錄歷程</string>
+    <string name="pref_title_remember_tab">記住最後一個畫面</string>
     <string name="pref_title_show_lyrics">顯示歌詞</string>
     <string name="pref_title_suggestions">顯示建議</string>
     <string name="pref_title_swipe_anywhere_now_playing">隨意滑動以切換歌曲</string>
-    <string name="pref_title_swipe_to_dismiss">向下滑動以關閉</string>
-    <string name="pref_title_tab_text_mode">索引標籤模式</string>
+    <string name="pref_title_tab_text_mode">索引標題模式</string>
     <string name="pref_title_toggle_carousel_effect">輪播效果</string>
     <string name="pref_title_toggle_full_screen">全螢幕應用程式</string>
     <string name="pref_title_toggle_toggle_headset">自動播放</string>
     <string name="pref_title_toggle_toggle_shuffle">隨機播放模式</string>
     <string name="pref_title_toggle_volume">音量控制</string>
-    <string name="pref_title_wallpaper_accent">桌布強調色</string>
+    <string name="pref_title_wallpaper_accent">桌布主題色彩</string>
     <string name="pref_title_whitelist">白名單音樂</string>
+    <string name="pref_title_manage_audio_focus">Always play</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">暗色主題、現正播放主題、輪播效果以及更多...</string>
+    <string name="pro_summary">例如深色主題、現正播放主題、輪播效果等...</string>
     <string name="profile">個人資料</string>
     <string name="purchase">購買</string>
     <string name="queue">播放佇列</string>
     <string name="rate_app">評分</string>
-    <string name="rate_on_google_play_summary">您還喜歡 Retro Music 嗎？歡迎在 Play 商店上評論，使我們能日臻完善</string>
+    <string name="rate_on_google_play_summary">您還喜歡 Retro music 嗎？歡迎在 Play 商店上評論，使我們能日臻完善</string>
     <string name="recent_albums">最近專輯</string>
-    <string name="recent_artists">最近藝人</string>
+    <string name="recent_artists">最近演唱者</string>
     <string name="remove_action">移除</string>
     <string name="remove_cover">移除封面</string>
-    <string name="remove_from_blacklist">從黑名單移除</string>
+    <string name="remove_from_blacklist">從黑名單中移除</string>
     <string name="remove_image">移除圖片</string>
-    <string name="remove_song_from_playlist_title">從播放清單移除歌曲</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[確定要將歌曲 <b>%1$s</b> 從播放清單移除嗎？]]></string>
-    <string name="remove_songs_from_playlist_title">從播放清單移除歌曲</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[確定要將 <b>%1$d</b> 首歌從播放清單移除嗎？]]></string>
+    <string name="remove_song_from_playlist_title">從播放清單中移除歌曲</string>
+    <string name="remove_song_x_from_playlist"><![CDATA[確定要將歌曲 <b>%1$s</b> 從播放清單中移除嗎？]]></string>
+    <string name="remove_songs_from_playlist_title">從播放清單中移除歌曲</string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[確定要將 <b>%1$d</b> 首歌從播放清單中移除嗎？]]></string>
     <string name="rename_playlist_title">重新命名播放清單</string>
-    <string name="replace_cover">隱藏封面</string>
+    <string name="replace_cover">取代封面</string>
     <string name="report_an_issue">回報問題</string>
-    <string name="report_bug">回報錯誤</string>
+    <string name="report_bug">報告錯誤</string>
     <string name="reset_action">重設</string>
-    <string name="reset_artist_image">重設藝人圖片</string>
+    <string name="reset_artist_image">重設演唱者圖片</string>
     <string name="restore">復原</string>
-    <string name="restore_message">確定要復原備份嗎？</string>
+    <string name="restore_message">您確定要復原備份嗎？</string>
     <string name="restored_previous_purchase_please_restart">已復原先前的購買。請重新開啟應用程式以啟用全數功能。</string>
     <string name="restored_previous_purchases">已復原先前購買。</string>
     <string name="restoring_purchase">正在復原購買…</string>
@@ -467,50 +444,49 @@
     <!-- SAF guide -->
     <string name="save_playlist_title">另存新檔</string>
     <string name="save_playlists_title">另存新檔</string>
-    <string name="saved_playlist_to">已儲存播放清單至 %s。</string>
+    <string name="saved_playlist_to">已儲存播放清單到 %s。</string>
     <string name="saving_changes">儲存變更</string>
     <string name="scan_media">掃描媒體</string>
-    <string name="scanned_files">已掃描 %1$d 個檔案，共 %2$d 個。</string>
+    <string name="scanned_files">已掃描 %2$d 個檔案夾中的 %1$d 個。</string>
     <string name="scrobbles_label">音樂記錄</string>
     <string name="select_all">選取全部</string>
-    <string name="selected">僅顯示已選取的標籤</string>
+    <string name="selected">僅顯示已選取的索引標籤</string>
     <string name="set">設定</string>
-    <string name="set_artist_image">設定藝人圖片</string>
+    <string name="set_artist_image">設定演唱者圖片</string>
     <string name="share_app">分享應用程式</string>
     <string name="share_summary">與家人和朋友分享程式</string>
-    <string name="share_to_stories">分享至限時動態</string>
-    <string name="show_album_artists">顯示專輯藝人</string>
+    <string name="share_to_stories">分享到限時動態</string>
+    <string name="show_album_artists">顯示專輯演唱者</string>
     <string name="shuffle">隨機播放</string>
     <string name="simple">簡單風</string>
-    <string name="sleep_timer_canceled">已取消睡眠計時器。</string>
-    <string name="sleep_timer_set">睡眠計時器將從現在計時 %d 分鐘。</string>
+    <string name="sleep_timer_canceled">已取消睡眠定時器。</string>
+    <string name="sleep_timer_set">睡眠定時器將從現在計時 %d 分鐘。</string>
     <string name="social">社群</string>
-    <string name="social_stories">分享至限時動態</string>
+    <string name="social_stories">分享到限時動態</string>
     <string name="song">歌曲</string>
     <string name="song_duration">歌曲長度</string>
     <string name="songs">歌曲</string>
     <string name="sort_order">排序</string>
     <string name="sort_order_a_z">遞增</string>
     <string name="sort_order_album">專輯</string>
-    <string name="sort_order_artist">藝人</string>
+    <string name="sort_order_artist">演唱者</string>
     <string name="sort_order_composer">作曲者</string>
     <string name="sort_order_date">新增日期</string>
     <string name="sort_order_date_modified">修改日期</string>
-    <string name="sort_order_default">預設</string>
     <string name="sort_order_num_songs">歌曲數量</string>
     <string name="sort_order_num_songs_desc">歌曲數量資訊</string>
     <string name="sort_order_year">年份</string>
     <string name="sort_order_z_a">遞減</string>
     <string name="speech_not_supported">抱歉！您的裝置不支援語音輸入</string>
     <string name="speech_prompt">搜尋音樂庫</string>
-    <string name="stack">堆疊風</string>
+    <string name="stack">堆疊</string>
     <string name="start_play_music">開始播放音樂。</string>
     <string name="suggestion_songs">建議</string>
     <string name="support_development">支持開發</string>
     <string name="swipe_to_unlock">滑動以解鎖</string>
-    <string name="synced_lyrics">動態歌詞</string>
+    <string name="synced_lyrics">同步歌詞</string>
     <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">加入 Telegram 群組以討論臭蟲、提供建議、交流，以及探索更多</string>
+    <string name="telegram_group_summary">加入 Telegram 群組以討論臭蟲、提供建議，以及探索更多</string>
     <string name="thank_you">感謝您！</string>
     <string name="the_audio_file">音訊檔案</string>
     <string name="this_month">本月</string>
@@ -522,7 +498,7 @@
     <string name="title_new_backup">新增備份</string>
     <string name="today">今日</string>
     <string name="top_albums">熱門專輯</string>
-    <string name="top_artists">熱門藝人</string>
+    <string name="top_artists">熱門演唱者</string>
     <string name="track_hint">"曲目 (2 代表曲目 2，或以 3004 代表 CD3 曲目 4)"</string>
     <string name="track_list">曲目編號</string>
     <string name="translate">翻譯</string>
@@ -539,7 +515,7 @@
     <string name="user_name">使用者名稱</string>
     <string name="username">使用者名稱</string>
     <string name="version">版本</string>
-    <string name="vertical_flip">垂直翻轉風</string>
+    <string name="vertical_flip">垂直翻轉</string>
     <string name="view_on_telegram">在 Telegram 上檢視</string>
     <string name="volume">音量</string>
     <string name="web_search">網頁搜尋</string>
@@ -556,4 +532,5 @@
     <string name="you_have_to_select_at_least_one_category">您必須選取至少一個類別。</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">您將被重新導向至議題追蹤器網頁。</string>
     <string name="your_account_data_is_only_used_for_authentication">您的帳戶資料僅用於驗證。</string>
+    <string name="bug_report_success">臭蟲回報成功</string>
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 5497f4091..9de012247 100755
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -123,9 +123,12 @@
 
     <string-array name="pref_language_names">
         <item>System default</item>
+        <item>Afrikaans</item>
         <item>Arabic</item>
         <item>Basque</item>
+        <item>Bengali</item>
         <item>Burmese</item>
+        <item>Catalan</item>
         <item>Simplified Chinese</item>
         <item>Traditional Chinese(Hong Kong)</item>
         <item>Traditional Chinese(Taiwan)</item>
@@ -134,10 +137,12 @@
         <item>Danish</item>
         <item>Dutch</item>
         <item>English</item>
+        <item>Finnish</item>
         <item>Filipino</item>
         <item>French</item>
         <item>German</item>
         <item>Greek</item>
+        <item>Hebrew</item>
         <item>Hindi</item>
         <item>Hungarian</item>
         <item>Indonesian</item>
@@ -145,9 +150,10 @@
         <item>Japanese</item>
         <item>Kannada</item>
         <item>Korean</item>
-        <item>Kurmanji Kurdish</item>
-        <item>Latvian</item>
         <item>Malayalam</item>
+        <item>Nepali</item>
+        <item>Norwegian</item>
+        <item>Oriya</item>
         <item>Persian</item>
         <item>Polish</item>
         <item>Portuguese(Brazil)</item>
@@ -155,6 +161,7 @@
         <item>Romanian</item>
         <item>Russian</item>
         <item>Serbian</item>
+        <item>Slovak</item>
         <item>Spanish</item>
         <item>Spanish(Latin America)</item>
         <item>Swedish</item>
@@ -163,13 +170,17 @@
         <item>Thai</item>
         <item>Turkish</item>
         <item>Ukrainian</item>
+        <item>Urdu</item>
         <item>Vietnamese</item>
     </string-array>
     <string-array name="pref_language_codes">
         <item>auto</item>
+        <item>af-ZA</item>
         <item>ar-SA</item>
         <item>eu-ES</item>
+        <item>bn-IN</item>
         <item>my-MM</item>
+        <item>ca-ES</item>
         <item>zh-CN</item>
         <item>zh-HK</item>
         <item>zh-TW</item>
@@ -178,10 +189,12 @@
         <item>da-DK</item>
         <item>nl-NL</item>
         <item>en</item>
+        <item>fi-FI</item>
         <item>fil-PH</item>
         <item>fr</item>
         <item>de</item>
         <item>el</item>
+        <item>iw</item>
         <item>hi</item>
         <item>hu</item>
         <item>in</item>
@@ -189,9 +202,10 @@
         <item>ja</item>
         <item>kn</item>
         <item>ko</item>
-        <item>kmr-TR</item>
-        <item>lv-LV</item>
         <item>ml</item>
+        <item>ne</item>
+        <item>no</item>
+        <item>or</item>
         <item>fa</item>
         <item>pl</item>
         <item>pt-BR</item>
@@ -199,14 +213,16 @@
         <item>ro</item>
         <item>ru</item>
         <item>sr</item>
+        <item>sk</item>
         <item>es</item>
         <item>es-419</item>
         <item>sv</item>
         <item>ta</item>
         <item>te</item>
-        <item>th-TH</item>
         <item>tr</item>
+        <item>th-TH</item>
         <item>uk</item>
+        <item>ur</item>
         <item>vi</item>
     </string-array>
     <string-array name="image_settings_options">
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index 5e9f24c9f..3084d216b 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -5,5 +5,8 @@
 
     <bool name="allowBackup">true</bool>
 
-    <bool name="isMarshmallow">false</bool>
+    <bool name="wallpaper_accent_enabled">false</bool>
+    <bool name="wallpaper_accent_visible">false</bool>
+
+    <bool name="isNotOreo">true</bool>
 </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 891e44a46..c4b41ae8d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,6 +5,7 @@
 
     <dimen name="progress_container_height">20dp</dimen>
 
+
     <dimen name="tab_height">48dp</dimen>
 
     <dimen name="notification_big_image_size">112dp</dimen>
@@ -12,8 +13,12 @@
     <dimen name="list_item_image_icon_padding">8dp</dimen>
 
     <dimen name="mini_player_height">56dp</dimen>
-    <dimen name="bottom_nav_height">80dp</dimen>
-    <dimen name="bottom_nav_mini_player_height">136dp</dimen>
+    <dimen name="cast_mini_player_height">64dp</dimen>
+
+    <dimen name="mini_player_height_expanded">128dp</dimen>
+    <dimen name="mini_cast_player_height_expanded">136dp</dimen>
+
+    <dimen name="bottom_nav_height">72dp</dimen>
 
     <dimen name="app_widget_classic_height">96dp</dimen>
     <dimen name="app_widget_classic_image_size">96dp</dimen>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 595e2fbe5..6fa305f78 100755
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -27,5 +27,5 @@
     <string name="sort_order_album_artist">@string/album_artist</string>
     <string name="app_widget_circle_name">@string/circle</string>
 
-    <string name="download_policy">always</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 1ebc829d9..f831393ed 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -12,7 +12,6 @@
     <item name="action_import_playlist" type="id" />
     <item name="action_artist_sort_order_asc" type="id" />
     <item name="action_artist_sort_order_desc" type="id" />
-    <item name="action_song_default_sort_order" type="id" />
     <item name="action_song_sort_order_asc" type="id" />
     <item name="action_song_sort_order_desc" type="id" />
     <item name="action_playlist_sort_order_desc" type="id" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e9609c7c1..109040f4e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -94,7 +94,6 @@
     <string name="black_theme_name">Just Black</string>
     <string name="blacklist">Blacklist</string>
     <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
     <string name="blur">Blur</string>
     <string name="blur_card">Blur Card</string>
     <string name="bug_report_failed">Unable to send report</string>
@@ -179,7 +178,6 @@
     <string name="error_delete_backup">Couldn\u2019t delete backup</string>
     <string name="error_empty_name">Your name can\'t be empty!</string>
     <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
     <string name="expanded">Expanded</string>
     <string name="faq">FAQ</string>
     <string name="favorites">Favorites</string>
@@ -502,7 +500,6 @@
     <string name="sort_order_composer">Composer</string>
     <string name="sort_order_date">Date added</string>
     <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_default">Default</string>
     <string name="sort_order_num_songs">Song count</string>
     <string name="sort_order_num_songs_desc">Song count desc</string>
     <string name="sort_order_year">Year</string>
@@ -562,5 +559,5 @@
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-    <string name="could_not_write_tags_to_file">Could not write tags to the music file!</string>
+    <string name="bluetooth_title">Nearby devices</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9cfed1a10..9452f0649 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -36,6 +36,8 @@
     </style>
 
     <style name="Toolbar" parent="Widget.Material3.Toolbar">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="popupTheme">?toolbarPopupTheme</item>
         <item name="android:transitionName" tools:ignore="NewApi">toolbar</item>
         <item name="layout_collapseMode">pin</item>
@@ -44,6 +46,10 @@
         <item name="titleMarginStart">16dp</item>
     </style>
 
+    <style name="mcab_theme" parent="@style/ThemeOverlay.MaterialComponents.Light">
+        <item name="android:actionOverflowButtonStyle">@style/mcab_overflow_style</item>
+    </style>
+
     <style name="mcab_overflow_style" parent="Widget.AppCompat.ActionButton.Overflow">
         <item name="srcCompat">@drawable/ic_more_vert</item>
         <item name="android:tint">?colorSurface</item>
@@ -119,7 +125,7 @@
         <item name="cornerSize">0dp</item>
     </style>
 
-    <style name="Theme.RetroMusic.SplashScreen" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="SplashTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:windowBackground">@drawable/splash</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
@@ -168,7 +174,6 @@
     <style name="BottomSheetStyle" parent="Widget.Material3.BottomSheet">
         <item name="paddingBottomSystemWindowInsets">false</item>
         <item name="android:maxWidth">@empty</item>
-        <item name="shapeAppearance">?attr/shapeAppearanceCornerMedium</item>
     </style>
 
     <style name="MaterialCardViewStroke">
@@ -242,23 +247,5 @@
         </item>
     </style>
 
-    <style name="RoundedFABOverlay">
-        <item name="floatingActionButtonStyle">
-            @style/Widget.Material3.FloatingActionButton.Primary
-        </item>
-    </style>
-
-    <style name="Theme.AppWidget" parent="">
-        <item name="colorSurface">@color/md_black_1000</item>
-    </style>
-
-    <style name="ShapeAppearance.Material3.Circle" parent="">
-        <item name="cornerSize">50%</item>
-    </style>
-
-    <style name="Widget.Retro.Slider" parent="Widget.Material3.Slider">
-        <item name="labelBehavior">gone</item>
-        <item name="thumbRadius">6dp</item>
-        <item name="haloRadius">18dp</item>
-    </style>
+    <style name="Theme.AppWidget" parent="Theme.RetroMusic.FollowSystem" />
 </resources>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 672abc62b..18bed21e5 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Light</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
@@ -13,11 +12,10 @@
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>T
         <item name="elevationOverlayColor">@color/elevationOverlay</item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="android:windowActionModeOverlay">false</item>
     </style>
 
     <style name="Theme.RetroMusic.Base" parent="Theme.Material3.Dark.NoActionBar">
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Dark</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
@@ -29,7 +27,6 @@
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="elevationOverlayColor">@color/elevationOverlay</item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Black" parent="Theme.Material3.Dark.NoActionBar">
@@ -40,18 +37,17 @@
         <item name="colorSurface">@color/blackColorSurface</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="colorOnBackground">@color/blackColorSurface</item>
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Dark</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Light</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
@@ -60,7 +56,6 @@
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="elevationOverlayColor">@color/elevationOverlayLight</item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 
     <style name="MusicProgressSliderParent">
diff --git a/app/src/main/res/xml/allowed_media_browser_callers.xml b/app/src/main/res/xml/allowed_media_browser_callers.xml
index a1b85d3a8..2fa94b88f 100644
--- a/app/src/main/res/xml/allowed_media_browser_callers.xml
+++ b/app/src/main/res/xml/allowed_media_browser_callers.xml
@@ -18,23 +18,234 @@ limitations under the License.
   Spaces and newlines are ignored.
 -->
 <allowed_callers>
-    <signature name="Android Auto" package="com.google.android.projection.gearhead">
-        <key release="false">19:75:b2:f1:71:77:bc:89:a5:df:f3:1f:9e:64:a6:ca:e2:81:a5:3d:c1:d1:d5:9b:1d:14:7f:e1:c8:2a:fa:00</key>
-        <key release="false">70:81:1a:3e:ac:fd:2e:83:e1:8d:a9:bf:ed:e5:2d:f1:6c:e9:1f:2e:69:a4:4d:21:f1:8a:b6:69:91:13:07:71</key>
-        <key release="true">fd:b0:0c:43:db:de:8b:51:cb:31:2a:a8:1d:3b:5f:a1:77:13:ad:b9:4b:28:f5:98:d7:7f:8e:b8:9d:ac:ee:df</key>
-    </signature>
-
-    <signature name="WearOS" package="com.google.android.wearable.app">
-        <key release="false">69:d0:72:16:9a:2c:6b:2f:5a:cc:59:0c:e4:33:a1:1a:c3:df:55:1a:df:ee:5d:5f:63:c0:83:b7:22:76:2e:19</key>
-        <key release="true">85:cd:59:73:54:1b:e6:f4:77:d8:47:a0:bc:c6:aa:25:27:68:4b:81:9c:d5:96:85:29:66:4c:b0:71:57:b6:fe</key>
-    </signature>
-
-    <signature name="Android Auto Simulator" package="com.google.android.autosimulator">
-        <key release="true">19:75:b2:f1:71:77:bc:89:a5:df:f3:1f:9e:64:a6:ca:e2:81:a5:3d:c1:d1:d5:9b:1d:14:7f:e1:c8:2a:fa:00</key>
-    </signature>
-
-    <signature name="Google" package="com.google.android.googlequicksearchbox">
-        <key release="false">19:75:b2:f1:71:77:bc:89:a5:df:f3:1f:9e:64:a6:ca:e2:81:a5:3d:c1:d1:d5:9b:1d:14:7f:e1:c8:2a:fa:00</key>
-        <key release="true">f0:fd:6c:5b:41:0f:25:cb:25:c3:b5:33:46:c8:97:2f:ae:30:f8:ee:74:11:df:91:04:80:ad:6b:2d:60:db:83</key>
-    </signature>
+    <signing_certificate
+        name="Android Auto"
+        package="com.google.android.projection.gearhead"
+        release="false">
+        MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYD
+        VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g
+        VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE
+        AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
+        Fw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzET
+        MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G
+        A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p
+        ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI
+        hvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR
+        24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVy
+        xW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8X
+        W8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC
+        69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexA
+        cKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkw
+        HQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0c
+        xb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE
+        CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH
+        QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG
+        CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1Ud
+        EwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrP
+        zgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXcla
+        XjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05a
+        IskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+a
+        ayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUW
+        Ev9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
+    </signing_certificate>
+    <signing_certificate
+        name="Android Auto"
+        package="com.google.android.projection.gearhead"
+        release="false">
+        MIIDvTCCAqWgAwIBAgIJAOfkBvDXw5bzMA0GCSqGSIb3DQEBBQUAMHUxCzAJBgNV
+        BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBW
+        aWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDERMA8G
+        A1UEAwwIZ2VhcmhlYWQwHhcNMTQwNTI3MjMwMjUxWhcNNDExMDEyMjMwMjUxWjB1
+        MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91
+        bnRhaW4gVmlldzEUMBIGA1UECgwLR29vZ2xlIEluYy4xEDAOBgNVBAsMB0FuZHJv
+        aWQxETAPBgNVBAMMCGdlYXJoZWFkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+        CgKCAQEAou7wwBKFyznqpRretJ3EVp55/Yr049Ag5wlGvrCnjIP8DrMrU+skfKe1
+        DmwpsLNtnhhiNH+J000Lok3hc8jdWKeKOopzKGDNvL/HvnS70Zyk26gj9jtMMHz9
+        2aZdpmwD67FNmTlG2FERr+TwMD5agaPnsFR2zla6ugUvHGzz65YDxpCZsQ/TowyD
+        LnxgMagvhvS+Oex3yh2FN7pJfwS03KdGdkWPbLqf9Fem09s5jjeZW/O3RgnKoRPI
+        J4QLK70efjAZqJyBGcDZyQMwOs+8HIknraf8+cRZJDzqOx7rttl8M3KGB2EFljTp
+        6/FyxJLnAo6QlXn7GrYalTI0yLU9dQIDAQABo1AwTjAdBgNVHQ4EFgQU9QPJ5xJE
+        DA8MDQMrj0hm2/A2BRkwHwYDVR0jBBgwFoAU9QPJ5xJEDA8MDQMrj0hm2/A2BRkw
+        DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEADcr5h1FR8IpmN4hSsUA9
+        SnCQVyXa1GQhzpQgRbF+npkgOn2Mebp8bd28VpfgooD2OBNQXCUcZkn7pWj++ut9
+        HhObHVaV5FNg0pdDqLna9QZ9Y4oS+ZrijK70XZ/EjlYUHvhu0pIjZAbD8CmCFlow
+        SR55qCSjM5iS37LZB32SMr1BBiYrNAvncKjYQVK8ctTRzhpNQQPBgXBA98Xl+d1D
+        Py00JWQuF0ssmhKcJuvfdEnFF7Hvaxz/gCQ9nzarQI3CJB8dOXVwF8mcyDRBz4JR
+        +YDpXo6BD+fGt15ov+zmqC8xaT9P1/JgoDXiMhy/6rwgdi9WxPf8mb7TnBC+CksX
+        0A==
+    </signing_certificate>
+    <signing_certificate
+        name="Android Auto"
+        package="com.google.android.projection.gearhead"
+        release="true">
+        MIIDvTCCAqWgAwIBAgIJAMePnkuTQTAGMA0GCSqGSIb3DQEBBQUAMHUxCzAJBgNV
+        BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBW
+        aWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDERMA8G
+        A1UEAwwIZ2VhcmhlYWQwHhcNMTQwNTI3MjMwNTM0WhcNNDExMDEyMjMwNTM0WjB1
+        MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91
+        bnRhaW4gVmlldzEUMBIGA1UECgwLR29vZ2xlIEluYy4xEDAOBgNVBAsMB0FuZHJv
+        aWQxETAPBgNVBAMMCGdlYXJoZWFkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+        CgKCAQEA050XDkNIsVRMX2wTvVplpCu4OtnyNK2v5B7PS+DggmH2yuZiwpTurdKD
+        Q9R9UzxH9U4lsC+mIxXkiBYKIWNVgMtiTgxkEy7cgWvdYHgNYpFu8IxZKYDyXes+
+        02pfvpu63MIBD/PnvVFipo1oUrbfetj+mroEpjnA71gUS0Ok+H6XWWsmb8xFHQVM
+        oZWEIzsUJ2nhm8EcnPkAPfNZAG++XLPROoRQCaswyYsd42JuYAP3CwZuhDcUbMWm
+        k7rBi9BVQ8gmkrbwqo94A7qStLUp3NyCmlKSWHaZ05SspEPwsfctka0oXG5bhgT6
+        67EMCzQ+YsFN1oJRL7Qq+mMQjFJs3wIDAQABo1AwTjAdBgNVHQ4EFgQUGvBfYNeu
+        6JSJUnJZCiaBGsnXztswHwYDVR0jBBgwFoAUGvBfYNeu6JSJUnJZCiaBGsnXztsw
+        DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAlGsDY0EPu3NBSH5k6iw/
+        wJh9e3xMwS17ErKGlhyWogxJMzLjAN6g0aCPHxB40IQC+8qAl+RL7VQx6oxttf0m
+        31yUGQPcNYbt2CxBTCAr885oLK5t2TAi5tQzhd6ZEYihWSUWUd/X8BQRouxboss9
+        QbBA/iIx0OpDaxiAcq7Cb67TheXZDxGuQ8fmHYbLx84pEvm3DQOB/LIMkkpQSfEC
+        1f+oP1zB3urPU/dSvED/LCgOdrpxZ5di7SwSyue+Vq/TZQy34tPygEzD2d8hFlh/
+        yfhWkMizOeIXcayVAQdNn5zpBkuay1skGOjQQ5kTbDcDzigO2R2rqn6HCd9l5Z0W
+        IQ==
+    </signing_certificate>
+    <signing_certificate
+        name="Android Wear"
+        package="com.google.android.wearable.app"
+        release="false">
+        MIIDvzCCAqegAwIBAgIJANqYw9kVc9PvMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNV
+        BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBW
+        aWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDESMBAG
+        A1UEAwwJQ2xvY2tXb3JrMB4XDTE0MDMwNzIyMDExOFoXDTQxMDcyMzIyMDExOFow
+        djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDU1v
+        dW50YWluIFZpZXcxFDASBgNVBAoMC0dvb2dsZSBJbmMuMRAwDgYDVQQLDAdBbmRy
+        b2lkMRIwEAYDVQQDDAlDbG9ja1dvcmswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+        ggEKAoIBAQDcHW9LKO04MBSynIL22v/THd57jB5jCEBlC1ixZaNqrrYscVOVLgRF
+        Ca+CH5S6n08YZMOntdZTzAAVnQAQ4eVm+jeq/xg2Xa57SoXdsfODzEdwoj6VYpH+
+        tXLBaTFar0706qWuhh/N1ufl6tQxE3RGRgx8KPsyLJKVXFx6qJV3w3A/l+CYt362
+        oG6sa3LqoK0hCrAqH9z8dmJ0dEGpPzzqihb0jJciweMyQTJ+wsn3MDEujRvv7ikL
+        RRo0iSys71sUctbZfvlUKMyK1e8EuMTx9Q3SQtVdclhmhVBbXksbHlmtjB2FL6CC
+        SBVnO8bmQynsxOrU24RkqWsxg5+f28kHAgMBAAGjUDBOMB0GA1UdDgQWBBSEhUcQ
+        hKQ8s+r4P6shYqCVAM4sejAfBgNVHSMEGDAWgBSEhUcQhKQ8s+r4P6shYqCVAM4s
+        ejAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAHOWILon0qD1SIQ60b
+        YI4cKdkBKIHq/D/WKF9fYmqXPvBX5pfusqxcouYFyj0z9ZCZa4sAMsRH5lAPJb0X
+        yvmVAzmDQMjubNy1O+3ksfJI59AgmZ6B58rqpTLP2pn+SqXtQEBORPdb79J/yts1
+        uLIblHhGXhci8nr7KwtuFY5ExKsMT2V7Gdd9j1PJz7nuLU9FtlTgEryN6YHkwuLD
+        055RkwPYrk0swchijXhXrnU/HXsCo6cFeMYF4wUcbB2pSRrOE7uI0H2BfdSUJlGX
+        hK6WlaRHNQ2J60BekPKr82auL8pY0va/Hb9LHEie4KABVN/PAiUS9aHHIp5zHePw
+        R9b4
+    </signing_certificate>
+    <signing_certificate
+        name="Android Wear"
+        package="com.google.android.wearable.app"
+        release="true">
+        MIIFYTCCA0sCBgFEnpGW0zALBgkqhkiG9w0BAQUwdjELMAkGA1UEBhMCVVMxEzAR
+        BgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNV
+        BAoTC0dvb2dsZSBJbmMuMRAwDgYDVQQLEwdBbmRyb2lkMRIwEAYDVQQDEwlDbG9j
+        a1dvcmswHhcNMTQwMzA3MjIwMjI1WhcNMzgwMTE5MDMxNDA3WjB2MQswCQYDVQQG
+        EwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmll
+        dzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEjAQBgNV
+        BAMTCUNsb2NrV29yazCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALo8
+        fzkL/lmKYrz8izyUxidamRXt3N03OlVqmQvi/UP3nxizAdJAJ+NyfwnO/eKcfCaw
+        iiDeNn0a3+NOp4+uN/OQ9eAmcnpOCCg773b49kO8FSc2oEg/ybeRq1I8872Ge2Yt
+        KidMANiQ550R6LAmX+2pddzI5UKZiY6QE2picYwuCy85eVHbJLFXob/nxWvOSjgL
+        Jfq5JmM+qJQEOOC2lAu5nol+LvoFPDIpm9lhb6S9loIhezdDH83Ygu0hp/LwRn/g
+        lRy8Wphi40oVa+FaF/8CF5hkRNYTsR7XX4OAGO60/ZTkj1rjHOSvpDY4tpcshVzS
+        2woBxDJhKOTFGXq+rMxtwuitpEJfD5DVpaVYJGG/eBHhLs4O6gYDP5ZUOe3gcf/E
+        bCDy374jIzp/ZMHOCa2hy85r9ryiLpuYnErAyWqdbHVP7Bhx2HsQmMGg3mC8fXfe
+        MNVOuEfOaxJ8GR6nk28KRsFG8za5NOq6Wl8cA2S3UpZVRDJQ/WOq5Xvrq+AmPwkI
+        TRlEBgw62bu6f3n03jwrLTe6sw1LuRHcUWngr5VS9NOOPbPyy4AcUgJScGG/AbBC
+        0H6J5I8RqaqgJ/BElZ7aKMXd2FNXpx45u4JRs1frb3IY/MwXGIGmMGdGMeBVlDka
+        emea8lqgYgHWIrjQCd0R1QaiAw8kJ65n2Bs0N3l5AgMBAAEwCwYJKoZIhvcNAQEF
+        A4ICAQCkxJaWNGHIlTWlsQrNASQ3aonaJ0OdrDADSGcLICut4z8vuioHZAO1C+hx
+        yiqym769u8QG2wk5QcmMF2oORv+Q/wAWFgREgG7cguEw/hCGHuMFnbd+PZ2poq00
+        qdK02hsm/VpbcBzVbP7pZHrkFDuXpnwCgGWxf54U8jKl7xfhZKFJF5KWlBwwvVo2
+        q/jzQsjjr7xvSUNzB31qnBHXOSINWte1GS+bHP6Wj0pysbhUdeDpiL5ocohmZbEr
+        9O7DIlZU9eHyK4vrVY6+ZneL1l8JkS35XoCd/u8Px+rKXQ6+HUEEH+cgyzKbMH45
+        LhOX8SA5VGkwhIt/AhdAiS32x6By5984usPXIjVv5lR/anxXit9nyT0rNYiTVDXw
+        +aETzi3szW2hncNLQYLsrtYg61KFMCXF4ATstFG8ReFIWsw2f7ZJkq9ZTFUbC8k4
+        y9Ya1WdZkCD3OmXhqcikiNusgx7rkY8MkikJXt5BBXs8rupOFsW5RUuS4lmKEbSU
+        oh8/er+DwGf0GC6YQZuk5JOKNIDwhi/tr1dySlUzV4/aX7PN/PlUgH//2MlRd+d1
+        BKZCvlzboOEAZfx8aBKc7SezqATXpM3ZDNPsywWoyIpgmtBWoE60ih4Flf05XB+n
+        e7MdpSQ0Xgq9TgG1BoJP6rpC0y3Ukmc+z8AXnYYdJunNXEbv0A==
+    </signing_certificate>
+    <signing_certificate
+        name="Android Auto Simulator"
+        package="com.google.android.autosimulator"
+        release="true">
+        MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYD
+        VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g
+        VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE
+        AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
+        Fw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzET
+        MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G
+        A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p
+        ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI
+        hvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR
+        24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVy
+        xW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8X
+        W8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC
+        69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexA
+        cKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkw
+        HQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0c
+        xb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE
+        CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH
+        QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG
+        CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1Ud
+        EwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrP
+        zgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXcla
+        XjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05a
+        IskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+a
+        ayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUW
+        Ev9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
+    </signing_certificate>
+    <signing_certificate
+        name="Google"
+        package="com.google.android.googlequicksearchbox"
+        release="false">
+        MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYD
+        VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g
+        VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE
+        AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
+        Fw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzET
+        MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G
+        A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p
+        ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI
+        hvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR
+        24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVy
+        xW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8X
+        W8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC
+        69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexA
+        cKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkw
+        HQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0c
+        xb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE
+        CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH
+        QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG
+        CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1Ud
+        EwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrP
+        zgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXcla
+        XjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05a
+        IskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+a
+        ayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUW
+        Ev9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
+    </signing_certificate>
+    <signing_certificate
+        name="Google"
+        package="com.google.android.googlequicksearchbox"
+        release="true">
+        MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNV
+        BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBW
+        aWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4G
+        A1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQx
+        CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3Vu
+        dGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9p
+        ZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgC
+        ggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JO
+        Rland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/
+        8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfY
+        wXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LW
+        uT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0z
+        OHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Yl
+        mn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14al
+        oXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE
+        BxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsT
+        B0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTAD
+        AQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4
+        rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCE
+        yj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh
+        5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTb
+        Qe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZM
+        cUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
+    </signing_certificate>
 </allowed_callers>
\ No newline at end of file
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
deleted file mode 100644
index d11dda98d..000000000
--- a/app/src/main/res/xml/locales_config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <locale android:name="en" />
-    <locale android:name="ar-SA" />
-    <locale android:name="eu-ES" />
-    <locale android:name="my-MM" />
-    <locale android:name="zh-CN" />
-    <locale android:name="zh-HK" />
-    <locale android:name="zh-TW" />
-    <locale android:name="hr" />
-    <locale android:name="cs-cz" />
-    <locale android:name="da-DK" />
-    <locale android:name="nl-NL" />
-    <locale android:name="en" />
-    <locale android:name="fil-PH" />
-    <locale android:name="fr" />
-    <locale android:name="de" />
-    <locale android:name="el" />
-    <locale android:name="hi" />
-    <locale android:name="hu" />
-    <locale android:name="in" />
-    <locale android:name="it" />
-    <locale android:name="ja" />
-    <locale android:name="kn" />
-    <locale android:name="ko" />
-    <locale android:name="kmr-TR" />
-    <locale android:name="lv-LV" />
-    <locale android:name="ml" />
-    <locale android:name="fa" />
-    <locale android:name="pl" />
-    <locale android:name="pt-BR" />
-    <locale android:name="pt-PT" />
-    <locale android:name="ro" />
-    <locale android:name="ru" />
-    <locale android:name="sr" />
-    <locale android:name="es" />
-    <locale android:name="es-419" />
-    <locale android:name="sv" />
-    <locale android:name="ta" />
-    <locale android:name="te" />
-    <locale android:name="th-TH" />
-    <locale android:name="tr" />
-    <locale android:name="uk" />
-    <locale android:name="vi" />
-</locale-config>
\ 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 52cb14c3e..c5cce2a25 100755
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -2,7 +2,7 @@
 <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.BlacklistPreference
+    <io.github.muntashirakon.music.preferences.BlacklistPreference
         android:key="blacklist"
         android:layout="@layout/list_item_view"
         android:summary="@string/pref_summary_blacklist"
@@ -60,7 +60,7 @@
             android:layout="@layout/list_item_view_switch"
             android:summary="@string/pref_keep_screen_on_summary"
             android:title="@string/pref_keep_screen_on_title"
-            app:icon="@drawable/ic_settings_brightness" />
+            app:icon="@drawable/ic_settings_brigntness" />
 
 
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
diff --git a/app/src/main/res/xml/pref_audio.xml b/app/src/main/res/xml/pref_audio.xml
index 6bf54069c..f4640bd2b 100755
--- a/app/src/main/res/xml/pref_audio.xml
+++ b/app/src/main/res/xml/pref_audio.xml
@@ -2,7 +2,16 @@
 <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.DurationPreference
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+        android:defaultValue="true"
+        android:key="audio_ducking"
+        android:layout="@layout/list_item_view_switch"
+        android:summary="@string/pref_summary_audio_ducking"
+        android:title="@string/pref_title_audio_ducking"
+        app:icon="@drawable/ic_volume_down"
+        app:isPreferenceVisible="@bool/isNotOreo"/>
+
+    <io.github.muntashirakon.music.preferences.DurationPreference
         android:defaultValue="0"
         android:key="audio_fade_duration"
         android:layout="@layout/list_item_view"
@@ -47,6 +56,14 @@
         android:title="@string/pref_title_toggle_toggle_headset"
         app:icon="@drawable/ic_play_arrow" />
 
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+        android:defaultValue="false"
+        android:key="toggle_shuffle"
+        android:layout="@layout/list_item_view_switch"
+        android:summary="@string/pref_summary_toggle_shuffle"
+        android:title="@string/pref_title_toggle_toggle_shuffle"
+        app:icon="@drawable/ic_shuffle" />
+
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="false"
         android:key="bluetooth_playback"
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index c27bfbe14..0fc27c2e5 100755
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -14,7 +14,7 @@
             android:negativeButtonText="@null"
             android:positiveButtonText="@null"
             android:title="@string/pref_title_general_theme"
-            app:icon="@drawable/ic_palette_outline" />
+            app:icon="@drawable/ic_color_lens" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:key="black_theme"
@@ -43,11 +43,12 @@
         android:title="@string/colors">
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="false"
+            android:defaultValue="@bool/wallpaper_accent_enabled"
             android:key="wallpaper_accent"
             android:layout="@layout/list_item_view_switch"
             android:summary="@string/pref_summary_wallpaper_accent"
-            android:title="@string/pref_title_wallpaper_accent" />
+            android:title="@string/pref_title_wallpaper_accent"
+            app:isPreferenceVisible="@bool/wallpaper_accent_visible" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEColorPreference
             android:dependency="material_you"
diff --git a/app/src/main/res/xml/pref_notification.xml b/app/src/main/res/xml/pref_notification.xml
index 6f55aa5fa..77ad1b564 100755
--- a/app/src/main/res/xml/pref_notification.xml
+++ b/app/src/main/res/xml/pref_notification.xml
@@ -7,7 +7,7 @@
         android:layout="@layout/list_item_view_switch"
         android:summary="@string/pref_summary_classic_notification"
         android:title="@string/pref_title_classic_notification"
-        app:icon="@drawable/ic_notification_classic" />
+        app:icon="@drawable/ic_cellphone_lock" />
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="true"
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 63f4e7403..380f7390b 100644
--- a/app/src/main/res/xml/pref_now_playing_screen.xml
+++ b/app/src/main/res/xml/pref_now_playing_screen.xml
@@ -2,7 +2,7 @@
 <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
+    <io.github.muntashirakon.music.preferences.NowPlayingScreenPreference
         android:key="now_playing_screen_id"
         android:layout="@layout/list_item_view"
         android:title="@string/pref_title_now_playing_screen_appearance"
@@ -53,7 +53,7 @@
         android:layout="@layout/preference_category_title"
         android:title="@string/pref_header_album">
 
-        <code.name.monkey.retromusic.preferences.AlbumCoverStylePreference
+        <io.github.muntashirakon.music.preferences.AlbumCoverStylePreference
             android:key="album_cover_style_id"
             android:layout="@layout/list_item_view"
             android:title="@string/pref_title_album_cover_style"
diff --git a/app/src/main/res/xml/pref_ui.xml b/app/src/main/res/xml/pref_ui.xml
index 3517e949b..77b44de82 100644
--- a/app/src/main/res/xml/pref_ui.xml
+++ b/app/src/main/res/xml/pref_ui.xml
@@ -53,7 +53,7 @@
         android:layout="@layout/preference_category_title"
         android:title="@string/pref_header_library">
 
-        <code.name.monkey.retromusic.preferences.LibraryPreference
+        <io.github.muntashirakon.music.preferences.LibraryPreference
             android:key="library_categories"
             android:layout="@layout/list_item_view"
             android:summary="@string/pref_summary_library_categories"
@@ -98,7 +98,7 @@
             android:layout="@layout/list_item_view_switch"
             android:summary="@string/pref_summary_toggle_full_screen"
             android:title="@string/pref_title_toggle_full_screen"
-            app:icon="@drawable/ic_fullscreen" />
+            app:icon="@drawable/ic_cellphone" />
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
diff --git a/appthemehelper/.gitignore b/appthemehelper/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/appthemehelper/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/appthemehelper/build.gradle b/appthemehelper/build.gradle
index 2a5e0f50d..cbb0934dd 100644
--- a/appthemehelper/build.gradle
+++ b/appthemehelper/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 android {
-    compileSdk 33
-    namespace "code.name.monkey.appthemehelper"
+    compileSdk 32
 
     defaultConfig {
         minSdk 21
-        targetSdk 33
+        targetSdk 32
     }
     buildTypes {
         release {
@@ -27,4 +26,6 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$appcompat_version"
     implementation "com.google.android.material:material:$mdc_version"
     implementation "androidx.preference:preference-ktx:$preference_version"
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
diff --git a/appthemehelper/src/main/AndroidManifest.xml b/appthemehelper/src/main/AndroidManifest.xml
index cc947c567..a0b00a102 100644
--- a/appthemehelper/src/main/AndroidManifest.xml
+++ b/appthemehelper/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest />
+<manifest package="code.name.monkey.appthemehelper" />
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
index 1b5ad709e..6b8406b8d 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
@@ -223,7 +223,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
         fun primaryColor(context: Context): Int {
             return prefs(context).getInt(
                 ThemeStorePrefKeys.KEY_PRIMARY_COLOR,
-                resolveColor(context, androidx.appcompat.R.attr.colorPrimary, Color.parseColor("#455A64"))
+                resolveColor(context, R.attr.colorPrimary, Color.parseColor("#455A64"))
             )
         }
 
@@ -240,7 +240,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
             } else {
                 prefs(context).getInt(
                     ThemeStorePrefKeys.KEY_ACCENT_COLOR,
-                    resolveColor(context, androidx.appcompat.R.attr.colorAccent, Color.parseColor("#263238"))
+                    resolveColor(context, R.attr.colorAccent, Color.parseColor("#263238"))
                 )
             }
             return if (isWindowBackgroundDark(context) && desaturatedColor) ColorUtil.desaturateColor(
@@ -254,7 +254,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
         fun wallpaperColor(context: Context, isDarkMode: Boolean): Int {
             return prefs(context).getInt(
                 if (isDarkMode) ThemeStorePrefKeys.KEY_WALLPAPER_COLOR_DARK else ThemeStorePrefKeys.KEY_WALLPAPER_COLOR_LIGHT,
-                resolveColor(context, androidx.appcompat.R.attr.colorAccent, Color.parseColor("#263238"))
+                resolveColor(context, R.attr.colorAccent, Color.parseColor("#263238"))
             )
         }
 
@@ -343,14 +343,14 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
             return true
         }
 
-        fun isMD3Enabled(context: Context): Boolean {
+        private fun isMD3Enabled(context: Context): Boolean {
             return PreferenceManager.getDefaultSharedPreferences(context)
                 .getBoolean(ThemeStorePrefKeys.KEY_MATERIAL_YOU, VersionUtils.hasS())
         }
 
         private fun isWallpaperAccentEnabled(context: Context): Boolean {
             return PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean("wallpaper_accent", false)
+                .getBoolean("wallpaper_accent", VersionUtils.hasOreoMR1() && !VersionUtils.hasS())
         }
     }
 }
\ No newline at end of file
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 9c07c660f..aaa29d937 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
@@ -5,6 +5,7 @@ import android.view.Menu;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import code.name.monkey.appthemehelper.ATHActivity;
+import code.name.monkey.appthemehelper.R;
 import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
 
@@ -15,7 +16,7 @@ public class ATHToolbarActivity extends ATHActivity {
 
     public static int getToolbarBackgroundColor(@Nullable Toolbar toolbar) {
         if (toolbar != null) {
-            return ATHUtil.INSTANCE.resolveColor(toolbar.getContext(), com.google.android.material.R.attr.colorSurface);
+            return ATHUtil.INSTANCE.resolveColor(toolbar.getContext(), R.attr.colorSurface);
         }
         return Color.BLACK;
     }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt
index 82e66817f..19eb3e15a 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt
@@ -42,12 +42,12 @@ class ATESeekBarPreference @JvmOverloads constructor(
 
     override fun onBindViewHolder(view: PreferenceViewHolder) {
         super.onBindViewHolder(view)
-        val seekBar = view.findViewById(androidx.preference.R.id.seekbar) as SeekBar
+        val seekBar = view.findViewById(R.id.seekbar) as SeekBar
         TintHelper.setTintAuto(
             seekBar, // Set MD3 accent if MD3 is enabled or in-app accent otherwise
             ThemeStore.accentColor(context), false
         )
-        (view.findViewById(androidx.preference.R.id.seekbar_value) as TextView).apply {
+        (view.findViewById(R.id.seekbar_value) as TextView).apply {
             appendUnit(editableText)
             doAfterTextChanged {
                 appendUnit(it)
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 82a511e3b..ab82a32a9 100644
--- 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
@@ -29,6 +29,8 @@ import androidx.preference.DialogPreference;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
+import code.name.monkey.appthemehelper.R;
+
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
@@ -62,7 +64,7 @@ public class ATEPreferenceDialogFragment extends DialogFragment implements Dialo
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         FragmentActivity context = this.getActivity();
         MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context,
-                com.google.android.material.R.style.ThemeOverlay_MaterialComponents_Dialog_Alert)
+                R.style.ThemeOverlay_MaterialComponents_Dialog_Alert)
                 .setTitle(this.mPreference.getDialogTitle())
                 .setIcon(this.mPreference.getDialogIcon())
                 .setMessage(this.mPreference.getDialogMessage())
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt
index 13359781b..9f88e54ec 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt
@@ -26,6 +26,9 @@ class ATEAccentTextView @JvmOverloads constructor(
 ) : AppCompatTextView(context, attrs, defStyleAttr) {
 
     init {
-        setTextColor(ThemeStore.accentColor(context))
+        setTextColor(
+            // Set MD3 accent if MD3 is enabled or in-app accent otherwise
+            ThemeStore.accentColor(context)
+        )
     }
 }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt
index 869f5db83..c4dc3c77c 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt
@@ -2,24 +2,34 @@ package code.name.monkey.appthemehelper.common.views
 
 import android.content.Context
 import android.util.AttributeSet
+import androidx.appcompat.widget.SwitchCompat
 import androidx.core.view.isVisible
 import code.name.monkey.appthemehelper.ATH
 import code.name.monkey.appthemehelper.ThemeStore
-import com.google.android.material.materialswitch.MaterialSwitch
 
 /**
  * @author Aidan Follestad (afollestad)
  */
-class ATESwitch @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1,
-) : MaterialSwitch(context, attrs, defStyleAttr) {
+class ATESwitch : SwitchCompat {
 
-    init {
-        if (!isInEditMode && !ThemeStore.isMD3Enabled(context)) {
-            ATH.setTint(this, ThemeStore.accentColor(context))
-        }
+    constructor(context: Context) : super(context) {
+        init(context)
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init(context)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ) {
+        init(context)
+    }
+
+    private fun init(context: Context) {
+        ATH.setTint(this, ThemeStore.accentColor(context))
     }
 
     override fun isShown(): Boolean {
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.kt
index ace097c28..888f01c7e 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.kt
@@ -14,8 +14,8 @@ object MaterialValueHelper {
     @ColorInt
     fun getPrimaryTextColor(context: Context?, dark: Boolean): Int {
         return if (dark) {
-            ContextCompat.getColor(context!!, androidx.appcompat.R.color.primary_text_default_material_light)
-        } else ContextCompat.getColor(context!!, androidx.appcompat.R.color.primary_text_default_material_dark)
+            ContextCompat.getColor(context!!, R.color.primary_text_default_material_light)
+        } else ContextCompat.getColor(context!!, R.color.primary_text_default_material_dark)
     }
 
     @SuppressLint("PrivateResource")
@@ -23,8 +23,8 @@ object MaterialValueHelper {
     @ColorInt
     fun getSecondaryTextColor(context: Context?, dark: Boolean): Int {
         return if (dark) {
-            ContextCompat.getColor(context!!, androidx.appcompat.R.color.secondary_text_default_material_light)
-        } else ContextCompat.getColor(context!!, androidx.appcompat.R.color.secondary_text_default_material_dark)
+            ContextCompat.getColor(context!!, R.color.secondary_text_default_material_light)
+        } else ContextCompat.getColor(context!!, R.color.secondary_text_default_material_dark)
     }
 
     @SuppressLint("PrivateResource")
@@ -32,8 +32,8 @@ object MaterialValueHelper {
     @ColorInt
     fun getPrimaryDisabledTextColor(context: Context?, dark: Boolean): Int {
         return if (dark) {
-            ContextCompat.getColor(context!!, androidx.appcompat.R.color.primary_text_disabled_material_light)
-        } else ContextCompat.getColor(context!!, androidx.appcompat.R.color.primary_text_disabled_material_dark)
+            ContextCompat.getColor(context!!, R.color.primary_text_disabled_material_light)
+        } else ContextCompat.getColor(context!!, R.color.primary_text_disabled_material_dark)
     }
 
     @SuppressLint("PrivateResource")
@@ -41,7 +41,7 @@ object MaterialValueHelper {
     @ColorInt
     fun getSecondaryDisabledTextColor(context: Context?, dark: Boolean): Int {
         return if (dark) {
-            ContextCompat.getColor(context!!, androidx.appcompat.R.color.secondary_text_disabled_material_light)
-        } else ContextCompat.getColor(context!!, androidx.appcompat.R.color.secondary_text_disabled_material_dark)
+            ContextCompat.getColor(context!!, R.color.secondary_text_disabled_material_light)
+        } else ContextCompat.getColor(context!!, R.color.secondary_text_disabled_material_dark)
     }
 }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.kt
new file mode 100644
index 000000000..ae29dd81c
--- /dev/null
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.kt
@@ -0,0 +1,52 @@
+package code.name.monkey.appthemehelper.util
+
+import android.content.res.ColorStateList
+import androidx.annotation.ColorInt
+import code.name.monkey.appthemehelper.ThemeStore
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.google.android.material.navigation.NavigationView
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+object NavigationViewUtil {
+
+    fun setItemIconColors(navigationView: NavigationView, @ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
+        val iconSl = ColorStateList(
+            arrayOf(
+                intArrayOf(-android.R.attr.state_checked),
+                intArrayOf(android.R.attr.state_checked)
+            ), intArrayOf(normalColor, selectedColor)
+        )
+        navigationView.itemIconTintList = iconSl
+        val drawable = navigationView.itemBackground
+        navigationView.itemBackground = TintHelper.createTintedDrawable(
+            drawable,
+            ColorUtil.withAlpha(ThemeStore.accentColor(navigationView.context), 0.2f)
+        )
+    }
+
+    fun setItemTextColors(navigationView: NavigationView, @ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
+        val textSl = ColorStateList(
+            arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
+            intArrayOf(normalColor, selectedColor)
+        )
+        navigationView.itemTextColor = textSl
+    }
+
+    fun setItemIconColors(bottomNavigationView: BottomNavigationView, @ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
+        val iconSl = ColorStateList(
+            arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
+            intArrayOf(normalColor, selectedColor)
+        )
+        bottomNavigationView.itemIconTintList = iconSl
+    }
+
+    fun setItemTextColors(bottomNavigationView: BottomNavigationView, @ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
+        val textSl = ColorStateList(
+            arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
+            intArrayOf(normalColor, selectedColor)
+        )
+        bottomNavigationView.itemTextColor = textSl
+    }
+}
\ No newline at end of file
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 06b14526c..001b51dd7 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
@@ -3,7 +3,6 @@ package code.name.monkey.appthemehelper.util;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.RippleDrawable;
@@ -15,6 +14,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RadioButton;
 import android.widget.SeekBar;
+import android.widget.Switch;
 import android.widget.TextView;
 
 import androidx.annotation.CheckResult;
@@ -28,7 +28,6 @@ import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.materialswitch.MaterialSwitch;
 
 import java.lang.reflect.Field;
 
@@ -211,6 +210,17 @@ public final class TintHelper {
         image.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
     }
 
+    public static void setTint(@NonNull Switch switchView, @ColorInt int color, boolean useDarker) {
+        if (switchView.getTrackDrawable() != null) {
+            switchView.setTrackDrawable(modifySwitchDrawable(switchView.getContext(),
+                    switchView.getTrackDrawable(), color, false, false, useDarker));
+        }
+        if (switchView.getThumbDrawable() != null) {
+            switchView.setThumbDrawable(modifySwitchDrawable(switchView.getContext(),
+                    switchView.getThumbDrawable(), color, true, false, useDarker));
+        }
+    }
+
     public static void setTint(@NonNull SwitchCompat switchView, @ColorInt int color, boolean useDarker) {
         if (switchView.getTrackDrawable() != null) {
             switchView.setTrackDrawable(modifySwitchDrawable(switchView.getContext(),
@@ -222,15 +232,6 @@ public final class TintHelper {
         }
     }
 
-    public static void setTint(@NonNull MaterialSwitch switchView, @ColorInt int color, boolean useDarker) {
-        if (switchView.getTrackDrawable() != null) {
-            switchView.setTrackTintList(createSwitchDrawableTintList(switchView.getContext(), color, false, true, useDarker));
-        }
-        if (switchView.getThumbDrawable() != null) {
-            switchView.setThumbTintList(createSwitchDrawableTintList(switchView.getContext(), color, true, true, useDarker));
-        }
-    }
-
     public static void setTintAuto(final @NonNull View view, final @ColorInt int color,
                                    boolean background) {
         setTintAuto(view, color, background, ATHUtil.INSTANCE.isWindowBackgroundDark(view.getContext()));
@@ -253,8 +254,8 @@ public final class TintHelper {
                 setTint((CheckBox) view, color, isDark);
             } else if (view instanceof ImageView) {
                 setTint((ImageView) view, color);
-            } else if (view instanceof MaterialSwitch) {
-                setTint((MaterialSwitch) view, color, isDark);
+            } else if (view instanceof Switch) {
+                setTint((Switch) view, color, isDark);
             } else if (view instanceof SwitchCompat) {
                 setTint((SwitchCompat) view, color, isDark);
             } else {
@@ -265,7 +266,7 @@ public final class TintHelper {
                 // Ripples for the above views (e.g. when you tap and hold a switch or checkbox)
                 RippleDrawable rd = (RippleDrawable) view.getBackground();
                 @SuppressLint("PrivateResource") final int unchecked = ContextCompat.getColor(view.getContext(),
-                        isDark ? androidx.appcompat.R.color.ripple_material_dark : androidx.appcompat.R.color.ripple_material_light);
+                        isDark ? R.color.ripple_material_dark : R.color.ripple_material_light);
                 final int checked = ColorUtil.INSTANCE.adjustAlpha(color, 0.4f);
                 final ColorStateList sl = new ColorStateList(
                         new int[][]{
@@ -373,7 +374,7 @@ public final class TintHelper {
     private static int getDefaultRippleColor(@NonNull Context context, boolean useDarkRipple) {
         // Light ripple is actually translucent black, and vice versa
         return ContextCompat.getColor(context, useDarkRipple ?
-                androidx.appcompat.R.color.ripple_material_light : androidx.appcompat.R.color.ripple_material_dark);
+                R.color.ripple_material_light : R.color.ripple_material_dark);
     }
 
     @NonNull
@@ -387,15 +388,12 @@ public final class TintHelper {
         });
     }
 
-    private static ColorStateList createSwitchDrawableTintList(@NonNull Context context, @ColorInt int tint,
-                                                               boolean thumb, boolean compatSwitch, boolean useDarker) {
-        int lighterTint = ColorUtil.INSTANCE.blendColors(tint, Color.WHITE, 0.4f);
-        int darkerTint = ColorUtil.INSTANCE.shiftColor(tint, 0.8f);
+    private static Drawable modifySwitchDrawable(@NonNull Context context, @NonNull Drawable from, @ColorInt int tint,
+                                                 boolean thumb, boolean compatSwitch, boolean useDarker) {
         if (useDarker) {
-            tint = (compatSwitch && !thumb) ? lighterTint : darkerTint;
-        } else {
-            tint = (compatSwitch && !thumb) ? darkerTint : Color.WHITE;
+            tint = ColorUtil.INSTANCE.shiftColor(tint, 1.1f);
         }
+        tint = ColorUtil.INSTANCE.adjustAlpha(tint, (compatSwitch && !thumb) ? 0.5f : 1.0f);
         int disabled;
         int normal;
         if (thumb) {
@@ -415,7 +413,7 @@ public final class TintHelper {
             normal = ColorUtil.INSTANCE.stripAlpha(normal);
         }
 
-        return new ColorStateList(
+        final ColorStateList sl = new ColorStateList(
                 new int[][]{
                         new int[]{-android.R.attr.state_enabled},
                         new int[]{android.R.attr.state_enabled, -android.R.attr.state_activated,
@@ -430,12 +428,6 @@ public final class TintHelper {
                         tint
                 }
         );
-    }
-
-    private static Drawable modifySwitchDrawable(@NonNull Context context, @NonNull Drawable from, @ColorInt int tint,
-                                                 boolean thumb, boolean compatSwitch, boolean useDarker) {
-
-        ColorStateList sl = createSwitchDrawableTintList(context, tint, thumb, compatSwitch, useDarker);
         return createTintedDrawable(from, sl);
     }
 
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 23179ffbd..8688005af 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
@@ -39,6 +39,7 @@ import androidx.core.graphics.drawable.DrawableCompat;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 
+import code.name.monkey.appthemehelper.R;
 import code.name.monkey.appthemehelper.ThemeStore;
 
 public final class ToolbarContentTintHelper {
@@ -121,7 +122,7 @@ public final class ToolbarContentTintHelper {
         public static void setOverflowButtonColor(@NonNull Activity activity,
                 final @ColorInt int color) {
             final String overflowDescription = activity
-                    .getString(androidx.appcompat.R.string.abc_action_menu_overflow_description);
+                    .getString(R.string.abc_action_menu_overflow_description);
             final ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
             final ViewTreeObserver viewTreeObserver = decorView.getViewTreeObserver();
             viewTreeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@@ -282,7 +283,7 @@ public final class ToolbarContentTintHelper {
     }
 
     public static void colorBackButton(@NonNull Toolbar toolbar) {
-        int color = ATHUtil.INSTANCE.resolveColor(toolbar.getContext(), androidx.appcompat.R.attr.colorControlNormal);
+        int color = ATHUtil.INSTANCE.resolveColor(toolbar.getContext(), R.attr.colorControlNormal);
         final PorterDuffColorFilter colorFilter = new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY);
         for (int i = 0; i < toolbar.getChildCount(); i++) {
             final View backButton = toolbar.getChildAt(i);
@@ -563,7 +564,7 @@ public final class ToolbarContentTintHelper {
     private static void setOverflowButtonColor(final Activity activity,
             final PorterDuffColorFilter colorFilter) {
         final String overflowDescription = activity
-                .getString(androidx.appcompat.R.string.abc_action_menu_overflow_description);
+                .getString(R.string.abc_action_menu_overflow_description);
         final ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
         final ViewTreeObserver viewTreeObserver = decorView.getViewTreeObserver();
         viewTreeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@@ -595,9 +596,9 @@ public final class ToolbarContentTintHelper {
     private static void tintShareIconIfPresent(int color, MenuItem item) {
         if (item.getActionView() != null) {
             final View actionView = item.getActionView();
-            final View expandActivitiesButton = actionView.findViewById(com.google.android.material.R.id.expand_activities_button);
+            final View expandActivitiesButton = actionView.findViewById(R.id.expand_activities_button);
             if (expandActivitiesButton != null) {
-                final ImageView image = expandActivitiesButton.findViewById(com.google.android.material.R.id.image);
+                final ImageView image = expandActivitiesButton.findViewById(R.id.image);
                 if (image != null) {
                     final Drawable drawable = image.getDrawable();
                     final Drawable wrapped = DrawableCompat.wrap(drawable);
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/VersionUtils.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/VersionUtils.kt
index 269c2c698..dabc64eca 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/VersionUtils.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/VersionUtils.kt
@@ -1,7 +1,6 @@
 package code.name.monkey.appthemehelper.util
 
 import android.os.Build
-import androidx.annotation.ChecksSdkIntAtLeast
 
 /**
  * @author Hemanth S (h4h13).
@@ -11,7 +10,6 @@ object VersionUtils {
     /**
      * @return true if device is running API >= 23
      */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.M)
     fun hasMarshmallow(): Boolean {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
     }
@@ -19,7 +17,6 @@ object VersionUtils {
     /**
      * @return true if device is running API >= 24
      */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.N)
     fun hasNougat(): Boolean {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
     }
@@ -27,7 +24,6 @@ object VersionUtils {
     /**
      * @return true if device is running API >= 25
      */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.N_MR1)
     fun hasNougatMR(): Boolean {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1
     }
@@ -35,7 +31,6 @@ object VersionUtils {
     /**
      * @return true if device is running API >= 26
      */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.O)
     fun hasOreo(): Boolean {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
     }
@@ -43,7 +38,6 @@ object VersionUtils {
     /**
      * @return true if device is running API >= 27
      */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.O_MR1)
     fun hasOreoMR1(): Boolean {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1
     }
@@ -51,7 +45,6 @@ object VersionUtils {
     /**
      * @return true if device is running API >= 28
      */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.P)
     fun hasP(): Boolean {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
     }
@@ -59,7 +52,6 @@ object VersionUtils {
     /**
      * @return true if device is running API >= 29
      */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.Q)
     @JvmStatic
     fun hasQ(): Boolean {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
@@ -68,7 +60,6 @@ object VersionUtils {
     /**
      * @return true if device is running API >= 30
      */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.R)
     @JvmStatic
     fun hasR(): Boolean {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
@@ -77,18 +68,8 @@ object VersionUtils {
     /**
      * @return true if device is running API >= 31
      */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.S)
     @JvmStatic
     fun hasS(): Boolean {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
     }
-
-    /**
-     * @return true if device is running API >= 33
-     */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.TIRAMISU)
-    @JvmStatic
-    fun hasT(): Boolean {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
-    }
 }
diff --git a/appthemehelper/src/main/res/layout/ate_preference_switch_support.xml b/appthemehelper/src/main/res/layout/ate_preference_switch_support.xml
index 96e84ab06..50d68fcec 100755
--- a/appthemehelper/src/main/res/layout/ate_preference_switch_support.xml
+++ b/appthemehelper/src/main/res/layout/ate_preference_switch_support.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <code.name.monkey.appthemehelper.common.views.ATESwitch xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/checkbox"
-    style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:clickable="false"
diff --git a/build.gradle b/build.gradle
index 33029c4f9..f19b8301a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,12 +2,11 @@
 
 buildscript {
     ext {
-        lifecycle_version = '2.6.1'
-        navigation_version = '2.5.3'
-        mdc_version = '1.9.0-beta01'
+        kotlin_version = '1.6.21'
+        navigation_version = '2.5.0-rc01'
+        mdc_version = '1.6.0'
         preference_version = '1.2.0'
-        appcompat_version = '1.6.1'
-        core_version = '1.10.0-rc01'
+        appcompat_version = '1.4.1'
     }
 
     repositories {
@@ -15,16 +14,11 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
+        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
     }
 }
-plugins {
-    id "com.github.ben-manes.versions" version "0.46.0"
-    id 'com.google.devtools.ksp' version '1.8.10-1.0.9' apply false
-}
-
-tasks.register('clean', Delete) {
+task clean(type: Delete) {
     delete rootProject.buildDir
 }
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/10597.txt b/fastlane/metadata/android/en-US/changelogs/10597.txt
deleted file mode 100644
index d2297558d..000000000
--- a/fastlane/metadata/android/en-US/changelogs/10597.txt
+++ /dev/null
@@ -1 +0,0 @@
-Added lyrics downloading
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/10600.txt b/fastlane/metadata/android/en-US/changelogs/10600.txt
deleted file mode 100644
index cefa1c1ae..000000000
--- a/fastlane/metadata/android/en-US/changelogs/10600.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Synced with Retro Music Player.
-
-See in-app changelog for more information.
-
-NOTE: Metro is a fully offline music player, and intends to remain so. So, any features such as scribbling, fetching lyrics, album arts, etc. will never be available.
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/10603.txt b/fastlane/metadata/android/en-US/changelogs/10603.txt
deleted file mode 100644
index 3fcfb2d52..000000000
--- a/fastlane/metadata/android/en-US/changelogs/10603.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-- Remove startup warnings
-- Target Android 13
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/images/logo.png b/fastlane/metadata/android/en-US/images/logo.png
deleted file mode 100644
index 11a780e31..000000000
Binary files a/fastlane/metadata/android/en-US/images/logo.png and /dev/null differ
diff --git a/gradle.properties b/gradle.properties
index 5a5b46413..0bc9d912a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,21 @@
-android.injected.testOnly=false
-android.useAndroidX=true
-kotlin.code.style=official
-org.gradle.caching=true
-org.gradle.configureondemand=true
-org.gradle.jvmargs=-Xmx4g -XX:+UseParallelGC -Dfile.encoding=UTF-8
+# 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 -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
-
-# https://developer.android.com/studio/build/optimize-your-build#use-non-transitive-r-classes
-android.nonTransitiveRClass=true
-# https://blog.jetbrains.com/kotlin/2022/07/a-new-approach-to-incremental-compilation-in-kotlin/
-kotlin.incremental.useClasspathSnapshot=true
-# https://docs.gradle.org/7.5/userguide/configuration_cache.html
-org.gradle.unsafe.configuration-cache=true
\ No newline at end of file
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa..7a3265ee9 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f398c33c4..6308cc5cc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
+#Thu Dec 03 19:20:35 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
-networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/gradlew b/gradlew
index 65dcd68d6..cccdd3d51 100755
--- a/gradlew
+++ b/gradlew
@@ -1,129 +1,78 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+#!/usr/bin/env sh
 
 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +81,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -140,105 +89,84 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
         fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
 
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
 fi
 
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f1..f9553162f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,20 +1,4 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,23 +9,19 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -55,7 +35,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -65,26 +45,38 @@ echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
-
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg b/screenshots/albums.jpg
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg
rename to screenshots/albums.jpg
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg b/screenshots/artists.jpg
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg
rename to screenshots/artists.jpg
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg b/screenshots/home_black.jpg
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg
rename to screenshots/home_black.jpg
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg b/screenshots/home_dark.jpg
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg
rename to screenshots/home_dark.jpg
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg b/screenshots/home_light.jpg
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg
rename to screenshots/home_light.jpg
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg b/screenshots/normal.jpg
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg
rename to screenshots/normal.jpg
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/8.jpg b/screenshots/settings.jpg
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/8.jpg
rename to screenshots/settings.jpg
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg b/screenshots/songs.jpg
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg
rename to screenshots/songs.jpg
diff --git a/settings.gradle b/settings.gradle
index 08e2f668d..27bc031ae 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,15 +1,3 @@
-// https://docs.gradle.com/enterprise/gradle-plugin/
-plugins {
-    id "com.gradle.enterprise" version "3.10.3"
-}
-
-gradleEnterprise {
-    buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
-    }
-}
-
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
@@ -18,5 +6,4 @@ dependencyResolutionManagement {
         maven { url "https://jitpack.io" }
     }
 }
-
 include ':app', ':appthemehelper'
\ No newline at end of file