diff --git a/app/build.gradle b/app/build.gradle
index cb394ecda..5a300a9cb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,21 +10,20 @@ android {
 
     defaultConfig {
         minSdk 21
-        targetSdk 33
+        targetSdk 32
 
         vectorDrawables.useSupportLibrary = true
 
         applicationId 'io.github.muntashirakon.Music'
-        versionCode 10603
-        versionName '6.1.0'
+        versionCode 10600
+        versionName '6.0.4'
 
         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'
@@ -73,13 +72,13 @@ dependencies {
     implementation "androidx.core:core-ktx:$core_version"
     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.5.0'
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
     ksp "androidx.room:room-compiler:$room_version"
@@ -105,11 +104,11 @@ dependencies {
 
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
 
-    def koin_version = '3.4.0'
+    def koin_version = '3.3.3'
     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.15.0'
     implementation "com.github.bumptech.glide:glide:$glide_version"
     ksp "com.github.bumptech.glide:ksp:$glide_version"
 
@@ -128,5 +127,5 @@ dependencies {
     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.tankery.lib:circularSeekBar:1.4.1'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 14fbaaab7..3ffd1b15f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,11 +11,7 @@
     <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" />
@@ -34,19 +30,16 @@
     <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:targetApi="m">
         <activity
             android:name=".activities.MainActivity"
             android:exported="true"
@@ -302,6 +295,7 @@
 
         <service
             android:name=".service.MusicService"
+            android:enabled="true"
             android:exported="true"
             android:foregroundServiceType="mediaPlayback"
             android:label="@string/app_name">
@@ -328,16 +322,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/retro-changelog.html b/app/src/main/assets/retro-changelog.html
index b6b1c411a..a7ad7d229 100644
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@@ -63,19 +63,6 @@
 
 <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>
diff --git a/app/src/main/java/code/name/monkey/retromusic/Constants.kt b/app/src/main/java/code/name/monkey/retromusic/Constants.kt
index 31032f62b..a95428482 100644
--- a/app/src/main/java/code/name/monkey/retromusic/Constants.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/Constants.kt
@@ -87,7 +87,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"
@@ -111,6 +110,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"
diff --git a/app/src/main/java/code/name/monkey/retromusic/LanguageContextWrapper.kt b/app/src/main/java/code/name/monkey/retromusic/LanguageContextWrapper.kt
new file mode 100644
index 000000000..d6bb6f1c4
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/LanguageContextWrapper.kt
@@ -0,0 +1,25 @@
+package code.name.monkey.retromusic
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.os.LocaleList
+import code.name.monkey.appthemehelper.util.VersionUtils.hasNougat
+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 (hasNougat()) {
+                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/code/name/monkey/retromusic/MainModule.kt
index d88f8a760..b76107087 100644
--- a/app/src/main/java/code/name/monkey/retromusic/MainModule.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/MainModule.kt
@@ -3,6 +3,7 @@ package code.name.monkey.retromusic
 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.PlaylistWithSongs
 import code.name.monkey.retromusic.db.RetroDatabase
 import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.fragments.albums.AlbumDetailsViewModel
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt
index 5cb64cf93..5bbb51d7d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt
@@ -14,6 +14,7 @@
  */
 package code.name.monkey.retromusic.activities
 
+import android.Manifest
 import android.Manifest.permission.BLUETOOTH_CONNECT
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -126,7 +127,10 @@ 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)
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt
index 48b39ed35..da801f60c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt
@@ -11,6 +11,7 @@ import android.view.ViewGroup
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.core.content.PackageManagerCompat
 import androidx.core.content.pm.PackageInfoCompat
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.FragmentActivity
@@ -26,7 +27,7 @@ import code.name.monkey.retromusic.extensions.openUrl
 import code.name.monkey.retromusic.util.PreferenceUtil.lastVersion
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import java.nio.charset.StandardCharsets
-import java.util.*
+import java.util.Locale
 
 class WhatsNewFragment : BottomSheetDialogFragment() {
     private var _binding: FragmentWhatsNewBinding? = null
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
index f9f05c919..07937c7b5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
@@ -18,7 +18,6 @@ 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
@@ -97,7 +96,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 +122,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)
         }
     }
 
@@ -181,13 +190,7 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), IMusicServiceEventLi
     }
 
     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)
-            }
+        return mutableListOf(Manifest.permission.READ_EXTERNAL_STORAGE).apply {
             if (!VersionUtils.hasR()) {
                 add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
             }
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
index 2a81ca9b4..b799790ab 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -117,16 +117,6 @@ 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 by lazy {
         object : BottomSheetCallback() {
 
@@ -143,7 +133,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
             }
 
             override fun onStateChanged(bottomSheet: View, newState: Int) {
-                onBackPressedCallback.isEnabled = newState == STATE_EXPANDED
                 when (newState) {
                     STATE_EXPANDED -> {
                         onPanelExpanded()
@@ -202,8 +191,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
         }
 
         navigationBarColor = surfaceColor()
-
-        onBackPressedDispatcher.addCallback(onBackPressedCallback)
     }
 
     private fun setupBottomSheet() {
@@ -387,6 +374,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
     }
 
     private fun handleBackPress(): Boolean {
+        if (bottomSheetBehavior.peekHeight != 0 && playerFragment.onBackPressed()) return true
         if (panelState == STATE_EXPANDED) {
             collapsePanel()
             return true
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
index 32b025f01..6510dd38f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
@@ -15,27 +15,29 @@
 package code.name.monkey.retromusic.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 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.LanguageContextWrapper
 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.maybeShowAnnoyingToasts
 import code.name.monkey.retromusic.util.theme.getNightMode
 import code.name.monkey.retromusic.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)
@@ -46,6 +48,7 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         if (VersionUtils.hasQ()) {
             window.decorView.isForceDarkAllowed = false
         }
+        maybeShowAnnoyingToasts()
     }
 
     private fun updateTheme() {
@@ -59,14 +62,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         }
     }
 
-    private fun updateLocale() {
-        val localeCode = PreferenceUtil.languageCode
-        if (PreferenceUtil.isLocaleAutoStorageEnabled) {
-            AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(localeCode))
-            PreferenceUtil.isLocaleAutoStorageEnabled = true
-        }
-    }
-
     override fun onWindowFocusChanged(hasFocus: Boolean) {
         super.onWindowFocusChanged(hasFocus)
         if (hasFocus) {
@@ -101,6 +96,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/model/DeviceInfo.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.kt
index 19aff73a2..142d3fed5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.kt
@@ -5,10 +5,10 @@ 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.languageCode
 import code.name.monkey.retromusic.util.PreferenceUtil.nowPlayingScreen
 import java.util.*
 
@@ -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/tageditor/AbsTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
index 3a9ca4e4b..79ecca250 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
@@ -29,7 +29,6 @@ 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
@@ -37,6 +36,7 @@ import androidx.viewbinding.ViewBinding
 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.activities.saf.SAFGuideActivity
 import code.name.monkey.retromusic.extensions.accentColor
 import code.name.monkey.retromusic.extensions.colorButtons
 import code.name.monkey.retromusic.extensions.hideSoftKeyboard
@@ -44,8 +44,8 @@ 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.SAFUtil
 import code.name.monkey.retromusic.util.logD
-import code.name.monkey.retromusic.util.logE
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.GlobalScope
@@ -55,6 +55,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.Collections
 
 abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
     abstract val editorImage: ImageView
@@ -98,8 +99,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 +108,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 +116,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 +125,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 +134,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 +143,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 +152,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 +161,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 +170,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 +179,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 +188,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 +206,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)
@@ -267,7 +251,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()
@@ -368,12 +359,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 +399,39 @@ 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/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
index 2c9013657..1436da954 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
@@ -30,7 +30,11 @@ 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.extensions.appHandleColor
+import code.name.monkey.retromusic.extensions.defaultFooterColor
+import code.name.monkey.retromusic.extensions.isColorLight
+import code.name.monkey.retromusic.extensions.setTint
+import code.name.monkey.retromusic.extensions.showToast
 import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.model.ArtworkInfo
@@ -46,7 +50,7 @@ import com.bumptech.glide.request.target.ImageViewTarget
 import com.bumptech.glide.request.transition.Transition
 import com.google.android.material.shape.MaterialShapeDrawable
 import org.jaudiotagger.tag.FieldKey
-import java.util.*
+import java.util.EnumMap
 
 class AlbumTagEditorActivity : AbsTagEditorActivity<ActivityAlbumTagEditorBinding>() {
 
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
index b9d5f28dd..e4cf7fe89 100644
--- 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
@@ -7,7 +7,6 @@ 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
@@ -21,7 +20,6 @@ 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
@@ -33,9 +31,9 @@ class TagWriter {
     companion object {
 
         suspend fun scan(context: Context, toBeScanned: List<String?>?) {
-            if (toBeScanned.isNullOrEmpty()) {
+            if (toBeScanned == null || toBeScanned.isEmpty()) {
                 Log.i("scan", "scan: Empty")
-                context.showToast("Scan file from folder")
+                context.showToast( "Scan file from folder")
                 return
             }
             MediaScannerConnection.scanFile(
@@ -52,151 +50,150 @@ class TagWriter {
 
         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()
+                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: FieldDataInvalidException) {
-                                    withContext(Dispatchers.Main) {
-                                        context.showToast(R.string.could_not_write_tags_to_file)
+                    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()
                                     }
-                                    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
+                            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()
                         }
-                        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()
                 }
-                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)
-                            }
+                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()
                         }
-                        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()
+                    }
+                    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)
                                 }
                             }
-                        }
-                        if (info.artworkInfo != null) {
-                            if (info.artworkInfo.artwork == null) {
-                                tag.deleteArtworkField()
-                                deletedArtwork = true
-                            } else if (artwork != null) {
-                                tag.deleteArtworkField()
-                                tag.setField(artwork)
-                                wroteArtwork = true
+                            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()
                         }
-                        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)
+                    if (wroteArtwork) {
+                        insertAlbumArt(context, info.artworkInfo!!.albumId, albumArtFile!!.path)
+                    } else if (deletedArtwork) {
+                        deleteAlbumArt(context, info.artworkInfo!!.albumId)
+                    }
+                }.onFailure {
+                    it.printStackTrace()
                 }
                 cacheFiles
             }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
index 5a0a7d3cd..5b371369b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
@@ -27,7 +27,13 @@ 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.NowPlayingScreen.Card
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.Classic
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.Fit
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.Full
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.Gradient
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.Peek
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.Tiny
 import code.name.monkey.retromusic.fragments.base.goToLyrics
 import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
index bf85fe28b..88a0b7a8d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
@@ -26,7 +26,6 @@ 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 com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
 import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
 import kotlinx.coroutines.Dispatchers
@@ -51,7 +50,11 @@ 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 {
@@ -96,22 +99,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(0, itemCount - 1)
     }
 
     override fun onCheckCanDrop(draggingPosition: Int, dropPosition: Int): Boolean {
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/HistoryDao.kt b/app/src/main/java/code/name/monkey/retromusic/db/HistoryDao.kt
index 2ceb309db..c8b2e3165 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/HistoryDao.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/db/HistoryDao.kt
@@ -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/PlayCountDao.kt b/app/src/main/java/code/name/monkey/retromusic/db/PlayCountDao.kt
index 087ae4faf..420b2d434 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/PlayCountDao.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/db/PlayCountDao.kt
@@ -18,19 +18,24 @@ 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/extensions/ActivityExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt
index bf3d9d8cd..043bcbea5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt
@@ -20,6 +20,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.DimenRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.os.BundleCompat
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import com.google.android.material.appbar.MaterialToolbar
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
index 3e6b01b88..803cc07f6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
@@ -311,7 +311,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)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
index 5b8dc638c..483ae4ffc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
@@ -18,7 +18,11 @@ import android.app.ActivityOptions
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
-import android.view.*
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.SubMenu
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
 import androidx.core.view.doOnPreDraw
@@ -42,7 +46,11 @@ 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.extensions.applyColor
+import code.name.monkey.retromusic.extensions.applyOutlineColor
+import code.name.monkey.retromusic.extensions.findActivityNavController
+import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.extensions.surfaceColor
 import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
 import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions
@@ -58,7 +66,11 @@ 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 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.logD
+import code.name.monkey.retromusic.util.logE
 import com.bumptech.glide.Glide
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.transition.MaterialArcMotion
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt
index 7eb541485..c962a0083 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt
@@ -1,12 +1,13 @@
 package code.name.monkey.retromusic.fragments.artists
 
+import android.app.Activity
+import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.os.bundleOf
@@ -34,7 +35,9 @@ 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 code.name.monkey.retromusic.util.CustomArtistImageUtil
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.transition.MaterialContainerTransform
@@ -42,7 +45,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.get
-import java.util.*
+import java.util.Locale
 
 abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_details),
     IAlbumClickListener {
@@ -126,10 +129,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 +145,11 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
     }
 
     private fun loadArtistImage(artist: Artist) {
-        Glide.with(requireContext()).asBitmapPalette().artistImageOptions(artist)
-            .load(RetroGlideExtension.getArtistModel(artist)).dontAnimate()
+        Glide.with(requireContext())
+            .asBitmapPalette()
+            .artistImageOptions(artist)
+            .load(RetroGlideExtension.getArtistModel(artist))
+            .dontAnimate()
             .into(object : SingleColorTarget(binding.image) {
                 override fun onColorReady(color: Int) {
                     setColors(color)
@@ -195,8 +205,13 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
             }
 
             R.id.action_set_artist_image -> {
+                val intent = Intent(Intent.ACTION_GET_CONTENT)
+                intent.type = "image/*"
                 selectImageLauncher.launch(
-                    PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)
+                    Intent.createChooser(
+                        intent,
+                        getString(R.string.pick_from_local_storage)
+                    )
                 )
                 return true
             }
@@ -252,14 +267,14 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
             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_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_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_DURATION ->
+                sortOrder.findItem(R.id.action_sort_order_song_duration).isChecked = true
 
             else -> {
                 throw IllegalArgumentException("invalid $savedSongSortOrder")
@@ -268,11 +283,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)
+                    }
+
                 }
             }
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt
index 03cb17fb3..dbdba0a6a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt
@@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
+import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.databinding.ActivityRestoreBinding
 import code.name.monkey.retromusic.extensions.accentColor
 import code.name.monkey.retromusic.extensions.accentOutlineColor
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
index 6a72de41e..a267a09be 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
@@ -253,6 +253,8 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
 
     abstract fun onHide()
 
+    abstract fun onBackPressed(): Boolean
+
     abstract fun toolbarIconColor(): Int
 
     override fun onServiceConnected() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt
index f57aa8863..f0f869cb7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt
@@ -17,7 +17,11 @@ 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.view.ViewGroup
 import android.webkit.MimeTypeMap
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.widget.PopupMenu
@@ -74,7 +78,8 @@ import java.io.File
 import java.io.FileFilter
 import java.io.IOException
 import java.lang.ref.WeakReference
-import java.util.*
+import java.util.Collections
+import java.util.LinkedList
 
 class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
     IMainActivityFragmentCallbacks, SelectionCallback, ICallbacks,
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
index 3942692ec..1950b4174 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
@@ -15,8 +15,12 @@
 package code.name.monkey.retromusic.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 android.view.ViewGroup
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.os.bundleOf
 import androidx.core.view.doOnLayout
@@ -36,6 +40,7 @@ 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.drawNextToNavbar
 import code.name.monkey.retromusic.extensions.elevatedAccentColor
 import code.name.monkey.retromusic.fragments.ReloadType
 import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
@@ -49,6 +54,7 @@ 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 com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.transition.MaterialFadeThrough
 import com.google.android.material.transition.MaterialSharedAxis
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt
index e5e2159ac..4071e7dbf 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt
@@ -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/blur/BlurPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
index bd0f09c96..48798ff45 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
@@ -106,6 +106,10 @@ class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur),
     override fun onHide() {
     }
 
+    override fun onBackPressed(): Boolean {
+        return false
+    }
+
     override fun toolbarIconColor(): Int {
         return Color.WHITE
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt
index 3553c35ab..d2ce1d9cb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt
@@ -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 {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
index a5ac12b2d..9a4726610 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
@@ -62,6 +62,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 {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt
index fb1144e30..eacc6e43d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt
@@ -195,6 +195,8 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player),
     override fun onHide() {
     }
 
+    override fun onBackPressed(): Boolean = false
+
     override fun toolbarIconColor(): Int =
         colorControlNormal()
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
index ed51772bd..eb0709792 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
@@ -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
@@ -164,13 +163,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 +257,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
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
index 12221274d..7031f60bd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
@@ -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 {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
index 54a9c9f22..72d219bee 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
@@ -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 {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
index 23cd4f63f..12e5343b9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
@@ -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/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt
index f7e34433c..f42b204b7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt
@@ -32,7 +32,11 @@ 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.extensions.applyColor
+import code.name.monkey.retromusic.extensions.getSongInfo
+import code.name.monkey.retromusic.extensions.getTintedDrawable
+import code.name.monkey.retromusic.extensions.hide
+import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.fragments.ReloadType
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt
index 9d418e21d..0470188f5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt
@@ -86,6 +86,10 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) {
     override fun onHide() {
     }
 
+    override fun onBackPressed(): Boolean {
+        return false
+    }
+
     override fun toolbarIconColor(): Int {
         return Color.WHITE
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt
index ca4cebac7..9b601324f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt
@@ -21,7 +21,6 @@ import android.graphics.PorterDuff
 import android.graphics.drawable.AnimatedVectorDrawable
 import android.os.Bundle
 import android.view.View
-import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.PopupMenu
 import androidx.appcompat.widget.Toolbar
@@ -96,19 +95,16 @@ 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,
                 -> {
                     mainActivity.getBottomSheetBehavior().isDraggable = false
                 }
-
                 STATE_COLLAPSED -> {
                     resetToCurrentPosition()
                     mainActivity.getBottomSheetBehavior().isDraggable = true
                 }
-
                 else -> {
                     mainActivity.getBottomSheetBehavior().isDraggable = true
                 }
@@ -116,17 +112,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)
@@ -180,10 +165,6 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
             insets
         }
         binding.playbackControlsFragment.root.drawAboveSystemBars()
-        requireActivity().onBackPressedDispatcher.addCallback(
-            viewLifecycleOwner,
-            onBackPressedCallback
-        )
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -221,6 +202,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
     }
@@ -427,7 +418,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 +438,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 +445,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(
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt
index c374010dc..f40a4433b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt
@@ -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
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt
index ee88983c7..cb00c8de0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt
@@ -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()
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt
index f90aadb81..850316dc8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt
@@ -45,6 +45,11 @@ class MD3PlayerFragment : AbsPlayerFragment(R.layout.fragment_md3_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/normal/PlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
index 45bbac39d..381ded676 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
@@ -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()
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt
index 3fe563dc8..e27ff6961 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt
@@ -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/PlainPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt
index a2cc47387..4fc01cb6d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt
@@ -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/SimplePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt
index fd7f41e1b..63aac7083 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt
@@ -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) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
index 72489846e..25b603e5b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
@@ -63,6 +63,10 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player),
 
     override fun onHide() {}
 
+    override fun onBackPressed(): Boolean {
+        return false
+    }
+
     override fun toolbarIconColor(): Int {
         return toolbarColor
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
index 352bf453b..a4e2152d3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
@@ -34,6 +34,7 @@ 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
@@ -125,11 +126,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)
+            binding.recyclerView.adapter = wrappedAdapter
             ThemedFastScroller.create(this)
         }
         playlistSongAdapter.registerAdapterDataObserver(object :
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt
index ce2f452f5..23599d384 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt
@@ -18,6 +18,7 @@ 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.model.Playlist
 import code.name.monkey.retromusic.repository.RealRepository
 
 class PlaylistDetailsViewModel(
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/queue/PlayingQueueFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/queue/PlayingQueueFragment.kt
index 0526ade15..0747ccd86 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/queue/PlayingQueueFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/queue/PlayingQueueFragment.kt
@@ -79,6 +79,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 +93,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() {
@@ -183,7 +183,6 @@ class PlayingQueueFragment : AbsMusicServiceFragment(R.layout.fragment_playing_q
 
     private fun setupToolbar() {
         binding.appBarLayout.toolbar.subtitle = getUpNextAndQueueTime()
-        binding.appBarLayout.toolbar.isTitleCentered = false
         binding.clearQueue.backgroundTintList = ColorStateList.valueOf(accentColor())
         ColorStateList.valueOf(
             MaterialValueHelper.getPrimaryTextColor(
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt
index d493085c0..17915712a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt
@@ -49,16 +49,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), BLUETOOTH_PERMISSION_REQUEST)
                     }
                 }
                 return@setOnPreferenceChangeListener true
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt
index fcc625105..2d43fd948 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt
@@ -16,8 +16,6 @@ package code.name.monkey.retromusic.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
@@ -25,7 +23,6 @@ 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 org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
@@ -45,8 +42,6 @@ class OtherSettingsFragment : AbsSettingsFragment() {
     }
 
     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/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt
index 42dee53b9..24218f6fb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt
@@ -17,27 +17,22 @@ package code.name.monkey.retromusic.fragments.settings
 import android.os.Bundle
 import android.view.View
 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 code.name.monkey.retromusic.APPBAR_MODE
+import code.name.monkey.retromusic.HOME_ALBUM_GRID_STYLE
+import code.name.monkey.retromusic.HOME_ARTIST_GRID_STYLE
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.TAB_TEXT_MODE
 
 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() {}
 
     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)
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
index cfc758307..8c10b033d 100644
--- 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
@@ -24,6 +24,7 @@ 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.applyToolbar
 import code.name.monkey.retromusic.extensions.findNavController
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.color.ColorCallback
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
index 87ac19699..aea0e6858 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
@@ -134,7 +134,5 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
 
     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/glide/RetroMusicGlideModule.kt b/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt
index be5e36056..8f6630893 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt
@@ -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/code/name/monkey/retromusic/glide/SingleColorTarget.kt
index 6323411f8..c60445fb5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt
@@ -17,6 +17,7 @@ package code.name.monkey.retromusic.glide
 import android.graphics.drawable.Drawable
 import android.widget.ImageView
 import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteTarget
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.util.ColorUtil
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
index abad14fbb..7d5f9d0fa 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
@@ -73,15 +73,18 @@ 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 deleteSongs(songs: List<Song>)
     suspend fun searchArtists(query: String): List<Artist>
@@ -230,8 +233,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 +249,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,8 +265,8 @@ 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()
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt
index a38fc39f5..6afaf83b4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt
@@ -30,13 +30,16 @@ 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 deleteSongs(songs: List<Song>)
     suspend fun isSongFavorite(context: Context, songId: Long): Boolean
@@ -130,8 +133,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()
@@ -146,8 +155,11 @@ class RealRoomRepository(
             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,8 +172,8 @@ 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()
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
index 69ec73746..3548a8c27 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/AudioFader.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/AudioFader.kt
@@ -2,27 +2,21 @@ 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) {
+            val duration = PreferenceUtil.crossFadeDuration * 1000
+            if (duration == 0) {
                 return null
             }
             return ValueAnimator.ofFloat(0f, 1f).apply {
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt b/app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt
index 06590c269..dea5c7e6f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt
@@ -34,7 +34,6 @@ 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 crossFadeDuration = PreferenceUtil.crossFadeDuration
@@ -93,10 +92,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 {
+        endFade()
         getNextPlayer()?.stop()
         return try {
             getCurrentPlayer()?.seekTo(whereto)
@@ -146,12 +143,7 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
         }
     }
 
-    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?) {}
 
     override fun setAudioSessionId(sessionId: Int): Boolean {
         return try {
@@ -236,7 +228,7 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
 
     private fun crossFade(fadeInMp: MediaPlayer, fadeOutMp: MediaPlayer) {
         isCrossFading = true
-        crossFadeAnimator = createFadeAnimator(context, fadeInMp, fadeOutMp) {
+        crossFadeAnimator = createFadeAnimator(fadeInMp, fadeOutMp) {
             crossFadeAnimator = null
             durationListener.start()
             isCrossFading = false
@@ -289,7 +281,7 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
         fun start() {
             job?.cancel()
             job = launch {
-                while (isActive) {
+                while (true) {
                     delay(250)
                     onDurationUpdated(position(), duration())
                 }
@@ -306,21 +298,10 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
             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
+                if (nextSong != 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
-                    }
                 }
             }
         }
@@ -354,7 +335,7 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
     }
 }
 
-internal fun crossFadeScope(): CoroutineScope = CoroutineScope(Job() + Dispatchers.Default)
+internal fun crossFadeScope(): CoroutineScope = CoroutineScope(Job() + Dispatchers.Main)
 
 fun MediaPlayer.setPlaybackSpeedPitch(speed: Float, pitch: Float) {
     if (hasMarshmallow()) {
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
index a29122a68..6ad5c6bbc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.kt
@@ -200,7 +200,7 @@ class MultiPlayer(context: Context) : LocalPlayback(context) {
      * @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 {
+    override fun seek(whereto: Int): Int {
         return try {
             mCurrentMediaPlayer.seekTo(whereto)
             whereto
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
index f33d8341f..3289192af 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
@@ -38,10 +38,10 @@ import android.support.v4.media.session.PlaybackStateCompat
 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.core.os.ParcelCompat
 import androidx.media.MediaBrowserServiceCompat
 import androidx.preference.PreferenceManager
 import code.name.monkey.appthemehelper.util.VersionUtils
@@ -52,10 +52,12 @@ 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.extra
 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.getDefaultTransition
 import code.name.monkey.retromusic.glide.RetroGlideExtension.getSongModel
 import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.helper.ShuffleHelper.makeShuffleList
@@ -289,8 +291,8 @@ class MusicService : MediaBrowserServiceCompat(),
         setupMediaSession()
 
         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(widgetIntentReceiver, IntentFilter(APP_WIDGET_UPDATE))
+        registerReceiver(updateFavoriteReceiver, IntentFilter(FAVORITE_STATE_CHANGED))
         registerReceiver(lockScreenReceiver, IntentFilter(Intent.ACTION_SCREEN_ON))
         sessionToken = mediaSession?.sessionToken
         notificationManager = getSystemService()
@@ -706,7 +708,7 @@ class MusicService : MediaBrowserServiceCompat(),
             || repeatMode == REPEAT_MODE_NONE && isLastTrack
         ) {
             notifyChange(PLAY_STATE_CHANGED)
-            seek(0, false)
+            seek(0)
             if (pendingQuit) {
                 pendingQuit = false
                 quit()
@@ -726,7 +728,7 @@ class MusicService : MediaBrowserServiceCompat(),
         if (pendingQuit || repeatMode == REPEAT_MODE_NONE && isLastTrack) {
             playbackManager.setNextDataSource(null)
             pause(false)
-            seek(0, false)
+            seek(0)
             if (pendingQuit) {
                 pendingQuit = false
                 quit()
@@ -973,9 +975,9 @@ class MusicService : MediaBrowserServiceCompat(),
     }
 
     @Synchronized
-    fun seek(millis: Int, force: Boolean = true): Int {
+    fun seek(millis: Int): Int {
         return try {
-            val newPosition = playbackManager.seek(millis, force)
+            val newPosition = playbackManager.seek(millis)
             throttledSeekHandler?.notifySeek()
             newPosition
         } catch (e: Exception) {
@@ -1048,9 +1050,7 @@ class MusicService : MediaBrowserServiceCompat(),
             .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)
                 .asBitmap()
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
index 59137fa64..f2785510d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt
@@ -78,7 +78,7 @@ class PlaybackManager(val context: Context) {
         }
     }
 
-    fun seek(millis: Int, force: Boolean): Int = playback!!.seek(millis, force)
+    fun seek(millis: Int): Int = playback!!.seek(millis)
 
     fun setDataSource(
         song: Song,
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.kt b/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.kt
index fdcae6b55..3795e7634 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.kt
@@ -45,7 +45,7 @@ interface Playback {
 
     fun position(): Int
 
-    fun seek(whereto: Int, force: Boolean): Int
+    fun seek(whereto: Int): Int
 
     fun setVolume(vol: Float): Boolean
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt
index 3c0cb02d7..4cc73fae8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt
@@ -31,7 +31,7 @@ import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.IOException
-import java.util.*
+import java.util.Locale
 
 
 class CustomArtistImageUtil private constructor(context: Context) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PlagiarismUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/PlagiarismUtil.kt
new file mode 100644
index 000000000..230f250a0
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PlagiarismUtil.kt
@@ -0,0 +1,36 @@
+package code.name.monkey.retromusic.util
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.util.Log
+import android.widget.Toast
+import androidx.core.net.toUri
+import androidx.fragment.app.Fragment
+import code.name.monkey.retromusic.BuildConfig
+import code.name.monkey.retromusic.extensions.showToast
+
+fun Activity.maybeShowAnnoyingToasts() {
+    if (BuildConfig.APPLICATION_ID != "code.name.monkey.retromusic" &&
+        BuildConfig.APPLICATION_ID != "code.name.monkey.retromusic.debug"&&
+        BuildConfig.APPLICATION_ID != "code.name.monkey.retromusic.normal"
+    ) {
+        if (BuildConfig.DEBUG) {
+            // Log these things to console, if the plagiarizer even cares to check it
+            Log.d("Retro Music", "What are you doing with your life?")
+            Log.d("Retro Music", "Stop copying apps and make use of your brain.")
+            Log.d("Retro Music", "Stop doing this or you will end up straight to hell.")
+            Log.d("Retro Music", "To the boiler room of hell. All the way down.")
+        } else {
+            showToast("Warning! This is a copy of Retro Music Player", Toast.LENGTH_LONG)
+            showToast("Instead of using this copy by a dumb person who didn't even bother to remove this code.", Toast.LENGTH_LONG)
+            showToast("Support us by downloading the original version from Play Store.", Toast.LENGTH_LONG)
+            val packageName = "code.name.monkey.retromusic"
+            try {
+                startActivity(Intent(Intent.ACTION_VIEW, "market://details?id=$packageName".toUri()))
+            } catch (e: ActivityNotFoundException) {
+                startActivity(Intent(Intent.ACTION_VIEW, "https://play.google.com/store/apps/details?id=$packageName".toUri()))
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
index 13f4f3948..bd05b7044 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
@@ -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(
@@ -269,6 +256,11 @@ object PreferenceUtil {
             ALBUM_ART_ON_LOCK_SCREEN, true
         )
 
+    val isAudioDucking
+        get() = sharedPreferences.getBoolean(
+            AUDIO_DUCKING, true
+        )
+
     val isBluetoothSpeaker
         get() = sharedPreferences.getBoolean(
             BLUETOOTH_PLAYBACK, false
@@ -277,7 +269,7 @@ object PreferenceUtil {
     val isBlurredAlbumArt
         get() = sharedPreferences.getBoolean(
             BLURRED_ALBUM_ART, false
-        ) && !VersionUtils.hasR()
+        )
 
     val blurAmount get() = sharedPreferences.getInt(NEW_BLUR_AMOUNT, 25)
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt b/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt
index 043915984..f62c5c1d9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt
@@ -4,6 +4,7 @@ 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
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/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/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml
index c18e49710..a9e0cca1e 100644
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@@ -13,16 +13,17 @@
   -->
 <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
         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" />
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/container"
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/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 7c1b8e54a..d252fb722 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,6 +1,7 @@
 <?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">
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_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/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/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 18995c82e..1cb7fd36b 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -1,18 +1,18 @@
 <?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 +20,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 +30,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 +86,23 @@
     <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="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>
@@ -116,7 +116,7 @@
     <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_success">Bug report successful</string>
     <string name="bug_report_summary">حصل خطأ غير متوقع. نأسف لذالك, اذا تكرر معك الخطأ \"قم بمسح بيانات التطبيق\"او ارسل ايميل</string>
     <string name="bug_report_use_account">ارسال بأستخدام حساب چيتهب</string>
     <string name="buy_now">اشتري الآن</string>
@@ -129,18 +129,18 @@
     <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="compact">Compact</string>
     <string name="composer">المؤلف</string>
     <string name="copied_device_info_to_clipboard">تم نسخ معلومات الجهاز للحافظة.</string>
     <string name="could_not_create_playlist">تعذّر\u2019t إنشاء قائمة.</string>
@@ -152,9 +152,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 +170,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 +184,15 @@
     <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="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">الملف موجود مسبقا</string>
+    <string name="file_already_exists">File already exists</string>
     <string name="finish_last_song">إنهاء الأغنية الأخيرة</string>
     <string name="fit">تناسق</string>
     <string name="flat">مسطح</string>
@@ -208,7 +208,7 @@
     <string name="genres">فئات</string>
     <string name="git_hub_summary">اجلب المشروع على GitHub</string>
     <string name="gradient">متدرج</string>
-    <string name="grant_access">السماح بالوصول</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>
@@ -221,8 +221,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 +239,14 @@
     <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="lets_go">Let\'s go</string>
     <string name="library_categories">فئات المكتبة الموسيقية</string>
     <string name="licenses">تراخيص</string>
     <string name="light_theme_name">أبيض صافي</string>
@@ -259,23 +259,23 @@
     <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="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>
-    <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 +299,13 @@
     <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_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">تم رفض إذن الوصول إلى وحدة التخزين الخارجي.</string>
     <string name="permission_summary">يحتاج التطبيق إلى إذن للوصول إلى وحدة تخزين جهازك لتشغيل الموسيقى</string>
     <string name="permission_title">الوصول إلى التخزين</string>
@@ -316,13 +316,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 +345,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 +359,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 +368,38 @@
     <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_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">عند التمكين، لن تظهر الأغاني المشغلة حديثا في المحفوظات</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_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">سوف يتم تعطيل وضع الخلط عند التشغيل من قائمة جديدة</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_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">Header style</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 +412,27 @@
     <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_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">إيقاف السجل المؤقت</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_swipe_to_dismiss">Dismiss with swipe down</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="pro">الكامل</string>
-    <string name="pro_summary">السمة السوداء, تشغيل الآن السمات, تأثير التكدس وأكثر..</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>
@@ -443,19 +443,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 +509,7 @@
     <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_default">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 +532,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 +548,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>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 78694db93..5ec2d575c 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -421,7 +421,7 @@
     <string name="pref_title_wallpaper_accent">Akzentfarbe aus Hintergrundbild</string>
     <string name="pref_title_whitelist">Einbezogene Musik</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Dunkles Design, Stil des Wiedergabe-Bildschirms, Karussell-Effekt usw.</string>
+    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
     <string name="profile">Profil</string>
     <string name="purchase">Kaufen</string>
     <string name="queue">Warteschlange</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 775927ad8..18509fdb0 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -55,7 +55,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 +91,8 @@
     <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="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 +106,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_success">Bug report successful</string>
     <string name="bug_report_summary">Προέκυψε ένα μη αναμενόμενο σφάλμα. Λυπούμαστε που βρήκατε αυτό το σφάλμα, εάν εξακολουθεί να παρουσιάζεται  \"\"Διαγραφή δεδομένων εφαρμογής\" ή στείλτε ένα Email </string>
     <string name="bug_report_use_account">Αποστολή χρησιμοποιώντας λογαριασμό GitHub</string>
     <string name="buy_now">Αγορά τώρα</string>
@@ -119,18 +119,18 @@
     <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="compact">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 +143,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 +173,15 @@
     <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="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">Το αρχείο υπάρχει ήδη</string>
+    <string name="file_already_exists">File already exists</string>
     <string name="finish_last_song">Τελειώσε το τελευταίο κομμάτι</string>
     <string name="fit">Προσαρμογή</string>
     <string name="flat">Επίπεδο</string>
@@ -197,7 +197,7 @@
     <string name="genres">Είδη</string>
     <string name="git_hub_summary">Fork το έργο στο GitHub</string>
     <string name="gradient">Διαβάθμιση</string>
-    <string name="grant_access">Παραχώρηση πρόσβασης</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>
@@ -210,8 +210,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 +228,14 @@
     <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="lets_go">Let\'s go</string>
     <string name="library_categories">Κατηγορίες βιβλιοθήκης</string>
     <string name="licenses">Άδειες</string>
     <string name="light_theme_name">Ξεκάθαρα Λευκό</string>
@@ -248,12 +248,12 @@
     <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="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>
@@ -294,7 +294,7 @@
     <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_bluetooth_denied">Nearby devices permission denied.</string>
     <string name="permission_external_storage_denied">Η άδεια για προσπέλαση του external storage δεν παραχωρήθηκε.</string>
     <string name="permission_summary">Η εφαρμογή χρειάζεται άδεια για πρόσβαση στον αποθηκευτικό χώρο της συσκευής σας για την αναπαραγωγή μουσικής</string>
     <string name="permission_title">Πρόσβαση Χώρου Αποθήκευσης</string>
@@ -305,13 +305,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,14 +357,14 @@
     <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_manage_audio_focus">Always play audio in background regardless of anything else being played</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_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">Η λειτουργία ανακατέματος θα απενεργοποιείται όταν αναπαράγεται μια νέα λίστα τραγουδιών</string>
@@ -376,7 +376,7 @@
     <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">Header style</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 +403,15 @@
     <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_manage_audio_focus">Always play</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_swipe_to_dismiss">Dismiss with swipe down</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>
@@ -421,7 +421,7 @@
     <string name="pref_title_wallpaper_accent">Απόχρωση ταπετσαρίας</string>
     <string name="pref_title_whitelist">Λίστα επιτρεπόμενων κομματιών</string>
     <string name="pro">Pro</string>
-    <string name="pro_summary">Μαύρο θέμα, Θέματα στο Τώρα παίζει, εφέ Καρουσέλ και πολλά άλλα..</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>
@@ -432,7 +432,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 +498,7 @@
     <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_default">Default</string>
     <string name="sort_order_num_songs">Αριθμός τραγουδιών</string>
     <string name="sort_order_num_songs_desc">Αριθμός τραγουδιών φθίνουσα</string>
     <string name="sort_order_year">Έτος</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 239ae40a4..289f26f13 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -3,9 +3,9 @@
     <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>
@@ -33,7 +33,7 @@
     <string name="action_play_pause">Reproducir/Pausar</string>
     <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_playing_queue">Remover de la cola de reproducción</string>
     <string name="action_remove_from_playlist">Remover 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>
@@ -82,23 +82,23 @@
     <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_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="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="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_unknown">Ha ocurrido un error inesperado. Por favor, póngase en contacto con soporte técnico.</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>
@@ -112,7 +112,7 @@
     <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_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>
@@ -132,11 +132,11 @@
     <string name="colors">Colores</string>
     <string name="compact">Compacto</string>
     <string name="composer">Compositor</string>
-    <string name="copied_device_info_to_clipboard">Información de dispositivo copiada al portapapeles.</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 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_scan_files">No se pudieron escanear %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 +144,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 +160,29 @@
     <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_load_failed">Carga fallada</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>
@@ -216,12 +216,12 @@
     <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>
@@ -248,7 +248,7 @@
     <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_backup_create_success">Copia de seguridad creada con éxito.</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>
@@ -257,10 +257,10 @@
     <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>
@@ -418,7 +418,7 @@
     <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="pro">Pro</string>
     <string name="pro_summary">Tema Negro, Temas \"Ahora reproduciendo\", Efecto Carrusel y más...</string>
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index c5b5af75a..83b654849 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -295,26 +295,26 @@
     <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_external_storage_denied">Permiso para acceder al almacenamiento externo denegado.</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">Personalizar</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="pick_from_local_storage">Elegir del almacenamiento local</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="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">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
+    <string name="playback_settings">Ajustes 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">Playing notification</string>
+    <string name="playing_notification_name">Notificación de reproducción</string>
     <string name="playlist_created_sucessfully">%s creada exitosamente</string>
-    <string name="playlist_is_empty">Playlist is empty</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">Playlists</string>
+    <string name="playlists">Listas de reproducción</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>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index b4baef208..01b875f9c 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>
@@ -31,33 +31,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">Added %1$d titles to the playing queue.</string>
     <string name="album">آلبوم</string>
     <plurals name="albumSongs">
         <item quantity="one">آهنگ ها</item>
@@ -67,48 +67,48 @@
     <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="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>
     <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_success">Bug report successful</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 +119,18 @@
     <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="compact">Compact</string>
     <string name="composer">آهنگساز</string>
     <string name="copied_device_info_to_clipboard">اطلاعات دستگاه در کلیپ بورد کپی شد.</string>
     <string name="could_not_create_playlist">نمیتوان پلی لیست ساخت.</string>
@@ -143,7 +143,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 +158,46 @@
     <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="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">فایل از قبل موجود میباشد</string>
-    <string name="finish_last_song">پایان آخرین آهنگ</string>
+    <string name="favorites">موارد مورد علاقه</string>
+    <string name="file_already_exists">File already exists</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="grant_access">Grant access</string>
     <string name="grid_size_1">۱</string>
     <string name="grid_size_2">۲</string>
     <string name="grid_size_3">۳</string>
@@ -206,57 +206,57 @@
     <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="lets_go">Let\'s 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="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="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>
+    <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 +270,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 +288,45 @@
     <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_bluetooth_denied">Nearby devices permission 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">صفحه پخش اهنگ و رابط کاربری برنامه را شخصی سازی کنید</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 +336,95 @@
     <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_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">هدایت شود به اخرین 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_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">حالت پخش مخلوط اهنگ ها زمانی که لیست جدید اهنگ را پلی می‌کنید، خاموش می‌شود</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_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">Header style</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_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">توقف تاریخچه</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_swipe_to_dismiss">Dismiss with swipe down</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="pro">حرفه‌ای</string>
-    <string name="pro_summary">تم سیاه، تم های در حال پخش، جلوه چرخ فلک و موارد دیگر..</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>
+    <string name="queue">صف پخش</string>
     <string name="rate_app">به برنامه امتیاز دهید</string>
     <string name="rate_on_google_play_summary">این برنامه را دوست دارید؟ در فروشگاه گوگل پلی به ما اطلاع دهید که چگونه می‌توانیم آن را بهتر کنیم</string>
     <string name="recent_albums">آلبوم های اخیر</string>
@@ -432,7 +432,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 +445,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 +483,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 +496,9 @@
     <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_default">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 +512,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 +529,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>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index ec2519436..61d18e3b0 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -5,13 +5,13 @@
     <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>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index bf89c2c75..c3c3e0ac3 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -177,7 +177,7 @@
     <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="error_share_file">Couldn\'t share file</string>
     <string name="expanded">Kibővített</string>
     <string name="faq">GYIK</string>
     <string name="favorites">Kedvencek</string>
@@ -421,7 +421,7 @@
     <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="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">Black theme, Now playing themes, Carousel effect and more..</string>
     <string name="profile">Profil</string>
     <string name="purchase">Vásárlás</string>
     <string name="queue">Sorban áll</string>
@@ -498,7 +498,7 @@
     <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_default">Default</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>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 91fd054ad..885a1fa30 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -3,12 +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_add_to_playlist">プレイリストに追加…</string>
     <string name="action_cancel">キャンセル</string>
     <string name="action_cast">キャスト</string>
     <string name="action_clear_playing_queue">再生キューをクリア</string>
@@ -60,14 +60,14 @@
     <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,7 +86,7 @@
     <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>
@@ -140,7 +140,7 @@
     <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="dark_theme_name">ダーク</string>
@@ -181,12 +181,12 @@
     <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>
@@ -232,7 +232,7 @@
     <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>
@@ -243,7 +243,7 @@
     <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>
@@ -254,9 +254,9 @@
     <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>
@@ -361,7 +361,7 @@
     <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_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>
@@ -378,7 +378,7 @@
     <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">Bluetooth接続時に再生</string>
     <string name="pref_title_blurred_album_art">アルバムジャケットにぼかしを適用する</string>
@@ -400,7 +400,7 @@
     <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_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>
diff --git a/app/src/main/res/values-kmr-rTR/strings.xml b/app/src/main/res/values-kmr-rTR/strings.xml
index 20ac63491..77ba12bba 100644
--- a/app/src/main/res/values-kmr-rTR/strings.xml
+++ b/app/src/main/res/values-kmr-rTR/strings.xml
@@ -44,13 +44,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 +72,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>
@@ -184,7 +184,7 @@ https://play.google.com/store/apps/details?id=%s</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>
@@ -207,7 +207,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>
@@ -258,7 +258,7 @@ https://play.google.com/store/apps/details?id=%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 +281,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>
@@ -321,7 +321,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>
@@ -364,12 +364,12 @@ têne guhertin</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>
@@ -418,7 +418,7 @@ têne guhertin</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>
@@ -458,7 +458,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 +474,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 +484,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>
@@ -525,8 +525,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>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 428eec4b5..4653affb7 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -1,11 +1,11 @@
 <?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>
diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml
index 341d7a886..4b3227ac7 100644
--- a/app/src/main/res/values-lv-rLV/strings.xml
+++ b/app/src/main/res/values-lv-rLV/strings.xml
@@ -148,21 +148,21 @@
     <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_playlist_x"><![CDATA[Delete the playlist <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_playlists"><![CDATA[Delete <b>%1$d</b> playlists?]]></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="deleting_songs">Deleting Songs</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="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">Ziedot</string>
@@ -179,7 +179,7 @@
     <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="error_share_file">Couldn\'t share file</string>
     <string name="expanded">Expanded</string>
     <string name="faq">BUJ</string>
     <string name="favorites">Izlase</string>
@@ -198,8 +198,8 @@
     <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="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>
@@ -209,7 +209,7 @@
     <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="help_summary">Need more help?</string>
     <string name="hinge">Hinge</string>
     <string name="history">Vēsture</string>
     <string name="history_cleared">Vēsture notīrīta</string>
@@ -231,12 +231,12 @@
     <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_more_from">More from %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="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">Licences</string>
@@ -245,15 +245,15 @@
     <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="lyrics">Lyrics</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="md_storage_perm_error">Permission error</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_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">Vārds</string>
@@ -263,14 +263,14 @@
     <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_albums">You have no albums</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_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">Dziesmas vārdi nav atrasti</string>
-    <string name="no_playing_queue">Šobrīd nekas netiek atskaņots</string>
+    <string name="no_lyrics_found">No lyrics found</string>
+    <string name="no_playing_queue">No songs playing</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>
@@ -284,7 +284,7 @@
     <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_queue">Now playing queue</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>
@@ -293,7 +293,7 @@
     <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_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>
@@ -307,29 +307,29 @@
     <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="playList_already_exits">Playlist already exists</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="playlist_created_sucessfully">%s created successfully</string>
+    <string name="playlist_is_empty">Playlist is empty</string>
+    <string name="playlist_name_empty">Playlist name</string>
+    <string name="playlists">Playlists</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_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">Pevienot melnajam sarakstam</string>
+    <string name="pref_header_blacklist">Blacklist</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_images">Images</string>
     <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">Bloķēšanas ekrāns</string>
+    <string name="pref_header_lockscreen">Lockscreen</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>
@@ -350,29 +350,29 @@
     <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_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">"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_gapless_playback">"Can cause playback issues on some devices."</string>
+    <string name="pref_summary_home_banner">Show or hide the home banner</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_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">Rādīt jaunās mūzikas miksli sākuma ekrānā</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">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_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">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_summary_wallpaper_accent">Extract accent color from wallpaper</string>
+    <string name="pref_summary_whitelist">Only show music from /Music Folder</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>
@@ -382,20 +382,20 @@
     <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_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>
     <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_colored_notification">Colored notification</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_desaturated_color">Desaturated color</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_controls">Extra controls</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_gapless_playback">Gapless playback</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>
@@ -404,11 +404,11 @@
     <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_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">Atvērtā pirmkoda licences</string>
-    <string name="pref_title_pause_history">Apturēt vēsturi</string>
+    <string name="pref_title_open_source_licences">Open source licences</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>
@@ -426,35 +426,35 @@
     <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="queue">Playing Queue</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_action">Remove</string>
+    <string name="remove_cover">Remove cover</string>
+    <string name="remove_from_blacklist">Remove from blacklist</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="remove_song_from_playlist_title">Remove song from playlist</string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Remove the song <b>%1$s</b> from the playlist?]]></string>
+    <string name="remove_songs_from_playlist_title">Remove songs from playlist</string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[Remove <b>%1$d</b> songs from the playlist?]]></string>
+    <string name="rename_playlist_title">Rename playlist</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">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="restore_message">Do you want to restore backup?</string>
+    <string name="restored_previous_purchase_please_restart">Restored previous purchase. Please restart the app to make use of all features.</string>
+    <string name="restored_previous_purchases">Restored previous purchases.</string>
+    <string name="restoring_purchase">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">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>
+    <string name="saf_delete_failed">File delete failed: %s</string>
     <!-- SAF -->
     <string name="saf_error_uri">Can\'t get SAF URI</string>
     <string name="saf_guide_slide1_description">Open navigation drawer</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 070ec270a..d81deb6fe 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -20,7 +20,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 +55,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 +78,26 @@
     <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="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
+    <string name="bluetooth_title">Nearby devices</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,27 +106,27 @@
     <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_success">Bug report successful</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>
@@ -135,15 +135,15 @@
     <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 +160,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 +168,36 @@
     <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="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">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="file_already_exists">File already exists</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="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>
@@ -208,15 +208,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,7 +228,7 @@
     <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>
@@ -236,7 +236,7 @@
     <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>
@@ -249,11 +249,11 @@
     <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_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[Hallo! <br>Welkom bij %s]]></string>
+    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %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 +264,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>
@@ -305,36 +305,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,7 +350,7 @@
     <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>
@@ -359,21 +359,21 @@
     <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_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>
@@ -383,12 +383,12 @@
     <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,10 +403,10 @@
     <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_manage_audio_focus">Always play</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>
@@ -418,7 +418,7 @@
     <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="pro">Pro</string>
     <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
@@ -432,13 +432,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 +454,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 +487,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 +496,18 @@
     <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_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">Aantal nummers</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 +520,42 @@
     <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>
 </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..8a938fb25 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -106,7 +106,7 @@
     <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_success">Bug 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>
@@ -177,7 +177,7 @@
     <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="error_share_file">Couldn\'t share file</string>
     <string name="expanded">Expandido</string>
     <string name="faq">Perguntas frequentes</string>
     <string name="favorites">Favoritos</string>
@@ -421,7 +421,7 @@
     <string name="pref_title_wallpaper_accent">Cor de destaque do papel de parede</string>
     <string name="pref_title_whitelist">Lista branca</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">Black theme, Now playing themes, Carousel effect and more..</string>
     <string name="profile">Perfil</string>
     <string name="purchase">Comprar</string>
     <string name="queue">Fila</string>
@@ -498,7 +498,7 @@
     <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_default">Default</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>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index e04b164dd..02d4b026e 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -35,11 +35,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,7 +48,7 @@
     <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="adaptive">Adaptiv</string>
@@ -94,22 +94,22 @@
     <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="bluetooth_title">Nearby devices</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="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_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">Trimiteți utilizând contul GitHub</string>
     <string name="buy_now">Cumpărați acum</string>
     <string name="cancel_current_timer">Anulează cronometrul curent</string>
@@ -197,7 +197,7 @@
     <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>
@@ -210,20 +210,20 @@
     <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="hinge">Hinge</string>
     <string name="history">Istoric</string>
     <string name="history_cleared">Istoric șters</string>
     <string name="history_undo_button">Anulare</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="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="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
     <string name="keyboard">Tastatură</string>
     <string name="label_bit_rate">Rată de biți</string>
     <string name="label_file_format">Format</string>
@@ -238,7 +238,7 @@
     <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="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>
@@ -286,7 +286,7 @@
     <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_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="others">Altele</string>
@@ -294,21 +294,21 @@
     <string name="password">Parolă</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_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">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="playList_already_exits">Playlist already exists</string>
+    <string name="playback_pitch">Pitch</string>
     <string name="playback_settings">Setări de redare</string>
     <string name="playback_speed">Viteză de redare</string>
     <string name="playing_notification_description">Notificarea de redare oferă acțiuni de redare / pauză etc.</string>
@@ -317,10 +317,10 @@
     <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_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">Avansat</string>
     <string name="pref_header_album">Stil album</string>
     <string name="pref_header_audio">Audio</string>
@@ -331,68 +331,68 @@
     <string name="pref_header_library">Bibliotecă</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_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">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_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_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">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_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_manage_audio_focus">Always play audio in background regardless of anything else being played</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_swipe_to_dismiss">Swipe down to dismiss mini player</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_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">Header style</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_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">Comenzi suplimentare</string>
     <string name="pref_title_extra_song_info">Informații melodie</string>
     <string name="pref_title_gapless_playback">Redare \"Gapless\"</string>
@@ -408,9 +408,9 @@
     <string name="pref_title_manage_audio_focus">Redare întotdeauna</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_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">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>
@@ -421,10 +421,10 @@
     <string name="pref_title_toggle_toggle_shuffle">Mod redare aleatorie</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_whitelist">Whitelist music</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 +434,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_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>
+    <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>
 </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..d1d4e9131 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1,12 +1,12 @@
 <?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>
@@ -15,12 +15,12 @@
     <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 +28,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 +40,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,47 +55,47 @@
     <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_summary">Приложению требуется разрешение на проверку Bluetooth устройств рядом</string>
     <string name="bluetooth_title">Ближайшие устройства</string>
     <string name="blur">Размытие</string>
     <string name="blur_card">Карточка с размытием</string>
@@ -111,7 +111,7 @@
     <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>
@@ -146,9 +146,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,18 +159,18 @@
     <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>
@@ -181,22 +181,22 @@
     <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="error_share_file">Couldn\'t share file</string>
+    <string name="expanded">Растянутый</string>
     <string name="faq">ЧаВО</string>
-    <string name="favorites">Любимые</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="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>
@@ -212,7 +212,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 +220,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,17 +235,17 @@
     <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="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="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>
@@ -253,153 +253,153 @@
     <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_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="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="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_bluetooth_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_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_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_toggle_volume">Если доступно достаточно места, показывать регулировку громкости на экране воспроизведения</string>
+    <string name="pref_summary_wallpaper_accent">Использовать цветовое оформление из обоев</string>
     <string name="pref_summary_whitelist">Показывать музыку только из папки /Music</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 +407,32 @@
     <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_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_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_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_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">Pro</string>
-    <string name="pro_summary">Черное офромление, больше стилей экрана воспроизведения, эффект карусели и многое другое..</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>
+    <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 +440,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 +449,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 +473,51 @@
     <!-- 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_default">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_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,34 +529,34 @@
     <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>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index 276a5ef20..c99f33fcd 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -1,10 +1,10 @@
 <?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>
@@ -12,23 +12,23 @@
     <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,95 +42,95 @@
     <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="bluetooth_title">Nearby devices</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_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">Купи сада</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>
@@ -150,9 +150,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>
@@ -177,28 +177,28 @@
     <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="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="faq">FAQ</string>
     <string name="favorites">Favoriti</string>
-    <string name="file_already_exists">Песма већ постоји</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">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="gradient">Gradient</string>
     <string name="grant_access">Grant access</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
@@ -209,47 +209,47 @@
     <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="lets_go">Let\'s go</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="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="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>
@@ -262,7 +262,7 @@
     <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 +276,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>
@@ -299,9 +299,9 @@
     <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 +310,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 +325,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>
@@ -494,17 +494,17 @@
     <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 +532,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>
diff --git a/app/src/main/res/values-ta-rIN/strings.xml b/app/src/main/res/values-ta-rIN/strings.xml
index 921d409ba..87282779d 100644
--- a/app/src/main/res/values-ta-rIN/strings.xml
+++ b/app/src/main/res/values-ta-rIN/strings.xml
@@ -5,11 +5,11 @@
     <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_cancel">Cancel</string>
     <string name="action_cast">ஒப்பனை</string>
     <string name="action_clear_playing_queue">பாடல் வரிசையை நீக்கு</string>
     <string name="action_cycle_repeat">திரும்பச் செய்</string>
@@ -20,7 +20,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 +49,155 @@
     <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="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>
+    <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_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>
+    <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="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>
+    <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="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>
+    <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="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>
@@ -206,65 +206,65 @@
     <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="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>
+    <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="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>
+    <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>
@@ -322,7 +322,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>
@@ -380,7 +380,7 @@
     <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>
@@ -482,7 +482,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,9 +493,9 @@
     <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>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 5dbac01b4..654ee369f 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -253,7 +253,7 @@
     <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="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
     <string name="my_name">İsim</string>
     <string name="my_top_tracks">Sık oynatılanlar</string>
     <string name="never">Asla</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 74255debc..cd0a31edc 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -1,15 +1,15 @@
 <?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_cancel">Відмінити</string>
     <string name="action_cast">Трансляція на іншому дисплеї</string>
     <string name="action_clear_playing_queue">Очистити чергу відтворення</string>
     <string name="action_cycle_repeat">Циклічне повторення</string>
@@ -41,7 +41,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 +55,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 +70,39 @@
     <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="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>
-    <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 +110,31 @@
     <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_success">Bug report successful</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="compact">Compact</string>
     <string name="composer">Композитор</string>
     <string name="copied_device_info_to_clipboard">Скопійовано інформацію про пристрій у буфер обміну.</string>
     <string name="could_not_create_playlist">Не вдалося створити список відтворення.</string>
@@ -146,8 +146,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 +158,34 @@
     <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="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">Файл вже існує</string>
+    <string name="file_already_exists">File already exists</string>
     <string name="finish_last_song">Закінчити останню пісню</string>
     <string name="fit">Вмістити</string>
     <string name="flat">Плоский</string>
@@ -195,13 +195,13 @@
     <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="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>
@@ -211,19 +211,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 +232,14 @@
     <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="lets_go">Let\'s go</string>
     <string name="library_categories">Категорії бібліотеки</string>
     <string name="licenses">Ліцензії</string>
     <string name="light_theme_name">Яскраво-білий</string>
@@ -252,23 +252,23 @@
     <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="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>
-    <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 +280,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 +292,16 @@
     <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_bluetooth_denied">Nearby devices permission 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">Налаштуйте екран відтворення та зовнішній вигляд</string>
@@ -309,13 +309,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 +333,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 +361,101 @@
     <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_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">Коли увімкнено, нові пісні не відображатимуться в історії</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_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">Випадковий режим вимкнеться при відтворенні нового списку пісень</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_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">Header style</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_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">Призупинити історію</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_swipe_to_dismiss">Dismiss with swipe down</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="pro">Pro</string>
-    <string name="pro_summary">Чорна тема, теми відтворення, ефект каруселі та інше..</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>
-    <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 +482,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 +502,9 @@
     <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_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="speech_not_supported">Вибачте! Ваш пристрій не підтримує введення мови</string>
@@ -525,14 +525,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 +541,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>
diff --git a/app/src/main/res/values-v26/bools.xml b/app/src/main/res/values-v26/bools.xml
new file mode 100644
index 000000000..e557d81d8
--- /dev/null
+++ b/app/src/main/res/values-v26/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <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-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-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index 307c696d1..c8a4f68b1 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -10,7 +10,7 @@
     <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 +20,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 +55,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 +79,18 @@
     <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="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
+    <string name="bluetooth_title">Nearby devices</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 +104,7 @@
     <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_success">Bug report successful</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 +118,18 @@ 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="compact">Compact</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 +141,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 +159,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 +172,15 @@ 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="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">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="file_already_exists">File already exists</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 +196,7 @@ 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="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>
@@ -209,8 +209,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 +227,14 @@ 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="lets_go">Let\'s go</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 +247,23 @@ 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="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">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 +292,8 @@ 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_bluetooth_denied">Nearby devices permission denied.</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 +304,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 +333,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,14 +356,14 @@ 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_manage_audio_focus">Always play audio in background regardless of anything else being played</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_swipe_to_dismiss">Swipe down to dismiss mini player</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>
@@ -387,7 +387,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,13 +402,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_manage_audio_focus">Always play</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>
@@ -437,7 +437,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>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e5dfcc050..ba2976d15 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -340,8 +340,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>
@@ -511,7 +510,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>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index af56e2b1d..fdbab5012 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -54,7 +54,7 @@
     <string name="adaptive">適應風</string>
     <string name="add_action">新增</string>
     <string name="add_playlist_title">"新增至播放清單"</string>
-    <string name="add_time_framed_lryics">新增動態歌詞</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>
@@ -168,7 +168,7 @@
     <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_synced_lyrics">編輯同步歌詞</string>
     <string name="empty">沒有內容</string>
     <string name="equalizer">等化器</string>
     <string name="error_create_backup">無法建立備份</string>
@@ -255,7 +255,7 @@
     <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>
@@ -290,7 +290,7 @@
     <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>
@@ -359,8 +359,8 @@
     <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>
@@ -470,7 +470,7 @@
     <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>
@@ -508,7 +508,7 @@
     <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>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index 5e9f24c9f..654eeffa5 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -5,5 +5,9 @@
 
     <bool name="allowBackup">true</bool>
 
+    <bool name="wallpaper_accent_enabled">false</bool>
+    <bool name="wallpaper_accent_visible">false</bool>
+
+    <bool name="isNotOreo">true</bool>
     <bool name="isMarshmallow">false</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e9609c7c1..0e6eaba7a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -562,5 +562,4 @@
     <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>
 </resources>
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_audio.xml b/app/src/main/res/xml/pref_audio.xml
index 6bf54069c..749202ced 100755
--- a/app/src/main/res/xml/pref_audio.xml
+++ b/app/src/main/res/xml/pref_audio.xml
@@ -2,6 +2,15 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+        android:defaultValue="true"
+        android:key="audio_ducking"
+        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"/>
+
     <code.name.monkey.retromusic.preferences.DurationPreference
         android:defaultValue="0"
         android:key="audio_fade_duration"
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index c27bfbe14..9f5255c84 100755
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -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/appthemehelper/build.gradle b/appthemehelper/build.gradle
index 2a5e0f50d..31bfc76af 100644
--- a/appthemehelper/build.gradle
+++ b/appthemehelper/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 android {
-    compileSdk 33
+    compileSdk 32
     namespace "code.name.monkey.appthemehelper"
 
     defaultConfig {
         minSdk 21
-        targetSdk 33
+        targetSdk 32
     }
     buildTypes {
         release {
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..ac8db0c5d 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
@@ -82,13 +82,4 @@ object VersionUtils {
     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/build.gradle b/build.gradle
index 33029c4f9..52d6e5989 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,9 +2,9 @@
 
 buildscript {
     ext {
-        lifecycle_version = '2.6.1'
+        lifecycle_version = '2.6.0'
         navigation_version = '2.5.3'
-        mdc_version = '1.9.0-beta01'
+        mdc_version = '1.9.0-alpha02'
         preference_version = '1.2.0'
         appcompat_version = '1.6.1'
         core_version = '1.10.0-rc01'
@@ -15,7 +15,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.0-beta02'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
     }
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