diff --git a/README.md b/README.md
index 1f9427f71..b5c6894f0 100644
--- a/README.md
+++ b/README.md
@@ -62,3 +62,4 @@ WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OP
 
 ## Mirrors (read-only)
 <a href="https://gitlab.com/libretube/LibreTube">GitLab</a></p>
+<a href="https://notabug.org/LibreTube/LibreTube">NotABug</a></p>
diff --git a/app/build.gradle b/app/build.gradle
index 969e97e7a..90f219fa8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,35 +55,35 @@ android {
 }
 
 dependencies {
-    //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
+    //debugImplementation libs.square.leakcanary
 
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'com.google.android.material:material:1.6.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation libs.androidx.appcompat
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.legacySupport
+    implementation libs.androidx.multidex
+    implementation libs.androidx.navigation.fragment
+    implementation libs.androidx.navigation.ui
+    implementation libs.androidx.preference
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation libs.androidx.test.junit
+    androidTestImplementation libs.androidx.test.espressoCore
 
-    implementation 'com.squareup.picasso:picasso:2.8'
-    implementation 'de.hdodenhof:circleimageview:3.1.0'
-    implementation 'com.google.android.exoplayer:exoplayer:2.17.1'
-    implementation 'com.google.android.exoplayer:extension-mediasession:2.17.1'
-    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation libs.circleimageview
 
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-jackson:2.9.0'
-    //do not update jackson annotations! it does not supports <api26
-    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.13.3'
+    implementation libs.material
+    implementation libs.exoplayer
+    implementation(libs.exoplayer.extension.cronet) { exclude group: 'com.google.android.gms' }
+    implementation libs.exoplayer.extension.mediasession
 
-    implementation 'com.arthenica:ffmpeg-kit-min:4.5.1.LTS'
+    implementation libs.square.picasso
+    implementation libs.square.retrofit
+    implementation libs.square.retrofit.converterJackson
+    // Do not update jackson annotations! It does not supports < API 26.
+    implementation libs.jacksonAnnotations
 
+    implementation libs.mobileffmpeg
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
-    implementation('com.google.android.exoplayer:extension-cronet:2.17.1') { exclude group: 'com.google.android.gms' }
-    implementation 'org.chromium.net:cronet-embedded:101.4951.41'
-
+    coreLibraryDesugaring libs.desugaring
+    implementation libs.cronet.embedded
+    implementation libs.gson
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 88ea6ba64..8f5d7d3c2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,32 +11,32 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
+        android:name=".MyApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:largeHeap="true"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Purple"
-        android:name=".MyApp"
-        android:networkSecurityConfig="@xml/network_security_config"
-        android:largeHeap="true"
-        android:requestLegacyExternalStorage="true">
+        android:theme="@style/Theme.Purple">
         <activity
             android:name=".util.Player"
+            android:configChanges="orientation|screenSize"
             android:exported="false"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-            android:configChanges="orientation|screenSize" />
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name=".SettingsActivity"
             android:label="@string/settings" />
         <activity
             android:name=".MainActivity"
-            android:exported="true"
-            android:supportsPictureInPicture="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:exported="true"
             android:hardwareAccelerated="true"
+            android:launchMode="singleTop"
             android:screenOrientation="userPortrait"
-            android:launchMode="singleTop">
+            android:supportsPictureInPicture="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -44,16 +44,16 @@
         </activity>
 
         <activity-alias
-            android:label="@string/app_name"
-            android:icon="@mipmap/ic_gradient"
-            android:roundIcon="@mipmap/ic_gradient_round"
             android:name=".IconGradient"
-            android:enabled="false"
-            android:targetActivity=".MainActivity"
-            android:supportsPictureInPicture="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:enabled="false"
+            android:exported="true"
             android:hardwareAccelerated="true"
-            android:exported="true">
+            android:icon="@mipmap/ic_gradient"
+            android:label="@string/app_name"
+            android:roundIcon="@mipmap/ic_gradient_round"
+            android:supportsPictureInPicture="true"
+            android:targetActivity=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -61,16 +61,16 @@
         </activity-alias>
 
         <activity-alias
-            android:label="@string/app_name"
-            android:icon="@mipmap/ic_fire"
-            android:roundIcon="@mipmap/ic_fire_round"
             android:name=".IconFire"
-            android:enabled="false"
-            android:targetActivity=".MainActivity"
-            android:supportsPictureInPicture="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:enabled="false"
+            android:exported="true"
             android:hardwareAccelerated="true"
-            android:exported="true">
+            android:icon="@mipmap/ic_fire"
+            android:label="@string/app_name"
+            android:roundIcon="@mipmap/ic_fire_round"
+            android:supportsPictureInPicture="true"
+            android:targetActivity=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -78,16 +78,16 @@
         </activity-alias>
 
         <activity-alias
-            android:label="@string/app_name"
-            android:icon="@mipmap/ic_flame"
-            android:roundIcon="@mipmap/ic_flame_round"
             android:name=".IconFlame"
-            android:enabled="false"
-            android:targetActivity=".MainActivity"
-            android:supportsPictureInPicture="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:enabled="false"
+            android:exported="true"
             android:hardwareAccelerated="true"
-            android:exported="true">
+            android:icon="@mipmap/ic_flame"
+            android:label="@string/app_name"
+            android:roundIcon="@mipmap/ic_flame_round"
+            android:supportsPictureInPicture="true"
+            android:targetActivity=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -95,16 +95,16 @@
         </activity-alias>
 
         <activity-alias
-            android:label="@string/app_name"
-            android:icon="@mipmap/ic_shaped"
-            android:roundIcon="@mipmap/ic_shaped_round"
             android:name=".IconShaped"
-            android:enabled="false"
-            android:targetActivity=".MainActivity"
-            android:supportsPictureInPicture="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:enabled="false"
+            android:exported="true"
             android:hardwareAccelerated="true"
-            android:exported="true">
+            android:icon="@mipmap/ic_shaped"
+            android:label="@string/app_name"
+            android:roundIcon="@mipmap/ic_shaped_round"
+            android:supportsPictureInPicture="true"
+            android:targetActivity=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -112,16 +112,16 @@
         </activity-alias>
 
         <activity-alias
-            android:label="@string/app_name"
-            android:icon="@mipmap/ic_torch"
-            android:roundIcon="@mipmap/ic_torch_round"
             android:name=".IconTorch"
-            android:enabled="false"
-            android:targetActivity=".MainActivity"
-            android:supportsPictureInPicture="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:enabled="false"
+            android:exported="true"
             android:hardwareAccelerated="true"
-            android:exported="true">
+            android:icon="@mipmap/ic_torch"
+            android:label="@string/app_name"
+            android:roundIcon="@mipmap/ic_torch_round"
+            android:supportsPictureInPicture="true"
+            android:targetActivity=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -129,16 +129,16 @@
         </activity-alias>
 
         <activity-alias
-            android:label="@string/app_name"
-            android:icon="@mipmap/ic_legacy"
-            android:roundIcon="@mipmap/ic_legacy_round"
             android:name=".IconLegacy"
-            android:enabled="false"
-            android:targetActivity=".MainActivity"
-            android:supportsPictureInPicture="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:enabled="false"
+            android:exported="true"
             android:hardwareAccelerated="true"
-            android:exported="true">
+            android:icon="@mipmap/ic_legacy"
+            android:label="@string/app_name"
+            android:roundIcon="@mipmap/ic_legacy_round"
+            android:supportsPictureInPicture="true"
+            android:targetActivity=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -146,16 +146,16 @@
         </activity-alias>
 
         <activity-alias
-            android:label="@string/app_name"
-            android:icon="@mipmap/ic_bird"
-            android:roundIcon="@mipmap/ic_bird_round"
             android:name=".IconBird"
-            android:enabled="false"
-            android:targetActivity=".MainActivity"
-            android:supportsPictureInPicture="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:enabled="false"
+            android:exported="true"
             android:hardwareAccelerated="true"
-            android:exported="true">
+            android:icon="@mipmap/ic_bird"
+            android:label="@string/app_name"
+            android:roundIcon="@mipmap/ic_bird_round"
+            android:supportsPictureInPicture="true"
+            android:targetActivity=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/com/github/libretube/DownloadService.kt b/app/src/main/java/com/github/libretube/DownloadService.kt
index e13b766b5..eb7b309aa 100644
--- a/app/src/main/java/com/github/libretube/DownloadService.kt
+++ b/app/src/main/java/com/github/libretube/DownloadService.kt
@@ -17,8 +17,8 @@ import android.os.IBinder
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import androidx.preference.PreferenceManager
 import com.arthenica.ffmpegkit.FFmpegKit
+import com.github.libretube.util.PreferenceHelper
 import java.io.File
 
 var IS_DOWNLOAD_RUNNING = false
@@ -48,8 +48,7 @@ class DownloadService : Service() {
         videoUrl = intent.getStringExtra("videoUrl")!!
         audioUrl = intent.getStringExtra("audioUrl")!!
         duration = intent.getIntExtra("duration", 1)
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
-        extension = sharedPreferences.getString("video_format", ".mp4")!!
+        extension = PreferenceHelper.getString(this, "video_format", ".mp4")!!
         downloadType = if (audioUrl != "" && videoUrl != "") "mux"
         else if (audioUrl != "") "audio"
         else if (videoUrl != "") "video"
@@ -69,7 +68,6 @@ class DownloadService : Service() {
     }
 
     private fun downloadManager() {
-
         // create folder for temporary files
         tempDir = File(
             applicationContext.getExternalFilesDir(DIRECTORY_DOWNLOADS),
@@ -84,9 +82,8 @@ class DownloadService : Service() {
             Log.e(TAG, "Directory already have")
         }
 
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
-        val downloadLocationPref = sharedPreferences.getString("download_location", "")
-        val folderName = sharedPreferences.getString("download_folder", "")
+        val downloadLocationPref = PreferenceHelper.getString(this, "download_location", "")
+        val folderName = PreferenceHelper.getString(this, "download_folder", "LibreTube")
 
         val location = when (downloadLocationPref) {
             "downloads" -> Environment.getExternalStoragePublicDirectory(DIRECTORY_DOWNLOADS)
@@ -255,10 +252,11 @@ class DownloadService : Service() {
                 if (returnCode.toString() != "0") downloadFailedNotification()
                 else downloadSucceededNotification()
                 onDestroy()
-            }, {
-            // CALLED WHEN SESSION PRINTS LOGS
-            Log.e(TAG, it.message.toString())
-        }
+            },
+            {
+                // CALLED WHEN SESSION PRINTS LOGS
+                Log.e(TAG, it.message.toString())
+            }
         ) {
             // CALLED WHEN SESSION GENERATES STATISTICS
             Log.e(TAG + "stat", it.time.toString())
diff --git a/app/src/main/java/com/github/libretube/MainActivity.kt b/app/src/main/java/com/github/libretube/MainActivity.kt
index e6e7beee0..357250e75 100644
--- a/app/src/main/java/com/github/libretube/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/MainActivity.kt
@@ -32,12 +32,11 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
 import androidx.navigation.ui.setupWithNavController
-import androidx.preference.PreferenceManager
 import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.fragments.isFullScreen
-import com.github.libretube.preferences.SponsorBlockSettings
 import com.github.libretube.util.CronetHelper
 import com.github.libretube.util.LocaleHelper
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.bottomnavigation.BottomNavigationView
@@ -54,32 +53,12 @@ class MainActivity : AppCompatActivity() {
         DynamicColors.applyToActivityIfAvailable(this)
         super.onCreate(savedInstanceState)
         CronetHelper.initCronet(this.applicationContext)
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
-        RetrofitInstance.url =
-            sharedPreferences.getString("selectInstance", "https://pipedapi.kavin.rocks/")!!
-        SponsorBlockSettings.sponsorBlockEnabled =
-            sharedPreferences.getBoolean("sb_enabled_key", true)
-        SponsorBlockSettings.sponsorNotificationsEnabled =
-            sharedPreferences.getBoolean("sb_notifications_key", true)
-        SponsorBlockSettings.introEnabled =
-            sharedPreferences.getBoolean("intro_category_key", false)
-        SponsorBlockSettings.selfPromoEnabled =
-            sharedPreferences.getBoolean("selfpromo_category_key", false)
-        SponsorBlockSettings.interactionEnabled =
-            sharedPreferences.getBoolean("interaction_category_key", false)
-        SponsorBlockSettings.sponsorsEnabled =
-            sharedPreferences.getBoolean("sponsors_category_key", true)
-        SponsorBlockSettings.outroEnabled =
-            sharedPreferences.getBoolean("outro_category_key", false)
-        SponsorBlockSettings.fillerEnabled =
-            sharedPreferences.getBoolean("filler_category_key", false)
-        SponsorBlockSettings.musicOfftopicEnabled =
-            sharedPreferences.getBoolean("music_offtopic_category_key", false)
-        SponsorBlockSettings.previewEnabled =
-            sharedPreferences.getBoolean("preview_category_key", false)
 
-        ThemeHelper().updateTheme(this)
-        LocaleHelper().updateLanguage(this)
+        RetrofitInstance.url =
+            PreferenceHelper.getString(this, "selectInstance", "https://pipedapi.kavin.rocks/")!!
+
+        ThemeHelper.updateTheme(this)
+        LocaleHelper.updateLanguage(this)
 
         // show noInternet Activity if no internet available on app startup
         if (!isNetworkAvailable(this)) {
@@ -100,12 +79,11 @@ class MainActivity : AppCompatActivity() {
             bottomNavigationView.setupWithNavController(navController)
 
             // hide the trending page if enabled
-            val hideTrendingPage = sharedPreferences.getBoolean("hide_trending_page", false)
+            val hideTrendingPage = PreferenceHelper.getBoolean(this, "hide_trending_page", false)
             if (hideTrendingPage) bottomNavigationView.menu.findItem(R.id.home2).isVisible = false
 
             // navigate to the default start tab
-            val defaultTab = sharedPreferences.getString("default_tab", "home")
-            when (defaultTab) {
+            when (PreferenceHelper.getString(this, "default_tab", "home")) {
                 "home" -> navController.navigate(R.id.home2)
                 "subscriptions" -> navController.navigate(R.id.subscriptions)
                 "library" -> navController.navigate(R.id.library)
diff --git a/app/src/main/java/com/github/libretube/RouterActivity.kt b/app/src/main/java/com/github/libretube/RouterActivity.kt
index 1292422a3..3033fcfbb 100644
--- a/app/src/main/java/com/github/libretube/RouterActivity.kt
+++ b/app/src/main/java/com/github/libretube/RouterActivity.kt
@@ -21,7 +21,7 @@ class RouterActivity : AppCompatActivity() {
             handleSendText(uri!!)
         } else {
             // start app as normal if URI not in host list
-            ThemeHelper().restartMainActivity(this)
+            ThemeHelper.restartMainActivity(this)
         }
     }
 
diff --git a/app/src/main/java/com/github/libretube/SettingsActivity.kt b/app/src/main/java/com/github/libretube/SettingsActivity.kt
index 27f6f5046..8e2a3f69b 100644
--- a/app/src/main/java/com/github/libretube/SettingsActivity.kt
+++ b/app/src/main/java/com/github/libretube/SettingsActivity.kt
@@ -19,7 +19,7 @@ class SettingsActivity : AppCompatActivity() {
     val TAG = "SettingsActivity"
     override fun onCreate(savedInstanceState: Bundle?) {
         DynamicColors.applyToActivityIfAvailable(this)
-        ThemeHelper().updateTheme(this)
+        ThemeHelper.updateTheme(this)
         // makes the preference dialogs use material dialogs
         setTheme(R.style.MaterialAlertDialog)
 
@@ -54,7 +54,7 @@ class SettingsActivity : AppCompatActivity() {
                 val nManager =
                     this.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
                 nManager.cancelAll()
-                ThemeHelper().restartMainActivity(this)
+                ThemeHelper.restartMainActivity(this)
                 ActivityCompat.finishAffinity(this)
             } else {
                 super.onBackPressed()
diff --git a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt b/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
index efce52157..3ce71ac4a 100644
--- a/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/CommentsAdapter.kt
@@ -19,11 +19,11 @@ import com.github.libretube.obj.CommentsPage
 import com.github.libretube.util.RetrofitInstance
 import com.github.libretube.util.formatShort
 import com.squareup.picasso.Picasso
-import java.io.IOException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
+import java.io.IOException
 
 class CommentsAdapter(
     private val videoId: String,
diff --git a/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt b/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt
index bfc1e481a..448060c49 100644
--- a/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/PlaylistAdapter.kt
@@ -1,7 +1,6 @@
 package com.github.libretube.adapters
 
 import android.app.Activity
-import android.content.Context
 import android.os.Bundle
 import android.text.format.DateUtils
 import android.util.Log
@@ -18,13 +17,14 @@ import com.github.libretube.dialogs.VideoOptionsDialog
 import com.github.libretube.fragments.PlayerFragment
 import com.github.libretube.obj.PlaylistId
 import com.github.libretube.obj.StreamItem
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.squareup.picasso.Picasso
-import java.io.IOException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
+import java.io.IOException
 
 class PlaylistAdapter(
     private val videoFeed: MutableList<StreamItem>,
@@ -81,11 +81,7 @@ class PlaylistAdapter(
             val delete = holder.v.findViewById<ImageView>(R.id.delete_playlist)
             delete.visibility = View.VISIBLE
             delete.setOnClickListener {
-                val sharedPref = holder.v.context.getSharedPreferences(
-                    "token",
-                    Context.MODE_PRIVATE
-                )
-                val token = sharedPref?.getString("token", "")!!
+                val token = PreferenceHelper.getToken(holder.v.context)
                 removeFromPlaylist(token, position)
             }
         }
diff --git a/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt b/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt
index 1d3c8e5a2..08bdb332c 100644
--- a/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt
@@ -1,7 +1,6 @@
 package com.github.libretube.adapters
 
 import android.app.Activity
-import android.content.Context
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -14,13 +13,14 @@ import com.github.libretube.MainActivity
 import com.github.libretube.R
 import com.github.libretube.obj.PlaylistId
 import com.github.libretube.obj.Playlists
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.squareup.picasso.Picasso
-import java.io.IOException
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
+import java.io.IOException
 
 class PlaylistsAdapter(
     private val playlists: MutableList<Playlists>,
@@ -57,11 +57,7 @@ class PlaylistsAdapter(
             builder.setTitle(R.string.deletePlaylist)
             builder.setMessage(R.string.areYouSure)
             builder.setPositiveButton(R.string.yes) { _, _ ->
-                val sharedPref = holder.v.context.getSharedPreferences(
-                    "token",
-                    Context.MODE_PRIVATE
-                )
-                val token = sharedPref?.getString("token", "")!!
+                val token = PreferenceHelper.getToken(holder.v.context)
                 deletePlaylist(playlist.id!!, token, position)
             }
             builder.setNegativeButton(R.string.cancel) { _, _ ->
@@ -96,10 +92,6 @@ class PlaylistsAdapter(
                         playlists.removeAt(position)
                         // FIXME: This needs to run on UI thread?
                         activity.runOnUiThread { notifyDataSetChanged() }
-
-                        /*if(playlists.isEmpty()){
-                            view.findViewById<ImageView>(R.id.boogh2).visibility=View.VISIBLE
-                        }*/
                     }
                 } catch (e: Exception) {
                     Log.e(TAG, e.toString())
diff --git a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
index 33b5c705f..d7a8d465d 100644
--- a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
@@ -85,10 +85,11 @@ class SearchViewHolder(
         val viewsString = if (item.views?.toInt() != -1) item.views.formatShort() else ""
         val uploadDate = if (item.uploadedDate != null) item.uploadedDate else ""
         views.text =
-            if (viewsString != "" && uploadDate != "")
+            if (viewsString != "" && uploadDate != "") {
                 "$viewsString • $uploadDate"
-            else
+            } else {
                 viewsString + uploadDate
+            }
         val channelName = v.findViewById<TextView>(R.id.search_channel_name)
         channelName.text = item.uploaderName
         v.setOnClickListener {
@@ -145,9 +146,10 @@ class SearchViewHolder(
         val playlistChannelName = v.findViewById<TextView>(R.id.search_name)
         playlistChannelName.text = item.uploaderName
         val playlistVideosNumber = v.findViewById<TextView>(R.id.search_playlist_videos)
-        if (item.videos?.toInt() != -1)
+        if (item.videos?.toInt() != -1) {
             playlistVideosNumber.text =
                 v.context.getString(R.string.videoCount, item.videos.toString())
+        }
         v.setOnClickListener {
             // playlist clicked
             val activity = v.context as MainActivity
diff --git a/app/src/main/java/com/github/libretube/adapters/SearchHistoryAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SearchHistoryAdapter.kt
index 7dfdeaa72..a25359f30 100644
--- a/app/src/main/java/com/github/libretube/adapters/SearchHistoryAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/SearchHistoryAdapter.kt
@@ -5,12 +5,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
+import android.widget.ImageView
 import android.widget.TextView
-import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.fragments.SearchFragment
-import com.google.android.material.imageview.ShapeableImageView
+import com.github.libretube.util.PreferenceHelper
 
 class SearchHistoryAdapter(
     private val context: Context,
@@ -34,10 +34,9 @@ class SearchHistoryAdapter(
         val history = historyList[position]
         holder.v.findViewById<TextView>(R.id.history_text).text = history
 
-        holder.v.findViewById<ShapeableImageView>(R.id.delete_history).setOnClickListener {
-            val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+        holder.v.findViewById<ImageView>(R.id.delete_history).setOnClickListener {
             historyList = historyList - history
-            sharedPreferences.edit().putStringSet("search_history", HashSet(historyList)).apply()
+            PreferenceHelper.saveHistory(context, historyList)
             notifyDataSetChanged()
         }
 
diff --git a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt
index 0db923b83..a05024ce0 100644
--- a/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/SubscriptionAdapter.kt
@@ -34,8 +34,9 @@ class SubscriptionAdapter(
     fun updateItems() {
         // limitedVideoFeed.add("")
         i += 10
-        if (i > videoFeed.size)
+        if (i > videoFeed.size) {
             i = videoFeed.size
+        }
         notifyDataSetChanged()
     }
 
diff --git a/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt
index 3ae744511..7ce63a5ba 100644
--- a/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt
@@ -13,13 +13,14 @@ import com.github.libretube.MainActivity
 import com.github.libretube.R
 import com.github.libretube.obj.Subscribe
 import com.github.libretube.obj.Subscription
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.squareup.picasso.Picasso
-import java.io.IOException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
+import java.io.IOException
 
 class SubscriptionChannelAdapter(private val subscriptions: MutableList<Subscription>) :
     RecyclerView.Adapter<SubscriptionChannelViewHolder>() {
@@ -70,10 +71,9 @@ class SubscriptionChannelAdapter(private val subscriptions: MutableList<Subscrip
         fun run() {
             CoroutineScope(Dispatchers.IO).launch {
                 val response = try {
-                    val sharedPref = context
-                        .getSharedPreferences("token", Context.MODE_PRIVATE)
+                    val token = PreferenceHelper.getToken(context)
                     RetrofitInstance.api.subscribe(
-                        sharedPref?.getString("token", "")!!,
+                        token,
                         Subscribe(channelId)
                     )
                 } catch (e: IOException) {
@@ -93,10 +93,9 @@ class SubscriptionChannelAdapter(private val subscriptions: MutableList<Subscrip
         fun run() {
             CoroutineScope(Dispatchers.IO).launch {
                 val response = try {
-                    val sharedPref =
-                        context.getSharedPreferences("token", Context.MODE_PRIVATE)
+                    val token = PreferenceHelper.getToken(context)
                     RetrofitInstance.api.unsubscribe(
-                        sharedPref?.getString("token", "")!!,
+                        token,
                         Subscribe(channelId)
                     )
                 } catch (e: IOException) {
diff --git a/app/src/main/java/com/github/libretube/dialogs/AddtoPlaylistDialog.kt b/app/src/main/java/com/github/libretube/dialogs/AddtoPlaylistDialog.kt
index 80453c14b..cabc0826b 100644
--- a/app/src/main/java/com/github/libretube/dialogs/AddtoPlaylistDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/AddtoPlaylistDialog.kt
@@ -1,7 +1,6 @@
 package com.github.libretube.dialogs
 
 import android.app.Dialog
-import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import android.util.TypedValue
@@ -17,10 +16,11 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
 import com.github.libretube.obj.PlaylistId
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class AddtoPlaylistDialog : DialogFragment() {
     private val TAG = "AddToPlaylistDialog"
@@ -34,8 +34,7 @@ class AddtoPlaylistDialog : DialogFragment() {
             val builder = MaterialAlertDialogBuilder(it)
             // Get the layout inflater
             val inflater = requireActivity().layoutInflater
-            val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-            token = sharedPref?.getString("token", "")!!
+            token = PreferenceHelper.getToken(requireContext())
             var view: View = inflater.inflate(R.layout.dialog_addtoplaylist, null)
             spinner = view.findViewById(R.id.playlists_spinner)
             button = view.findViewById(R.id.addToPlaylist)
diff --git a/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt
index d33cf90ee..d08256704 100644
--- a/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt
@@ -1,7 +1,6 @@
 package com.github.libretube.dialogs
 
 import android.app.Dialog
-import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import android.util.TypedValue
@@ -9,18 +8,18 @@ import android.view.View
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
-import androidx.core.os.bundleOf
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.setFragmentResult
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
+import com.github.libretube.fragments.Library
 import com.github.libretube.obj.Playlists
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputEditText
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class CreatePlaylistDialog : DialogFragment() {
     val TAG = "CreatePlaylistDialog"
@@ -46,8 +45,7 @@ class CreatePlaylistDialog : DialogFragment() {
                 dismiss()
             }
 
-            val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-            token = sharedPref?.getString("token", "")!!
+            token = PreferenceHelper.getToken(requireContext())
 
             val playlistName = view.findViewById<TextInputEditText>(R.id.playlist_name)
             val createPlaylistBtn = view.findViewById<Button>(R.id.create_new_playlist)
@@ -88,8 +86,13 @@ class CreatePlaylistDialog : DialogFragment() {
                     Toast.makeText(context, getString(R.string.unknown_error), Toast.LENGTH_SHORT)
                         .show()
                 }
-                // tell the Subscription Activity to fetch the playlists again
-                setFragmentResult("fetchPlaylists", bundleOf("" to ""))
+                // refresh the playlists in the library
+                try {
+                    val parent = parentFragment as Library
+                    parent.fetchPlaylists()
+                } catch (e: Exception) {
+                    Log.e(TAG, e.toString())
+                }
                 dismiss()
             }
         }
diff --git a/app/src/main/java/com/github/libretube/dialogs/CustomInstanceDialog.kt b/app/src/main/java/com/github/libretube/dialogs/CustomInstanceDialog.kt
index e1f06186a..94df2f77d 100644
--- a/app/src/main/java/com/github/libretube/dialogs/CustomInstanceDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/CustomInstanceDialog.kt
@@ -9,8 +9,9 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
-import androidx.preference.PreferenceManager
 import com.github.libretube.R
+import com.github.libretube.obj.CustomInstance
+import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputEditText
 import java.net.URL
@@ -36,29 +37,38 @@ class CustomInstanceDialog : DialogFragment() {
             }
 
             addInstanceButton.setOnClickListener {
-                val instanceName = instanceNameEditText.text.toString()
-                val instanceApiUrl = instanceApiUrlEditText.text.toString()
-                val instanceFrontendUrl = instanceFrontendUrlEditText.text.toString()
+                val customInstance = CustomInstance()
+                customInstance.name = instanceNameEditText.text.toString()
+                customInstance.apiUrl = instanceApiUrlEditText.text.toString()
+                customInstance.frontendUrl = instanceFrontendUrlEditText.text.toString()
 
-                if (instanceName != "" && instanceApiUrl != "" && instanceFrontendUrl != "") {
+                if (
+                    customInstance.name != "" &&
+                    customInstance.apiUrl != "" &&
+                    customInstance.frontendUrl != ""
+                ) {
                     try {
                         // check whether the URL is valid, otherwise catch
-                        URL(instanceApiUrl).toURI()
-                        URL(instanceFrontendUrl).toURI()
+                        URL(customInstance.apiUrl).toURI()
+                        URL(customInstance.frontendUrl).toURI()
 
-                        saveCustomInstance(instanceName, instanceApiUrl, instanceFrontendUrl)
+                        PreferenceHelper.saveCustomInstance(requireContext(), customInstance)
                         activity?.recreate()
                         dismiss()
                     } catch (e: Exception) {
                         // invalid URL
                         Toast.makeText(
-                            context, getString(R.string.invalid_url), Toast.LENGTH_SHORT
+                            context,
+                            getString(R.string.invalid_url),
+                            Toast.LENGTH_SHORT
                         ).show()
                     }
                 } else {
                     // at least one empty input
                     Toast.makeText(
-                        context, context?.getString(R.string.empty_instance), Toast.LENGTH_SHORT
+                        context,
+                        context?.getString(R.string.empty_instance),
+                        Toast.LENGTH_SHORT
                     ).show()
                 }
             }
@@ -76,49 +86,4 @@ class CustomInstanceDialog : DialogFragment() {
             builder.create()
         } ?: throw IllegalStateException("Activity cannot be null")
     }
-
-    private fun saveCustomInstance(
-        instanceName: String,
-        instanceApiUrl: String,
-        instanceFrontendApiUrl: String
-    ) {
-        val sharedPreferences = PreferenceManager
-            .getDefaultSharedPreferences(requireContext())
-
-        // get the names of the other custom instances
-        var customInstancesNames = try {
-            sharedPreferences
-                .getStringSet("custom_instances_name", HashSet())!!.toList()
-        } catch (e: Exception) {
-            emptyList()
-        }
-
-        // get the api urls of the other custom instances
-        var customInstancesUrls = try {
-            sharedPreferences
-                .getStringSet("custom_instances_url", HashSet())!!.toList()
-        } catch (e: Exception) {
-            emptyList()
-        }
-
-        // get the frontend urls of the other custom instances
-        var customInstancesFrontendUrls = try {
-            sharedPreferences
-                .getStringSet("custom_instances_url", HashSet())!!.toList()
-        } catch (e: Exception) {
-            emptyList()
-        }
-
-        // append new instance to the list
-        customInstancesNames += instanceName
-        customInstancesUrls += instanceApiUrl
-        customInstancesFrontendUrls += instanceFrontendApiUrl
-
-        // save them to the shared preferences
-        sharedPreferences.edit()
-            .putStringSet("custom_instances_name", HashSet(customInstancesNames))
-            .putStringSet("custom_instances_url", HashSet(customInstancesUrls))
-            .putStringSet("custom_instances_frontend_url", HashSet(customInstancesFrontendUrls))
-            .apply()
-    }
 }
diff --git a/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt b/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt
new file mode 100644
index 000000000..a9e0da91d
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt
@@ -0,0 +1,82 @@
+package com.github.libretube.dialogs
+
+import android.app.Dialog
+import android.os.Bundle
+import android.util.Log
+import android.util.TypedValue
+import android.widget.Button
+import android.widget.EditText
+import android.widget.TextView
+import android.widget.Toast
+import androidx.core.text.HtmlCompat
+import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.lifecycleScope
+import com.github.libretube.R
+import com.github.libretube.obj.DeleteUserRequest
+import com.github.libretube.requireMainActivityRestart
+import com.github.libretube.util.PreferenceHelper
+import com.github.libretube.util.RetrofitInstance
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+class DeleteAccountDialog : DialogFragment() {
+    private val TAG = "DeleteAccountDialog"
+    lateinit var username: EditText
+    lateinit var password: EditText
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return activity?.let {
+            val builder = MaterialAlertDialogBuilder(it)
+            val inflater = requireActivity().layoutInflater
+            val view = inflater.inflate(R.layout.dialog_delete_account, null)
+
+            view.findViewById<Button>(R.id.cancel_button).setOnClickListener {
+                dialog?.dismiss()
+            }
+
+            password = view.findViewById(R.id.delete_password)
+            view.findViewById<Button>(R.id.delete_account_confirm).setOnClickListener {
+                if (password.text.toString() != "") {
+                    deleteAccount(password.text.toString())
+                } else {
+                    Toast.makeText(context, R.string.empty, Toast.LENGTH_SHORT).show()
+                }
+            }
+
+            val typedValue = TypedValue()
+            this.requireActivity().theme.resolveAttribute(R.attr.colorPrimaryDark, typedValue, true)
+            val hexColor = String.format("#%06X", (0xFFFFFF and typedValue.data))
+            val appName = HtmlCompat.fromHtml(
+                "Libre<span  style='color:$hexColor';>Tube</span>",
+                HtmlCompat.FROM_HTML_MODE_COMPACT
+            )
+            view.findViewById<TextView>(R.id.title).text = appName
+
+            builder.setView(view)
+            builder.create()
+        } ?: throw IllegalStateException("Activity cannot be null")
+    }
+
+    private fun deleteAccount(password: String) {
+        fun run() {
+            lifecycleScope.launchWhenCreated {
+                val token = PreferenceHelper.getToken(requireContext())
+
+                try {
+                    RetrofitInstance.api.deleteAccount(token, DeleteUserRequest(password))
+                } catch (e: Exception) {
+                    Log.e(TAG, e.toString())
+                    Toast.makeText(context, R.string.unknown_error, Toast.LENGTH_SHORT).show()
+                    return@launchWhenCreated
+                }
+                requireMainActivityRestart = true
+                Toast.makeText(context, R.string.success, Toast.LENGTH_SHORT).show()
+                logout()
+                dialog?.dismiss()
+            }
+        }
+        run()
+    }
+
+    private fun logout() {
+        PreferenceHelper.setToken(requireContext(), "")
+    }
+}
diff --git a/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt b/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt
index ae27c5ca2..466249620 100644
--- a/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt
@@ -1,7 +1,6 @@
 package com.github.libretube.dialogs
 
 import android.app.Dialog
-import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import android.util.TypedValue
@@ -15,10 +14,11 @@ import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
 import com.github.libretube.obj.Login
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class LoginDialog : DialogFragment() {
     private val TAG = "LoginDialog"
@@ -29,23 +29,17 @@ class LoginDialog : DialogFragment() {
             val builder = MaterialAlertDialogBuilder(it)
             // Get the layout inflater
             val inflater = requireActivity().layoutInflater
-            val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-            val token = sharedPref?.getString("token", "")
+            val token = PreferenceHelper.getToken(requireContext())
             var view: View
             Log.e("dafaq", token!!)
             if (token != "") {
-                val sharedPref2 = context?.getSharedPreferences("username", Context.MODE_PRIVATE)
-                val user = sharedPref2?.getString("username", "")
+                val user = PreferenceHelper.getUsername(requireContext())
                 view = inflater.inflate(R.layout.dialog_logout, null)
                 view.findViewById<TextView>(R.id.user).text =
                     view.findViewById<TextView>(R.id.user).text.toString() + " (" + user + ")"
                 view.findViewById<Button>(R.id.logout).setOnClickListener {
                     Toast.makeText(context, R.string.loggedout, Toast.LENGTH_SHORT).show()
-                    val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-                    with(sharedPref!!.edit()) {
-                        putString("token", "")
-                        apply()
-                    }
+                    PreferenceHelper.setToken(requireContext(), "")
                     dialog?.dismiss()
                 }
             } else {
@@ -99,24 +93,15 @@ class LoginDialog : DialogFragment() {
                     Toast.makeText(context, R.string.server_error, Toast.LENGTH_SHORT).show()
                     return@launchWhenCreated
                 } catch (e: Exception) {
-                    Log.e(TAG, "dafaq?" + e.toString())
+                    Log.e(TAG, "dafaq?$e")
                     return@launchWhenCreated
                 }
                 if (response.error != null) {
                     Toast.makeText(context, response.error, Toast.LENGTH_SHORT).show()
                 } else if (response.token != null) {
                     Toast.makeText(context, R.string.loggedIn, Toast.LENGTH_SHORT).show()
-                    val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-                    with(sharedPref!!.edit()) {
-                        putString("token", response.token)
-                        apply()
-                    }
-                    val sharedPref2 =
-                        context?.getSharedPreferences("username", Context.MODE_PRIVATE)
-                    with(sharedPref2!!.edit()) {
-                        putString("username", login.username)
-                        apply()
-                    }
+                    PreferenceHelper.setToken(requireContext(), response.token!!)
+                    PreferenceHelper.setUsername(requireContext(), login.username!!)
                     dialog?.dismiss()
                 }
             }
@@ -139,24 +124,15 @@ class LoginDialog : DialogFragment() {
                     Toast.makeText(context, R.string.server_error, Toast.LENGTH_SHORT).show()
                     return@launchWhenCreated
                 } catch (e: Exception) {
-                    Log.e(TAG, "dafaq?" + e.toString())
+                    Log.e(TAG, "dafaq?$e")
                     return@launchWhenCreated
                 }
                 if (response.error != null) {
                     Toast.makeText(context, response.error, Toast.LENGTH_SHORT).show()
                 } else if (response.token != null) {
                     Toast.makeText(context, R.string.registered, Toast.LENGTH_SHORT).show()
-                    val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-                    with(sharedPref!!.edit()) {
-                        putString("token", response.token)
-                        apply()
-                    }
-                    val sharedPref2 =
-                        context?.getSharedPreferences("username", Context.MODE_PRIVATE)
-                    with(sharedPref2!!.edit()) {
-                        putString("username", login.username)
-                        apply()
-                    }
+                    PreferenceHelper.setToken(requireContext(), response.token!!)
+                    PreferenceHelper.setUsername(requireContext(), login.username!!)
                     dialog?.dismiss()
                 }
             }
diff --git a/app/src/main/java/com/github/libretube/dialogs/PlaylistOptionsDialog.kt b/app/src/main/java/com/github/libretube/dialogs/PlaylistOptionsDialog.kt
index 862bf8a4f..a468a2344 100644
--- a/app/src/main/java/com/github/libretube/dialogs/PlaylistOptionsDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/PlaylistOptionsDialog.kt
@@ -9,13 +9,14 @@ import android.widget.Toast
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
 import com.github.libretube.obj.PlaylistId
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.io.IOException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
+import java.io.IOException
 
 class PlaylistOptionsDialog(
     private val playlistId: String,
@@ -43,9 +44,7 @@ class PlaylistOptionsDialog(
                 when (which) {
                     // Clone the playlist to the users Piped account
                     0 -> {
-                        val sharedPref =
-                            context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-                        val token = sharedPref?.getString("token", "")
+                        val token = PreferenceHelper.getToken(requireContext())
                         if (token != "") {
                             importPlaylist(token!!, playlistId)
                         } else {
diff --git a/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt b/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt
index 45836c26e..8f92e7a8b 100644
--- a/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt
@@ -4,8 +4,8 @@ import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
-import androidx.preference.PreferenceManager
 import com.github.libretube.R
+import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class ShareDialog(
@@ -54,35 +54,19 @@ class ShareDialog(
 
     // get the frontend url if it's a custom instance
     private fun getCustomInstanceFrontendUrl(): String {
-        val sharedPreferences =
-            PreferenceManager.getDefaultSharedPreferences(requireContext())
-        val instancePref = sharedPreferences.getString(
+        val instancePref = PreferenceHelper.getString(
+            requireContext(),
             "selectInstance",
             "https://pipedapi.kavin.rocks"
         )
 
         // get the api urls of the other custom instances
-        var customInstancesUrls = try {
-            sharedPreferences
-                .getStringSet("custom_instances_url", HashSet())!!.toList()
-        } catch (e: Exception) {
-            emptyList()
-        }
-
-        // get the frontend urls of the other custom instances
-        var customInstancesFrontendUrls = try {
-            sharedPreferences
-                .getStringSet("custom_instances_url", HashSet())!!.toList()
-        } catch (e: Exception) {
-            emptyList()
-        }
+        val customInstances = PreferenceHelper.getCustomInstances(requireContext())
 
         // return the custom instance frontend url if available
-        return if (customInstancesUrls.contains(instancePref)) {
-            val index = customInstancesUrls.indexOf(instancePref)
-            return customInstancesFrontendUrls[index]
-        } else {
-            ""
+        customInstances.forEach { instance ->
+            if (instance.apiUrl == instancePref) return instance.apiUrl
         }
+        return ""
     }
 }
diff --git a/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt b/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt
index e5eb2a764..9271af500 100644
--- a/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt
@@ -8,6 +8,7 @@ import android.widget.Toast
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.BackgroundMode
 import com.github.libretube.R
+import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 /**
@@ -50,11 +51,7 @@ class VideoOptionsDialog(private val videoId: String, context: Context) : Dialog
                     }
                     // Add Video to Playlist Dialog
                     1 -> {
-                        val sharedPref = context?.getSharedPreferences(
-                            "token",
-                            Context.MODE_PRIVATE
-                        )
-                        val token = sharedPref?.getString("token", "")
+                        val token = PreferenceHelper.getToken(requireContext())
                         if (token != "") {
                             val newFragment = AddtoPlaylistDialog()
                             val bundle = Bundle()
diff --git a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt
index f42f95b69..a45f80c71 100644
--- a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt
@@ -1,7 +1,6 @@
 package com.github.libretube.fragments
 
 import android.annotation.SuppressLint
-import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -18,12 +17,13 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.libretube.R
 import com.github.libretube.adapters.ChannelAdapter
 import com.github.libretube.obj.Subscribe
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.github.libretube.util.formatShort
 import com.google.android.material.button.MaterialButton
 import com.squareup.picasso.Picasso
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class ChannelFragment : Fragment() {
 
@@ -63,9 +63,8 @@ class ChannelFragment : Fragment() {
         val refreshChannel = {
             refreshLayout?.isRefreshing = true
             fetchChannel(view)
-            val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
             val subButton = view.findViewById<MaterialButton>(R.id.channel_subscribe)
-            if (sharedPref?.getString("token", "") != "") {
+            if (PreferenceHelper.getToken(requireContext()) != "") {
                 isSubscribed(subButton)
             }
         }
@@ -95,10 +94,10 @@ class ChannelFragment : Fragment() {
         fun run() {
             lifecycleScope.launchWhenCreated {
                 val response = try {
-                    val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
+                    val token = PreferenceHelper.getToken(requireContext())
                     RetrofitInstance.api.isSubscribed(
                         channel_id!!,
-                        sharedPref?.getString("token", "")!!
+                        token
                     )
                 } catch (e: IOException) {
                     println(e)
@@ -135,9 +134,9 @@ class ChannelFragment : Fragment() {
         fun run() {
             lifecycleScope.launchWhenCreated {
                 val response = try {
-                    val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
+                    val token = PreferenceHelper.getToken(requireContext())
                     RetrofitInstance.api.subscribe(
-                        sharedPref?.getString("token", "")!!,
+                        token,
                         Subscribe(channel_id)
                     )
                 } catch (e: IOException) {
@@ -158,9 +157,9 @@ class ChannelFragment : Fragment() {
         fun run() {
             lifecycleScope.launchWhenCreated {
                 val response = try {
-                    val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
+                    val token = PreferenceHelper.getToken(requireContext())
                     RetrofitInstance.api.unsubscribe(
-                        sharedPref?.getString("token", "")!!,
+                        token,
                         Subscribe(channel_id)
                     )
                 } catch (e: IOException) {
@@ -201,7 +200,10 @@ class ChannelFragment : Fragment() {
                     channelName.text = response.name
                     if (response.verified) {
                         channelName.setCompoundDrawablesWithIntrinsicBounds(
-                            0, 0, R.drawable.ic_verified, 0
+                            0,
+                            0,
+                            R.drawable.ic_verified,
+                            0
                         )
                     }
                     view.findViewById<TextView>(R.id.channel_subs).text = resources.getString(
@@ -231,7 +233,6 @@ class ChannelFragment : Fragment() {
 
     private fun fetchNextPage() {
         fun run() {
-
             lifecycleScope.launchWhenCreated {
                 val response = try {
                     RetrofitInstance.api.getChannelNextPage(channel_id!!, nextPage!!)
diff --git a/app/src/main/java/com/github/libretube/fragments/Home.kt b/app/src/main/java/com/github/libretube/fragments/Home.kt
index 5235e72c7..573d1ad41 100644
--- a/app/src/main/java/com/github/libretube/fragments/Home.kt
+++ b/app/src/main/java/com/github/libretube/fragments/Home.kt
@@ -9,15 +9,15 @@ import android.widget.ProgressBar
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
-import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.libretube.R
 import com.github.libretube.adapters.TrendingAdapter
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class Home : Fragment() {
 
@@ -34,7 +34,6 @@ class Home : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-
         // Inflate the layout for this fragment
         return inflater.inflate(R.layout.fragment_home, container, false)
     }
@@ -42,8 +41,8 @@ class Home : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val recyclerView = view.findViewById<RecyclerView>(R.id.recview)
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
-        val grid = sharedPreferences.getString(
+        val grid = PreferenceHelper.getString(
+            requireContext(),
             "grid",
             resources.getInteger(R.integer.grid_items).toString()
         )!!
@@ -62,9 +61,8 @@ class Home : Fragment() {
         fun run() {
             lifecycleScope.launchWhenCreated {
                 val response = try {
-                    val sharedPreferences =
-                        PreferenceManager.getDefaultSharedPreferences(requireContext())
-                    RetrofitInstance.api.getTrending(sharedPreferences.getString("region", "US")!!)
+                    val region = PreferenceHelper.getString(requireContext(), "region", "US")
+                    RetrofitInstance.api.getTrending(region!!)
                 } catch (e: IOException) {
                     println(e)
                     Log.e(TAG, "IOException, you might not have internet connection")
diff --git a/app/src/main/java/com/github/libretube/fragments/Library.kt b/app/src/main/java/com/github/libretube/fragments/Library.kt
index 14946625e..4c844066e 100644
--- a/app/src/main/java/com/github/libretube/fragments/Library.kt
+++ b/app/src/main/java/com/github/libretube/fragments/Library.kt
@@ -1,6 +1,5 @@
 package com.github.libretube.fragments
 
-import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -17,10 +16,11 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.libretube.R
 import com.github.libretube.adapters.PlaylistsAdapter
 import com.github.libretube.dialogs.CreatePlaylistDialog
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class Library : Fragment() {
 
@@ -28,6 +28,7 @@ class Library : Fragment() {
     lateinit var token: String
     private lateinit var playlistRecyclerView: RecyclerView
     private lateinit var refreshLayout: SwipeRefreshLayout
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
@@ -47,33 +48,37 @@ class Library : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         playlistRecyclerView = view.findViewById(R.id.playlist_recView)
         playlistRecyclerView.layoutManager = LinearLayoutManager(view.context)
-        val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-        token = sharedPref?.getString("token", "")!!
+        token = PreferenceHelper.getToken(requireContext())
         refreshLayout = view.findViewById(R.id.playlist_refresh)
         if (token != "") {
             view.findViewById<ImageView>(R.id.boogh2).visibility = View.GONE
             view.findViewById<TextView>(R.id.textLike2).visibility = View.GONE
-            fetchPlaylists(view)
+            fetchPlaylists()
             refreshLayout.isEnabled = true
             refreshLayout.setOnRefreshListener {
-                Log.d(TAG, "hmm")
-                fetchPlaylists(view)
+                fetchPlaylists()
             }
-            view.findViewById<com.google.android.material.floatingactionbutton
-                .FloatingActionButton>(R.id.create_playlist).setOnClickListener {
+            val createPlaylistButton = view.findViewById<FloatingActionButton>(R.id.create_playlist)
+            createPlaylistButton.setOnClickListener {
                 val newFragment = CreatePlaylistDialog()
                 newFragment.show(childFragmentManager, "Create Playlist")
             }
-            childFragmentManager.setFragmentResultListener("fetchPlaylists", this) { _, _ ->
-                fetchPlaylists(view)
-            }
         } else {
             refreshLayout.isEnabled = false
             view.findViewById<FloatingActionButton>(R.id.create_playlist).visibility = View.GONE
         }
     }
 
-    private fun fetchPlaylists(view: View) {
+    override fun onResume() {
+        // optimize CreatePlaylistFab bottom margin if miniPlayer active
+        val createPlaylistButton = view?.findViewById<FloatingActionButton>(R.id.create_playlist)
+        val layoutParams = createPlaylistButton?.layoutParams as ViewGroup.MarginLayoutParams
+        layoutParams.bottomMargin = if (isMiniPlayerVisible) 180 else 64
+        createPlaylistButton?.layoutParams = layoutParams
+        super.onResume()
+    }
+
+    fun fetchPlaylists() {
         fun run() {
             refreshLayout.isRefreshing = true
             lifecycleScope.launchWhenCreated {
@@ -93,12 +98,8 @@ class Library : Fragment() {
                 }
                 if (response.isNotEmpty()) {
                     runOnUiThread {
-                        with(view.findViewById<ImageView>(R.id.boogh2)) {
-                            visibility = View.GONE
-                        }
-                        with(view.findViewById<TextView>(R.id.textLike2)) {
-                            visibility = View.GONE
-                        }
+                        view?.findViewById<ImageView>(R.id.boogh2)?.visibility = View.GONE
+                        view?.findViewById<TextView>(R.id.textLike2)?.visibility = View.GONE
                     }
                     val playlistsAdapter = PlaylistsAdapter(
                         response.toMutableList(),
@@ -107,13 +108,13 @@ class Library : Fragment() {
                     playlistRecyclerView.adapter = playlistsAdapter
                 } else {
                     runOnUiThread {
-                        with(view.findViewById<ImageView>(R.id.boogh2)) {
-                            visibility = View.VISIBLE
-                            setImageResource(R.drawable.ic_list)
+                        view?.findViewById<ImageView>(R.id.boogh2).apply {
+                            this?.visibility = View.VISIBLE
+                            this?.setImageResource(R.drawable.ic_list)
                         }
-                        with(view.findViewById<TextView>(R.id.textLike2)) {
-                            visibility = View.VISIBLE
-                            text = getString(R.string.emptyList)
+                        view?.findViewById<TextView>(R.id.textLike2).apply {
+                            this?.visibility = View.VISIBLE
+                            this?.text = getString(R.string.emptyList)
                         }
                     }
                 }
diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index 54aa2cad5..57755dad2 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -2,6 +2,7 @@ package com.github.libretube.fragments
 
 import android.annotation.SuppressLint
 import android.app.NotificationManager
+import android.app.PictureInPictureParams
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ActivityInfo
@@ -18,6 +19,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.ImageView
@@ -33,7 +35,6 @@ import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
-import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -51,12 +52,13 @@ import com.github.libretube.obj.ChapterSegment
 import com.github.libretube.obj.PipedStream
 import com.github.libretube.obj.Segment
 import com.github.libretube.obj.Segments
+import com.github.libretube.obj.SponsorBlockPrefs
 import com.github.libretube.obj.StreamItem
 import com.github.libretube.obj.Streams
 import com.github.libretube.obj.Subscribe
-import com.github.libretube.preferences.SponsorBlockSettings
 import com.github.libretube.util.CronetHelper
 import com.github.libretube.util.DescriptionAdapter
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.github.libretube.util.formatShort
 import com.google.android.exoplayer2.C
@@ -84,13 +86,14 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.squareup.picasso.Picasso
+import org.chromium.net.CronetEngine
+import retrofit2.HttpException
 import java.io.IOException
 import java.util.concurrent.Executors
 import kotlin.math.abs
-import org.chromium.net.CronetEngine
-import retrofit2.HttpException
 
 var isFullScreen = false
+var isMiniPlayerVisible = false
 
 class PlayerFragment : Fragment() {
 
@@ -118,6 +121,7 @@ class PlayerFragment : Fragment() {
     private lateinit var segmentData: Segments
     private var relatedStreams: List<StreamItem>? = arrayListOf()
     private var relatedStreamsEnabled = true
+    private var isPlayerLocked: Boolean = false
 
     private lateinit var relDownloadVideo: LinearLayout
 
@@ -128,6 +132,7 @@ class PlayerFragment : Fragment() {
     private lateinit var title: String
     private lateinit var uploader: String
     private lateinit var thumbnailUrl: String
+    private val sponsorBlockPrefs = SponsorBlockPrefs()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -149,6 +154,7 @@ class PlayerFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         hideKeyboard()
 
+        setSponsorBlockPrefs()
         initializeTransitionLayout(view)
         fetchJsonAndInitPlayer(view)
     }
@@ -182,6 +188,7 @@ class PlayerFragment : Fragment() {
                 val mainMotionLayout =
                     mainActivity.findViewById<MotionLayout>(R.id.mainMotionLayout)
                 mainMotionLayout.progress = abs(progress)
+                exoPlayerView.hideController()
                 eId = endId
                 sId = startId
             }
@@ -192,13 +199,13 @@ class PlayerFragment : Fragment() {
                 val mainMotionLayout =
                     mainActivity.findViewById<MotionLayout>(R.id.mainMotionLayout)
                 if (currentId == eId) {
-                    exoPlayerView.hideController()
+                    isMiniPlayerVisible = true
                     exoPlayerView.useController = false
-                    mainMotionLayout.progress = 1.toFloat()
+                    mainMotionLayout.progress = 1F
                 } else if (currentId == sId) {
-                    exoPlayerView.showController()
+                    isMiniPlayerVisible = false
                     exoPlayerView.useController = true
-                    mainMotionLayout.progress = 0.toFloat()
+                    mainMotionLayout.progress = 0F
                 }
             }
 
@@ -215,6 +222,7 @@ class PlayerFragment : Fragment() {
         playerMotionLayout.transitionToStart()
 
         view.findViewById<ImageView>(R.id.close_imageView).setOnClickListener {
+            isMiniPlayerVisible = false
             motionLayout.transitionToEnd()
             val mainActivity = activity as MainActivity
             mainActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
@@ -223,6 +231,7 @@ class PlayerFragment : Fragment() {
                 .commit()
         }
         view.findViewById<ImageButton>(R.id.close_imageButton).setOnClickListener {
+            isMiniPlayerVisible = false
             motionLayout.transitionToEnd()
             val mainActivity = activity as MainActivity
             mainActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
@@ -258,30 +267,42 @@ class PlayerFragment : Fragment() {
                 toggleComments()
             }
 
+        val fullScreenButton = view.findViewById<ImageButton>(R.id.fullscreen)
+        val exoTitle = view.findViewById<TextView>(R.id.exo_title)
+        val mainContainer = view.findViewById<ConstraintLayout>(R.id.main_container)
+        val linLayout = view.findViewById<LinearLayout>(R.id.linLayout)
+
         // FullScreen button trigger
-        view.findViewById<ImageButton>(R.id.fullscreen).setOnClickListener {
-            // remember to hide everything when new thing added
+        fullScreenButton.setOnClickListener {
+            exoPlayerView.hideController()
             if (!isFullScreen) {
                 with(motionLayout) {
                     getConstraintSet(R.id.start).constrainHeight(R.id.player, -1)
                     enableTransition(R.id.yt_transition, false)
                 }
-                view.findViewById<ConstraintLayout>(R.id.main_container).isClickable = true
-                view.findViewById<LinearLayout>(R.id.linLayout).visibility = View.GONE
+
+                mainContainer.isClickable = true
+                linLayout.visibility = View.GONE
+                fullScreenButton.setImageResource(R.drawable.ic_fullscreen_exit)
+                exoTitle.visibility = View.VISIBLE
+
                 val mainActivity = activity as MainActivity
                 mainActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
-                isFullScreen = true
             } else {
                 with(motionLayout) {
                     getConstraintSet(R.id.start).constrainHeight(R.id.player, 0)
                     enableTransition(R.id.yt_transition, true)
                 }
-                view.findViewById<ConstraintLayout>(R.id.main_container).isClickable = false
-                view.findViewById<LinearLayout>(R.id.linLayout).visibility = View.VISIBLE
+
+                mainContainer.isClickable = false
+                linLayout.visibility = View.VISIBLE
+                fullScreenButton.setImageResource(R.drawable.ic_fullscreen)
+                exoTitle.visibility = View.INVISIBLE
+
                 val mainActivity = activity as MainActivity
                 mainActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
-                isFullScreen = false
             }
+            isFullScreen = !isFullScreen
         }
 
         // switching between original aspect ratio (black bars) and zoomed to fill device screen
@@ -295,6 +316,23 @@ class PlayerFragment : Fragment() {
             }
         }
 
+        // lock and unlock the player
+        val lockPlayerButton = view.findViewById<ImageButton>(R.id.lock_player)
+        lockPlayerButton.setOnClickListener {
+            // change the locked/unlocked icon
+            if (!isPlayerLocked) {
+                lockPlayerButton.setImageResource(R.drawable.ic_locked)
+            } else {
+                lockPlayerButton.setImageResource(R.drawable.ic_unlocked)
+            }
+
+            // show/hide all the controls
+            lockPlayer(isPlayerLocked)
+
+            // change locked status
+            isPlayerLocked = !isPlayerLocked
+        }
+
         val scrollView = view.findViewById<ScrollView>(R.id.player_scrollView)
         scrollView.viewTreeObserver
             .addOnScrollChangedListener {
@@ -326,9 +364,11 @@ class PlayerFragment : Fragment() {
 
     override fun onPause() {
         // pause the player if the screen is turned off
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
-        val pausePlayerOnScreenOffEnabled = sharedPreferences
-            .getBoolean("pause_screen_off", false)
+        val pausePlayerOnScreenOffEnabled = PreferenceHelper.getBoolean(
+            requireContext(),
+            "pause_screen_off",
+            false
+        )
 
         // check whether the screen is on
         val pm = context?.getSystemService(Context.POWER_SERVICE) as PowerManager
@@ -358,19 +398,20 @@ class PlayerFragment : Fragment() {
     }
 
     private fun checkForSegments() {
-        if (!exoPlayer.isPlaying || !SponsorBlockSettings.sponsorBlockEnabled) return
+        if (!exoPlayer.isPlaying || !sponsorBlockPrefs.sponsorBlockEnabled) return
 
         exoPlayerView.postDelayed(this::checkForSegments, 100)
 
-        if (!::segmentData.isInitialized || segmentData.segments.isEmpty())
+        if (!::segmentData.isInitialized || segmentData.segments.isEmpty()) {
             return
+        }
 
         segmentData.segments.forEach { segment: Segment ->
             val segmentStart = (segment.segment!![0] * 1000.0f).toLong()
             val segmentEnd = (segment.segment[1] * 1000.0f).toLong()
             val currentPosition = exoPlayer.currentPosition
             if (currentPosition in segmentStart until segmentEnd) {
-                if (SponsorBlockSettings.sponsorNotificationsEnabled) {
+                if (sponsorBlockPrefs.sponsorNotificationsEnabled) {
                     Toast.makeText(context, R.string.segment_skipped, Toast.LENGTH_SHORT).show()
                 }
                 exoPlayer.seekTo(segmentEnd)
@@ -399,27 +440,29 @@ class PlayerFragment : Fragment() {
                 thumbnailUrl = response.thumbnailUrl!!
 
                 // check whether related streams and autoplay are enabled
-                val sharedPreferences = PreferenceManager
-                    .getDefaultSharedPreferences(requireContext())
-                autoplay = sharedPreferences.getBoolean("autoplay", false)
-                relatedStreamsEnabled = sharedPreferences.getBoolean("related_streams_toggle", true)
+                autoplay = PreferenceHelper.getBoolean(requireContext(), "autoplay", false)
+                relatedStreamsEnabled =
+                    PreferenceHelper.getBoolean(requireContext(), "related_streams_toggle", true)
                 // save related streams for autoplay
                 relatedStreams = response.relatedStreams
                 runOnUiThread {
                     createExoPlayer(view)
                     prepareExoPlayerView()
                     if (response.chapters != null) initializeChapters(response.chapters)
+                    // set media sources for the player
                     setResolutionAndSubtitles(view, response)
+                    exoPlayer.prepare()
+                    initializePlayerView(view, response)
                     // support for time stamped links
                     if (arguments?.getLong("timeStamp") != null) {
                         val position = arguments?.getLong("timeStamp")!! * 1000
                         exoPlayer.seekTo(position)
                     }
-                    exoPlayer.prepare()
                     exoPlayer.play()
-                    initializePlayerView(view, response)
+                    exoPlayerView.useController = true
                     initializePlayerNotification(requireContext())
                     fetchSponsorBlockSegments()
+                    // show comments if related streams disabled
                     if (!relatedStreamsEnabled) toggleComments()
                 }
             }
@@ -427,38 +470,60 @@ class PlayerFragment : Fragment() {
         run()
     }
 
+    private fun setSponsorBlockPrefs() {
+        sponsorBlockPrefs.sponsorBlockEnabled =
+            PreferenceHelper.getBoolean(requireContext(), "sb_enabled_key", true)
+        sponsorBlockPrefs.sponsorNotificationsEnabled =
+            PreferenceHelper.getBoolean(requireContext(), "sb_notifications_key", true)
+        sponsorBlockPrefs.introEnabled =
+            PreferenceHelper.getBoolean(requireContext(), "intro_category_key", false)
+        sponsorBlockPrefs.selfPromoEnabled =
+            PreferenceHelper.getBoolean(requireContext(), "selfpromo_category_key", false)
+        sponsorBlockPrefs.interactionEnabled =
+            PreferenceHelper.getBoolean(requireContext(), "interaction_category_key", false)
+        sponsorBlockPrefs.sponsorsEnabled =
+            PreferenceHelper.getBoolean(requireContext(), "sponsors_category_key", true)
+        sponsorBlockPrefs.outroEnabled =
+            PreferenceHelper.getBoolean(requireContext(), "outro_category_key", false)
+        sponsorBlockPrefs.fillerEnabled =
+            PreferenceHelper.getBoolean(requireContext(), "filler_category_key", false)
+        sponsorBlockPrefs.musicOffTopicEnabled =
+            PreferenceHelper.getBoolean(requireContext(), "music_offtopic_category_key", false)
+        sponsorBlockPrefs.previewEnabled =
+            PreferenceHelper.getBoolean(requireContext(), "preview_category_key", false)
+    }
+
     private fun fetchSponsorBlockSegments() {
         fun run() {
             lifecycleScope.launchWhenCreated {
-                if (SponsorBlockSettings.sponsorBlockEnabled) {
+                if (sponsorBlockPrefs.sponsorBlockEnabled) {
                     val categories: ArrayList<String> = arrayListOf()
-                    if (SponsorBlockSettings.introEnabled) {
+                    if (sponsorBlockPrefs.introEnabled) {
                         categories.add("intro")
                     }
-                    if (SponsorBlockSettings.selfPromoEnabled) {
+                    if (sponsorBlockPrefs.selfPromoEnabled) {
                         categories.add("selfpromo")
                     }
-                    if (SponsorBlockSettings.interactionEnabled) {
+                    if (sponsorBlockPrefs.interactionEnabled) {
                         categories.add("interaction")
                     }
-                    if (SponsorBlockSettings.sponsorsEnabled) {
+                    if (sponsorBlockPrefs.sponsorsEnabled) {
                         categories.add("sponsor")
                     }
-                    if (SponsorBlockSettings.outroEnabled) {
+                    if (sponsorBlockPrefs.outroEnabled) {
                         categories.add("outro")
                     }
-                    if (SponsorBlockSettings.fillerEnabled) {
+                    if (sponsorBlockPrefs.fillerEnabled) {
                         categories.add("filler")
                     }
-                    if (SponsorBlockSettings.musicOfftopicEnabled) {
+                    if (sponsorBlockPrefs.musicOffTopicEnabled) {
                         categories.add("music_offtopic")
                     }
-                    if (SponsorBlockSettings.previewEnabled) {
+                    if (sponsorBlockPrefs.previewEnabled) {
                         categories.add("preview")
                     }
                     if (categories.size > 0) {
                         segmentData = try {
-
                             RetrofitInstance.api.getSegments(
                                 videoId!!,
                                 "[\"" + TextUtils.join("\",\"", categories) + "\"]"
@@ -490,6 +555,7 @@ class PlayerFragment : Fragment() {
             setRepeatToggleModes(RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL)
             // controllerShowTimeoutMs = 1500
             controllerHideOnTouch = true
+            useController = false
             player = exoPlayer
         }
     }
@@ -507,10 +573,12 @@ class PlayerFragment : Fragment() {
         view.findViewById<TextView>(R.id.player_title).text = response.title
         view.findViewById<TextView>(R.id.player_description).text = response.description
 
+        view.findViewById<TextView>(R.id.exo_title).text = response.title
+
         // Listener for play and pause icon change
         exoPlayer.addListener(object : Player.Listener {
             override fun onIsPlayingChanged(isPlaying: Boolean) {
-                if (isPlaying && SponsorBlockSettings.sponsorBlockEnabled) {
+                if (isPlaying && sponsorBlockPrefs.sponsorBlockEnabled) {
                     exoPlayerView.postDelayed(
                         this@PlayerFragment::checkForSegments,
                         100
@@ -523,7 +591,6 @@ class PlayerFragment : Fragment() {
                 playWhenReady: Boolean,
                 playbackState: Int
             ) {
-
                 exoPlayerView.keepScreenOn = !(
                     playbackState == Player.STATE_IDLE ||
                         playbackState == Player.STATE_ENDED ||
@@ -627,15 +694,14 @@ class PlayerFragment : Fragment() {
             }
 
         view.findViewById<RelativeLayout>(R.id.player_channel).setOnClickListener {
-
             val activity = view.context as MainActivity
             val bundle = bundleOf("channel_id" to response.uploaderUrl)
             activity.navController.navigate(R.id.channel, bundle)
             activity.findViewById<MotionLayout>(R.id.mainMotionLayout).transitionToEnd()
             view.findViewById<MotionLayout>(R.id.playerMotionLayout).transitionToEnd()
         }
-        val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-        if (sharedPref?.getString("token", "") != "") {
+        val token = PreferenceHelper.getToken(requireContext())
+        if (token != "") {
             val channelId = response.uploaderUrl?.replace("/channel/", "")
             val subButton = view.findViewById<MaterialButton>(R.id.player_subscribe)
             isSubscribed(subButton, channelId!!)
@@ -698,14 +764,12 @@ class PlayerFragment : Fragment() {
     }
 
     private fun setResolutionAndSubtitles(view: View, response: Streams) {
-        val sharedPreferences =
-            PreferenceManager.getDefaultSharedPreferences(requireContext())
-
-        val videoFormatPreference = sharedPreferences.getString("player_video_format", "WEBM")
-        val defres = sharedPreferences.getString("default_res", "")!!
+        val videoFormatPreference =
+            PreferenceHelper.getString(requireContext(), "player_video_format", "WEBM")
+        val defres = PreferenceHelper.getString(requireContext(), "default_res", "")!!
 
         val qualityText = view.findViewById<TextView>(R.id.quality_text)
-        val qualitySelect = view.findViewById<ImageButton>(R.id.quality_select)
+        val qualitySelect = view.findViewById<LinearLayout>(R.id.quality_linLayout)
 
         var videosNameArray: Array<CharSequence> = arrayOf()
         var videosUrlArray: Array<Uri> = arrayOf()
@@ -717,7 +781,6 @@ class PlayerFragment : Fragment() {
         }
 
         for (vid in response.videoStreams!!) {
-            Log.e(TAG, vid.toString())
             // append quality to list if it has the preferred format (e.g. MPEG)
             if (vid.format.equals(videoFormatPreference)) { // preferred format
                 videosNameArray += vid.quality!!
@@ -817,11 +880,13 @@ class PlayerFragment : Fragment() {
     }
 
     private fun createExoPlayer(view: View) {
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
-        val playbackSpeed = sharedPreferences.getString("playback_speed", "1F")?.toFloat()
+        val playbackSpeed =
+            PreferenceHelper.getString(requireContext(), "playback_speed", "1F")?.toFloat()
         // multiply by thousand: s -> ms
-        val bufferingGoal = sharedPreferences.getString("buffering_goal", "50")?.toInt()!! * 1000
-        val seekIncrement = sharedPreferences.getString("seek_increment", "5")?.toLong()!! * 1000
+        val bufferingGoal =
+            PreferenceHelper.getString(requireContext(), "buffering_goal", "50")?.toInt()!! * 1000
+        val seekIncrement =
+            PreferenceHelper.getString(requireContext(), "seek_increment", "5")?.toLong()!! * 1000
 
         val cronetEngine: CronetEngine = CronetHelper.getCronetEngine()
         val cronetDataSourceFactory: CronetDataSource.Factory =
@@ -863,7 +928,6 @@ class PlayerFragment : Fragment() {
     }
 
     private fun initializePlayerNotification(c: Context) {
-
         mediaSession = MediaSessionCompat(c, this.javaClass.name)
         mediaSession.apply {
             isActive = true
@@ -887,15 +951,26 @@ class PlayerFragment : Fragment() {
         }
     }
 
+    private fun lockPlayer(isLocked: Boolean) {
+        val visibility = if (isLocked) View.VISIBLE else View.INVISIBLE
+        exoPlayerView.findViewById<LinearLayout>(R.id.exo_top_bar_right).visibility = visibility
+        exoPlayerView.findViewById<ImageButton>(R.id.exo_play_pause).visibility = visibility
+        exoPlayerView.findViewById<Button>(R.id.exo_ffwd_with_amount).visibility = visibility
+        exoPlayerView.findViewById<Button>(R.id.exo_rew_with_amount).visibility = visibility
+        exoPlayerView.findViewById<FrameLayout>(R.id.exo_bottom_bar).visibility = visibility
+        exoPlayerView.findViewById<TextView>(R.id.exo_title).visibility =
+            if (isLocked && isFullScreen) View.VISIBLE else View.INVISIBLE
+    }
+
     private fun isSubscribed(button: MaterialButton, channel_id: String) {
         @SuppressLint("ResourceAsColor")
         fun run() {
             lifecycleScope.launchWhenCreated {
                 val response = try {
-                    val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
+                    val token = PreferenceHelper.getToken(requireContext())
                     RetrofitInstance.api.isSubscribed(
                         channel_id,
-                        sharedPref?.getString("token", "")!!
+                        token
                     )
                 } catch (e: IOException) {
                     println(e)
@@ -932,9 +1007,9 @@ class PlayerFragment : Fragment() {
         fun run() {
             lifecycleScope.launchWhenCreated {
                 val response = try {
-                    val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
+                    val token = PreferenceHelper.getToken(requireContext())
                     RetrofitInstance.api.subscribe(
-                        sharedPref?.getString("token", "")!!,
+                        token,
                         Subscribe(channel_id)
                     )
                 } catch (e: IOException) {
@@ -955,9 +1030,9 @@ class PlayerFragment : Fragment() {
         fun run() {
             lifecycleScope.launchWhenCreated {
                 val response = try {
-                    val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
+                    val token = PreferenceHelper.getToken(requireContext())
                     RetrofitInstance.api.unsubscribe(
-                        sharedPref?.getString("token", "")!!,
+                        token,
                         Subscribe(channel_id)
                     )
                 } catch (e: IOException) {
@@ -1072,7 +1147,11 @@ class PlayerFragment : Fragment() {
                     isFullScreen
                 )
         ) {
-            requireActivity().enterPictureInPictureMode()
+            activity?.enterPictureInPictureMode(updatePipParams())
         }
     }
+
+    private fun updatePipParams() = PictureInPictureParams.Builder()
+        .setActions(emptyList())
+        .build()
 }
diff --git a/app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt
index 02ac6193a..4e8c20dab 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlaylistFragment.kt
@@ -1,6 +1,5 @@
 package com.github.libretube.fragments
 
-import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -15,9 +14,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.libretube.R
 import com.github.libretube.adapters.PlaylistAdapter
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class PlaylistFragment : Fragment() {
     private val TAG = "PlaylistFragment"
@@ -75,9 +75,7 @@ class PlaylistFragment : Fragment() {
                     view.findViewById<TextView>(R.id.playlist_uploader).text = response.uploader
                     view.findViewById<TextView>(R.id.playlist_totVideos).text =
                         getString(R.string.videoCount, response.videos.toString())
-                    val sharedPref2 =
-                        context?.getSharedPreferences("username", Context.MODE_PRIVATE)
-                    val user = sharedPref2?.getString("username", "")
+                    val user = PreferenceHelper.getUsername(requireContext())
                     var isOwner = false
                     if (response.uploaderUrl == null && response.uploader.equals(user, true)) {
                         isOwner = true
@@ -113,7 +111,6 @@ class PlaylistFragment : Fragment() {
 
     private fun fetchNextPage() {
         fun run() {
-
             lifecycleScope.launchWhenCreated {
                 val response = try {
                     RetrofitInstance.api.getPlaylistNextPage(playlistId!!, nextPage!!)
diff --git a/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt b/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt
index a61714dd8..cfe515d71 100644
--- a/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt
@@ -18,7 +18,6 @@ import android.widget.TextView.OnEditorActionListener
 import android.widget.TextView.VISIBLE
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
-import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -27,12 +26,13 @@ import com.github.libretube.adapters.SearchAdapter
 import com.github.libretube.adapters.SearchHistoryAdapter
 import com.github.libretube.adapters.SearchSuggestionsAdapter
 import com.github.libretube.hideKeyboard
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.io.IOException
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
+import java.io.IOException
 
 class SearchFragment : Fragment() {
     private val TAG = "SearchFragment"
@@ -94,7 +94,7 @@ class SearchFragment : Fragment() {
                     tempSelectedItem = id
                 }
                 .setPositiveButton(
-                    getString(R.string.okay),
+                    getString(R.string.okay)
                 ) { _, _ ->
                     selectedFilter = tempSelectedItem
                     apiSearchFilter = when (selectedFilter) {
@@ -266,7 +266,7 @@ class SearchFragment : Fragment() {
 
     private fun showHistory() {
         searchRecView.visibility = GONE
-        val historyList = getHistory()
+        val historyList = PreferenceHelper.getHistory(requireContext())
         if (historyList.isNotEmpty()) {
             historyRecView.adapter =
                 SearchHistoryAdapter(requireContext(), historyList, autoTextView, this)
@@ -275,10 +275,10 @@ class SearchFragment : Fragment() {
     }
 
     private fun addToHistory(query: String) {
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
-        val searchHistoryEnabled = sharedPreferences.getBoolean("search_history_toggle", true)
+        val searchHistoryEnabled =
+            PreferenceHelper.getBoolean(requireContext(), "search_history_toggle", true)
         if (searchHistoryEnabled) {
-            var historyList = getHistory()
+            var historyList = PreferenceHelper.getHistory(requireContext())
 
             if ((historyList.isNotEmpty() && historyList.contains(query)) || query == "") {
                 return
@@ -290,20 +290,7 @@ class SearchFragment : Fragment() {
                 historyList = historyList.takeLast(10)
             }
 
-            val set: Set<String> = HashSet(historyList)
-
-            sharedPreferences.edit().putStringSet("search_history", set)
-                .apply()
-        }
-    }
-
-    private fun getHistory(): List<String> {
-        return try {
-            val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
-            val set: Set<String> = sharedPreferences.getStringSet("search_history", HashSet())!!
-            set.toList()
-        } catch (e: Exception) {
-            emptyList()
+            PreferenceHelper.saveHistory(requireContext(), historyList)
         }
     }
 }
diff --git a/app/src/main/java/com/github/libretube/fragments/Subscriptions.kt b/app/src/main/java/com/github/libretube/fragments/Subscriptions.kt
index 077b5415e..d502a7cf3 100644
--- a/app/src/main/java/com/github/libretube/fragments/Subscriptions.kt
+++ b/app/src/main/java/com/github/libretube/fragments/Subscriptions.kt
@@ -1,6 +1,5 @@
 package com.github.libretube.fragments
 
-import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -15,7 +14,6 @@ import android.widget.Toast
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
-import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -23,9 +21,10 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.libretube.R
 import com.github.libretube.adapters.SubscriptionAdapter
 import com.github.libretube.adapters.SubscriptionChannelAdapter
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
-import java.io.IOException
 import retrofit2.HttpException
+import java.io.IOException
 
 class Subscriptions : Fragment() {
     val TAG = "SubFragment"
@@ -50,8 +49,7 @@ class Subscriptions : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-        token = sharedPref?.getString("token", "")!!
+        token = PreferenceHelper.getToken(requireContext())
         refreshLayout = view.findViewById(R.id.sub_refresh)
         if (token != "") {
             view.findViewById<RelativeLayout>(R.id.loginOrRegister).visibility = View.GONE
@@ -63,9 +61,10 @@ class Subscriptions : Fragment() {
             var channelRecView = view.findViewById<RecyclerView>(R.id.sub_channels)
 
             var feedRecView = view.findViewById<RecyclerView>(R.id.sub_feed)
-            val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
-            val grid = sharedPreferences.getString(
-                "grid", resources.getInteger(R.integer.grid_items).toString()
+            val grid = PreferenceHelper.getString(
+                requireContext(),
+                "grid",
+                resources.getInteger(R.integer.grid_items).toString()
             )!!
             feedRecView.layoutManager = GridLayoutManager(view.context, grid.toInt())
             fetchFeed(feedRecView, progressBar, view)
diff --git a/app/src/main/java/com/github/libretube/obj/CommentsPage.kt b/app/src/main/java/com/github/libretube/obj/CommentsPage.kt
index 71e1a830f..4ba48f667 100644
--- a/app/src/main/java/com/github/libretube/obj/CommentsPage.kt
+++ b/app/src/main/java/com/github/libretube/obj/CommentsPage.kt
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 data class CommentsPage(
     val comments: MutableList<Comment> = arrayListOf(),
     val disabled: Boolean? = null,
-    val nextpage: String? = "",
+    val nextpage: String? = ""
 ) {
     constructor() : this(arrayListOf(), null, "")
 }
diff --git a/app/src/main/java/com/github/libretube/obj/CustomInstance.kt b/app/src/main/java/com/github/libretube/obj/CustomInstance.kt
new file mode 100644
index 000000000..880044448
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/obj/CustomInstance.kt
@@ -0,0 +1,7 @@
+package com.github.libretube.obj
+
+class CustomInstance(
+    var name: String = "",
+    var apiUrl: String = "",
+    var frontendUrl: String = ""
+)
diff --git a/app/src/main/java/com/github/libretube/obj/DeleteUserRequest.kt b/app/src/main/java/com/github/libretube/obj/DeleteUserRequest.kt
new file mode 100644
index 000000000..f48084e46
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/obj/DeleteUserRequest.kt
@@ -0,0 +1,5 @@
+package com.github.libretube.obj
+
+data class DeleteUserRequest(
+    var password: String? = null
+)
diff --git a/app/src/main/java/com/github/libretube/obj/Playlist.kt b/app/src/main/java/com/github/libretube/obj/Playlist.kt
index 02e8dee8b..1c1a054b4 100644
--- a/app/src/main/java/com/github/libretube/obj/Playlist.kt
+++ b/app/src/main/java/com/github/libretube/obj/Playlist.kt
@@ -12,5 +12,5 @@ data class Playlist(
     var uploaderUrl: String? = null,
     var uploaderAvatar: String? = null,
     var videos: Int? = 0,
-    var relatedStreams: List<StreamItem>? = null,
+    var relatedStreams: List<StreamItem>? = null
 )
diff --git a/app/src/main/java/com/github/libretube/obj/PlaylistId.kt b/app/src/main/java/com/github/libretube/obj/PlaylistId.kt
index 2db63f2da..93f31488c 100644
--- a/app/src/main/java/com/github/libretube/obj/PlaylistId.kt
+++ b/app/src/main/java/com/github/libretube/obj/PlaylistId.kt
@@ -6,5 +6,5 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 data class PlaylistId(
     var playlistId: String? = null,
     var videoId: String? = null,
-    var index: Int = -1,
+    var index: Int = -1
 )
diff --git a/app/src/main/java/com/github/libretube/obj/Playlists.kt b/app/src/main/java/com/github/libretube/obj/Playlists.kt
index b4444cef5..f5dd42a61 100644
--- a/app/src/main/java/com/github/libretube/obj/Playlists.kt
+++ b/app/src/main/java/com/github/libretube/obj/Playlists.kt
@@ -7,5 +7,5 @@ data class Playlists(
     var id: String? = null,
     var name: String? = null,
     var shortDescription: String? = null,
-    var thumbnail: String? = null,
+    var thumbnail: String? = null
 )
diff --git a/app/src/main/java/com/github/libretube/obj/SponsorBlockPrefs.kt b/app/src/main/java/com/github/libretube/obj/SponsorBlockPrefs.kt
new file mode 100644
index 000000000..73118d5ca
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/obj/SponsorBlockPrefs.kt
@@ -0,0 +1,14 @@
+package com.github.libretube.obj
+
+class SponsorBlockPrefs(
+    var sponsorBlockEnabled: Boolean = false,
+    var sponsorNotificationsEnabled: Boolean = false,
+    var sponsorsEnabled: Boolean = false,
+    var selfPromoEnabled: Boolean = false,
+    var interactionEnabled: Boolean = false,
+    var introEnabled: Boolean = false,
+    var outroEnabled: Boolean = false,
+    var fillerEnabled: Boolean = false,
+    var musicOffTopicEnabled: Boolean = false,
+    var previewEnabled: Boolean = false
+)
diff --git a/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt b/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt
index 3f0715198..1de88cba5 100644
--- a/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt
@@ -1,15 +1,13 @@
 package com.github.libretube.preferences
 
-import android.content.Context
 import android.os.Bundle
 import android.widget.TextView
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.PreferenceManager
 import com.github.libretube.R
 import com.github.libretube.requireMainActivityRestart
+import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.chromium.base.CommandLine.reset
 
 class AdvancedSettings : PreferenceFragmentCompat() {
     val TAG = "AdvancedSettings"
@@ -22,9 +20,7 @@ class AdvancedSettings : PreferenceFragmentCompat() {
 
         val clearHistory = findPreference<Preference>("clear_history")
         clearHistory?.setOnPreferenceClickListener {
-            val sharedPreferences =
-                PreferenceManager.getDefaultSharedPreferences(requireContext())
-            sharedPreferences.edit().remove("search_history").commit()
+            PreferenceHelper.removePreference(requireContext(), "search_history")
             true
         }
 
@@ -39,14 +35,10 @@ class AdvancedSettings : PreferenceFragmentCompat() {
         MaterialAlertDialogBuilder(requireContext())
             .setPositiveButton(R.string.reset) { _, _ ->
                 // clear default preferences
-                val sharedPreferences =
-                    PreferenceManager.getDefaultSharedPreferences(requireContext())
-                sharedPreferences.edit().clear().commit()
+                PreferenceHelper.clearPreferences(requireContext())
 
                 // clear login token
-                val sharedPrefToken =
-                    context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-                sharedPrefToken?.edit()?.clear()?.commit()
+                PreferenceHelper.setToken(requireContext(), "")
 
                 requireMainActivityRestart = true
                 activity?.recreate()
diff --git a/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt b/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
index ea88a50f4..b8a4bd076 100644
--- a/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
@@ -21,7 +21,7 @@ class AppearanceSettings : PreferenceFragmentCompat() {
         val themeToggle = findPreference<ListPreference>("theme_togglee")
         themeToggle?.setOnPreferenceChangeListener { _, _ ->
             requireMainActivityRestart = true
-            ThemeHelper().restartMainActivity(requireContext())
+            ThemeHelper.restartMainActivity(requireContext())
             true
         }
 
@@ -34,7 +34,7 @@ class AppearanceSettings : PreferenceFragmentCompat() {
 
         val iconChange = findPreference<ListPreference>("icon_change")
         iconChange?.setOnPreferenceChangeListener { _, newValue ->
-            ThemeHelper().changeIcon(requireContext(), newValue.toString())
+            ThemeHelper.changeIcon(requireContext(), newValue.toString())
             true
         }
 
diff --git a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
index 430f89944..f34042572 100644
--- a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
@@ -2,7 +2,6 @@ package com.github.libretube.preferences
 
 import android.Manifest
 import android.content.ContentResolver
-import android.content.Context
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
@@ -19,19 +18,20 @@ import androidx.lifecycle.lifecycleScope
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.PreferenceManager
 import com.github.libretube.R
 import com.github.libretube.dialogs.CustomInstanceDialog
+import com.github.libretube.dialogs.DeleteAccountDialog
 import com.github.libretube.dialogs.LoginDialog
 import com.github.libretube.requireMainActivityRestart
+import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
+import org.json.JSONObject
+import org.json.JSONTokener
+import retrofit2.HttpException
 import java.io.IOException
 import java.io.InputStream
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
-import org.json.JSONObject
-import org.json.JSONTokener
-import retrofit2.HttpException
 
 class InstanceSettings : PreferenceFragmentCompat() {
     val TAG = "InstanceSettings"
@@ -59,8 +59,8 @@ class InstanceSettings : PreferenceFragmentCompat() {
                             val jsonObject = JSONTokener(json).nextValue() as JSONObject
                             Log.e(TAG, jsonObject.getJSONArray("subscriptions").toString())
                             for (
-                                i in 0 until jsonObject.getJSONArray("subscriptions")
-                                    .length()
+                            i in 0 until jsonObject.getJSONArray("subscriptions")
+                                .length()
                             ) {
                                 var url =
                                     jsonObject.getJSONArray("subscriptions").getJSONObject(i)
@@ -85,8 +85,9 @@ class InstanceSettings : PreferenceFragmentCompat() {
                             inputStream?.bufferedReader()?.readLines()?.forEach {
                                 if (it.isNotBlank()) {
                                     val channelId = it.substringBefore(",")
-                                    if (channelId.length == 24)
+                                    if (channelId.length == 24) {
                                         channels.add(channelId)
+                                    }
                                 }
                             }
                         }
@@ -132,11 +133,7 @@ class InstanceSettings : PreferenceFragmentCompat() {
 
         val clearCustomInstances = findPreference<Preference>("clearCustomInstances")
         clearCustomInstances?.setOnPreferenceClickListener {
-            val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
-            sharedPreferences.edit()
-                .remove("custom_instances_name")
-                .remove("custom_instances_url")
-                .commit()
+            PreferenceHelper.removePreference(requireContext(), "customInstances")
             activity?.recreate()
             true
         }
@@ -149,10 +146,21 @@ class InstanceSettings : PreferenceFragmentCompat() {
             true
         }
 
+        val deleteAccount = findPreference<Preference>("delete_account")
+        deleteAccount?.setOnPreferenceClickListener {
+            val token = PreferenceHelper.getToken(requireContext())
+            if (token != "") {
+                val newFragment = DeleteAccountDialog()
+                newFragment.show(childFragmentManager, "DeleteAccountDialog")
+            } else {
+                Toast.makeText(context, R.string.login_first, Toast.LENGTH_SHORT).show()
+            }
+            true
+        }
+
         val importFromYt = findPreference<Preference>("import_from_yt")
         importFromYt?.setOnPreferenceClickListener {
-            val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-            val token = sharedPref?.getString("token", "")!!
+            val token = PreferenceHelper.getToken(requireContext())
             // check StorageAccess
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                 Log.d("myz", "" + Build.VERSION.SDK_INT)
@@ -204,27 +212,15 @@ class InstanceSettings : PreferenceFragmentCompat() {
     }
 
     private fun initCustomInstances() {
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
+        val customInstances = PreferenceHelper.getCustomInstances(requireContext())
 
-        // get the names of the custom instances
-        val customInstancesNames = try {
-            sharedPreferences
-                .getStringSet("custom_instances_name", HashSet())!!.toList()
-        } catch (e: Exception) {
-            emptyList()
+        var instanceNames = resources.getStringArray(R.array.instances)
+        var instanceValues = resources.getStringArray(R.array.instancesValue)
+        customInstances.forEach { instance ->
+            instanceNames += instance.name
+            instanceValues += instance.apiUrl
         }
 
-        // get the urls of the custom instances
-        val customInstancesUrls = try {
-            sharedPreferences
-                .getStringSet("custom_instances_url", HashSet())!!.toList()
-        } catch (e: Exception) {
-            emptyList()
-        }
-
-        val instanceNames = resources.getStringArray(R.array.instances) + customInstancesNames
-        val instanceValues = resources.getStringArray(R.array.instancesValue) + customInstancesUrls
-
         // add custom instances to the list preference
         val instance = findPreference<ListPreference>("selectInstance")
         instance?.entries = instanceNames
@@ -241,15 +237,7 @@ class InstanceSettings : PreferenceFragmentCompat() {
     }
 
     private fun logout() {
-        val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
-        val token = sharedPref?.getString("token", "")
-        if (token != "") {
-            with(sharedPref!!.edit()) {
-                putString("token", "")
-                apply()
-            }
-            Toast.makeText(context, R.string.loggedout, Toast.LENGTH_SHORT).show()
-        }
+        PreferenceHelper.setToken(requireContext(), "")
     }
 
     private fun fetchInstance() {
@@ -305,11 +293,10 @@ class InstanceSettings : PreferenceFragmentCompat() {
         fun run() {
             lifecycleScope.launchWhenCreated {
                 val response = try {
-                    val sharedPref =
-                        context?.getSharedPreferences("token", Context.MODE_PRIVATE)
+                    val token = PreferenceHelper.getToken(requireContext())
                     RetrofitInstance.api.importSubscriptions(
                         false,
-                        sharedPref?.getString("token", "")!!,
+                        token,
                         channels
                     )
                 } catch (e: IOException) {
diff --git a/app/src/main/java/com/github/libretube/preferences/MainSettings.kt b/app/src/main/java/com/github/libretube/preferences/MainSettings.kt
index 6654872d4..a8ceef736 100644
--- a/app/src/main/java/com/github/libretube/preferences/MainSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/MainSettings.kt
@@ -31,7 +31,7 @@ class MainSettings : PreferenceFragmentCompat() {
 
         val language = findPreference<ListPreference>("language")
         language?.setOnPreferenceChangeListener { _, _ ->
-            ThemeHelper().restartMainActivity(requireContext())
+            ThemeHelper.restartMainActivity(requireContext())
             true
         }
 
diff --git a/app/src/main/java/com/github/libretube/preferences/SponsorBlockSettings.kt b/app/src/main/java/com/github/libretube/preferences/SponsorBlockSettings.kt
index 1236a8b5c..4d8def0b3 100644
--- a/app/src/main/java/com/github/libretube/preferences/SponsorBlockSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/SponsorBlockSettings.kt
@@ -3,88 +3,15 @@ package com.github.libretube.preferences
 import android.os.Bundle
 import android.widget.TextView
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SwitchPreferenceCompat
 import com.github.libretube.R
 
 class SponsorBlockSettings : PreferenceFragmentCompat() {
     private val TAG = "SponsorBlockSettings"
 
-    companion object {
-        var sponsorBlockEnabled: Boolean = false
-        var sponsorNotificationsEnabled: Boolean = false
-        var sponsorsEnabled: Boolean = false
-        var selfPromoEnabled: Boolean = false
-        var interactionEnabled: Boolean = false
-        var introEnabled: Boolean = false
-        var outroEnabled: Boolean = false
-        var fillerEnabled: Boolean = false
-        var musicOfftopicEnabled: Boolean = false
-        var previewEnabled: Boolean = false
-    }
-
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.sponsorblock_settings, rootKey)
 
         val topBarTextView = activity?.findViewById<TextView>(R.id.topBar_textView)
         topBarTextView?.text = getString(R.string.sponsorblock)
-
-        val sponsorBlockToggle = findPreference<SwitchPreferenceCompat>("sb_enabled_key")
-        sponsorBlockToggle?.setOnPreferenceChangeListener { _, newValue ->
-            sponsorBlockEnabled = newValue as Boolean
-            true
-        }
-
-        val notificationsToggle = findPreference<SwitchPreferenceCompat>("sb_notifications_key")
-        notificationsToggle?.setOnPreferenceChangeListener { _, newValue ->
-            sponsorNotificationsEnabled = newValue as Boolean
-            true
-        }
-
-        val sponsorToggle = findPreference<SwitchPreferenceCompat>("sponsors_category_key")
-        sponsorToggle?.setOnPreferenceChangeListener { _, newValue ->
-            sponsorsEnabled = newValue as Boolean
-            true
-        }
-        val selfPromoToggle = findPreference<SwitchPreferenceCompat>("selfpromo_category_key")
-        selfPromoToggle?.setOnPreferenceChangeListener { _, newValue ->
-            selfPromoEnabled = newValue as Boolean
-            true
-        }
-
-        val interactionToggle = findPreference<SwitchPreferenceCompat>("interaction_category_key")
-        interactionToggle?.setOnPreferenceChangeListener { _, newValue ->
-            interactionEnabled = newValue as Boolean
-            true
-        }
-
-        val introToggle = findPreference<SwitchPreferenceCompat>("intro_category_key")
-        introToggle?.setOnPreferenceChangeListener { _, newValue ->
-            introEnabled = newValue as Boolean
-            true
-        }
-
-        val outroToggle = findPreference<SwitchPreferenceCompat>("outro_category_key")
-        outroToggle?.setOnPreferenceChangeListener { _, newValue ->
-            outroEnabled = newValue as Boolean
-            true
-        }
-
-        val fillerToggle = findPreference<SwitchPreferenceCompat>("filler_category_key")
-        fillerToggle?.setOnPreferenceChangeListener { _, newValue ->
-            fillerEnabled = newValue as Boolean
-            true
-        }
-
-        val musicToggle = findPreference<SwitchPreferenceCompat>("music_offtopic_category_key")
-        musicToggle?.setOnPreferenceChangeListener { _, newValue ->
-            musicOfftopicEnabled = newValue as Boolean
-            true
-        }
-
-        val previewToggle = findPreference<SwitchPreferenceCompat>("preview_category_key")
-        previewToggle?.setOnPreferenceChangeListener { _, newValue ->
-            previewEnabled = newValue as Boolean
-            true
-        }
     }
 }
diff --git a/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt b/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt
index ad8feb7ae..8f81b6fad 100644
--- a/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt
+++ b/app/src/main/java/com/github/libretube/util/DescriptionAdapter.kt
@@ -82,7 +82,10 @@ class DescriptionAdapter(
          */
         return try {
             val resizedBitmap = Bitmap.createScaledBitmap(
-                bitmap, 1080, 1080, false
+                bitmap,
+                1080,
+                1080,
+                false
             )
             resizedBitmap
         } catch (e: Exception) {
diff --git a/app/src/main/java/com/github/libretube/util/VideoViews.kt b/app/src/main/java/com/github/libretube/util/FormatShort.kt
similarity index 100%
rename from app/src/main/java/com/github/libretube/util/VideoViews.kt
rename to app/src/main/java/com/github/libretube/util/FormatShort.kt
diff --git a/app/src/main/java/com/github/libretube/util/LocaleHelper.kt b/app/src/main/java/com/github/libretube/util/LocaleHelper.kt
index 71a52a542..1c4ec8400 100644
--- a/app/src/main/java/com/github/libretube/util/LocaleHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/LocaleHelper.kt
@@ -2,14 +2,12 @@ package com.github.libretube.util
 
 import android.content.Context
 import android.os.Build
-import androidx.preference.PreferenceManager
 import java.util.*
 
-class LocaleHelper {
+object LocaleHelper {
 
     fun updateLanguage(context: Context) {
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-        val languageName = sharedPreferences.getString("language", "sys")
+        val languageName = PreferenceHelper.getString(context, "language", "en")
         if (languageName != "") {
             setLanguage(context, languageName!!)
         }
diff --git a/app/src/main/java/com/github/libretube/util/PipedApi.kt b/app/src/main/java/com/github/libretube/util/PipedApi.kt
index 82b8c67aa..ca0f791a5 100644
--- a/app/src/main/java/com/github/libretube/util/PipedApi.kt
+++ b/app/src/main/java/com/github/libretube/util/PipedApi.kt
@@ -2,6 +2,7 @@ package com.github.libretube.util
 
 import com.github.libretube.obj.Channel
 import com.github.libretube.obj.CommentsPage
+import com.github.libretube.obj.DeleteUserRequest
 import com.github.libretube.obj.Instances
 import com.github.libretube.obj.Login
 import com.github.libretube.obj.Message
@@ -86,6 +87,12 @@ interface PipedApi {
     @POST("register")
     suspend fun register(@Body login: Login): Token
 
+    @POST("user/delete")
+    suspend fun deleteAccount(
+        @Header("Authorization") token: String,
+        @Body password: DeleteUserRequest
+    )
+
     @GET("feed")
     suspend fun getFeed(@Query("authToken") token: String?): List<StreamItem>
 
diff --git a/app/src/main/java/com/github/libretube/util/PreferenceHelper.kt b/app/src/main/java/com/github/libretube/util/PreferenceHelper.kt
new file mode 100644
index 000000000..310a02578
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/util/PreferenceHelper.kt
@@ -0,0 +1,132 @@
+package com.github.libretube.util
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.preference.PreferenceManager
+import com.github.libretube.obj.CustomInstance
+import com.google.common.reflect.TypeToken
+import com.google.gson.Gson
+import java.lang.reflect.Type
+
+object PreferenceHelper {
+    fun setString(context: Context, key: String?, value: String?) {
+        val editor = getDefaultSharedPreferencesEditor(context)
+        editor.putString(key, value)
+        editor.apply()
+    }
+
+    fun setInt(context: Context, key: String?, value: Int) {
+        val editor = getDefaultSharedPreferencesEditor(context)
+        editor.putInt(key, value)
+        editor.apply()
+    }
+
+    fun setLong(context: Context, key: String?, value: Long) {
+        val editor = getDefaultSharedPreferencesEditor(context)
+        editor.putLong(key, value)
+        editor.apply()
+    }
+
+    fun setBoolean(context: Context, key: String?, value: Boolean) {
+        val editor = getDefaultSharedPreferencesEditor(context)
+        editor.putBoolean(key, value)
+        editor.apply()
+    }
+
+    fun getString(context: Context, key: String?, defValue: String?): String? {
+        val settings: SharedPreferences = getDefaultSharedPreferences(context)
+        return settings.getString(key, defValue)
+    }
+
+    fun getInt(context: Context, key: String?, defValue: Int): Int {
+        val settings: SharedPreferences = getDefaultSharedPreferences(context)
+        return settings.getInt(key, defValue)
+    }
+
+    fun getLong(context: Context, key: String?, defValue: Long): Long {
+        val settings: SharedPreferences = getDefaultSharedPreferences(context)
+        return settings.getLong(key, defValue)
+    }
+
+    fun getBoolean(context: Context, key: String?, defValue: Boolean): Boolean {
+        val settings: SharedPreferences = getDefaultSharedPreferences(context)
+        return settings.getBoolean(key, defValue)
+    }
+
+    fun clearPreferences(context: Context) {
+        val editor = getDefaultSharedPreferencesEditor(context)
+        editor.clear().apply()
+    }
+
+    fun removePreference(context: Context, value: String?) {
+        val editor = getDefaultSharedPreferencesEditor(context)
+        editor.remove(value).apply()
+    }
+
+    fun getToken(context: Context): String {
+        val sharedPref = context.getSharedPreferences("token", Context.MODE_PRIVATE)
+        return sharedPref?.getString("token", "")!!
+    }
+
+    fun setToken(context: Context, newValue: String) {
+        val editor = context.getSharedPreferences("token", Context.MODE_PRIVATE).edit()
+        editor.putString("token", newValue).apply()
+    }
+
+    fun getUsername(context: Context): String {
+        val sharedPref = context.getSharedPreferences("username", Context.MODE_PRIVATE)
+        return sharedPref.getString("username", "")!!
+    }
+
+    fun setUsername(context: Context, newValue: String) {
+        val editor = context.getSharedPreferences("username", Context.MODE_PRIVATE).edit()
+        editor.putString("username", newValue).apply()
+    }
+
+    fun saveCustomInstance(context: Context, customInstance: CustomInstance) {
+        val editor = getDefaultSharedPreferencesEditor(context)
+        val gson = Gson()
+
+        val customInstancesList = getCustomInstances(context)
+        customInstancesList += customInstance
+
+        val json = gson.toJson(customInstancesList)
+        editor.putString("customInstances", json).apply()
+    }
+
+    fun getCustomInstances(context: Context): ArrayList<CustomInstance> {
+        val settings = getDefaultSharedPreferences(context)
+        val gson = Gson()
+        val json: String = settings.getString("customInstances", "")!!
+        val type: Type = object : TypeToken<List<CustomInstance?>?>() {}.type
+        return try {
+            gson.fromJson(json, type)
+        } catch (e: Exception) {
+            arrayListOf()
+        }
+    }
+
+    fun getHistory(context: Context): List<String> {
+        return try {
+            val settings = getDefaultSharedPreferences(context)
+            val set: Set<String> = settings.getStringSet("search_history", HashSet())!!
+            set.toList()
+        } catch (e: Exception) {
+            emptyList()
+        }
+    }
+
+    fun saveHistory(context: Context, historyList: List<String>) {
+        val editor = getDefaultSharedPreferencesEditor(context)
+        val set: Set<String> = HashSet(historyList)
+        editor.putStringSet("search_history", set).apply()
+    }
+
+    private fun getDefaultSharedPreferences(context: Context): SharedPreferences {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+    }
+
+    private fun getDefaultSharedPreferencesEditor(context: Context): SharedPreferences.Editor {
+        return getDefaultSharedPreferences(context).edit()
+    }
+}
diff --git a/app/src/main/java/com/github/libretube/util/ThemeHelper.kt b/app/src/main/java/com/github/libretube/util/ThemeHelper.kt
index 1719be3e7..ca9498685 100644
--- a/app/src/main/java/com/github/libretube/util/ThemeHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/ThemeHelper.kt
@@ -7,20 +7,17 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.preference.PreferenceManager
 import com.github.libretube.R
 
-class ThemeHelper {
+object ThemeHelper {
 
     fun updateTheme(context: Context) {
         updateAccentColor(context)
         updateThemeMode(context)
     }
 
-    fun updateAccentColor(context: Context) {
-        val colorAccent =
-            PreferenceManager.getDefaultSharedPreferences(context).getString("accent_color", "red")
-        when (colorAccent) {
+    private fun updateAccentColor(context: Context) {
+        when (PreferenceHelper.getString(context, "accent_color", "red")) {
             "my" -> context.setTheme(R.style.Theme_MY)
             "red" -> context.setTheme(R.style.Theme_Red)
             "blue" -> context.setTheme(R.style.Theme_Blue)
@@ -30,10 +27,8 @@ class ThemeHelper {
         }
     }
 
-    fun updateThemeMode(context: Context) {
-        val themeMode =
-            PreferenceManager.getDefaultSharedPreferences(context).getString("theme_togglee", "A")
-        when (themeMode) {
+    private fun updateThemeMode(context: Context) {
+        when (PreferenceHelper.getString(context, "theme_togglee", "A")) {
             "A" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
             "L" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
             "D" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
diff --git a/app/src/main/java/com/github/libretube/util/UpdateChecker.kt b/app/src/main/java/com/github/libretube/util/UpdateChecker.kt
index 2c6b9dada..3513a636d 100644
--- a/app/src/main/java/com/github/libretube/util/UpdateChecker.kt
+++ b/app/src/main/java/com/github/libretube/util/UpdateChecker.kt
@@ -7,12 +7,12 @@ import com.github.libretube.GITHUB_API_URL
 import com.github.libretube.dialogs.NoUpdateAvailableDialog
 import com.github.libretube.dialogs.UpdateAvailableDialog
 import com.github.libretube.obj.UpdateInfo
+import org.json.JSONArray
+import org.json.JSONObject
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.net.URL
 import javax.net.ssl.HttpsURLConnection
-import org.json.JSONArray
-import org.json.JSONObject
 
 fun checkUpdate(childFragmentManager: FragmentManager) {
     var updateInfo: UpdateInfo? = UpdateInfo("", "")
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index 0dbf2e57a..9460f4eaa 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorSurface"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorSurface">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
index 10cedc2e3..68fd4058e 100644
--- a/app/src/main/res/drawable/ic_arrow_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_down.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z" />
diff --git a/app/src/main/res/drawable/ic_arrow_up_down.xml b/app/src/main/res/drawable/ic_arrow_up_down.xml
index aa33a09e8..4b0da4369 100644
--- a/app/src/main/res/drawable/ic_arrow_up_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_up_down.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="14dp"
     android:width="14dp"
-    android:viewportHeight="160"
+    android:height="14dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="160"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="160">
     <path
         android:fillColor="#FF000000"
         android:pathData="M30.24,64.96C27.52,67.61 23.16,67.55 20.51,64.82 17.86,62.1 17.92,57.74 20.64,55.09L75.43,1.97 80.23,6.9 75.42,1.95c2.74,-2.65 7.1,-2.58 9.76,0.15 0.08,0.08 0.15,0.16 0.23,0.24L139.36,55.1c2.72,2.65 2.78,7.01 0.13,9.73 -2.65,2.72 -7,2.78 -9.73,0.14L80.21,16.5Z" />
diff --git a/app/src/main/res/drawable/ic_arrow_up_left.xml b/app/src/main/res/drawable/ic_arrow_up_left.xml
new file mode 100644
index 000000000..e5ed20662
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_up_left.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,17.59L17.59,19L7,8.41V15H5V5H15V7H8.41L19,17.59Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_aspect_ratio.xml b/app/src/main/res/drawable/ic_aspect_ratio.xml
index 4f2bff3ea..e7b7cbba1 100644
--- a/app/src/main/res/drawable/ic_aspect_ratio.xml
+++ b/app/src/main/res/drawable/ic_aspect_ratio.xml
@@ -1,9 +1,9 @@
-<vector android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportHeight="24"
-    android:viewportWidth="24"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M19,12h-2v3h-3v2h5v-5zM7,9h3L10,7L5,7v5h2L7,9zM21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19.01L3,19.01L3,4.99h18v14.02z" />
diff --git a/app/src/main/res/drawable/ic_bell.xml b/app/src/main/res/drawable/ic_bell.xml
index a65a68661..458ed83e0 100644
--- a/app/src/main/res/drawable/ic_bell.xml
+++ b/app/src/main/res/drawable/ic_bell.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="18"
     android:viewportHeight="20">
     <path
-        android:pathData="M8.625,0H9.375C9.5821,0 9.75,0.1679 9.75,0.375C9.75,0.5821 9.9179,0.75 10.125,0.75C10.3321,0.75 10.5,0.9179 10.5,1.125V1.875C10.5,2.4963 11.0088,3.0566 11.5685,3.3265C12.4353,3.7446 13.5132,4.5489 14.0889,5.6503C14.2067,5.8758 14.25,6.1307 14.25,6.3852V12.0512C14.25,12.9156 14.8488,13.6151 15.5614,14.1044C15.8681,14.315 16.102,14.5525 16.3642,14.8462C16.4522,14.9448 16.5,15.0728 16.5,15.2049C16.5,15.506 16.256,15.75 15.955,15.75H2.051C1.7467,15.75 1.5,15.5033 1.5,15.199C1.5,15.0704 1.5445,14.9452 1.6287,14.848C1.8916,14.5448 2.1396,14.3062 2.4619,14.0946C3.1737,13.6273 3.75,12.9293 3.75,12.0778V6.3852C3.75,6.1307 3.7933,5.8758 3.9111,5.6503C4.4868,4.5489 5.5648,3.7446 6.4316,3.3265C6.9912,3.0566 7.5,2.4963 7.5,1.875V1.125C7.5,0.9179 7.6679,0.75 7.875,0.75C8.0821,0.75 8.25,0.5821 8.25,0.375C8.25,0.1679 8.4179,0 8.625,0ZM9,19.4998C7.7574,19.4998 6.7501,18.4925 6.75,17.2499H11.25C11.2499,18.4925 10.2426,19.4998 9,19.4998ZM0.0558,7.5132C-0.1246,6.2857 0.1356,5.034 0.7902,3.9801C1.4447,2.9262 2.4513,2.1382 3.6315,1.7557L3.9552,2.7546C3.0111,3.0605 2.2058,3.691 1.6821,4.5341C1.1585,5.3772 0.9503,6.3786 1.0946,7.3605L0.0558,7.5132ZM17.1808,3.934C16.5153,2.8869 15.5006,2.1094 14.3165,1.7392L14.0032,2.7414C14.9504,3.0375 15.7623,3.6596 16.2946,4.4972C16.827,5.3348 17.0455,6.334 16.9115,7.3174L17.9519,7.4592C18.1194,6.2299 17.8463,4.981 17.1808,3.934Z"
         android:fillColor="#E6E1E5"
-        android:fillType="evenOdd" />
+        android:fillType="evenOdd"
+        android:pathData="M8.625,0H9.375C9.5821,0 9.75,0.1679 9.75,0.375C9.75,0.5821 9.9179,0.75 10.125,0.75C10.3321,0.75 10.5,0.9179 10.5,1.125V1.875C10.5,2.4963 11.0088,3.0566 11.5685,3.3265C12.4353,3.7446 13.5132,4.5489 14.0889,5.6503C14.2067,5.8758 14.25,6.1307 14.25,6.3852V12.0512C14.25,12.9156 14.8488,13.6151 15.5614,14.1044C15.8681,14.315 16.102,14.5525 16.3642,14.8462C16.4522,14.9448 16.5,15.0728 16.5,15.2049C16.5,15.506 16.256,15.75 15.955,15.75H2.051C1.7467,15.75 1.5,15.5033 1.5,15.199C1.5,15.0704 1.5445,14.9452 1.6287,14.848C1.8916,14.5448 2.1396,14.3062 2.4619,14.0946C3.1737,13.6273 3.75,12.9293 3.75,12.0778V6.3852C3.75,6.1307 3.7933,5.8758 3.9111,5.6503C4.4868,4.5489 5.5648,3.7446 6.4316,3.3265C6.9912,3.0566 7.5,2.4963 7.5,1.875V1.125C7.5,0.9179 7.6679,0.75 7.875,0.75C8.0821,0.75 8.25,0.5821 8.25,0.375C8.25,0.1679 8.4179,0 8.625,0ZM9,19.4998C7.7574,19.4998 6.7501,18.4925 6.75,17.2499H11.25C11.2499,18.4925 10.2426,19.4998 9,19.4998ZM0.0558,7.5132C-0.1246,6.2857 0.1356,5.034 0.7902,3.9801C1.4447,2.9262 2.4513,2.1382 3.6315,1.7557L3.9552,2.7546C3.0111,3.0605 2.2058,3.691 1.6821,4.5341C1.1585,5.3772 0.9503,6.3786 1.0946,7.3605L0.0558,7.5132ZM17.1808,3.934C16.5153,2.8869 15.5006,2.1094 14.3165,1.7392L14.0032,2.7414C14.9504,3.0375 15.7623,3.6596 16.2946,4.4972C16.827,5.3348 17.0455,6.334 16.9115,7.3174L17.9519,7.4592C18.1194,6.2299 17.8463,4.981 17.1808,3.934Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_bell_small.xml b/app/src/main/res/drawable/ic_bell_small.xml
index c9f18e09d..2df32bee1 100644
--- a/app/src/main/res/drawable/ic_bell_small.xml
+++ b/app/src/main/res/drawable/ic_bell_small.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="18"
     android:viewportHeight="20">
     <path
-        android:pathData="M8.625,0H9.375C9.5821,0 9.75,0.1679 9.75,0.375C9.75,0.5821 9.9179,0.75 10.125,0.75C10.3321,0.75 10.5,0.9179 10.5,1.125V1.875C10.5,2.4963 11.0088,3.0566 11.5685,3.3265C12.4353,3.7446 13.5132,4.5489 14.0889,5.6503C14.2067,5.8758 14.25,6.1307 14.25,6.3852V12.0512C14.25,12.9156 14.8488,13.6151 15.5614,14.1044C15.8681,14.315 16.102,14.5525 16.3642,14.8462C16.4522,14.9448 16.5,15.0728 16.5,15.2049C16.5,15.506 16.256,15.75 15.955,15.75H2.051C1.7467,15.75 1.5,15.5033 1.5,15.199C1.5,15.0704 1.5445,14.9452 1.6287,14.848C1.8916,14.5448 2.1396,14.3062 2.4619,14.0946C3.1737,13.6273 3.75,12.9293 3.75,12.0778V6.3852C3.75,6.1307 3.7933,5.8758 3.9111,5.6503C4.4868,4.5489 5.5648,3.7446 6.4316,3.3265C6.9912,3.0566 7.5,2.4963 7.5,1.875V1.125C7.5,0.9179 7.6679,0.75 7.875,0.75C8.0821,0.75 8.25,0.5821 8.25,0.375C8.25,0.1679 8.4179,0 8.625,0ZM9,19.4998C7.7574,19.4998 6.7501,18.4925 6.75,17.2499H11.25C11.2499,18.4925 10.2426,19.4998 9,19.4998ZM0.0558,7.5132C-0.1246,6.2857 0.1356,5.034 0.7902,3.9801C1.4447,2.9262 2.4513,2.1382 3.6315,1.7557L3.9552,2.7546C3.0111,3.0605 2.2058,3.691 1.6821,4.5341C1.1585,5.3772 0.9503,6.3786 1.0946,7.3605L0.0558,7.5132ZM17.1808,3.934C16.5153,2.8869 15.5006,2.1094 14.3165,1.7392L14.0032,2.7414C14.9504,3.0375 15.7623,3.6596 16.2946,4.4972C16.827,5.3348 17.0455,6.334 16.9115,7.3174L17.9519,7.4592C18.1194,6.2299 17.8463,4.981 17.1808,3.934Z"
         android:fillColor="#E6E1E5"
-        android:fillType="evenOdd" />
+        android:fillType="evenOdd"
+        android:pathData="M8.625,0H9.375C9.5821,0 9.75,0.1679 9.75,0.375C9.75,0.5821 9.9179,0.75 10.125,0.75C10.3321,0.75 10.5,0.9179 10.5,1.125V1.875C10.5,2.4963 11.0088,3.0566 11.5685,3.3265C12.4353,3.7446 13.5132,4.5489 14.0889,5.6503C14.2067,5.8758 14.25,6.1307 14.25,6.3852V12.0512C14.25,12.9156 14.8488,13.6151 15.5614,14.1044C15.8681,14.315 16.102,14.5525 16.3642,14.8462C16.4522,14.9448 16.5,15.0728 16.5,15.2049C16.5,15.506 16.256,15.75 15.955,15.75H2.051C1.7467,15.75 1.5,15.5033 1.5,15.199C1.5,15.0704 1.5445,14.9452 1.6287,14.848C1.8916,14.5448 2.1396,14.3062 2.4619,14.0946C3.1737,13.6273 3.75,12.9293 3.75,12.0778V6.3852C3.75,6.1307 3.7933,5.8758 3.9111,5.6503C4.4868,4.5489 5.5648,3.7446 6.4316,3.3265C6.9912,3.0566 7.5,2.4963 7.5,1.875V1.125C7.5,0.9179 7.6679,0.75 7.875,0.75C8.0821,0.75 8.25,0.5821 8.25,0.375C8.25,0.1679 8.4179,0 8.625,0ZM9,19.4998C7.7574,19.4998 6.7501,18.4925 6.75,17.2499H11.25C11.2499,18.4925 10.2426,19.4998 9,19.4998ZM0.0558,7.5132C-0.1246,6.2857 0.1356,5.034 0.7902,3.9801C1.4447,2.9262 2.4513,2.1382 3.6315,1.7557L3.9552,2.7546C3.0111,3.0605 2.2058,3.691 1.6821,4.5341C1.1585,5.3772 0.9503,6.3786 1.0946,7.3605L0.0558,7.5132ZM17.1808,3.934C16.5153,2.8869 15.5006,2.1094 14.3165,1.7392L14.0032,2.7414C14.9504,3.0375 15.7623,3.6596 16.2946,4.4972C16.827,5.3348 17.0455,6.334 16.9115,7.3174L17.9519,7.4592C18.1194,6.2299 17.8463,4.981 17.1808,3.934Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_block.xml b/app/src/main/res/drawable/ic_block.xml
index bae4d16c2..6dca0e37e 100644
--- a/app/src/main/res/drawable/ic_block.xml
+++ b/app/src/main/res/drawable/ic_block.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
         android:pathData="M12,22.7994C11.55,22.7994 11.1,22.7094 10.74,22.4394 4.89,18.8394 1.29,12.6294 1.2,5.7894 1.2,4.8894 1.65,3.9894 2.46,3.5394 8.4,0.3894 15.6,0.3894 21.54,3.6294 22.35,3.9894 22.8,4.8894 22.8,5.7894 22.71,12.6294 19.11,18.8394 13.35,22.4394 12.9,22.7094 12.45,22.7994 12,22.7994ZM12,1.9194c-3.15,0 -6.3,0.81 -9.18,2.34 -0.54,0.27 -0.9,0.9 -0.9,1.53 0.09,6.57 3.51,12.51 9.18,16.02 0.54,0.36 1.26,0.36 1.8,0C18.57,18.3894 21.9,12.3594 22.08,5.7894 22.08,5.1594 21.72,4.5294 21.18,4.2594 18.3,2.7294 15.15,1.9194 12,1.9194Z" />
diff --git a/app/src/main/res/drawable/ic_campaign.xml b/app/src/main/res/drawable/ic_campaign.xml
index 9a5eb603d..7f22d42a0 100644
--- a/app/src/main/res/drawable/ic_campaign.xml
+++ b/app/src/main/res/drawable/ic_campaign.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M18,11v2h4v-2h-4zM16,17.61c0.96,0.71 2.21,1.65 3.2,2.39 0.4,-0.53 0.8,-1.07 1.2,-1.6 -0.99,-0.74 -2.24,-1.68 -3.2,-2.4 -0.4,0.54 -0.8,1.08 -1.2,1.61zM20.4,5.6c-0.4,-0.53 -0.8,-1.07 -1.2,-1.6 -0.99,0.74 -2.24,1.68 -3.2,2.4 0.4,0.53 0.8,1.07 1.2,1.6 0.96,-0.72 2.21,-1.65 3.2,-2.4zM4,9c-1.1,0 -2,0.9 -2,2v2c0,1.1 0.9,2 2,2h1v4h2v-4h1l5,3L13,6L8,9L4,9zM15.5,12c0,-1.33 -0.58,-2.53 -1.5,-3.35v6.69c0.92,-0.81 1.5,-2.01 1.5,-3.34z" />
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index 3b3c877a9..f96401501 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/black"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
diff --git a/app/src/main/res/drawable/ic_color.xml b/app/src/main/res/drawable/ic_color.xml
index a42e26a0a..ae57a36aa 100644
--- a/app/src/main/res/drawable/ic_color.xml
+++ b/app/src/main/res/drawable/ic_color.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="48">
     <path
         android:fillColor="#FF000000"
         android:pathData="M24,44Q19.9,44 16.25,42.425Q12.6,40.85 9.875,38.125Q7.15,35.4 5.575,31.75Q4,28.1 4,24Q4,19.8 5.6,16.15Q7.2,12.5 9.975,9.8Q12.75,7.1 16.475,5.55Q20.2,4 24.45,4Q28.4,4 31.95,5.325Q35.5,6.65 38.175,9Q40.85,11.35 42.425,14.575Q44,17.8 44,21.65Q44,27.05 40.85,30.175Q37.7,33.3 32.5,33.3H28.75Q27.85,33.3 27.2,34Q26.55,34.7 26.55,35.55Q26.55,36.55 27.275,37.45Q28,38.35 28,39.6Q28,40.9 26.775,42.45Q25.55,44 24,44ZM12.35,25.3Q13.35,25.3 14.1,24.55Q14.85,23.8 14.85,22.8Q14.85,21.8 14.1,21.05Q13.35,20.3 12.35,20.3Q11.35,20.3 10.6,21.05Q9.85,21.8 9.85,22.8Q9.85,23.8 10.6,24.55Q11.35,25.3 12.35,25.3ZM18.65,16.8Q19.65,16.8 20.4,16.05Q21.15,15.3 21.15,14.3Q21.15,13.3 20.4,12.55Q19.65,11.8 18.65,11.8Q17.65,11.8 16.9,12.55Q16.15,13.3 16.15,14.3Q16.15,15.3 16.9,16.05Q17.65,16.8 18.65,16.8ZM29.35,16.8Q30.35,16.8 31.1,16.05Q31.85,15.3 31.85,14.3Q31.85,13.3 31.1,12.55Q30.35,11.8 29.35,11.8Q28.35,11.8 27.6,12.55Q26.85,13.3 26.85,14.3Q26.85,15.3 27.6,16.05Q28.35,16.8 29.35,16.8ZM35.9,25.3Q36.9,25.3 37.65,24.55Q38.4,23.8 38.4,22.8Q38.4,21.8 37.65,21.05Q36.9,20.3 35.9,20.3Q34.9,20.3 34.15,21.05Q33.4,21.8 33.4,22.8Q33.4,23.8 34.15,24.55Q34.9,25.3 35.9,25.3Z" />
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 1726235a5..05fc2abd8 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
 
     <path
         android:fillColor="#FF000000"
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
index a97988273..cdd1955bd 100644
--- a/app/src/main/res/drawable/ic_download.xml
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="48">
     <path
         android:fillColor="#FF000000"
         android:pathData="M24,32.1 L13.9,22.05 16.35,19.6 22.3,25.55V7.15H25.7V25.55L31.65,19.6L34.1,22.05ZM10.8,40.55Q9.45,40.55 8.425,39.55Q7.4,38.55 7.4,37.15V29.45H10.8V37.15Q10.8,37.15 10.8,37.15Q10.8,37.15 10.8,37.15H37.15Q37.15,37.15 37.15,37.15Q37.15,37.15 37.15,37.15V29.45H40.55V37.15Q40.55,38.55 39.55,39.55Q38.55,40.55 37.15,40.55Z" />
diff --git a/app/src/main/res/drawable/ic_download_filled.xml b/app/src/main/res/drawable/ic_download_filled.xml
index 4e586a0eb..6d5b1302c 100644
--- a/app/src/main/res/drawable/ic_download_filled.xml
+++ b/app/src/main/res/drawable/ic_download_filled.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="300"
-    android:viewportHeight="300"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="300">
     <path
         android:fillColor="#FF000000"
         android:pathData="M149.99,0C67.16,0 0,67.16 0,150c0,82.84 67.16,150 149.99,150s150,-67.16 150,-150C300,67.16 232.83,0 149.99,0zM110.97,105.36c2.08,-2.08 4.79,-3.11 7.51,-3.11c2.72,0 5.43,1.04 7.51,3.11l13.3,13.3v-3.91V62.48c0,-5.87 4.75,-10.62 10.62,-10.62s10.62,4.75 10.62,10.62v52.26v4.63l4.63,-4.63l9.39,-9.38c2.08,-2.08 4.79,-3.11 7.51,-3.11s5.44,1.04 7.51,3.11c2.55,2.55 3.52,6.08 2.93,9.38c0,0 -0,0 -0,0.01c-0.04,0.24 -0.12,0.47 -0.18,0.7c-0.09,0.37 -0.19,0.73 -0.32,1.08c-0.09,0.24 -0.19,0.47 -0.3,0.7c-0.17,0.37 -0.36,0.73 -0.57,1.08c-0.11,0.19 -0.22,0.37 -0.34,0.55c-0.36,0.52 -0.76,1.03 -1.23,1.5l-15.11,15.11l-16.59,16.59c-2.08,2.08 -4.79,3.11 -7.51,3.11c-0.03,0 -0.05,0 -0.08,0s-0.05,0 -0.08,0c-2.71,0 -5.43,-1.03 -7.51,-3.11l-16.59,-16.59l-15.11,-15.11c-0.47,-0.47 -0.86,-0.97 -1.22,-1.5c-0.13,-0.18 -0.23,-0.37 -0.34,-0.56c-0.21,-0.35 -0.4,-0.7 -0.56,-1.07c-0.11,-0.24 -0.21,-0.47 -0.3,-0.72c-0.13,-0.35 -0.22,-0.7 -0.31,-1.06c-0.06,-0.25 -0.14,-0.49 -0.19,-0.73C107.44,111.44 108.41,107.91 110.97,105.36zM231.57,209.32h-0c0,14.34 -14.06,25.57 -32.01,25.57h-99.13c-17.94,0 -32.01,-11.23 -32.01,-25.57V140.31c0,-12.12 10.06,-21.99 24,-24.76c0.6,5.98 3.22,11.53 7.53,15.83l4.11,4.11h-3.64c-7.26,0 -11.26,3.62 -11.26,4.82v69c0,1.2 3.99,4.82 11.26,4.82h99.14c7.26,0 11.26,-3.62 11.26,-4.82V140.31c0,-1.2 -3.99,-4.82 -11.26,-4.82h-3.12l4.11,-4.11c4.28,-4.28 6.89,-9.79 7.52,-15.73c13.68,2.91 23.5,12.69 23.5,24.66V209.32z" />
diff --git a/app/src/main/res/drawable/ic_empty_playlist.xml b/app/src/main/res/drawable/ic_empty_playlist.xml
index 3b7371ebc..5e92611a9 100644
--- a/app/src/main/res/drawable/ic_empty_playlist.xml
+++ b/app/src/main/res/drawable/ic_empty_playlist.xml
@@ -1,11 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="143dp"
     android:height="144dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="143"
-    android:viewportHeight="144"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="144">
     <path
+        android:fillColor="#120807"
         android:pathData="M35.74,87.66L35.74,41.39c0,-1.44 0.54,-2.7 1.61,-3.78 1.07,-1.08 2.32,-1.62 3.75,-1.62h45.95v5.4L41.11,41.39L41.11,87.66ZM46.47,98.47L46.47,52.2c0,-1.44 0.54,-2.7 1.61,-3.78 1.07,-1.08 2.32,-1.62 3.75,-1.62h45.95v5.4L51.83,52.2L51.83,98.47ZM101.89,108.01L62.56,108.01c-1.43,0 -2.68,-0.54 -3.75,-1.62 -1.07,-1.08 -1.61,-2.34 -1.61,-3.78L57.2,63c0,-1.44 0.54,-2.7 1.61,-3.78 1.07,-1.08 2.32,-1.62 3.75,-1.62h39.33c1.43,0 2.68,0.54 3.75,1.62 1.07,1.08 1.61,2.34 1.61,3.78v39.61c0,1.44 -0.54,2.7 -1.61,3.78 -1.07,1.08 -2.32,1.62 -3.75,1.62zM101.89,102.61L101.89,63L62.56,63L62.56,102.61ZM62.56,63v39.61z"
-        android:strokeWidth="1"
-        android:fillColor="#120807" />
+        android:strokeWidth="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml
index 0761dca14..52d959093 100644
--- a/app/src/main/res/drawable/ic_filter.xml
+++ b/app/src/main/res/drawable/ic_filter.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24"
     android:viewportWidth="24"
-    android:width="24dp">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
diff --git a/app/src/main/res/drawable/ic_frame.xml b/app/src/main/res/drawable/ic_frame.xml
index a665fed39..7f0e915ba 100644
--- a/app/src/main/res/drawable/ic_frame.xml
+++ b/app/src/main/res/drawable/ic_frame.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="48">
     <path
         android:fillColor="#FF000000"
         android:pathData="M13.05,21.7 L24.05,4 35.05,21.7ZM35.3,44Q31.6,44 29.1,41.5Q26.6,39 26.6,35.3Q26.6,31.6 29.1,29.1Q31.6,26.6 35.3,26.6Q39,26.6 41.5,29.1Q44,31.6 44,35.3Q44,39 41.5,41.5Q39,44 35.3,44ZM6,42.75V27.55H21.2V42.75Z" />
diff --git a/app/src/main/res/drawable/ic_fullscreen.xml b/app/src/main/res/drawable/ic_fullscreen.xml
new file mode 100644
index 000000000..bf4ff36cd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fullscreen.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@android:color/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_fullscreen_exit.xml b/app/src/main/res/drawable/ic_fullscreen_exit.xml
new file mode 100644
index 000000000..12719f5b4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fullscreen_exit.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@android:color/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M5,16h3v3h2v-5L5,14v2zM8,8L5,8v2h5L10,5L8,5v3zM14,19h2v-3h3v-2h-5v5zM16,8L16,5h-2v5h5L19,8h-3z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_grid.xml b/app/src/main/res/drawable/ic_grid.xml
index add61c29f..c37661f36 100644
--- a/app/src/main/res/drawable/ic_grid.xml
+++ b/app/src/main/res/drawable/ic_grid.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
         android:pathData="M5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H11V21ZM13,21V12H21V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM13,10V3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V10Z" />
diff --git a/app/src/main/res/drawable/ic_hd.xml b/app/src/main/res/drawable/ic_hd.xml
index 752aa24d1..7c4595403 100644
--- a/app/src/main/res/drawable/ic_hd.xml
+++ b/app/src/main/res/drawable/ic_hd.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="48">
     <path
         android:fillColor="#FF000000"
         android:pathData="M12,30.15H14.5V25.7H19.5V30.15H22V17.85H19.5V23.2H14.5V17.85H12ZM26,30.15H33.5Q34.5,30.15 35.25,29.4Q36,28.65 36,27.65V20.35Q36,19.35 35.25,18.6Q34.5,17.85 33.5,17.85H26ZM28.5,27.65V20.35H33.5Q33.5,20.35 33.5,20.35Q33.5,20.35 33.5,20.35V27.65Q33.5,27.65 33.5,27.65Q33.5,27.65 33.5,27.65ZM7,40Q5.8,40 4.9,39.1Q4,38.2 4,37V11Q4,9.8 4.9,8.9Q5.8,8 7,8H41Q42.2,8 43.1,8.9Q44,9.8 44,11V37Q44,38.2 43.1,39.1Q42.2,40 41,40Z" />
diff --git a/app/src/main/res/drawable/ic_hearted.xml b/app/src/main/res/drawable/ic_hearted.xml
index 026c4821e..604628cc2 100644
--- a/app/src/main/res/drawable/ic_hearted.xml
+++ b/app/src/main/res/drawable/ic_hearted.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="66.911"
     android:viewportHeight="66.911">
     <path
-        android:pathData="M66.911,22.831c0,-10.563 -8.558,-19.122 -19.118,-19.122c-5.658,0 -10.721,2.473 -14.223,6.377c-0.037,0.043 -0.076,0.085 -0.113,0.128c-3.5,-3.98 -8.618,-6.505 -14.334,-6.505C8.561,3.709 0.005,12.268 0,22.831c0,5.834 2.629,11.059 6.758,14.565H6.751l27.104,25.806l26.308,-25.806h-0.012C64.279,33.89 66.911,28.669 66.911,22.831z"
-        android:fillColor="#E34326" />
+        android:fillColor="#E34326"
+        android:pathData="M66.911,22.831c0,-10.563 -8.558,-19.122 -19.118,-19.122c-5.658,0 -10.721,2.473 -14.223,6.377c-0.037,0.043 -0.076,0.085 -0.113,0.128c-3.5,-3.98 -8.618,-6.505 -14.334,-6.505C8.561,3.709 0.005,12.268 0,22.831c0,5.834 2.629,11.059 6.758,14.565H6.751l27.104,25.806l26.308,-25.806h-0.012C64.279,33.89 66.911,28.669 66.911,22.831z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_history_filled.xml b/app/src/main/res/drawable/ic_history_filled.xml
index b191e731a..253ae05ac 100644
--- a/app/src/main/res/drawable/ic_history_filled.xml
+++ b/app/src/main/res/drawable/ic_history_filled.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
         android:pathData="M12,2c5.523,0 10,4.477 10,10s-4.477,10 -10,10c-1.702,0 -3.305,-0.425 -4.708,-1.175L2,22l1.176,-5.29C2.426,15.306 2,13.703 2,12 2,6.477 6.477,2 12,2zM13,7h-2v7h6v-2h-4L13,7z" />
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index 7eb8f98dd..20c5ae8c5 100644
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:viewportWidth="48"
     android:width="24dp"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal">
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
 
     <path
         android:fillColor="#FF000000"
diff --git a/app/src/main/res/drawable/ic_home_outlined.xml b/app/src/main/res/drawable/ic_home_outlined.xml
index 3825c2fa1..745a5e520 100644
--- a/app/src/main/res/drawable/ic_home_outlined.xml
+++ b/app/src/main/res/drawable/ic_home_outlined.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="48">
 
     <path
         android:fillColor="#FF000000"
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
index e4c976cea..581e50e0e 100644
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="48">
     <path
         android:fillColor="#FF000000"
         android:pathData="M24,44Q19.75,44 16.1,42.475Q12.45,40.95 9.75,38.25Q7.05,35.55 5.525,31.9Q4,28.25 4,24Q4,19.8 5.525,16.15Q7.05,12.5 9.75,9.8Q12.45,7.1 16.1,5.55Q19.75,4 24,4Q28.2,4 31.85,5.55Q35.5,7.1 38.2,9.8Q40.9,12.5 42.45,16.15Q44,19.8 44,24Q44,28.25 42.45,31.9Q40.9,35.55 38.2,38.25Q35.5,40.95 31.85,42.475Q28.2,44 24,44ZM24,18.3Q24.7,18.3 25.175,17.85Q25.65,17.4 25.65,16.7Q25.65,16 25.175,15.5Q24.7,15 24,15Q23.3,15 22.825,15.5Q22.35,16 22.35,16.7Q22.35,17.4 22.825,17.85Q23.3,18.3 24,18.3ZM22.65,34H25.65V22H22.65Z" />
diff --git a/app/src/main/res/drawable/ic_library.xml b/app/src/main/res/drawable/ic_library.xml
index f49974c03..e623e5d3c 100644
--- a/app/src/main/res/drawable/ic_library.xml
+++ b/app/src/main/res/drawable/ic_library.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:viewportWidth="48"
     android:width="24dp"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal">
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
 
     <path
         android:fillColor="#FF000000"
diff --git a/app/src/main/res/drawable/ic_license.xml b/app/src/main/res/drawable/ic_license.xml
index 406f76fb8..d3decef2f 100644
--- a/app/src/main/res/drawable/ic_license.xml
+++ b/app/src/main/res/drawable/ic_license.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="96"
-    android:viewportHeight="96"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="96">
     <path
         android:fillColor="#FF000000"
         android:fillType="evenOdd"
diff --git a/app/src/main/res/drawable/ic_like.xml b/app/src/main/res/drawable/ic_like.xml
index f55183f28..146f85cee 100644
--- a/app/src/main/res/drawable/ic_like.xml
+++ b/app/src/main/res/drawable/ic_like.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-2z" />
diff --git a/app/src/main/res/drawable/ic_list.xml b/app/src/main/res/drawable/ic_list.xml
index 4ca7cd869..ed656a508 100644
--- a/app/src/main/res/drawable/ic_list.xml
+++ b/app/src/main/res/drawable/ic_list.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/black"
         android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z" />
diff --git a/app/src/main/res/drawable/ic_locked.xml b/app/src/main/res/drawable/ic_locked.xml
new file mode 100644
index 000000000..a1014afc6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_locked.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@android:color/holo_green_dark"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml
index aff40998d..40a327adf 100644
--- a/app/src/main/res/drawable/ic_login.xml
+++ b/app/src/main/res/drawable/ic_login.xml
@@ -1,14 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
-        android:pathData="M9,3h8a2,2 0,0 1,2 2v14a2,2 0,0 1,-2 2H9m6,-9 l-4,-4m4,4 l-4,4m4,-4H5"
-        android:strokeLineJoin="round"
-        android:strokeWidth="2"
         android:fillColor="#00000000"
+        android:pathData="M9,3h8a2,2 0,0 1,2 2v14a2,2 0,0 1,-2 2H9m6,-9 l-4,-4m4,4 l-4,4m4,-4H5"
+        android:strokeWidth="2"
         android:strokeColor="@android:color/black"
-        android:strokeLineCap="round" />
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_login_filled.xml b/app/src/main/res/drawable/ic_login_filled.xml
index 3446db2fd..a4f99155a 100644
--- a/app/src/main/res/drawable/ic_login_filled.xml
+++ b/app/src/main/res/drawable/ic_login_filled.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
         android:pathData="M10,11H4V3a1,1 0,0 1,1 -1h14a1,1 0,0 1,1 1v18a1,1 0,0 1,-1 1H5a1,1 0,0 1,-1 -1v-8h6v3l5,-4 -5,-4v3z" />
diff --git a/app/src/main/res/drawable/ic_no_wifi.xml b/app/src/main/res/drawable/ic_no_wifi.xml
index b984b8dbc..8d8b7777a 100644
--- a/app/src/main/res/drawable/ic_no_wifi.xml
+++ b/app/src/main/res/drawable/ic_no_wifi.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M22.99,9C19.15,5.16 13.8,3.76 8.84,4.78l2.52,2.52c3.47,-0.17 6.99,1.05 9.63,3.7l2,-2zM18.99,13c-1.29,-1.29 -2.84,-2.13 -4.49,-2.56l3.53,3.53 0.96,-0.97zM2,3.05L5.07,6.1C3.6,6.82 2.22,7.78 1,9l1.99,2c1.24,-1.24 2.67,-2.16 4.2,-2.77l2.24,2.24C7.81,10.89 6.27,11.73 5,13v0.01L6.99,15c1.36,-1.36 3.14,-2.04 4.92,-2.06L18.98,20l1.27,-1.26L3.29,1.79 2,3.05zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0z" />
diff --git a/app/src/main/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_pause.xml
index 7e8a3e2ad..645e31d2c 100644
--- a/app/src/main/res/drawable/ic_pause.xml
+++ b/app/src/main/res/drawable/ic_pause.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
diff --git a/app/src/main/res/drawable/ic_pause_filled.xml b/app/src/main/res/drawable/ic_pause_filled.xml
index 98cc2172d..39b09cf20 100644
--- a/app/src/main/res/drawable/ic_pause_filled.xml
+++ b/app/src/main/res/drawable/ic_pause_filled.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="300"
-    android:viewportHeight="300"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="300">
     <path
         android:fillColor="#FF000000"
         android:pathData="M150,0c-82.84,0 -150,67.16 -150,150c0,82.84 67.16,150 150,150c82.84,0 150,-67.17 150,-150C300,67.16 232.85,0 150,0zM134.41,194.54c0,9.5 -7.7,17.2 -17.2,17.2s-17.2,-7.7 -17.2,-17.2V105.46c0,-9.5 7.7,-17.2 17.2,-17.2s17.2,7.7 17.2,17.2V194.54zM198.96,194.54c0,9.5 -7.7,17.2 -17.2,17.2c-9.5,0 -17.2,-7.7 -17.2,-17.2V105.46c0,-9.5 7.7,-17.2 17.2,-17.2s17.2,7.7 17.2,17.2V194.54z" />
diff --git a/app/src/main/res/drawable/ic_pinned.xml b/app/src/main/res/drawable/ic_pinned.xml
index e08649fa0..5519b88fa 100644
--- a/app/src/main/res/drawable/ic_pinned.xml
+++ b/app/src/main/res/drawable/ic_pinned.xml
@@ -1,11 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M16,9V4l1,0c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3v0c0,0.55 0.45,1 1,1l1,0v5c0,1.66 -1.34,3 -3,3h0v2h5.97v7l1,1l1,-1v-7H19v-2h0C17.34,12 16,10.66 16,9z"
-        android:fillType="evenOdd" />
+        android:fillType="evenOdd"
+        android:pathData="M16,9V4l1,0c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3v0c0,0.55 0.45,1 1,1l1,0v5c0,1.66 -1.34,3 -3,3h0v2h5.97v7l1,1l1,-1v-7H19v-2h0C17.34,12 16,10.66 16,9z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_play_filled.xml b/app/src/main/res/drawable/ic_play_filled.xml
index f3e089124..952f0be6c 100644
--- a/app/src/main/res/drawable/ic_play_filled.xml
+++ b/app/src/main/res/drawable/ic_play_filled.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="485.74"
-    android:viewportHeight="485.74"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="485.74">
     <path
         android:fillColor="#FF000000"
         android:pathData="M242.87,0C108.73,0 0,108.74 0,242.86c0,134.14 108.73,242.88 242.87,242.88c134.14,0 242.86,-108.74 242.86,-242.88C485.74,108.74 377.01,0 242.87,0zM338.41,263.94l-134.36,92.73c-16.78,11.59 -30.58,4.25 -30.58,-16.32V145.38c0,-20.56 13.81,-27.9 30.58,-16.31l134.32,92.73C355.14,233.38 355.18,252.35 338.41,263.94z" />
diff --git a/app/src/main/res/drawable/ic_playlist.xml b/app/src/main/res/drawable/ic_playlist.xml
index 24d17c426..c96251991 100644
--- a/app/src/main/res/drawable/ic_playlist.xml
+++ b/app/src/main/res/drawable/ic_playlist.xml
@@ -1,9 +1,9 @@
-<vector android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportHeight="24"
-    android:viewportWidth="24"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M4,10h12v2L4,12zM4,6h12v2L4,8zM4,14h8v2L4,16zM14,14v6l5,-3z" />
diff --git a/app/src/main/res/drawable/ic_region.xml b/app/src/main/res/drawable/ic_region.xml
index c311f9af4..68c610189 100644
--- a/app/src/main/res/drawable/ic_region.xml
+++ b/app/src/main/res/drawable/ic_region.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
         android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
diff --git a/app/src/main/res/drawable/ic_save.xml b/app/src/main/res/drawable/ic_save.xml
index 602bb91b5..6a9620b07 100644
--- a/app/src/main/res/drawable/ic_save.xml
+++ b/app/src/main/res/drawable/ic_save.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M14,10L2,10v2h12v-2zM14,6L2,6v2h12L14,6zM18,14v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zM2,16h8v-2L2,14v2z" />
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index 451a03301..f13841ac2 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -1,9 +1,9 @@
-<vector android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24"
-    android:tint="?attr/colorControlNormal"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
diff --git a/app/src/main/res/drawable/ic_server.xml b/app/src/main/res/drawable/ic_server.xml
index 05c9d5b44..e7cb848fa 100644
--- a/app/src/main/res/drawable/ic_server.xml
+++ b/app/src/main/res/drawable/ic_server.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="48">
     <path
         android:fillColor="#FF000000"
         android:pathData="M7.7,23.3Q6.95,23.3 6.475,22.7Q6,22.1 6,21.25V7.8Q6,7 6.475,6.525Q6.95,6.05 7.7,6.05H40.25Q41.05,6.05 41.525,6.525Q42,7 42,7.8V21.25Q42,22.1 41.525,22.7Q41.05,23.3 40.25,23.3ZM14.35,17.15Q15.4,17.15 16.125,16.425Q16.85,15.7 16.85,14.65Q16.85,13.6 16.125,12.875Q15.4,12.15 14.35,12.15Q13.3,12.15 12.575,12.875Q11.85,13.6 11.85,14.65Q11.85,15.7 12.575,16.425Q13.3,17.15 14.35,17.15ZM7.95,44Q7.15,44 6.575,43.475Q6,42.95 6,41.95V28.75Q6,27.95 6.475,27.325Q6.95,26.7 7.7,26.7H40.05Q40.8,26.7 41.4,27.325Q42,27.95 42,28.75V41.95Q42,42.95 41.4,43.475Q40.8,44 40.05,44ZM14.35,37.85Q15.4,37.85 16.125,37.125Q16.85,36.4 16.85,35.35Q16.85,34.3 16.125,33.575Q15.4,32.85 14.35,32.85Q13.3,32.85 12.575,33.575Q11.85,34.3 11.85,35.35Q11.85,36.4 12.575,37.125Q13.3,37.85 14.35,37.85Z" />
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index 36897c94c..76837ec84 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="48">
     <path
         android:fillColor="#FF000000"
         android:pathData="M36.35,44Q34,44 32.325,42.325Q30.65,40.65 30.65,38.3Q30.65,37.95 30.725,37.475Q30.8,37 30.95,36.6L15.8,27.8Q15.05,28.65 13.95,29.175Q12.85,29.7 11.7,29.7Q9.35,29.7 7.675,28.025Q6,26.35 6,24Q6,21.6 7.675,19.95Q9.35,18.3 11.7,18.3Q12.85,18.3 13.9,18.75Q14.95,19.2 15.8,20.05L30.95,11.35Q30.8,11 30.725,10.55Q30.65,10.1 30.65,9.7Q30.65,7.3 32.325,5.65Q34,4 36.35,4Q38.75,4 40.4,5.65Q42.05,7.3 42.05,9.7Q42.05,12.05 40.4,13.725Q38.75,15.4 36.35,15.4Q35.2,15.4 34.125,15.025Q33.05,14.65 32.3,13.8L17.15,22.2Q17.25,22.6 17.325,23.125Q17.4,23.65 17.4,24Q17.4,24.35 17.325,24.75Q17.25,25.15 17.15,25.55L32.3,34.15Q33.05,33.45 34.05,33.025Q35.05,32.6 36.35,32.6Q38.75,32.6 40.4,34.25Q42.05,35.9 42.05,38.3Q42.05,40.65 40.4,42.325Q38.75,44 36.35,44Z" />
diff --git a/app/src/main/res/drawable/ic_skip.xml b/app/src/main/res/drawable/ic_skip.xml
index d88b792d4..1594f7d64 100644
--- a/app/src/main/res/drawable/ic_skip.xml
+++ b/app/src/main/res/drawable/ic_skip.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="32"
-    android:viewportHeight="32"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="32">
     <path
         android:fillColor="#111918"
         android:pathData="M20.164,16 L5.098,28.555V3.445ZM12.631,3.445V8.088L22.125,16 12.631,23.912v4.643L27.697,16Z"
diff --git a/app/src/main/res/drawable/ic_speed.xml b/app/src/main/res/drawable/ic_speed.xml
index c009fa492..3af12ef35 100644
--- a/app/src/main/res/drawable/ic_speed.xml
+++ b/app/src/main/res/drawable/ic_speed.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="512"
-    android:viewportHeight="512"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
         android:pathData="M430.87,128.99l11.91,-11.91c6.38,-6.38 6.38,-16.73 0,-23.11c-6.38,-6.38 -16.73,-6.38 -23.11,0l-11.9,11.9c-36.81,-32.03 -83.82,-52.64 -135.43,-56.26V32.68h4.36c9.02,0 16.34,-7.32 16.34,-16.34c0,-9.02 -7.32,-16.34 -16.34,-16.34h-41.4c-9.02,0 -16.34,7.32 -16.34,16.34c0,9.02 7.32,16.34 16.34,16.34h4.36v16.92c-51.62,3.62 -98.62,24.22 -135.43,56.26L92.33,93.97c-6.38,-6.38 -16.73,-6.38 -23.11,0c-6.38,6.38 -6.38,16.73 0,23.11l11.91,11.91c-35.26,40.63 -56.62,93.63 -56.62,151.52C24.51,408.15 128.36,512 256,512s231.49,-103.85 231.49,-231.49C487.49,222.62 466.13,169.62 430.87,128.99zM256,323.54c-23.73,0 -43.03,-19.3 -43.03,-43.03c0,-17.94 11.04,-33.35 26.69,-39.8v-77.31c0,-9.02 7.32,-16.34 16.34,-16.34c9.02,0 16.34,7.32 16.34,16.34v77.31c15.65,6.45 26.69,21.85 26.69,39.8C299.03,304.24 279.73,323.54 256,323.54z" />
diff --git a/app/src/main/res/drawable/ic_sponsorblock.xml b/app/src/main/res/drawable/ic_sponsorblock.xml
index c16db6ea8..afe0e720b 100644
--- a/app/src/main/res/drawable/ic_sponsorblock.xml
+++ b/app/src/main/res/drawable/ic_sponsorblock.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
         android:pathData="M12,22.7994C11.55,22.7994 11.1,22.7094 10.74,22.4394 4.89,18.8394 1.29,12.6294 1.2,5.7894 1.2,4.8894 1.65,3.9894 2.46,3.5394 8.4,0.3894 15.6,0.3894 21.54,3.6294 22.35,3.9894 22.8,4.8894 22.8,5.7894 22.71,12.6294 19.11,18.8394 13.35,22.4394 12.9,22.7094 12.45,22.7994 12,22.7994ZM12,1.9194c-3.15,0 -6.3,0.81 -9.18,2.34 -0.54,0.27 -0.9,0.9 -0.9,1.53 0.09,6.57 3.51,12.51 9.18,16.02 0.54,0.36 1.26,0.36 1.8,0C18.57,18.3894 21.9,12.3594 22.08,5.7894 22.08,5.1594 21.72,4.5294 21.18,4.2594 18.3,2.7294 15.15,1.9194 12,1.9194Z" />
diff --git a/app/src/main/res/drawable/ic_subscriptions.xml b/app/src/main/res/drawable/ic_subscriptions.xml
index f877314b4..10574772e 100644
--- a/app/src/main/res/drawable/ic_subscriptions.xml
+++ b/app/src/main/res/drawable/ic_subscriptions.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:viewportWidth="48"
     android:width="24dp"
-    android:viewportHeight="48"
-    android:tint="?attr/colorControlNormal">
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
 
     <path
         android:fillColor="#FF000000"
diff --git a/app/src/main/res/drawable/ic_theme.xml b/app/src/main/res/drawable/ic_theme.xml
index 49d92b710..c6f1801be 100644
--- a/app/src/main/res/drawable/ic_theme.xml
+++ b/app/src/main/res/drawable/ic_theme.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="48"
-    android:viewportHeight="48"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="48">
     <path
         android:fillColor="#FF000000"
         android:pathData="M24,42Q16.5,42 11.25,36.75Q6,31.5 6,24Q6,16.5 11.25,11.25Q16.5,6 24,6Q24.4,6 24.85,6.025Q25.3,6.05 26,6.1Q24.2,7.7 23.2,10.05Q22.2,12.4 22.2,15Q22.2,19.5 25.35,22.65Q28.5,25.8 33,25.8Q35.6,25.8 37.95,24.875Q40.3,23.95 41.9,22.3Q41.95,22.9 41.975,23.275Q42,23.65 42,24Q42,31.5 36.75,36.75Q31.5,42 24,42Z" />
diff --git a/app/src/main/res/drawable/ic_thumb_up.xml b/app/src/main/res/drawable/ic_thumb_up.xml
index f55183f28..146f85cee 100644
--- a/app/src/main/res/drawable/ic_thumb_up.xml
+++ b/app/src/main/res/drawable/ic_thumb_up.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-2z" />
diff --git a/app/src/main/res/drawable/ic_time.xml b/app/src/main/res/drawable/ic_time.xml
index 120a2b142..fe85b1f50 100644
--- a/app/src/main/res/drawable/ic_time.xml
+++ b/app/src/main/res/drawable/ic_time.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="60"
-    android:viewportHeight="60"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="60">
     <path
         android:fillColor="#FF000000"
         android:pathData="M30,0.061c-16.542,0 -30,13.458 -30,30s13.458,29.879 30,29.879s30,-13.337 30,-29.879S46.542,0.061 30,0.061zM32,30.939c0,1.104 -0.896,2 -2,2H14c-1.104,0 -2,-0.896 -2,-2s0.896,-2 2,-2h14v-22c0,-1.104 0.896,-2 2,-2s2,0.896 2,2V30.939z" />
diff --git a/app/src/main/res/drawable/ic_translate.xml b/app/src/main/res/drawable/ic_translate.xml
index 92291014a..6da4f4e5e 100644
--- a/app/src/main/res/drawable/ic_translate.xml
+++ b/app/src/main/res/drawable/ic_translate.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
 
     <path
         android:fillColor="#FF000000"
diff --git a/app/src/main/res/drawable/ic_trash.xml b/app/src/main/res/drawable/ic_trash.xml
index a0969185a..789dd4fe0 100644
--- a/app/src/main/res/drawable/ic_trash.xml
+++ b/app/src/main/res/drawable/ic_trash.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24"
     android:viewportWidth="24"
-    android:width="24dp">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z" />
diff --git a/app/src/main/res/drawable/ic_trending.xml b/app/src/main/res/drawable/ic_trending.xml
index fbcf2a478..536738d66 100644
--- a/app/src/main/res/drawable/ic_trending.xml
+++ b/app/src/main/res/drawable/ic_trending.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="52"
-    android:viewportHeight="52"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="52">
     <path
         android:fillColor="#FF000000"
         android:pathData="M50.1,30.56a1.16,1.16 0,0 1,-2 0.82L42.73,26 30.32,36.65a3.39,3.39 0,0 1,-4.92 0l-7.49,-8.54L4.57,39.81a1.13,1.13 0,0 1,-1.64 0l-0.59,-0.59a1.13,1.13 0,0 1,0 -1.64L15.46,19.68a3.39,3.39 0,0 1,4.92 0l7.49,7.49 7.61,-8.78 -4.92,-4.45a1.26,1.26 0,0 1,0.82 -2.11H47.76A2.35,2.35 0,0 1,50 14.3Z" />
diff --git a/app/src/main/res/drawable/ic_unlocked.xml b/app/src/main/res/drawable/ic_unlocked.xml
new file mode 100644
index 000000000..157322ca5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_unlocked.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@android:color/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
index f175850f5..ca962aa07 100644
--- a/app/src/main/res/drawable/ic_update.xml
+++ b/app/src/main/res/drawable/ic_update.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="420.83"
-    android:viewportHeight="420.83"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="420.83">
     <path
         android:fillColor="#FF000000"
         android:pathData="M210.31,32.5C164.41,32.5 120.8,50 87.53,81.77 54.37,113.43 34.86,155.97 32.62,201.54c-0.11,2.31 0.72,4.57 2.32,6.25 1.6,1.68 3.81,2.63 6.13,2.63l38.23,0c4.46,0 8.15,-3.46 8.44,-7.92 4.12,-64.44 57.96,-114.92 122.58,-114.92 67.73,0 122.83,55.1 122.83,122.84 0,67.73 -55.1,122.84 -122.83,122.84 -15.31,0 -30.25,-2.78 -44.39,-8.26l14.68,-13.04c2.27,-1.99 3.31,-5.04 2.72,-8.01 -0.59,-2.96 -2.71,-5.39 -5.57,-6.36l-95.54,-27.52c-2.86,-0.97 -6.02,-0.34 -8.29,1.65 -2.27,1.99 -3.31,5.04 -2.72,8L91.44,373.38c0.59,2.96 2.71,5.39 5.57,6.36 2.86,0.97 6.02,0.34 8.29,-1.65l15.73,-13.78c27.01,15.7 57.88,24.01 89.27,24.01 98.1,0 177.91,-79.81 177.91,-177.91C388.22,112.31 308.41,32.5 210.31,32.5Z"
diff --git a/app/src/main/res/drawable/ic_upload.xml b/app/src/main/res/drawable/ic_upload.xml
index 32cec3cca..0f80db591 100644
--- a/app/src/main/res/drawable/ic_upload.xml
+++ b/app/src/main/res/drawable/ic_upload.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="300"
-    android:viewportHeight="300"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="300">
     <path
         android:fillColor="#FF000000"
         android:pathData="M150,0C67.16,0 0,67.16 0,150s67.16,150 150,150C232.83,300 300,232.84 300,150C300,67.16 232.83,0 150,0zM110.97,81.48l31.71,-31.71c2.08,-2.08 4.79,-3.11 7.51,-3.11c0.03,0 0.05,0 0.08,0c0.03,0 0.05,0 0.08,0c2.71,0 5.43,1.03 7.51,3.11l31.71,31.71c4.15,4.15 4.15,10.87 0,15.02c-2.07,2.08 -4.79,3.11 -7.51,3.11c-2.72,0 -5.44,-1.04 -7.51,-3.11l-14.02,-14.01v32.26v20.75v3.89c0,5.87 -4.76,10.62 -10.62,10.62c-5.87,0 -10.62,-4.75 -10.62,-10.62v-3.89v-20.75V83.21l-13.3,13.3c-2.08,2.08 -4.79,3.11 -7.51,3.11c-2.72,0 -5.44,-1.04 -7.51,-3.11C106.82,92.36 106.82,85.63 110.97,81.48zM231.58,209.32h-0c0,14.34 -14.06,25.57 -32.01,25.57h-99.13c-17.94,0 -32.01,-11.23 -32.01,-25.57V140.31c0,-14.34 14.06,-25.57 32.01,-25.57h13.39c1.52,0.27 3.08,0.43 4.66,0.43c1.57,0 3.12,-0.16 4.63,-0.43h0.61v20.75h-23.28c-7.26,0 -11.26,3.62 -11.26,4.82v69.01c0,1.2 3.99,4.82 11.26,4.82h99.14c7.26,0 11.26,-3.62 11.26,-4.82V140.31c0,-1.2 -3.99,-4.82 -11.26,-4.82h-23.49v-20.75h1.44c1.48,0.26 2.99,0.43 4.53,0.43c1.58,0 3.13,-0.16 4.66,-0.43h12.86c17.95,0 32.01,11.23 32.01,25.57V209.32z" />
diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml
index d7bd40fba..cc83f3eda 100644
--- a/app/src/main/res/drawable/ic_verified.xml
+++ b/app/src/main/res/drawable/ic_verified.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="14dp"
     android:height="14dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M23,12l-2.44,-2.79l0.34,-3.69l-3.61,-0.82L15.4,1.5L12,2.96L8.6,1.5L6.71,4.69L3.1,5.5L3.44,9.2L1,12l2.44,2.79l-0.34,3.7l3.61,0.82L8.6,22.5l3.4,-1.47l3.4,1.46l1.89,-3.19l3.61,-0.82l-0.34,-3.69L23,12zM10.09,16.72l-3.8,-3.81l1.48,-1.48l2.32,2.33l5.85,-5.87l1.48,1.48L10.09,16.72z" />
diff --git a/app/src/main/res/drawable/ic_video.xml b/app/src/main/res/drawable/ic_video.xml
index ca1dce23e..16fefb228 100644
--- a/app/src/main/res/drawable/ic_video.xml
+++ b/app/src/main/res/drawable/ic_video.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="512"
-    android:viewportHeight="512"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="512">
     <path
         android:fillColor="#FF000000"
         android:pathData="M395.6,69.8L325.8,0h-58.2l69.8,69.8H395.6zM23.3,0H0v69.8h93.1L23.3,0zM244.4,69.8L174.5,0h-58.2l69.8,69.8H244.4zM418.9,162.9h-93.1l69.8,-69.8h-58.2l-69.8,69.8h-93.1l69.8,-69.8h-58.2l-69.8,69.8H23.3l69.8,-69.8H0v372.4C0,491.1 20.9,512 46.5,512h418.9c25.7,0 46.5,-20.9 46.5,-46.5V93.1h-23.3L418.9,162.9zM186.2,442.2V232.7l186.2,104.7L186.2,442.2zM418.9,0l69.8,69.8H512V0H418.9z" />
diff --git a/app/src/main/res/drawable/ic_videocam.xml b/app/src/main/res/drawable/ic_videocam.xml
index e91a47788..f3699e8ab 100644
--- a/app/src/main/res/drawable/ic_videocam.xml
+++ b/app/src/main/res/drawable/ic_videocam.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/colorControlNormal"
     android:viewportWidth="28"
-    android:viewportHeight="28"
-    android:tint="?android:attr/colorControlNormal">
+    android:viewportHeight="28">
     <path
         android:fillColor="#212121"
         android:pathData="M5.25,5.5C3.455,5.5 2,6.955 2,8.75V19.25C2,21.045 3.455,22.5 5.25,22.5H14.75C16.545,22.5 18,21.045 18,19.25V8.75C18,6.955 16.545,5.5 14.75,5.5H5.25Z" />
diff --git a/app/src/main/res/drawable/ic_vlc.xml b/app/src/main/res/drawable/ic_vlc.xml
index db03e26e9..074c57662 100644
--- a/app/src/main/res/drawable/ic_vlc.xml
+++ b/app/src/main/res/drawable/ic_vlc.xml
@@ -1,9 +1,9 @@
-<vector android:height="24dp"
-    android:viewportHeight="1000"
-    android:viewportWidth="1000"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="?attr/colorControlNormal">
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="1000"
+    android:viewportHeight="1000">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M469.81,12.11c-5.14,0.79 -12.65,6.33 -17,11.86c-6.33,8.3 -23.33,56.15 -37.96,109.13c-5.14,17 77.1,28.47 134.84,18.98c42.31,-7.12 41.12,-4.75 25.7,-56.54c-19.38,-66.03 -25.7,-77.5 -43.1,-82.24C518.05,9.34 486.81,8.95 469.81,12.11z" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b30527a37..aed494ea4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -2,21 +2,21 @@
 <androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/mainMotionLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layoutDescription="@xml/activity_main_scene"
-    tools:context=".MainActivity"
-    android:id="@+id/mainMotionLayout">
+    tools:context=".MainActivity">
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         app:menu="@menu/action_bar"
-        app:titleCentered="true"
+        app:navigationIcon="@drawable/ic_settings"
         app:subtitleCentered="true"
         app:title="@string/app_name"
-        app:navigationIcon="@drawable/ic_settings"
+        app:titleCentered="true"
 
         />
 
@@ -44,9 +44,9 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@android:color/transparent"
         android:elevation="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:background="@android:color/transparent" />
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.motion.widget.MotionLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_player.xml b/app/src/main/res/layout/activity_player.xml
index 35f81a257..c9851ab3f 100644
--- a/app/src/main/res/layout/activity_player.xml
+++ b/app/src/main/res/layout/activity_player.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".util.Player"
-    android:background="@android:color/black">
+    android:background="@android:color/black"
+    tools:context=".util.Player">
 
     <com.github.libretube.util.CustomExoPlayerView
         android:id="@+id/fullscreen_player"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 30f251f90..73ca5679f 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -5,14 +5,16 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:paddingVertical="5dp">
 
         <ImageButton
             android:id="@+id/back_imageButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="6dp"
             android:layout_marginVertical="10dp"
+            android:layout_marginLeft="15dp"
+            android:background="?android:selectableItemBackgroundBorderless"
             android:backgroundTint="@android:color/transparent"
             android:src="@drawable/ic_arrow_back" />
 
@@ -20,16 +22,16 @@
             android:id="@+id/topBar_textView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="25dp"
             android:text="@string/settings"
-            android:layout_marginLeft="14dp"
-            android:textSize="20sp"
-            android:layout_gravity="center" />
+            android:textSize="20sp" />
 
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/settings"
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:orientation="vertical" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/channel_search_row.xml b/app/src/main/res/layout/channel_search_row.xml
index bd82790a1..c52c4c0cd 100644
--- a/app/src/main/res/layout/channel_search_row.xml
+++ b/app/src/main/res/layout/channel_search_row.xml
@@ -16,10 +16,10 @@
 
     <LinearLayout
         android:id="@+id/constraintLayout"
-        android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="40dp"
+        android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/search_channel_image"
         app:layout_constraintTop_toTopOf="parent">
@@ -29,9 +29,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="10dp"
-            android:textSize="16sp"
+            android:ellipsize="end"
             android:maxLines="1"
-            android:ellipsize="end" />
+            android:textSize="16sp" />
 
         <TextView
             android:id="@+id/search_views"
diff --git a/app/src/main/res/layout/channel_subscription_row.xml b/app/src/main/res/layout/channel_subscription_row.xml
index 746ef9fd9..ce414f2b9 100644
--- a/app/src/main/res/layout/channel_subscription_row.xml
+++ b/app/src/main/res/layout/channel_subscription_row.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginLeft="8dp"
-    android:layout_marginRight="8dp"
     android:layout_marginTop="4dp"
+    android:layout_marginRight="8dp"
     android:layout_marginBottom="4dp"
     android:background="?android:attr/selectableItemBackground">
 
@@ -35,7 +35,7 @@
         android:layout_alignParentEnd="true"
         android:backgroundTint="?attr/colorOnPrimary"
         android:text="@string/unsubscribe"
-        android:textSize="11dp"
         android:textColor="?android:attr/textColorPrimary"
+        android:textSize="11dp"
         app:cornerRadius="20dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chapter_column.xml b/app/src/main/res/layout/chapter_column.xml
index 4f5171ea4..bc9a2f45d 100644
--- a/app/src/main/res/layout/chapter_column.xml
+++ b/app/src/main/res/layout/chapter_column.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_marginHorizontal="10dp"
     android:layout_width="80dp"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="10dp"
+    android:orientation="vertical">
 
     <ImageView
         android:id="@+id/chapter_image"
@@ -16,8 +16,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
-        android:maxLines="3"
         android:ellipsize="end"
+        android:maxLines="3"
         android:text="Title"
         android:textSize="13sp" />
 
diff --git a/app/src/main/res/layout/comments_row.xml b/app/src/main/res/layout/comments_row.xml
index d764f3b71..a694c0029 100644
--- a/app/src/main/res/layout/comments_row.xml
+++ b/app/src/main/res/layout/comments_row.xml
@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:background="?android:attr/selectableItemBackground"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -11,11 +11,11 @@
         android:orientation="vertical">
 
         <LinearLayout
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="16dp">
+            android:paddingBottom="16dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <de.hdodenhof.circleimageview.CircleImageView
                 android:id="@+id/commentor_image"
@@ -48,19 +48,19 @@
                         android:id="@+id/verified_imageView"
                         android:layout_width="16dp"
                         android:layout_height="16dp"
-                        android:layout_marginTop="4dp"
                         android:layout_marginLeft="4dp"
-                        app:srcCompat="@drawable/ic_verified"
-                        android:visibility="gone" />
+                        android:layout_marginTop="4dp"
+                        android:visibility="gone"
+                        app:srcCompat="@drawable/ic_verified" />
 
                     <ImageView
                         android:id="@+id/pinned_imageView"
                         android:layout_width="16dp"
                         android:layout_height="16dp"
-                        android:layout_marginTop="4dp"
                         android:layout_marginLeft="4dp"
-                        app:srcCompat="@drawable/ic_pinned"
-                        android:visibility="gone" />
+                        android:layout_marginTop="4dp"
+                        android:visibility="gone"
+                        app:srcCompat="@drawable/ic_pinned" />
                 </LinearLayout>
 
                 <TextView
@@ -80,8 +80,8 @@
                         android:id="@+id/likes_imageView"
                         android:layout_width="16dp"
                         android:layout_height="16dp"
-                        android:layout_marginRight="6dp"
                         android:layout_marginTop="2dp"
+                        android:layout_marginRight="6dp"
                         app:srcCompat="@drawable/ic_thumb_up" />
 
                     <TextView
@@ -96,8 +96,8 @@
                         android:layout_height="14dp"
                         android:layout_marginLeft="8dp"
                         android:layout_marginTop="3dp"
-                        app:srcCompat="@drawable/ic_hearted"
-                        android:visibility="gone" />
+                        android:visibility="gone"
+                        app:srcCompat="@drawable/ic_hearted" />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_addtoplaylist.xml b/app/src/main/res/layout/dialog_addtoplaylist.xml
index c5b01143b..04e3bc172 100644
--- a/app/src/main/res/layout/dialog_addtoplaylist.xml
+++ b/app/src/main/res/layout/dialog_addtoplaylist.xml
@@ -4,7 +4,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
@@ -23,7 +22,8 @@
 
     <Button
         android:id="@+id/addToPlaylist"
-        android:text="@string/addToPlaylist"
-        style="@style/CustomDialogButton" />
+        style="@style/CustomDialogButton"
+        android:layout_marginRight="16dp"
+        android:text="@string/addToPlaylist" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_create_playlist.xml b/app/src/main/res/layout/dialog_create_playlist.xml
index f6a44397a..4a78eb664 100644
--- a/app/src/main/res/layout/dialog_create_playlist.xml
+++ b/app/src/main/res/layout/dialog_create_playlist.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
 
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/app_name"
-        android:gravity="center"
         android:layout_margin="10dp"
+        android:gravity="center"
+        android:text="@string/app_name"
         android:textSize="20sp" />
 
     <com.google.android.material.textfield.TextInputLayout style="@style/CustomDialogTextInputLayout">
@@ -29,18 +29,19 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="right">
+        android:gravity="right"
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/cancel_button"
-            android:text="@string/cancel"
-            style="@style/CustomDialogButton" />
+            style="@style/CustomDialogButton"
+            android:text="@string/cancel" />
 
         <Button
             android:id="@+id/create_new_playlist"
-            android:text="@string/createPlaylist"
-            style="@style/CustomDialogButton" />
+            style="@style/CustomDialogButton"
+            android:layout_marginRight="16dp"
+            android:text="@string/createPlaylist" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_custom_instance.xml b/app/src/main/res/layout/dialog_custom_instance.xml
index fa7d2a08e..2343e3bf5 100644
--- a/app/src/main/res/layout/dialog_custom_instance.xml
+++ b/app/src/main/res/layout/dialog_custom_instance.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
 
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/app_name"
-        android:gravity="center"
         android:layout_margin="10dp"
+        android:gravity="center"
+        android:text="@string/app_name"
         android:textSize="20sp" />
 
     <com.google.android.material.textfield.TextInputLayout style="@style/CustomDialogTextInputLayout">
@@ -40,28 +40,29 @@
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/instanceApiUrl"
-            android:inputType="text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/instance_api_url"
+            android:inputType="text"
             android:padding="12dp" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="end">
+        android:gravity="end"
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/cancel"
-            android:text="@string/cancel"
-            style="@style/CustomDialogButton" />
+            style="@style/CustomDialogButton"
+            android:text="@string/cancel" />
 
         <Button
             android:id="@+id/addInstance"
-            android:text="@string/addInstance"
-            style="@style/CustomDialogButton" />
+            style="@style/CustomDialogButton"
+            android:layout_marginRight="16dp"
+            android:text="@string/addInstance" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_delete_account.xml b/app/src/main/res/layout/dialog_delete_account.xml
new file mode 100644
index 000000000..8eee7ae87
--- /dev/null
+++ b/app/src/main/res/layout/dialog_delete_account.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:gravity="center"
+        android:text="@string/app_name"
+        android:textSize="20sp" />
+
+    <com.google.android.material.textfield.TextInputLayout style="@style/CustomDialogTextInputLayout">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/delete_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/password"
+            android:inputType="textPassword"
+            android:padding="12dp" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="right"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/cancel_button"
+            style="@style/CustomDialogButton"
+            android:text="@string/cancel" />
+
+        <Button
+            android:id="@+id/delete_account_confirm"
+            style="@style/CustomDialogButton"
+            android:layout_marginRight="16dp"
+            android:text="@string/deleteAccount" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_download.xml b/app/src/main/res/layout/dialog_download.xml
index a4a3060df..b77541111 100644
--- a/app/src/main/res/layout/dialog_download.xml
+++ b/app/src/main/res/layout/dialog_download.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
 
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/app_name"
-        android:gravity="center"
         android:layout_margin="10dp"
+        android:gravity="center"
+        android:text="@string/app_name"
         android:textSize="20sp" />
 
     <Spinner
@@ -28,7 +28,8 @@
 
     <Button
         android:id="@+id/download"
-        android:text="@string/download"
-        style="@style/CustomDialogButton" />
+        style="@style/CustomDialogButton"
+        android:layout_marginRight="16dp"
+        android:text="@string/download" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_login.xml b/app/src/main/res/layout/dialog_login.xml
index d9a178b5a..14ff19d95 100644
--- a/app/src/main/res/layout/dialog_login.xml
+++ b/app/src/main/res/layout/dialog_login.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
 
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/app_name"
-        android:gravity="center"
         android:layout_margin="10dp"
+        android:gravity="center"
+        android:text="@string/app_name"
         android:textSize="20sp" />
 
     <com.google.android.material.textfield.TextInputLayout style="@style/CustomDialogTextInputLayout">
@@ -29,10 +29,10 @@
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/password"
-            android:inputType="textPassword"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/password"
+            android:inputType="textPassword"
             android:padding="12dp" />
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -40,18 +40,19 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="right">
+        android:gravity="right"
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/register"
-            android:text="@string/register"
-            style="@style/CustomDialogButton" />
+            style="@style/CustomDialogButton"
+            android:text="@string/register" />
 
         <Button
             android:id="@+id/login"
-            android:text="@string/login"
-            style="@style/CustomDialogButton" />
+            style="@style/CustomDialogButton"
+            android:layout_marginRight="16dp"
+            android:text="@string/login" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_logout.xml b/app/src/main/res/layout/dialog_logout.xml
index d2a66be03..4d3bb82ad 100644
--- a/app/src/main/res/layout/dialog_logout.xml
+++ b/app/src/main/res/layout/dialog_logout.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/app_name"
-        android:gravity="center"
         android:layout_margin="10dp"
+        android:gravity="center"
+        android:text="@string/app_name"
         android:textSize="20sp" />
 
     <TextView
         android:id="@+id/user"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/already_logged_in"
+        android:layout_margin="8dp"
         android:padding="8dp"
-        android:layout_margin="8dp" />
+        android:text="@string/already_logged_in" />
 
     <Button
         android:id="@+id/logout"
-        android:text="@string/logout"
-        style="@style/CustomDialogButton" />
+        style="@style/CustomDialogButton"
+        android:text="@string/logout" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/exo_styled_player_control_view.xml b/app/src/main/res/layout/exo_styled_player_control_view.xml
index 3e7c5e32a..02d9d5655 100644
--- a/app/src/main/res/layout/exo_styled_player_control_view.xml
+++ b/app/src/main/res/layout/exo_styled_player_control_view.xml
@@ -12,8 +12,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<merge xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <!-- 0dp dimensions are used to prevent this view from influencing the size of
          the parent view if it uses "wrap_content". It is expanded to occupy the
@@ -27,80 +27,111 @@
         android:layout_height="0dp"
         android:background="@color/exo_black_opacity_60" />
 
-    <FrameLayout
+    <LinearLayout
         android:id="@+id/top_bar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/exo_styled_bottom_bar_height"
-        android:layout_marginBottom="@dimen/exo_styled_bottom_bar_margin_top"
         android:layout_gravity="top"
+        android:layout_marginBottom="@dimen/exo_styled_bottom_bar_margin_top"
         android:layoutDirection="ltr">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layoutDirection="ltr"
             android:paddingStart="@dimen/exo_styled_bottom_bar_time_padding"
-            android:paddingEnd="@dimen/exo_styled_bottom_bar_time_padding"
             android:paddingLeft="@dimen/exo_styled_bottom_bar_time_padding"
-            android:paddingRight="@dimen/exo_styled_bottom_bar_time_padding"
-            android:layout_gravity="center_vertical|start"
-            android:layoutDirection="ltr">
+            android:paddingEnd="@dimen/exo_styled_bottom_bar_time_padding"
+            android:paddingRight="@dimen/exo_styled_bottom_bar_time_padding">
 
             <ImageButton
                 android:id="@+id/close_imageButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_close"
-                android:padding="@dimen/exo_icon_padding"
+                android:layout_marginRight="10dp"
                 android:background="#00FFFFFF"
+                android:padding="@dimen/exo_icon_padding"
+                android:src="@drawable/ic_close"
+                android:visibility="gone"
                 app:tint="@android:color/white" />
+
+            <ImageButton
+                android:id="@+id/lock_player"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="#00FFFFFF"
+                android:padding="@dimen/exo_icon_padding"
+                android:src="@drawable/ic_unlocked" />
+
         </LinearLayout>
 
+        <TextView
+            android:id="@+id/exo_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginHorizontal="10dp"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@android:color/white"
+            android:textSize="18sp"
+            android:visibility="invisible" />
+
         <LinearLayout
+            android:id="@+id/exo_top_bar_right"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layoutDirection="ltr"
             android:paddingStart="@dimen/exo_styled_bottom_bar_time_padding"
-            android:paddingEnd="@dimen/exo_styled_bottom_bar_time_padding"
             android:paddingLeft="@dimen/exo_styled_bottom_bar_time_padding"
-            android:paddingRight="@dimen/exo_styled_bottom_bar_time_padding"
-            android:layout_gravity="center_vertical|end"
-            android:layoutDirection="ltr">
+            android:paddingEnd="@dimen/exo_styled_bottom_bar_time_padding"
+            android:paddingRight="@dimen/exo_styled_bottom_bar_time_padding">
 
             <ImageButton
                 android:id="@+id/aspect_ratio_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_aspect_ratio"
-                android:padding="@dimen/exo_icon_padding"
                 android:layout_marginEnd="12dp"
-                android:background="#00FFFFFF" />
-
-            <TextView
-                android:id="@+id/quality_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:padding="@dimen/exo_icon_padding"
-                android:text="HLS"
-                android:textColor="#FFFFFF" />
-
-            <ImageButton
-                android:id="@+id/quality_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_arrow_down"
-                android:padding="@dimen/exo_icon_padding"
                 android:background="#00FFFFFF"
-                app:tint="@android:color/white" />
+                android:padding="@dimen/exo_icon_padding"
+                android:src="@drawable/ic_aspect_ratio" />
+
+            <LinearLayout
+                android:id="@+id/quality_linLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/quality_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:padding="@dimen/exo_icon_padding"
+                    android:text="HLS"
+                    android:textColor="#FFFFFF" />
+
+                <ImageView
+                    android:id="@+id/quality_select"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/exo_icon_padding"
+                    android:src="@drawable/ic_arrow_down"
+                    app:tint="@android:color/white" />
+
+            </LinearLayout>
         </LinearLayout>
 
-    </FrameLayout>
+    </LinearLayout>
 
     <FrameLayout
         android:id="@id/exo_bottom_bar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/exo_styled_bottom_bar_height"
-        android:layout_marginTop="@dimen/exo_styled_bottom_bar_margin_top"
         android:layout_gravity="bottom"
+        android:layout_marginTop="@dimen/exo_styled_bottom_bar_margin_top"
         android:background="@color/exo_bottom_bar_background"
         android:layoutDirection="ltr">
 
@@ -108,13 +139,13 @@
             android:id="@id/exo_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/exo_styled_bottom_bar_time_padding"
-            android:paddingEnd="@dimen/exo_styled_bottom_bar_time_padding"
-            android:paddingLeft="@dimen/exo_styled_bottom_bar_time_padding"
-            android:paddingRight="@dimen/exo_styled_bottom_bar_time_padding"
             android:layout_gravity="center_vertical|start"
             android:layout_marginBottom="10dp"
-            android:layoutDirection="ltr">
+            android:layoutDirection="ltr"
+            android:paddingStart="@dimen/exo_styled_bottom_bar_time_padding"
+            android:paddingLeft="@dimen/exo_styled_bottom_bar_time_padding"
+            android:paddingEnd="@dimen/exo_styled_bottom_bar_time_padding"
+            android:paddingRight="@dimen/exo_styled_bottom_bar_time_padding">
 
             <TextView
                 android:id="@id/exo_position"
@@ -136,14 +167,6 @@
             android:layout_marginBottom="10dp"
             android:layoutDirection="ltr">
 
-            <ImageButton
-                android:id="@id/exo_vr"
-                style="@style/ExoStyledControls.Button.Bottom.VR" />
-
-            <ImageButton
-                android:id="@id/exo_shuffle"
-                style="@style/ExoStyledControls.Button.Bottom.Shuffle" />
-
             <ImageButton
                 android:id="@id/exo_repeat_toggle"
                 style="@style/ExoStyledControls.Button.Bottom.RepeatToggle" />
@@ -158,63 +181,35 @@
 
             <ImageButton
                 android:id="@+id/fullscreen"
-                style="@style/ExoStyledControls.Button.Bottom.FullScreen" />
-
-            <ImageButton
-                android:id="@id/exo_fullscreen"
-                style="@style/ExoStyledControls.Button.Bottom.FullScreen" />
-
-            <ImageButton
-                android:id="@id/exo_overflow_show"
-                style="@style/ExoStyledControls.Button.Bottom.OverflowShow" />
+                style="@style/ExoStyledControls.Button.Bottom.FullScreen"
+                android:src="@drawable/ic_fullscreen" />
 
         </LinearLayout>
 
-        <HorizontalScrollView
-            android:id="@id/exo_extra_controls_scroll_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:visibility="invisible">
-
-            <LinearLayout
-                android:id="@id/exo_extra_controls"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layoutDirection="ltr">
-
-                <ImageButton
-                    android:id="@id/exo_overflow_hide"
-                    style="@style/ExoStyledControls.Button.Bottom.OverflowHide" />
-
-            </LinearLayout>
-
-        </HorizontalScrollView>
-
-    </FrameLayout>
-
-    <LinearLayout
-        android:id="@+id/progress_bar"
-        android:layout_gravity="bottom"
-        android:layout_above="@id/exo_basic_controls"
-        android:layout_marginBottom="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="15dp">
-
-        <com.google.android.exoplayer2.ui.DefaultTimeBar
-            android:id="@id/exo_progress"
+        <LinearLayout
+            android:id="@+id/progress_bar"
             android:layout_width="match_parent"
             android:layout_height="15dp"
-            app:bar_height="2dp"
-            app:scrubber_color="?attr/colorOnPrimary"
-            app:played_color="?attr/colorOnSecondary"
-            app:scrubber_enabled_size="12dp"
-            app:scrubber_dragged_size="15dp"
-            android:background="@color/exo_bottom_bar_background" />
+            android:layout_above="@id/exo_basic_controls"
+            android:layout_gravity="bottom"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginBottom="10dp">
 
-    </LinearLayout>
+            <com.google.android.exoplayer2.ui.DefaultTimeBar
+                android:id="@id/exo_progress"
+                android:layout_width="match_parent"
+                android:layout_height="15dp"
+                android:background="@color/exo_bottom_bar_background"
+                app:bar_height="2dp"
+                app:played_color="?attr/colorOnSecondary"
+                app:scrubber_color="?attr/colorOnPrimary"
+                app:scrubber_dragged_size="15dp"
+                app:scrubber_enabled_size="12dp" />
+
+        </LinearLayout>
+
+    </FrameLayout>
 
     <LinearLayout
         android:id="@id/exo_minimal_controls"
@@ -222,13 +217,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_marginBottom="@dimen/exo_styled_minimal_controls_margin_bottom"
-        android:orientation="horizontal"
         android:gravity="center_vertical"
-        android:layoutDirection="ltr">
-
-        <ImageButton
-            android:id="@id/exo_minimal_fullscreen"
-            style="@style/ExoStyledControls.Button.Bottom.FullScreen" />
+        android:layoutDirection="ltr"
+        android:orientation="horizontal">
 
     </LinearLayout>
 
@@ -238,25 +229,29 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:background="@android:color/transparent"
+        android:clipToPadding="false"
         android:gravity="center"
-        android:padding="@dimen/exo_styled_controls_padding"
-        android:clipToPadding="false">
+        android:padding="@dimen/exo_styled_controls_padding">
 
         <Button
             android:id="@id/exo_rew_with_amount"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
-            style="@style/ExoStyledControls.Button.Center.RewWithAmount" />
+            style="@style/ExoStyledControls.Button.Center.RewWithAmount"
+            android:layout_marginRight="25dp"
+            android:scaleX="1.1"
+            android:scaleY="1.1" />
 
         <ImageButton
             android:id="@id/exo_play_pause"
-            style="@style/ExoStyledControls.Button.Center.PlayPause" />
+            style="@style/ExoStyledControls.Button.Center.PlayPause"
+            android:scaleX="1.1"
+            android:scaleY="1.1" />
 
         <Button
             android:id="@id/exo_ffwd_with_amount"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
-            style="@style/ExoStyledControls.Button.Center.FfwdWithAmount" />
+            style="@style/ExoStyledControls.Button.Center.FfwdWithAmount"
+            android:layout_marginLeft="25dp"
+            android:scaleX="1.1"
+            android:scaleY="1.1" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 4fe82127a..1bf1f174b 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -26,8 +26,6 @@
             android:textSize="27sp"
             android:textStyle="bold" />
 
-        <View style="@style/HorizontalLine" />
-
         <LinearLayout
             android:id="@+id/website"
             style="@style/AboutItem">
@@ -45,8 +43,6 @@
 
         </LinearLayout>
 
-        <View style="@style/HorizontalLine" />
-
         <LinearLayout
             android:id="@+id/contributing"
             style="@style/AboutItem">
@@ -64,8 +60,6 @@
 
         </LinearLayout>
 
-        <View style="@style/HorizontalLine" />
-
         <LinearLayout
             android:id="@+id/authors"
             style="@style/AboutItem">
@@ -83,8 +77,6 @@
 
         </LinearLayout>
 
-        <View style="@style/HorizontalLine" />
-
         <LinearLayout
             android:id="@+id/piped"
             style="@style/AboutItem">
@@ -102,8 +94,6 @@
 
         </LinearLayout>
 
-        <View style="@style/HorizontalLine" />
-
         <LinearLayout
             android:id="@+id/donate"
             style="@style/AboutItem">
@@ -121,8 +111,6 @@
 
         </LinearLayout>
 
-        <View style="@style/HorizontalLine" />
-
         <LinearLayout
             android:id="@+id/license"
             style="@style/AboutItem">
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index 37c2f1246..bb9bfd903 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -10,8 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        tools:context=".fragments.ChannelFragment"
-        android:visibility="invisible">
+        android:visibility="invisible"
+        tools:context=".fragments.ChannelFragment">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -37,28 +37,28 @@
 
                 <LinearLayout
                     android:layout_width="0dp"
-                    android:layout_weight="1"
                     android:layout_height="match_parent"
-                    android:orientation="vertical"
                     android:layout_marginLeft="10dp"
-                    android:layout_marginRight="5dp">
+                    android:layout_marginRight="5dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
 
                     <LinearLayout
-                        android:layout_marginTop="3.5dp"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="3.5dp">
 
                         <TextView
                             android:id="@+id/channel_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="left"
-                            android:text="Channel Name"
                             android:drawablePadding="3dip"
-                            android:textSize="16sp"
-                            android:textStyle="bold"
+                            android:ellipsize="end"
                             android:maxLines="1"
-                            android:ellipsize="end" />
+                            android:text="Channel Name"
+                            android:textSize="16sp"
+                            android:textStyle="bold" />
 
                     </LinearLayout>
 
@@ -76,14 +76,14 @@
                     android:id="@+id/channel_subscribe"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
                     android:layout_alignParentEnd="true"
+                    android:layout_gravity="center_horizontal"
                     android:backgroundTint="?attr/colorOnPrimary"
+                    android:drawableLeft="@drawable/ic_bell_small"
+                    android:drawableTint="?android:attr/textColorPrimary"
                     android:text="@string/subscribe"
                     android:textColor="?android:attr/textColorPrimary"
-                    android:textSize="11sp"
-                    android:drawableLeft="@drawable/ic_bell_small"
-                    android:drawableTint="?android:attr/textColorPrimary" />
+                    android:textSize="11sp" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 0fbd446f5..2e240e5db 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -10,10 +10,10 @@
         android:id="@+id/progressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/home_refresh"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 0edbd0fc3..b41f6804d 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -70,8 +70,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        app:tint="?android:attr/colorBackground"
         app:backgroundTint="?attr/colorSecondary"
-        app:srcCompat="@drawable/ic_add" />
+        app:srcCompat="@drawable/ic_add"
+        app:tint="?android:attr/colorBackground" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_playlist.xml b/app/src/main/res/layout/fragment_playlist.xml
index cae93ffad..2265ea7a1 100644
--- a/app/src/main/res/layout/fragment_playlist.xml
+++ b/app/src/main/res/layout/fragment_playlist.xml
@@ -14,23 +14,23 @@
         android:visibility="gone" />
 
     <ScrollView
+        android:id="@+id/playlist_scrollview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/playlist_scrollview">
+        android:layout_height="match_parent">
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/playlist_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:padding="8dp"
                 android:text=""
                 android:textSize="24sp"
-                android:textStyle="bold"
-                android:padding="8dp" />
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/playlist_uploader"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index cf46d6d0b..1cd0329b1 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -17,12 +17,12 @@
             android:id="@+id/outlinedTextField"
             style="@style/Widget.Material3.CardView.Filled"
             android:layout_width="match_parent"
-            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
+            android:layout_weight="1"
             app:cardCornerRadius="24dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -60,9 +60,9 @@
                     android:layout_width="20dp"
                     android:layout_height="20dp"
                     android:layout_alignParentRight="true"
-                    android:src="@drawable/ic_close"
                     android:layout_centerVertical="true"
-                    android:layout_marginRight="16dp" />
+                    android:layout_marginRight="16dp"
+                    android:src="@drawable/ic_close" />
 
             </RelativeLayout>
         </com.google.android.material.card.MaterialCardView>
@@ -71,10 +71,10 @@
             android:id="@+id/filterMenu_imageView"
             android:layout_width="30dp"
             android:layout_height="30dp"
-            android:layout_weight="0"
             android:layout_alignParentRight="true"
             android:layout_marginTop="25dp"
             android:layout_marginRight="20dp"
+            android:layout_weight="0"
             android:src="@drawable/ic_filter" />
     </LinearLayout>
 
@@ -329,12 +329,12 @@
         android:id="@+id/history_recycler"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_margin="10dp"
+        android:layout_marginVertical="10dp"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/searchbar_holder"
-        android:visibility="gone" />
+        app:layout_constraintTop_toBottomOf="@+id/searchbar_holder" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/search_recycler"
diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml
index 3918135e6..fe372d20d 100644
--- a/app/src/main/res/layout/fragment_subscriptions.xml
+++ b/app/src/main/res/layout/fragment_subscriptions.xml
@@ -81,11 +81,11 @@
                     android:descendantFocusability="blocksDescendants">
 
                     <androidx.recyclerview.widget.RecyclerView
-                        android:visibility="gone"
                         android:id="@+id/sub_channels"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:nestedScrollingEnabled="false" />
+                        android:nestedScrollingEnabled="false"
+                        android:visibility="gone" />
                 </RelativeLayout>
 
                 <RelativeLayout
diff --git a/app/src/main/res/layout/playlist_search_row.xml b/app/src/main/res/layout/playlist_search_row.xml
index d520aaada..7c8625c95 100644
--- a/app/src/main/res/layout/playlist_search_row.xml
+++ b/app/src/main/res/layout/playlist_search_row.xml
@@ -16,17 +16,17 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/card_playlist"
-        app:cardCornerRadius="8dp"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:strokeWidth="0dp"
+        app:cardCornerRadius="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="16:9"
+        app:layout_constraintEnd_toStartOf="@+id/guideline"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
-        app:layout_constraintEnd_toStartOf="@+id/guideline">
+        app:strokeWidth="0dp">
 
         <ImageView
             android:id="@+id/search_thumbnail"
@@ -73,8 +73,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:maxLines="1"
         android:ellipsize="end"
+        android:maxLines="1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/card_playlist"
         app:layout_constraintTop_toBottomOf="@+id/search_description" />
diff --git a/app/src/main/res/layout/playlists_row.xml b/app/src/main/res/layout/playlists_row.xml
index 0d8b60e63..2d5695c9d 100644
--- a/app/src/main/res/layout/playlists_row.xml
+++ b/app/src/main/res/layout/playlists_row.xml
@@ -2,12 +2,12 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/playlist"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
     android:layout_marginBottom="16dp"
-    android:background="?android:attr/selectableItemBackground"
-    android:id="@+id/playlist">
+    android:background="?android:attr/selectableItemBackground">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
@@ -18,17 +18,17 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/card_playlist_thumbnail"
-        app:cardCornerRadius="8dp"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:strokeWidth="0dp"
+        app:cardCornerRadius="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="16:9"
+        app:layout_constraintEnd_toStartOf="@+id/guideline"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
-        app:layout_constraintEnd_toStartOf="@+id/guideline">
+        app:strokeWidth="0dp">
 
         <ImageView
             android:id="@+id/playlist_thumbnail"
@@ -61,10 +61,10 @@
         android:id="@+id/delete_playlist"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:shapeAppearanceOverlay="@style/roundedImageViewRounded"
+        android:background="?android:attr/selectableItemBackground"
+        android:padding="8dp"
         android:src="@drawable/ic_delete"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:background="?android:attr/selectableItemBackground"
-        android:padding="8dp" />
+        app:shapeAppearanceOverlay="@style/roundedImageViewRounded" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/replies_row.xml b/app/src/main/res/layout/replies_row.xml
index 2c8f21637..4e448955b 100644
--- a/app/src/main/res/layout/replies_row.xml
+++ b/app/src/main/res/layout/replies_row.xml
@@ -2,15 +2,15 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:background="?android:attr/selectableItemBackground"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground">
 
     <LinearLayout
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="16dp">
+        android:paddingBottom="16dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/commentor_image"
@@ -43,19 +43,19 @@
                     android:id="@+id/verified_imageView"
                     android:layout_width="16dp"
                     android:layout_height="16dp"
-                    android:layout_marginTop="4dp"
                     android:layout_marginLeft="4dp"
-                    app:srcCompat="@drawable/ic_verified"
-                    android:visibility="gone" />
+                    android:layout_marginTop="4dp"
+                    android:visibility="gone"
+                    app:srcCompat="@drawable/ic_verified" />
 
                 <ImageView
                     android:id="@+id/pinned_imageView"
                     android:layout_width="16dp"
                     android:layout_height="16dp"
-                    android:layout_marginTop="4dp"
                     android:layout_marginLeft="4dp"
-                    app:srcCompat="@drawable/ic_pinned"
-                    android:visibility="gone" />
+                    android:layout_marginTop="4dp"
+                    android:visibility="gone"
+                    app:srcCompat="@drawable/ic_pinned" />
             </LinearLayout>
 
             <TextView
@@ -75,8 +75,8 @@
                     android:id="@+id/likes_imageView"
                     android:layout_width="16dp"
                     android:layout_height="16dp"
-                    android:layout_marginRight="6dp"
                     android:layout_marginTop="2dp"
+                    android:layout_marginRight="6dp"
                     app:srcCompat="@drawable/ic_thumb_up" />
 
                 <TextView
@@ -91,8 +91,8 @@
                     android:layout_height="14dp"
                     android:layout_marginLeft="8dp"
                     android:layout_marginTop="3dp"
-                    app:srcCompat="@drawable/ic_hearted"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    app:srcCompat="@drawable/ic_hearted" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/searchhistory_row.xml b/app/src/main/res/layout/searchhistory_row.xml
index 11bcf477e..4c3ad5ed3 100644
--- a/app/src/main/res/layout/searchhistory_row.xml
+++ b/app/src/main/res/layout/searchhistory_row.xml
@@ -3,33 +3,31 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_marginBottom="16dp"
-    android:background="?android:attr/selectableItemBackground">
+    android:background="?android:attr/selectableItemBackground"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="8dp">
 
     <ImageView
         android:id="@+id/history_icon"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_margin="5dp"
         android:src="@drawable/ic_history"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_margin="5dp" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/history_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:text=""
+        android:layout_marginHorizontal="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/delete_history"
         app:layout_constraintStart_toEndOf="@id/history_icon"
         app:layout_constraintTop_toTopOf="parent" />
 
-
-    <com.google.android.material.imageview.ShapeableImageView
+    <ImageView
         android:id="@+id/delete_history"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/searchsuggestion_row.xml b/app/src/main/res/layout/searchsuggestion_row.xml
index f8cd7454d..2639eb876 100644
--- a/app/src/main/res/layout/searchsuggestion_row.xml
+++ b/app/src/main/res/layout/searchsuggestion_row.xml
@@ -1,25 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="8dp"
-    android:paddingVertical="8dp"
-    android:background="?android:attr/selectableItemBackground">
+    android:background="?android:attr/selectableItemBackground"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="8dp">
 
     <ImageView
         android:id="@+id/search_icon"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp"
         android:src="@drawable/ic_search"
-        android:layout_marginTop="3dp"
-        android:layout_marginHorizontal="5dp" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/suggestion_text"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_gravity="center" />
+        android:layout_marginHorizontal="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/arrow"
+        app:layout_constraintStart_toEndOf="@id/search_icon"
+        app:layout_constraintTop_toTopOf="parent" />
 
-</LinearLayout>
\ No newline at end of file
+    <ImageView
+        android:id="@+id/arrow"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:padding="5dp"
+        android:src="@drawable/ic_arrow_up_left"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/roundedImageViewRounded" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/action_bar.xml b/app/src/main/res/menu/action_bar.xml
index 6aa29f4da..a5d77e155 100644
--- a/app/src/main/res/menu/action_bar.xml
+++ b/app/src/main/res/menu/action_bar.xml
@@ -3,9 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:title="@string/search_hint"
-        android:icon="@drawable/ic_search"
         android:id="@+id/action_search"
+        android:icon="@drawable/ic_search"
+        android:title="@string/search_hint"
         app:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_menu.xml b/app/src/main/res/menu/bottom_menu.xml
index 4a47bc113..809c8b2ee 100644
--- a/app/src/main/res/menu/bottom_menu.xml
+++ b/app/src/main/res/menu/bottom_menu.xml
@@ -3,15 +3,15 @@
 
     <item
         android:id="@+id/home2"
-        android:title="@string/startpage"
-        android:icon="@drawable/ic_home" />
+        android:icon="@drawable/ic_home"
+        android:title="@string/startpage" />
     <item
         android:id="@+id/subscriptions"
-        android:title="@string/subscriptions"
-        android:icon="@drawable/ic_subscriptions" />
+        android:icon="@drawable/ic_subscriptions"
+        android:title="@string/subscriptions" />
     <item
         android:id="@+id/library"
-        android:title="@string/library"
-        android:icon="@drawable/ic_library" />
+        android:icon="@drawable/ic_library"
+        android:title="@string/library" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index c10046ded..6bf04c086 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -175,13 +175,13 @@
     <string name="video_format_summary">تحويل الملفات إذا تم تنزيل كل من الصوت والفيديو.</string>
     <string name="download_directory_summary">حيث يتم تخزين الوسائط التي تم تنزيلها.</string>
     <string name="advanced">متقدم</string>
-    <string name="player">المشغل</string>
+    <string name="player">الصوت والفيديو</string>
     <string name="license_summary">GPLv3+ هو ترخيص حر متروك للحقوق. الاستخدام والدراسة والتغيير والمشاركة؛ مع الجميع.</string>
     <string name="donate_summary">أعط ما يستحقه هذا لك ، إذا استطعت. فريق LibreTube أصغر من تبرعك أو مساعدتك.</string>
     <string name="playback_speed">سرعة التشغيل الافتراضية</string>
     <string name="appearance_summary">اضبط التطبيق حسب رغبتك.</string>
-    <string name="authors_summary">تعرف على الجميع.</string>
-    <string name="advanced_summary">المشغل، التنزيلات، التاريخ</string>
+    <string name="authors_summary">تعرف على كل من يشارك في تطوير التطبيق وتحسينه.</string>
+    <string name="advanced_summary">التنزيلات والتاريخ</string>
     <string name="customInstance_summary">إضافة مثيل مخصص (على مسؤوليتك الخاصة)</string>
     <string name="movies_directory">مجلد الأفلام</string>
     <string name="shareTo">مشاركة عنوان URL إلى</string>
@@ -190,4 +190,17 @@
     <string name="audio">صوت</string>
     <string name="video">فيديو</string>
     <string name="downloading">قيد التحميل</string>
+    <string name="hideTrendingPage">إخفاء صفحة المحتوى الشائع</string>
+    <string name="instance_frontend_url">عنوان URL لمثيل الواجهة الأمامية</string>
+    <string name="quality">الجودة</string>
+    <string name="behavior">السلوك</string>
+    <string name="player_summary">الجودة وسلوك المشغل</string>
+    <string name="seek_increment">معدل التقديم</string>
+    <string name="piped_summary">Piped هي واجهة ويب بديلة مفتوحة المصدر ل YouTube توفر واجهة برمجة التطبيقات التي نستخدمها. بدون Piped ، لن يكون LibreTube موجودا. شكرا جزيلا لمطوريهم!</string>
+    <string name="pauseOnScreenOff">الإيقاف المؤقت التلقائي</string>
+    <string name="autoplay_summary">قم بتشغيل الفيديو التالي تلقائيا عند الانتهاء من الحالي.</string>
+    <string name="pauseOnScreenOff_summary">أوقف المشغل مؤقتا عند إيقاف تشغيل الشاشة.</string>
+    <string name="reset">استعادة الإعدادات الافتراضية</string>
+    <string name="reset_message">هل أنت متأكد؟ سيؤدي ذلك إلى تسجيل خروجك وإعادة تعيين جميع إعداداتك!</string>
+    <string name="clonePlaylist">نسخ قائمة التشغيل</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 6f00f0f82..cc6e701ea 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -5,7 +5,7 @@
     <string name="search_hint">Axtarın</string>
     <string name="videos">Videolar</string>
     <string name="subscribe">Abunə Olun</string>
-    <string name="unsubscribe">Abunəlikdən Çıxın</string>
+    <string name="unsubscribe">Abunəlikdən çıxın</string>
     <string name="share">Paylaşın</string>
     <string name="save">Saxlayın</string>
     <string name="download">Endirin</string>
@@ -38,7 +38,7 @@
     <string name="music_songs">YT Musiqi Mahnıları</string>
     <string name="music_videos">YT Musiqi Videoları</string>
     <string name="music_playlists">YT Musiqi Pleylistləri</string>
-    <string name="defaultTab">Defolt Tab</string>
+    <string name="defaultTab">Defolt Panel</string>
     <string name="sponsorblock">SponsorBlok</string>
     <string name="sponsorblock_summary">https://sponsor.ajay.app API\'sini istifadə edir</string>
     <string name="category_intro_description">Həqiqi məzmunu olmayan aralıq. Fasilə, statik çərçivə, təkrarlanan animasiya ola bilər. Məlumat ehtiva edən keçidlər üçün istifadə edilməməlidir.</string>
@@ -46,9 +46,9 @@
     <string name="category_outro_description">Bitişdən sonra məlumat. Məlumatla nəticə çıxarmaq üçün deyil.</string>
     <string name="category_segments">Seqmentlər</string>
     <string name="category_sponsor">Sponsor</string>
-    <string name="category_selfpromo">Ödənişsiz/Özünü Reklam</string>
-    <string name="category_selfpromo_description">Ödənişsiz və ya özünü reklam istisna olmaqla, \"sponsor\" kimi. Buraya mallar, ianələr və ya onların kiminlə əməkdaşlıq etdiyi barədə məlumatlar haqqında bölmələr daxildir.</string>
-    <string name="category_interaction_description">Bəyənmək, abunə olmaq və ya məzmunun ortasında izləmək üçün qısa xatırlatma olduqda. Əgər uzun və ya konkret bir şey haqqındadırsa, bunun əvəzinə özünü reklam lazımdır.</string>
+    <string name="category_selfpromo">Ödənişsiz/Öz Reklamı</string>
+    <string name="category_selfpromo_description">Ödənişsiz və ya öz reklamı istisna olmaqla, \"sponsor\" kimi. Buraya mallar, ianələr və ya onların kiminlə əməkdaşlıq etdiyi barədə məlumatlar haqqında bölmələr daxildir.</string>
+    <string name="category_interaction_description">Bəyənmək, abunə olmaq və ya məzmunun ortasında izləmək üçün qısa xatırlatma olduqda. Əgər uzun və ya konkret bir şey haqqındadırsa, bunun əvəzinə öz reklamıdır.</string>
     <string name="license">Lisenziya</string>
     <string name="emptyPlaylistName">Pleylist adı boş ola bilməz</string>
     <string name="success">Bitdi.</string>
@@ -57,7 +57,7 @@
     <string name="retry">Yenidən Cəhd Edin</string>
     <string name="segment_skipped">Seqment ötürüldü</string>
     <string name="sponsorblock_state">Açıq</string>
-    <string name="category_sponsor_description">Ödənişli reklam ,tövsiyələr və birbaşa reklamlar. Səbəblərə, yaradıcılara, vebsaytlara və məhsullara özünü reklam və ya pulsuz orijinal çağırışlar üçün deyil.</string>
+    <string name="category_sponsor_description">Ödənişli reklam, tövsiyələr və birbaşa reklamlar.Öz reklamı və ya səbəblərə, yaradıcılara, veb saytlara və məhsullara pulsuz orijinal elanlar üçün deyil.</string>
     <string name="category_interaction">İnteraksiya xatırlatma(bəyən və abunə ol)</string>
     <string name="category_intro">Fasilə/Giriş Animasiyası</string>
     <string name="login_register">Daxil olun/qeydiyyatdan keçin</string>
@@ -70,7 +70,7 @@
     <string name="downloadfailed">Endirmək alınmadı.</string>
     <string name="vlc">VLC\'də Açın</string>
     <string name="vlcerror">VLC\'də açmaq mümkün deyil. O, quraşdırılmamış ola bilər.</string>
-    <string name="import_from_yt">Abunəlikləri İdxal Edin</string>
+    <string name="import_from_yt">Abunəlikləri idxal edin</string>
     <string name="import_from_yt_summary">YouTube və ya NewPipe\'dan</string>
     <string name="app_theme">Mövzu</string>
     <string name="server_error">Serverdə problem var. Başqasını cəhd edə bilərsiniz\?</string>
@@ -92,8 +92,8 @@
     <string name="changeLanguage">Dil</string>
     <string name="systemLanguage">Sistem</string>
     <string name="systemDefault">Sistem</string>
-    <string name="lightTheme">Açıq</string>
-    <string name="darkTheme">Tünd</string>
+    <string name="lightTheme">İşıqlı</string>
+    <string name="darkTheme">Qaranlıq</string>
     <string name="subscribers">%1$s abunəçi</string>
     <string name="videoCount">%1$s video</string>
     <string name="settings">Tənzimləmələr</string>
@@ -127,10 +127,10 @@
     <string name="download_directory_summary">Endirilmiş medianın saxlandığı yer.</string>
     <string name="website_summary">Tətbiq və onun xüsusiyyətləri haqqında ətraflı məlumat üçün veb sayta daxil olun.</string>
     <string name="contributing">Töhfə</string>
-    <string name="contributing_summary">İdeyalar, tərcümələr, dizayn dəyişiklikləri təmin edin, kodu aydınlaşdırın və yazın. Nə qədər çox etsəniz, bir o qədər yaxşıdır!</string>
-    <string name="license_summary">GPLv3+ kopyalanmış azad lisenziyadır. İstifadə edin, öyrənin, dəyişdirin və paylaşın; hamı ilə.</string>
+    <string name="contributing_summary">İdeyalar, tərcümələr, dizayn dəyişiklikləri təmin edin, kodu təmizləyin və yazın. Nə qədər çox etsəniz, bir o qədər yaxşıdır!</string>
+    <string name="license_summary">GPLv3+ kopyalanmış pulsuz lisenziyadır. İstifadə edin, öyrənin, dəyişdirin və paylaşın; birlikdə.</string>
     <string name="donate">İanə Edin</string>
-    <string name="donate_summary">Mümkünsə, bunun sizə nə dəyəri varsa verin. LibreTube komandası ianə və ya yardımınızdan kiçikdir.</string>
+    <string name="donate_summary">Mümkünsə, bunun sizə nə dəyəri varsa verin. LibreTube komandası ianə və ya yardımınızdan daha kiçikdir.</string>
     <string name="update">Yeni versiyanı axtarın</string>
     <string name="app_uptodate">Ən son versiya işlədilir.</string>
     <string name="playback_speed">Defolt oynatma sürəti</string>
@@ -172,7 +172,7 @@
     <string name="version">Versiya %1$s</string>
     <string name="about_summary">LibreTube komandası və bunların necə baş verdiyini öyrənin.</string>
     <string name="related_streams">Əlaqədar məzmun</string>
-    <string name="related_streams_summary">Baxdıqlarınızla yanaşı əlaqəli yayımları göstərin.</string>
+    <string name="related_streams_summary">İzlədiyinizin altında əlaqəli yayımları göstərin.</string>
     <string name="category_filler">Əlaqəsiz/Zarafatlar</string>
     <string name="show_chapters">Bölmələri göstərin</string>
     <string name="category_music_offtopic">Musiqi: Musiqisiz Bölmə</string>
@@ -180,7 +180,7 @@
     <string name="category_preview_description">Bu və ya onun seriyasındakı gələcək videolarda qarşıdan gələn məzmunu təfərrüatlandıran, lakin əlavə məlumat təqdim etməyən seqmentlər üçün. Əgər o, yalnız burada görünən klipləri ehtiva edirsə, bu, çox güman ki, yanlış kateqoriyadır.</string>
     <string name="hide_chapters">Bölmələri gizlədin</string>
     <string name="category_filler_description">Yalnız doldurucu və ya yumor üçün əlavə edilmiş əlaqəsiz səhnələr üçün,videonun əsas məzmununu başa düşmək tələb olunmur.</string>
-    <string name="category_music_offtopic_description">Yalnız musiqi videolarında istifadə üçün. O, rəsmi qarışıqların bir hissəsi deyil, videonun hissələrini əhatə etməlidir. Sonda video Spotify və ya hər hansı digər qarışıq versiyaya mümkün qədər yaxından bənzəməlidir və ya danışıq və ya digər diqqəti yayındıran amilləri azaltmalıdır.</string>
+    <string name="category_music_offtopic_description">Yalnız musiqi videolarında istifadə üçün. O, rəsmi mikslərin bir hissəsi deyil, videonun hissələrini əhatə etməlidir. Sonda video Spotify və ya hər hansı digər miks versiyaya mümkün qədər yaxından bənzəməlidir və ya danışıq və ya digər diqqəti yayındıran amilləri azaltmalıdır.</string>
     <string name="playerVideoFormat">Oynadıcı üçün video formatı</string>
     <string name="buffering_goal_summary">Maks. bufer üçün video saniyələrin miqdarı.</string>
     <string name="buffering_goal">Ön yükləmə</string>
@@ -194,7 +194,13 @@
     <string name="quality">Keyfiyyət</string>
     <string name="behavior">Davranış</string>
     <string name="player_summary">Keyfiyyət və oynadıcı davranışı</string>
-    <string name="seek_increment">Gəlir axtarın</string>
-    <string name="piped_summary">(Piped) YouTube üçün açıq mənbəli alternativ veb-frontendi, istifadə etdiyimiz API təmin edir. Piped olmasaydı, LibreTube mövcud olmazdı. Onların tərtibatçılarına böyük təşəkkürlər!</string>
+    <string name="seek_increment">Axtarışı artırın</string>
+    <string name="piped_summary">Piped, istifadə etdiyimiz API\' ni təmin edən YouTube üçün açıq mənbəli alternativ veb interfeysidir. Piped olmasaydı LibreTube olmazdı. Tərtibatçılarına böyük təşəkkürlər!</string>
     <string name="instance_frontend_url">Server üçün URL</string>
+    <string name="autoplay_summary">Cari bitdikdə növbəti videonu avtomatik olaraq oynadın.</string>
+    <string name="pauseOnScreenOff">Avto-fasilə</string>
+    <string name="pauseOnScreenOff_summary">Ekran söndürüldükdə pleyeri dayandırın.</string>
+    <string name="clonePlaylist">Pleylisti klonlayın</string>
+    <string name="reset">Defoltlara bərpa edin</string>
+    <string name="reset_message">Siz əminsiz\? Bu, sizi sistemdən çıxaracaq və bütün tənzimləmələrinizi sıfırlayacaq!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
new file mode 100644
index 000000000..55ee8b2ae
--- /dev/null
+++ b/app/src/main/res/values-bn/strings.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="download">ডাউনলোড</string>
+    <string name="customization">সমন্বয়</string>
+    <string name="startpage">হোম</string>
+    <string name="library">লাইব্রেরি</string>
+    <string name="unsubscribe">আনসাবস্ক্রাইব</string>
+    <string name="subscribe">সাবস্ক্রাইব</string>
+    <string name="share">শেয়ার</string>
+    <string name="import_from_yt_summary">ইউটিউব অথবা নিউপাইপ হতে</string>
+    <string name="app_theme">থিম</string>
+    <string name="server_error">সার্ভারের সাথে সংযোগ স্থাপনে সমস্যা হয়েছে। আপনি কি অন্য ইনস্ট্যান্স চেষ্টা করবেন\?</string>
+    <string name="unknown_error">নেটওয়ার্ক ত্রুটি।</string>
+    <string name="error">একটি ত্রুটি দেখা দিয়েছে।</string>
+    <string name="empty">আপনাকে ব্যবহারকারীর নাম ও পাসওয়ার্ড উল্লেখ করতে হবে।</string>
+    <string name="defres">ডিফল্ট ভিডিও রেজ্যুলেশন</string>
+    <string name="grid">গ্রিড কলামগুলো</string>
+    <string name="emptyList">এখানে কিছুই পাওয়া যায়নি।</string>
+    <string name="deletePlaylist">প্লেলিস্ট মুছে ফেলুন</string>
+    <string name="areYouSure">আপনি কি প্লেলিস্টটি মুছে ফেলতে চান\?</string>
+    <string name="createPlaylist">প্লেলিস্ট তৈরি করুন</string>
+    <string name="playlistCreated">প্লেলিস্ট তৈরি করা হয়েছে।</string>
+    <string name="playlistName">প্লেলিস্টের নাম</string>
+    <string name="addToPlaylist">প্লেলিস্টে যোগ করুন</string>
+    <string name="success">কাজটি সম্পন্ন হয়েছে।</string>
+    <string name="fail">কাজটি সম্পন্ন করা যায়নি :(</string>
+    <string name="about">সম্পর্কে</string>
+    <string name="changeLanguage">ভাষা</string>
+    <string name="systemLanguage">সিস্টেম</string>
+    <string name="systemDefault">সিস্টেম</string>
+    <string name="lightTheme">উজ্জ্বল</string>
+    <string name="darkTheme">অন্ধকার</string>
+    <string name="subscribers">সাবস্ক্রাইবার সংখ্যা %1$s</string>
+    <string name="settings">সেটিংস</string>
+    <string name="location">অবস্থান</string>
+    <string name="instance">ইনস্ট্যান্স</string>
+    <string name="website">ওয়েবসাইট</string>
+    <string name="comments">মন্তব্যগুলো</string>
+    <string name="channels">চ্যানেলগুলো</string>
+    <string name="all">সবগুলো</string>
+    <string name="playlists">প্লেলিস্টগুলো</string>
+    <string name="okay">ঠিক আছে</string>
+    <string name="search_history">অনুসন্ধান ইতিহাস</string>
+    <string name="clear_history">ইতিহাস মুছে ফেলুন</string>
+    <string name="defaultTab">ডিফল্ট ট্যাব</string>
+    <string name="sponsorblock">স্পন্সরব্লক</string>
+    <string name="sponsorblock_summary">এটি https://sponsor.ajay.app এপিআই ব্যবহার করে</string>
+    <string name="sponsorblock_state">চালু</string>
+    <string name="category_segments">ভিডিওর অংশগুলো</string>
+    <string name="category_sponsor">স্পন্সর</string>
+    <string name="category_selfpromo">বিনামূল্যে/ব্যক্তিগত উৎসাহ</string>
+    <string name="music_songs">ইউটিউব মিউজিক গানগুলো</string>
+    <string name="music_videos">ইউটিউব মিউজিক ভিডিওগুলো</string>
+    <string name="music_albums">ইউটিউব মিউজিক অ্যালবামগুলো</string>
+    <string name="category_interaction_description">ভিডিওর মাঝখানে লাইক, সাবস্ক্রাইব অথবা ফলো করার জন্য সংক্ষিপ্ত রিমাইন্ডার। অংশটুকু দীর্ঘ অথবা নির্দিষ্ট কোনো বিষয়ের উপর হলে ব্যক্তিগত উৎসাহ নির্বাচন করা উচিত।</string>
+    <string name="category_intro">বিচ্ছেদ/সূচনা এনিমেশন</string>
+    <string name="category_music_offtopic">সঙ্গীত: বাদ্যবিহীন দৃশ্য</string>
+    <string name="category_preview">আসন্ন/পুনরালোচনা</string>
+    <string name="category_filler">হাস্যরস/কৌতুক</string>
+    <string name="license">লাইসেন্স</string>
+    <string name="color_accent">স্বতন্ত্র রং</string>
+    <string name="color_blue">নীল</string>
+    <string name="color_yellow">হলুদ</string>
+    <string name="color_green">সবুজ</string>
+    <string name="color_purple">বেগুনি</string>
+    <string name="color_red">লাল</string>
+    <string name="category_interaction">মিথস্ক্রিয়া রিমাইন্ডার (লাইক ও সাবস্ক্রাইব)</string>
+    <string name="category_outro">ইতিকথা ও কৃতিত্ব</string>
+    <string name="category_outro_description">ভিডিওর সমাপ্তিতে উল্লেখ করা হয়েছে এমন অংশ। প্রয়োজনীয় তথ্য আছে এমন উপসংহারের জন্য অপ্রযোজ্য।</string>
+    <string name="material_you">মিস্টিক ম্যাটেরিয়াল ৩</string>
+    <string name="app_icon">আইকন</string>
+    <string name="enabled">চালু</string>
+    <string name="disabled">বন্ধ</string>
+    <string name="piped">পাইপড</string>
+    <string name="youtube">ইউটিউব</string>
+    <string name="playOnBackground">ব্যাকগ্রাউন্ডে প্লে করুন</string>
+    <string name="update_available">সংস্করণ %1$s এ আপডেট করা যাবে</string>
+    <string name="update_available_text">আপনি কি গিটহাব রিলিজ থেকে ডাউনলোড করতে ইচ্ছুক\?</string>
+    <string name="appearance">উপস্থাপনা</string>
+    <string name="app_behavior">আচরণ</string>
+    <string name="downloads">ডাউনলোডগুলো</string>
+    <string name="video_format">ভিডিও ফরম্যাট</string>
+    <string name="video_format_summary">ফাইল কনভার্সন যদি অডিও ও ভিডিও উভয়ই ডাউনলোড করা হয়।</string>
+    <string name="download_directory">ডাউনলোড স্থান</string>
+    <string name="download_directory_summary">যেখানে ডাউনলোড করা মিডিয়া সংরক্ষণ করা হয়।</string>
+    <string name="website_summary">অ্যাপ সম্পর্কে বিস্তারিত তথ্য ও ফিচার জানতে ওয়েবসাইটে প্রবেশ করুন।</string>
+    <string name="donate">অনুদান প্রদান</string>
+    <string name="update">নতুন সংস্করণ দেখুন</string>
+    <string name="app_uptodate">অ্যাপটি হালনাগাদ করা হয়েছে।</string>
+    <string name="playback_speed">ডিফল্ট প্লেব্যাক গতি</string>
+    <string name="advanced">অগ্রবর্তী</string>
+    <string name="appearance_summary">অ্যাপটি আপনার মনমতো সাজিয়ে তুলুন।</string>
+    <string name="authors_summary">অ্যাপটি নির্মাণ ও উন্নয়নে সহযোগী ব্যক্তিদের সম্পর্কে জানুন।</string>
+    <string name="download_folder">নাম</string>
+    <string name="authors">নির্মাতাগণ</string>
+    <string name="download_folder_summary">ডাউনলোড ফোল্ডারের নাম ঠিক করুন।</string>
+    <string name="internal_storage">অভ্যন্তরীণ স্টোরেজ</string>
+    <string name="downloads_directory">ডাউনলোড ফোল্ডার</string>
+    <string name="sdcard">মেমোরি কার্ড</string>
+    <string name="shareTo">লিংক শেয়ার করুন</string>
+    <string name="music_directory">অডিও ফোল্ডার</string>
+    <string name="movies_directory">ভিডিও ফোল্ডার</string>
+    <string name="legacyIcon">হারানো লিগ্যাসি</string>
+    <string name="gradientIcon">গ্লিব গ্রেডিয়েন্ট</string>
+    <string name="fireIcon">ফ্যাশনেবল আগুন</string>
+    <string name="flameIcon">জ্বলন্ত শিখা</string>
+    <string name="instance_summary">পাইপড, লগইন, সাবস্ক্রিপশনগুলো</string>
+    <string name="customInstance_summary">সতর্কতার সাথে কাস্টম ইনস্ট্যান্স যোগ করুন</string>
+    <string name="instance_name">ইনস্ট্যান্সের নাম</string>
+    <string name="instance_api_url">ইনস্ট্যান্স এপিআই লিংক</string>
+    <string name="addInstance">ইনস্ট্যান্স যোগ করুন</string>
+    <string name="clear_customInstances">কাস্টম ইনস্ট্যান্সগুলো মুছে ফেলুন</string>
+    <string name="invalid_url">কাজ করে এমন একটি লিংক উল্লেখ করুন</string>
+    <string name="version">সংস্করণ %1$s</string>
+    <string name="related_streams">সম্পর্কিত কন্টেন্ট</string>
+    <string name="birdIcon">শক্তিশালী পাখি</string>
+    <string name="show_chapters">অধ্যায়গুলো প্রদর্শন করুন</string>
+    <string name="hide_chapters">অধ্যায়গুলো আড়াল করুন</string>
+    <string name="buffering_goal">প্রিলোড করা হচ্ছে</string>
+    <string name="playerVideoFormat">প্লেয়ারের জন্য ভিডিও ফরম্যাট</string>
+    <string name="buffering_goal_summary">ভিডিও বাফারিংএর জন্য সর্বোচ্চ সময় (সেকেন্ডে)।</string>
+    <string name="no_audio">কোনো অডিও নেই</string>
+    <string name="no_video">কোনো ভিডিও নেই</string>
+    <string name="audio">অডিও</string>
+    <string name="video">ভিডিও</string>
+    <string name="downloading">ডাউনলোড করা হচ্ছে</string>
+    <string name="player_autoplay">অটোপ্লে</string>
+    <string name="hideTrendingPage">ট্রেন্ডিং পৃষ্ঠা আড়াল করুন</string>
+    <string name="instance_frontend_url">ইনস্ট্যান্স ফ্রন্টইন্ডের লিংক</string>
+    <string name="quality">মান</string>
+    <string name="player_summary">মান ও প্লেয়ার গতিবিধি</string>
+    <string name="behavior">গতিবিধি</string>
+    <string name="seek_increment">সন্ধান দ্রুতি</string>
+    <string name="piped_summary">পাইপড ইউটিউবের জন্য একটি ওপেন সোর্স বিকল্প ফ্রন্টইন্ড যা আমাদের ব্যবহৃত এপিআই ব্যবহার করে। পাইপড ব্যতীত লিবরাটিউবের অস্তিত্বই থাকতো না। উক্ত প্রজেক্টের ডেভেলপারদেরকে অসংখ্য ধন্যবাদ!</string>
+    <string name="pauseOnScreenOff">অটোপজ</string>
+    <string name="videos">ভিডিওগুলো</string>
+    <string name="pauseOnScreenOff_summary">স্ক্রিন বন্ধ হওয়ার পর স্বয়ংক্রিয়ভাবে প্লেয়ার বন্ধ করুন।</string>
+    <string name="clonePlaylist">প্লেলিস্ট ক্লোন করুন</string>
+    <string name="reset">ডিফল্ট সেটিংস ফিরিয়ে আনুন</string>
+    <string name="already_logged_in">ইতিমধ্যে লগ ইন করা হয়েছে। আপনি আপনার অ্যাকাউন্ট থেকে লগ আউট হয়ে যেতে পারেন।</string>
+    <string name="subscribeIsEmpty">প্রথমে কিছু চ্যানেল সাবস্ক্রাইব করুন।</string>
+    <string name="please_login">অনুগ্রহ করে প্রথমে সেটিংসে লগ ইন অথবা নিবন্ধন করুন।</string>
+    <string name="dlisinprogress">অনুগ্রহ করে সব ডাউনলোড সমাপ্ত হওয়া পর্যন্ত অপেক্ষা করুন…</string>
+    <string name="import_from_yt">সাবস্ক্রিপশনগুলো ইমপোর্ট করুন</string>
+    <string name="history">ইতিহাস</string>
+    <string name="emptyPlaylistName">প্লেলিস্টটির নাম খালি থাকতে পারে না</string>
+    <string name="videoCount">ভিডিও সংখ্যা %1$s</string>
+    <string name="retry">পুনরায় চেষ্টা করুন</string>
+    <string name="choose_filter">প্রথমে অনুসন্ধান ফিল্টার নির্বাচন করুন</string>
+    <string name="music_playlists">ইউটিউব মিউজিক প্লেলিস্টগুলো</string>
+    <string name="segment_skipped">ভিডিও অংশ অতিক্রম করা হয়েছে</string>
+    <string name="category_sponsor_description">অর্থ প্রদানের মাধ্যমে করা উৎসাহ, সুপারিশ এবং সরাসরি বিজ্ঞাপন। ব্যক্তিগত উৎসাহ অথবা ঘটনা, নির্মাতা, ওয়েবসাইট অথবা পণ্যের প্রতি আন্তরিক নিবেদনের জন্য প্রযোজ্য।</string>
+    <string name="category_selfpromo_description">ব্যক্তিগত উৎসাহ ব্যতীত \"স্পন্সর\"এর সাথে সাদৃশ্যপূর্ণ। নিজস্ব পণ্য, অনুদান অথবা সহযোগী নির্মাতা সম্পর্কিত তথ্য উল্লেখ করা হয়।</string>
+    <string name="category_intro_description">মূল কন্টেন্টের বাইরে বিরতি। এটি যেকোনো স্বল্প বিরতি, স্থির চিত্র অথবা পুনরাবৃত্তিক এনিমেশনের জন্য প্রযোজ্য। এমন এনিমেশনের জন্য ব্যবহার করা অনুচিত যাতে প্রয়োজনীয় তথ্য বিদ্যমান।</string>
+    <string name="category_filler_description">এমন স্পর্শকাতর দৃশ্য যা হাস্যরস উদ্দীপক কিন্তু ভিডিওর মূল কন্টেন্ট বোঝার জন্য অপ্রয়োজনীয়।</string>
+    <string name="sponsorblock_notifications">নোটিফিকেশনগুলো</string>
+    <string name="advanced_summary">ডাউনলোডগুলো, ইতিহাস</string>
+    <string name="no_replies">এই মন্তব্যে কোনো প্রত্যুত্তর নেই।</string>
+    <string name="oledTheme">কালো</string>
+    <string name="category_music_offtopic_description">শুধুমাত্র মিউজিক ভিডিওর জন্য প্রযোজ্য। অফিসিয়াল মিক্সগুলোর অংশ এমন দৃশ্যগুলো এখানে অপ্রযোজ্য। স্পটিফাই বা অডিও ভার্সনের প্রতিফলন ঘটায় অথবা ন্যূনতম অপ্রয়োজনীয় অংশ থাকবে।</string>
+    <string name="contributing">অবদানে</string>
+    <string name="category_preview_description">ভিডিওর এই অংশে আসন্ন কন্টেন্ট অথবা একই সিরিজের অন্য ভিডিওতে পূর্বে আলোচনা করা হয়েছে এমন তথ্য এখানে থাকবে‌‌ যদি এখানে এমন তথ্য থাকে যা অন্য ভিডিও বা একই ভিডিওর অন্য কোথাও আলোচনা করা হয়নি, তবে ভিডিওর উক্ত অংশের জন্য ভুল ক্যাটাগরি নির্বাচন করা হয়েছে।</string>
+    <string name="contributing_summary">আইডিয়া, অনুবাদ, ডিজাইন এবং কোড ডেভেলপ করুন। যত সহায়তা, তত ভালো!</string>
+    <string name="player">অডিও ও ভিডিও</string>
+    <string name="license_summary">GPLv3+ একটি কপিলেফট লিবরা লাইসেন্স। সবার সাথে ব্যবহার, অধ্যয়ন, পরিবর্তন ও শেয়ার করুন।</string>
+    <string name="update_summary">অ্যাপটি হালনাগাদ করা হয়েছে কিনা জানতে ক্লিক করুন।</string>
+    <string name="no_update_available">আপনি সর্বশেষ সংস্করণ ব্যবহার করছেন।</string>
+    <string name="live">সরাসরি</string>
+    <string name="donate_summary">আপনি যা পারেন, তাই দিয়ে প্রজেক্টটিকে উৎসাহিত করুন। টিম লিবরাটিউব আপনার অনুদানের চেয়ে ছোট।</string>
+    <string name="views">দর্শক সংখ্যা %1$s</string>
+    <string name="torchIcon">ট্রেন্ডি টর্চ</string>
+    <string name="shapedIcon">কিম্ভুতকিমাকার</string>
+    <string name="related_streams_summary">আপনার দেখতে থাকা ভিডিও সম্পর্কিত ভিডিও প্রদর্শন করুন।</string>
+    <string name="defaultIcon">ডিফল্ট</string>
+    <string name="empty_instance">অ্যাপের নাম ও লিংক উল্লেখ করুন।</string>
+    <string name="about_summary">টিম লিবরাটিউবের সদস্যদের ও তাদের কাজ সম্পর্কে জানুন।</string>
+    <string name="autoplay_summary">ভিডিও শেষ হওয়ার পর স্বয়ংক্রিয়ভাবে নতুন ভিডিও প্লে করুন।</string>
+    <string name="reset_message">আপনি কি নিশ্চিত\? আপনি লগ আউট হয়ে যাবেন এবং সমস্ত সেটিংস আগের অবস্থায় ফিরে যাবে!</string>
+    <string name="vlcerror">ভিএলসি অ্যাপে প্রদর্শন করা যাচ্ছে না। সম্ভবত অ্যাপটি ইনস্টল করা হয়নি।</string>
+    <string name="notgmail">এটি একটি লিবরাটিউব অ্যাকাউন্টের জন্য।</string>
+    <string name="noInternet">প্রথমে ইন্টারনেট চালু করুন।</string>
+    <string name="yes">হ্যাঁ</string>
+    <string name="choose_quality_dialog">কোয়ালিটি</string>
+    <string name="search_hint">অনুসন্ধান</string>
+    <string name="save">সংরক্ষণ</string>
+    <string name="username">ব্যবহারকারীর নাম</string>
+    <string name="password">পাসওয়ার্ড</string>
+    <string name="register">নিবন্ধন</string>
+    <string name="logout">লগ আউট</string>
+    <string name="cancel">বাতিল</string>
+    <string name="loggedIn">লগ ইন করা হয়েছে।</string>
+    <string name="loggedout">লগ আউট করা হয়েছে।</string>
+    <string name="registered">নিবন্ধন করা হয়েছে। আপনি এখন চ্যানেলগুলো সাবস্ক্রাইব করতে পারবেন।</string>
+    <string name="login_first">অনুগ্রহ করে লগ ইন করুন এবং আবার চেষ্টা করুন।</string>
+    <string name="instances">ইনস্ট্যান্স নির্বাচন করুন</string>
+    <string name="region">এলাকা</string>
+    <string name="login_register">লগ ইন/নিবন্ধন</string>
+    <string name="importsuccess">সাবস্ক্রাইব করা হয়েছে</string>
+    <string name="cannotDownload">এই স্ট্রিম ডাউনলোড করা সম্ভব হচ্ছে না।</string>
+    <string name="dlcomplete">ডাউনলোড করা সমাপ্ত হয়েছে।</string>
+    <string name="downloadfailed">ডাউনলোড ব্যর্থ হয়েছে।</string>
+    <string name="subscriptions">সাবস্ক্রিপশনগুলো</string>
+    <string name="login">লগ ইন</string>
+    <string name="customInstance">কাস্টম ইনস্ট্যান্স</string>
+    <string name="vlc">ভিএলসি অ্যাপে প্রদর্শন</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index b63f17381..f9185c492 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -195,6 +195,12 @@
     <string name="quality">Ποιότητα</string>
     <string name="behavior">Συμπεριφορά</string>
     <string name="player_summary">Ποιότητα και συμπεριφορά του αναπαραγωγέα</string>
-    <string name="seek_increment">Προσάυξηση αναζήτησης</string>
+    <string name="seek_increment">Προσαύξηση αναπήδησης</string>
     <string name="piped_summary">Το Piped είναι μία εναλλακτική σελίδα ανοικτού κώδικα για το YouTube που παρέχει το API που χρησιμοποιούμε. Χωρίς το Piped, το LibreTube δεν θα υπήρχε. Τεράστιες ευχαριστίες στους προγραμματιστές του!</string>
+    <string name="reset">Επαναφορά προεπιλογών</string>
+    <string name="reset_message">Είστε σίγουρος/η; Αυτό θα σας αποσυνδέσει και θα επαναφέρει όλες τις ρυθμίσεις σας!</string>
+    <string name="pauseOnScreenOff">Αυτόματη παύση</string>
+    <string name="pauseOnScreenOff_summary">Παύση της αναπαραγωγής όταν η οθόνη είναι απενεργοποιημένη.</string>
+    <string name="autoplay_summary">Αυτόματη αναπαραγωγή του επόμενου βίντεο όταν τελειώσει το τρέχον.</string>
+    <string name="clonePlaylist">Κλωνοποίηση λίστας αναπαραγωγής</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ff01ecb75..1a7cf324c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -9,7 +9,7 @@
     <string name="password">Contraseña</string>
     <string name="login">Iniciar sesión</string>
     <string name="register">Registrarse</string>
-    <string name="choose_quality_dialog">Calidad:</string>
+    <string name="choose_quality_dialog">Calidad</string>
     <string name="search_hint">Buscar</string>
     <string name="logout">Cerrar sesión</string>
     <string name="cancel">Cancelar</string>
@@ -123,7 +123,7 @@
     <string name="appearance">Apariencia</string>
     <string name="no_replies">Este comentario no tiene respuestas.</string>
     <string name="authors">Autores</string>
-    <string name="authors_summary">Conozca a todos.</string>
+    <string name="authors_summary">Conozca a todos los que están involucrados en el desarrollo y la mejora de la aplicación.</string>
     <string name="internal_storage">Almacenamiento interno</string>
     <string name="sdcard">Tarjeta SD</string>
     <string name="shareTo">Compartir con</string>
@@ -154,7 +154,7 @@
     <string name="license_summary">La GPLv3+ es una licencia libre con copyleft. Utiliza, estudia, cambia y comparte; con todos.</string>
     <string name="movies_directory">Carpeta de películas</string>
     <string name="no_update_available">Estás utilizando la última versión.</string>
-    <string name="advanced_summary">Reproductor, descargas e historial</string>
+    <string name="advanced_summary">Descargas, historial</string>
     <string name="legacyIcon">Antiguo</string>
     <string name="download_folder_summary">El nombre de la carpeta en la que se almacenan los medios descargados.</string>
     <string name="addInstance">Añadir instancia</string>
@@ -169,7 +169,7 @@
     <string name="contributing">Contribución</string>
     <string name="donate">Donar</string>
     <string name="advanced">Avanzado</string>
-    <string name="player">Reproductor</string>
+    <string name="player">Audio y vídeo</string>
     <string name="appearance_summary">Ajuste la aplicación a su gusto.</string>
     <string name="playback_speed">Velocidad de reproducción predeterminada</string>
     <string name="live">En vivo</string>
@@ -192,4 +192,15 @@
     <string name="no_audio">Sin audio</string>
     <string name="audio">Audio</string>
     <string name="video">Vídeo</string>
+    <string name="quality">Calidad</string>
+    <string name="behavior">Comportamiento</string>
+    <string name="player_summary">Calidad y comportamiento del reproductor</string>
+    <string name="seek_increment">Incremento de búsqueda</string>
+    <string name="piped_summary">Piped es una interfaz web alternativa de código abierto para YouTube que proporciona la API que usamos. Sin Piped, LibreTube no existiría. ¡Muchas gracias a sus desarrolladores!</string>
+    <string name="pauseOnScreenOff">Pausa automática</string>
+    <string name="pauseOnScreenOff_summary">Pausa el reproductor cuando se apaga la pantalla.</string>
+    <string name="autoplay_summary">Reproduce automáticamente el siguiente vídeo cuando el actual haya terminado.</string>
+    <string name="clonePlaylist">Clonar lista de reproducción</string>
+    <string name="reset">Restaurar los valores predeterminados</string>
+    <string name="reset_message">¿Está seguro\? ¡Esto te cerrará la sesión y restablecerá todos tus ajustes!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 4e92acb49..93ffec4d3 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -101,19 +101,19 @@
     <string name="update_available_text">GitHub-era joan deskargatzeko\?</string>
     <string name="category_outro">Amaierako txartelak eta kredituak</string>
     <string name="video_format">Bideo formatua</string>
-    <string name="video_format_summary">Audioa eta bideoa deskargatzen badira, fitxategi bihurtzea.</string>
+    <string name="video_format_summary">Deskargatutako fitxategietarako</string>
     <string name="download_directory">Deskargatu hona</string>
-    <string name="download_directory_summary">Deskargatutako multimedia gordetzen den lekuan.</string>
+    <string name="download_directory_summary">Deskargatutako multimedia gordetzen den lekua</string>
     <string name="app_uptodate">Azken bertsioa da hau.</string>
     <string name="no_update_available">Azken bertsioa erabiltzen ari zara.</string>
     <string name="advanced">Aurreratua</string>
-    <string name="player">Erabiltzailea</string>
-    <string name="appearance_summary">Egokitu aplikazioa zure gustura.</string>
-    <string name="advanced_summary">Erreproduzitzailea, deskargak, historiala</string>
+    <string name="player">Audioa eta bideoa</string>
+    <string name="appearance_summary">Egokitu aplikazioa zure gustura</string>
+    <string name="advanced_summary">Deskargak, historiala</string>
     <string name="no_replies">Iruzkin honek ez du erantzunik.</string>
-    <string name="authors_summary">Ezagutu guztiak.</string>
+    <string name="authors_summary">Ezagutu aplikazioaren garapenean eta hobekuntzan parte hartzen duten guztiak.</string>
     <string name="download_folder">Izena</string>
-    <string name="download_folder_summary">Deskargatutako multimediak gordetzen diren karpetaren izena.</string>
+    <string name="download_folder_summary">Deskargatutako multimediak gordetzen diren karpetaren izena</string>
     <string name="downloads_directory">Deskarga karpeta</string>
     <string name="sdcard">SD txartela</string>
     <string name="music_directory">Musika karpeta</string>
@@ -185,4 +185,22 @@
     <string name="buffering_goal">Aurrez kargatzea</string>
     <string name="playerVideoFormat">Erreproduzitzailearen bideo formatua</string>
     <string name="player_autoplay">Erreprodukzio automatikoa</string>
+    <string name="no_video">Bideorik gabe</string>
+    <string name="no_audio">Audiorik gabe</string>
+    <string name="audio">Audioa</string>
+    <string name="video">Bideoa</string>
+    <string name="downloading">Deskargatzen</string>
+    <string name="hideTrendingPage">Ezkutatu joera-orria</string>
+    <string name="instance_frontend_url">Instantziaren frontenderako URLa</string>
+    <string name="quality">Kalitatea</string>
+    <string name="behavior">Portaera</string>
+    <string name="player_summary">Kalitatea eta erreprodukzioaen portaera</string>
+    <string name="seek_increment">Bilatu gehikuntza</string>
+    <string name="piped_summary">Piped kode irekiko web-frontend alternatibo bat da eta YouTube-k erabiltzen duen APIa eskaintzen du. Piped gabe, LibreTube ez litzateke existituko. Mila esker haien garatzaileei!</string>
+    <string name="reset">Leheneratu lehenetsiak</string>
+    <string name="reset_message">Ziur zaude\? Honek saioa amaitu eta zure ezarpen guztiak berrezarriko ditu!</string>
+    <string name="pauseOnScreenOff_summary">Pantaila itzalita dagoenean, erreproduzitzailea gelditu.</string>
+    <string name="autoplay_summary">Erreproduzitu automatikoki hurrengo bideoa unekoa amaitzen denean.</string>
+    <string name="pauseOnScreenOff">Automatikoki gelditzea</string>
+    <string name="clonePlaylist">Klonatu erreprodukzio-zerrenda</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 2f2265ab9..ef9064dd6 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -85,4 +85,28 @@
     <string name="playlists">فهرست پخش</string>
     <string name="music_albums">آلبوم‌های موسیقی</string>
     <string name="license">مجوز</string>
+    <string name="youtube">یوتیوب</string>
+    <string name="music_playlists">پلی لیست های یوتیوب موزیک</string>
+    <string name="segment_skipped">بخش رد شده</string>
+    <string name="category_segments">بخش</string>
+    <string name="category_interaction">یادآوری تعامل (لایک و اشتراک)</string>
+    <string name="color_accent">لهجه</string>
+    <string name="color_blue">ابی شاد</string>
+    <string name="color_green">سبز</string>
+    <string name="color_yellow">زرد</string>
+    <string name="color_purple">بنفش</string>
+    <string name="oledTheme">سیاه</string>
+    <string name="color_red">سرخ</string>
+    <string name="enabled">روشن</string>
+    <string name="disabled">خاموش</string>
+    <string name="appearance">ظاهر</string>
+    <string name="app_behavior">رفتار</string>
+    <string name="download_directory">دانلود در...</string>
+    <string name="download_directory_summary">جایی که فایل دانلود شده ذخیره میشود.</string>
+    <string name="website_summary">برای اطلاعات بیشتر در مورد برنامه و ویژگی های آن به وب سایت مراجعه کنید.</string>
+    <string name="donate_summary">به اندازه ای که این برنامه را دوست دارید به ما کمک کنید. تیم ما کوچک است و هر مقدار کمکی مفید است.</string>
+    <string name="update_available">نسخه %1$s موجود است</string>
+    <string name="downloads">دانلودها</string>
+    <string name="video_format">فرمت ویدئو</string>
+    <string name="contributing">کمک کردن</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 23bfac0cf..9d2859ea8 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -31,19 +31,19 @@
     <string name="defres">Videon oletustarkkuus</string>
     <string name="grid">Valitse ruudukon sarakkeet</string>
     <string name="app_theme">Sovelluksen teema</string>
-    <string name="success">Onnistui!</string>
+    <string name="success">Onnistui.</string>
     <string name="about">Tietoja</string>
     <string name="choose_quality_dialog">Valitse laatu:</string>
     <string name="share">Jaa</string>
     <string name="customInstance">Lisää mukautettu instanssi</string>
     <string name="subscribeIsEmpty">Tilaa ensin joitakin kanavia.</string>
-    <string name="dlisinprogress">Toinen lataus on jo käynnissä, odota kunnes se on valmis.</string>
+    <string name="dlisinprogress">Odota kunnes kaikki lataukset ovat valmiita.</string>
     <string name="cannotDownload">Ei voi ladata tätä videota.</string>
     <string name="vlc">Avaa VLC:ssä</string>
     <string name="unknown_error">Verkkovirhe.</string>
     <string name="import_from_yt">Tuo tilaukset YouTubesta</string>
     <string name="error">Jokin meni pieleen.</string>
-    <string name="playlistCreated">Soittolista luotu!</string>
+    <string name="playlistCreated">Soittolista luotu.</string>
     <string name="emptyList">Täällä ei ole mitään.</string>
     <string name="deletePlaylist">Poista soittolista</string>
     <string name="areYouSure">Haluatko varmasti poistaa tämän soittolistan\?</string>
@@ -57,11 +57,11 @@
     <string name="subscriptions">Tilaukset</string>
     <string name="library">Kirjasto</string>
     <string name="videos">Videot</string>
-    <string name="changeLanguage">Vaihda kieltä</string>
+    <string name="changeLanguage">Kieli</string>
     <string name="systemLanguage">Järjestelmän kieli</string>
-    <string name="darkTheme">Tumma teema</string>
+    <string name="darkTheme">Tumma</string>
     <string name="systemDefault">Järjestelmän oletusarvo</string>
-    <string name="lightTheme">Vaalea teema</string>
+    <string name="lightTheme">Vaalea</string>
     <string name="subscribers">%1$s tilaajaa</string>
     <string name="comments">Kommentit</string>
     <string name="noInternet">Ei Internet-yhteyttä</string>
@@ -104,4 +104,13 @@
     <string name="appearance_summary">Tee sovelluksesta haluamasi näköinen.</string>
     <string name="advanced">Edistynyt</string>
     <string name="live">Live</string>
+    <string name="music_playlists">YT Musiikki Soittolistat</string>
+    <string name="segment_skipped">Ohitettu segmentti</string>
+    <string name="category_sponsor">Sponsori</string>
+    <string name="category_selfpromo">Ei maksettu/itsensä mainostaminen</string>
+    <string name="category_segments">Segmentit</string>
+    <string name="category_intro">Väliaika/Intro animaatio</string>
+    <string name="sponsorblock_state">Päällä</string>
+    <string name="category_selfpromo_description">Samankaltainen kuin \"sponsori\" lukuunottamatta ei maksettua tai itsensä mainostamista. Tämä sisältää osiot, jotka sisältävät kauppatavaraa, lahjoituksia tai tietoa keiden kanssa he tekivät yhteistyötä.</string>
+    <string name="category_interaction">Vuorovaikutus muistutus (tykkäys ja tilaus)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 18835bb6d..88ea14659 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -143,7 +143,7 @@
     <string name="live">En direct</string>
     <string name="no_replies">Ce commentaire n\'a pas de réponse.</string>
     <string name="authors">Auteurs</string>
-    <string name="authors_summary">Apprenez à connaître tout le monde.</string>
+    <string name="authors_summary">Apprenez à connaître toutes les personnes qui participent au développement et à l\'amélioration de l\'application.</string>
     <string name="sdcard">Carte SD</string>
     <string name="download_folder_summary">Le nom du dossier dans lequel le média téléchargé est stocké.</string>
     <string name="download_folder">Nom</string>
@@ -196,4 +196,11 @@
     <string name="behavior">Comportement</string>
     <string name="player_summary">Qualité et comportement du lecteur</string>
     <string name="seek_increment">Rechercher l\'incrément</string>
+    <string name="piped_summary">Piped est un front-end web alternatif open-source pour YouTube qui fournit l\'API que nous utilisons. Sans Piped, LibreTube n\'existerait pas. Un grand merci à leurs développeurs !</string>
+    <string name="reset">Restaurer les valeurs par défaut</string>
+    <string name="reset_message">Êtes-vous sûr·e \? Ceci va vous déconnecter et réinitialiser tous vos paramètres !</string>
+    <string name="pauseOnScreenOff">Pause automatique</string>
+    <string name="pauseOnScreenOff_summary">Mettre le lecteur en pause lorsque l\'écran est éteint.</string>
+    <string name="autoplay_summary">Lancer automatiquement la vidéo suivante lorsque la vidéo en cours est terminée.</string>
+    <string name="clonePlaylist">Cloner la liste de lecture</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 5906f5144..f196abc8d 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -19,7 +19,7 @@
     <string name="already_logged_in">आप पहले ही लॉग इन हैं, आप अपने खाते से लॉगआउट कर सकते हैं।</string>
     <string name="login_first">कृपया पुनः लॉगिन करें और पुनः प्रयास करें!</string>
     <string name="instances">इंस्टेंस चुनें</string>
-    <string name="customInstance">एक कस्टम इंस्टेंस जोड़ें</string>
+    <string name="customInstance">अलग इंस्टेंस जोड़ें</string>
     <string name="login_register">लॉग इन/रजिस्टर</string>
     <string name="importsuccess">सफलतापूर्वक सब्सक्राइब ही गया!</string>
     <string name="cannotDownload">इस स्ट्रीम को डाउनलोड नहीं कर सकते!</string>
@@ -51,4 +51,8 @@
     <string name="dlisinprogress">एक और डाउनलोड पहले से ही हो रहा है कृपया इसके समाप्त होने तक प्रतीक्षा करें!</string>
     <string name="choose_quality_dialog">क्वालिटी चुनें:</string>
     <string name="about">के बारे में</string>
+    <string name="startpage">होम</string>
+    <string name="subscriptions">सदस्यता</string>
+    <string name="library">लायब्ररी</string>
+    <string name="videos">वीडियो</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e931ea3bb..4d30628bc 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -119,7 +119,7 @@
     <string name="downloads">Scaricamenti</string>
     <string name="video_format_summary">Conversione dei file se entrambi audio e video vengono scaricati.</string>
     <string name="video_format">Formato video</string>
-    <string name="advanced_summary">Lettore, scaricamenti, cronologia</string>
+    <string name="advanced_summary">Scaricamenti, cronologia</string>
     <string name="update_available">La versione %1$s è disponibile</string>
     <string name="update_available_text">Andare ai rilasci su GitHub per scaricarlo\?</string>
     <string name="appearance">Aspetto</string>
@@ -138,12 +138,12 @@
     <string name="no_update_available">Stai eseguendo l\'ultima versione.</string>
     <string name="playback_speed">Velocità di riproduzione predefinita</string>
     <string name="advanced">Avanzate</string>
-    <string name="player">Lettore</string>
+    <string name="player">Audio e video</string>
     <string name="appearance_summary">Regola l\'app a tuo piacimento.</string>
     <string name="live">Dal vivo</string>
     <string name="authors">Autori</string>
     <string name="no_replies">Questo commento non ha risposte.</string>
-    <string name="authors_summary">Fai conoscenza con tutti.</string>
+    <string name="authors_summary">Conosci tutti coloro che sono coinvolti nello sviluppo e nel miglioramento dell\'applicazione.</string>
     <string name="downloads_directory">Cartella degli scaricamenti</string>
     <string name="sdcard">Scheda SD</string>
     <string name="music_directory">Cartella musicale</string>
@@ -191,4 +191,16 @@
     <string name="video">Con video</string>
     <string name="downloading">Scaricando</string>
     <string name="hideTrendingPage">Nascondi la pagina Tendenze</string>
+    <string name="instance_frontend_url">URL dell\'istanza frontend</string>
+    <string name="quality">Qualità</string>
+    <string name="behavior">Comportamento</string>
+    <string name="player_summary">Qualità e comportamento lettore</string>
+    <string name="seek_increment">Cerca incremento</string>
+    <string name="piped_summary">Piped è un\' alternativa web-frontend open-source per YouTube che fornisce l\'API che usiamo. Senza Piped, LibreTube non esisterebbe. Un enorme grazie ai loro sviluppatori!</string>
+    <string name="autoplay_summary">Riproduci automaticamente il video successivo quando quello corrente è finito.</string>
+    <string name="pauseOnScreenOff">Pausa automatica</string>
+    <string name="pauseOnScreenOff_summary">Metti in pausa il lettore quando lo schermo é spento.</string>
+    <string name="clonePlaylist">Clona playlist</string>
+    <string name="reset">Ripristina predefiniti</string>
+    <string name="reset_message">Sei sicuro\? Questo ti disconnetterà e ripristinerà tutte le tue impostazioni!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 84a06f969..5c02f795f 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -197,4 +197,10 @@
     <string name="behavior">התנהגות</string>
     <string name="seek_increment">הגדלת קפיצה</string>
     <string name="piped_summary">Piped הוא חלופה בקוד פתוח למנשק המשתמש של YouTube ומספק את ה־API בו אנו משתמשים. בלי Piped,‏ LibreTube לא היה קיים. אנו מודים למפתחים מקרב לב!</string>
+    <string name="pauseOnScreenOff">השהיה אוטומטית</string>
+    <string name="pauseOnScreenOff_summary">השהיית הנגן עם כיבוי המסך.</string>
+    <string name="clonePlaylist">שכפול רשימת הנגינה</string>
+    <string name="autoplay_summary">לנגן את הסרטון הבא אוטומטית כשהנוכחי מסתיים.</string>
+    <string name="reset">שחזור ברירות מחדל</string>
+    <string name="reset_message">להמשיך\? פעולה זו תוציא אותך מהמערכת ותאפס את כל ההגדרות שלך!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 8e0e6e6a0..76d7d574c 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -120,7 +120,7 @@
     <string name="video_format_summary">오디오와 비디오가 모두 다운로드된 경우 파일 변환.</string>
     <string name="appearance_summary">원하는 대로 앱을 조정하세요.</string>
     <string name="no_replies">이 댓글에는 답글이 없습니다.</string>
-    <string name="authors_summary">모두를 알아보세요.</string>
+    <string name="authors_summary">앱 개발과 개선에 참여한 사람이 누구인지 알아보세요.</string>
     <string name="update_available">%1$s 버전 사용 가능</string>
     <string name="update_available_text">GitHub의 릴리스로 이동하여 다운로드하시겠습니까\?</string>
     <string name="app_behavior">동작</string>
@@ -142,7 +142,7 @@
     <string name="playback_speed">기본 재생 속도</string>
     <string name="advanced">고급</string>
     <string name="player">오디오 및 비디오</string>
-    <string name="advanced_summary">플레이어, 다운로드, 기록</string>
+    <string name="advanced_summary">다운로드, 기록</string>
     <string name="live">실시간</string>
     <string name="download_folder">이름</string>
     <string name="sdcard">SD 카드</string>
@@ -175,11 +175,29 @@
     <string name="buffering_goal_summary">최대 버퍼링할 비디오의 시간(초)입니다.</string>
     <string name="playerVideoFormat">플레이어의 비디오 형식</string>
     <string name="buffering_goal">사전 로딩</string>
-    <string name="legacyIcon">레거시</string>
+    <string name="legacyIcon">잃어버린 레거시</string>
     <string name="torchIcon">세련된 등불</string>
     <string name="fireIcon">멋진 불</string>
     <string name="category_filler">사족/농담</string>
     <string name="category_filler_description">분량을 채우기 위한 사족 씬이나 동영상의 메인 컨텐츠를 이해하는데 필요하지 않은 유머가 해당됩니다.</string>
     <string name="birdIcon">돌진하는 새</string>
     <string name="flameIcon">휘날리는 화염</string>
+    <string name="reset">초기값으로 복원</string>
+    <string name="reset_message">정말 실행합니까\? 이후 로그아웃되며 설정값이 모두 지워집니다!</string>
+    <string name="autoplay_summary">현재 동영상이 끝나면 다음 동영상을 자동으로 재생합니다.</string>
+    <string name="no_audio">오디오 없음</string>
+    <string name="no_video">비디오 없음</string>
+    <string name="audio">오디오</string>
+    <string name="video">비디오</string>
+    <string name="downloading">다운로드 중</string>
+    <string name="player_autoplay">자동 재생</string>
+    <string name="hideTrendingPage">인기 동영상 페이지 숨기기</string>
+    <string name="quality">품질</string>
+    <string name="behavior">행동</string>
+    <string name="player_summary">품질 및 플레이어 행동</string>
+    <string name="piped_summary">Piped는 이 앱이 사용하는, YouTube용 오픈소스 대안 웹 프로트엔드 API를 제공합니다. Piped 없이는 LibreTube가 존재하지 않습니다. 그들의 개발품에 매우 큰 감사를 보냅니다!</string>
+    <string name="pauseOnScreenOff">자동 일시중지</string>
+    <string name="pauseOnScreenOff_summary">화면이 꺼질 경우 동영상 재생을 일시중지합니다.</string>
+    <string name="clonePlaylist">재생목록 복제</string>
+    <string name="instance_frontend_url">인스턴스 프론트엔드에 대한 URL</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 7e986a16e..f64da66fe 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -118,7 +118,7 @@
     <string name="playOnBackground">Atskaņot fonā</string>
     <string name="no_replies">Šim komentāram nav atbilžu.</string>
     <string name="authors">Autori</string>
-    <string name="authors_summary">Iepazīstieties ar visiem.</string>
+    <string name="authors_summary">Iepazīstieties ar visiem, kas ir iesaistīti aplikācijas veidošanā un uzlabošanā.</string>
     <string name="download_folder_summary">Nosaukums mapei, kurā tiek saglabāti lejupielādētie faili.</string>
     <string name="download_directory">Lejupielādēt uz</string>
     <string name="download_folder">Nosaukums</string>
@@ -156,9 +156,9 @@
     <string name="app_uptodate">Šī ir jaunākā versija.</string>
     <string name="no_update_available">Šī ir jaunākā versija.</string>
     <string name="advanced">Tehniski</string>
-    <string name="player">Atskaņotājs</string>
+    <string name="player">Audio un video</string>
     <string name="appearance_summary">Pielāgojiet aplikāciju tā, kā jūs to vēlaties.</string>
-    <string name="advanced_summary">Atskaņotājs, lejupielādes, vēsture</string>
+    <string name="advanced_summary">Lejupielādes, vēsture</string>
     <string name="playback_speed">Noklusējuma atskaņošanas ātrums</string>
     <string name="live">Tiešraide</string>
     <string name="customInstance_summary">Pievienot pielāgotu instanci (uz jūsu atbildību)</string>
@@ -185,4 +185,22 @@
     <string name="playerVideoFormat">Atskaņotāja video formāts</string>
     <string name="category_music_offtopic_description">Tikai priekš mūzikas video. Tas ir laika sprīžiem, kas nav oficiālajā dziesmas versijā. Beigās video vajadzētu būt tik līdzīgam Spotify vai jebkurai citai dziesmas versijai, cik vien iespējams vai ar samazinātu runāšanas daudzumu un uzmanības novēršanu.</string>
     <string name="player_autoplay">Automātiski atskaņot</string>
+    <string name="reset">Atjaunot noklusējumu</string>
+    <string name="reset_message">Vai esat pārliecināts\? Šī darbība jūs izrakstīs un iestatīs visus iestatījumus uz noklusējumu!</string>
+    <string name="no_audio">Nav audio</string>
+    <string name="no_video">Nav video</string>
+    <string name="audio">Audio</string>
+    <string name="video">Video</string>
+    <string name="downloading">Lejupielādē</string>
+    <string name="hideTrendingPage">Paslēpt tendenču lapu</string>
+    <string name="instance_frontend_url">URL instances frontend</string>
+    <string name="quality">Kvalitāte</string>
+    <string name="behavior">Uzvedība</string>
+    <string name="player_summary">Kvalitāte un atskaņotāja uzvedība</string>
+    <string name="seek_increment">Meklēšanas iedaļa</string>
+    <string name="piped_summary">Piped ir atvērta pirmkoda alternatīva mājaslapa priekš YouTube, kas sniedz API, ko mēs izmantojam. Bez Piped, LibreTube neeksistētu. Milzīgs paldies viņu veidotājiem!</string>
+    <string name="pauseOnScreenOff">Automātiska pauzēšana</string>
+    <string name="pauseOnScreenOff_summary">Iepauzēt atskaņotāju, kamēr ekrāns ir izslēgts.</string>
+    <string name="autoplay_summary">Automātiski atskaņot nākamo video, kad pašreizējais ir beidzies.</string>
+    <string name="clonePlaylist">Duplicēt atskaņošanas sarakstu</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index e97131b73..703828320 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -197,4 +197,10 @@
     <string name="player_summary">Kvalitet og avspilleroppførsel</string>
     <string name="seek_increment">Blafringsmengde</string>
     <string name="piped_summary">Piped er en fri alternativ grenseflate for YouTube som tilbyr API-et programmet bruker. Uten Piped ville ikke LibreTube eksistert. Stor takk til utviklerne deres.</string>
+    <string name="reset_message">Logg ut og tilbakestill alle innstillinger\?</string>
+    <string name="autoplay_summary">Spill neste video når nåværende er fullført.</string>
+    <string name="reset">Gjenopprett forvalg</string>
+    <string name="pauseOnScreenOff">Automatisk pause</string>
+    <string name="pauseOnScreenOff_summary">Sett avspilleren på pause når skjermen skrus av.</string>
+    <string name="clonePlaylist">Dupliser spillelisten</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6c2fde7eb..f60853233 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="choose_quality_dialog">Kies Kwaliteit:</string>
+    <string name="choose_quality_dialog">Kwaliteit</string>
     <string name="registered">Geregistreerd. Nu kunt u zich abonneren op kanalen.</string>
     <string name="search_hint">Zoeken</string>
     <string name="videos">Video\'s</string>
@@ -16,16 +16,16 @@
     <string name="logout">Uitloggen</string>
     <string name="cancel">Annuleren</string>
     <string name="already_logged_in">Al ingelogd. U mag uitloggen uit uw account.</string>
-    <string name="login_first">Log in en probeer het opnieuw a.u.b.!</string>
+    <string name="login_first">Log in en probeer het opnieuw a.u.b.</string>
     <string name="instances">Kies een instantie</string>
-    <string name="customInstance">Een aangepaste instantie toevoegen</string>
-    <string name="region">Kies een regio</string>
-    <string name="login_register">Inloggen/Registreren</string>
+    <string name="customInstance">Aangepaste instantie</string>
+    <string name="region">Regio</string>
+    <string name="login_register">Inloggen/registreren</string>
     <string name="please_login">Gelieve eerst in te loggen of te registreren in de instellingen.</string>
     <string name="subscribeIsEmpty">Abonneer je eerst op enkele kanalen.</string>
     <string name="cannotDownload">Kan deze stream niet downloaden.</string>
     <string name="dlcomplete">Download voltooid.</string>
-    <string name="dlisinprogress">Een andere download is al bezig. Wacht alstublieft tot het klaar is.</string>
+    <string name="dlisinprogress">Wacht a.u.b. tot alle downloads klaar zijn…</string>
     <string name="downloadfailed">Download mislukt.</string>
     <string name="vlc">Open in VLC</string>
     <string name="vlcerror">Kan niet openen in VLC. Het is mogelijk niet geïnstalleerd.</string>
@@ -33,17 +33,17 @@
     <string name="import_from_yt_summary">Van YouTube of NewPipe</string>
     <string name="app_theme">Thema</string>
     <string name="error">Er ging iets mis.</string>
-    <string name="notgmail">Dit is niet uw Gmail account.</string>
+    <string name="notgmail">Dit is voor een LibreTube account.</string>
     <string name="importsuccess">Geabonneerd</string>
     <string name="unknown_error">Netwerkfout.</string>
-    <string name="grid">Kies rasterkolommen</string>
+    <string name="grid">Rasterkolommen</string>
     <string name="playlistName">Afspeellijstnaam</string>
-    <string name="systemLanguage">Systeemtaal</string>
+    <string name="systemLanguage">Systeem</string>
     <string name="startpage">Start</string>
     <string name="library">Bibliotheek</string>
     <string name="loggedout">Uitgelogd.</string>
     <string name="defres">Standaard videoresolutie</string>
-    <string name="noInternet">Geen Internet Verbinding</string>
+    <string name="noInternet">Maak eerst verbinding met het internet.</string>
     <string name="retry">Opnieuw</string>
     <string name="comments">Commentaren</string>
     <string name="choose_filter">Kies zoekfilter</string>
@@ -60,62 +60,147 @@
     <string name="music_playlists">YT-muziekafspeellijsten</string>
     <string name="defaultTab">Standaard Tabblad</string>
     <string name="sponsorblock">SponsorBlock</string>
-    <string name="sponsorblock_summary">Gebruikt API van https://sponsor.ajay.app/</string>
+    <string name="sponsorblock_summary">Gebruikt de https://sponsor.ajay.app API</string>
     <string name="segment_skipped">Segment overgeslagen</string>
-    <string name="sponsorblock_state">Ingeschakeld</string>
+    <string name="sponsorblock_state">Aan</string>
     <string name="category_segments">Segmenten</string>
     <string name="category_sponsor">Sponsor</string>
-    <string name="category_sponsor_description">Betaalde promotie, betaalde verwijzingen en directe advertenties. Niet voor zelfpromotie of gratis shoutouts naar goede doelen/makers/websites/producten die ze leuk vinden.</string>
+    <string name="category_sponsor_description">Betaalde promotie, betaalde verwijzingen en directe advertenties. Niet voor zelfpromotie of gratis oprechte shoutouts naar goede doelen, makers, websites en producten.</string>
     <string name="category_selfpromo">Onbetaald/Zelfpromotie</string>
-    <string name="category_selfpromo_description">Vergelijkbaar met \"sponsor\" behalve voor onbetaalde of zelfpromotie. Dit omvat secties over merchandise, donaties, of informatie over met wie ze hebben samengewerkt.</string>
-    <string name="category_interaction">Interactieherinnering (Abonneren)</string>
-    <string name="category_interaction_description">Als er een korte herinnering is om te liken, abonneren of volgen in het midden van de inhoud. Als het lang is of over iets specifieks gaat, moet het in plaats daarvan onder zelfpromotie staan.</string>
+    <string name="category_selfpromo_description">Vergelijkbaar met \"sponsor\" behalve voor onbetaalde of zelfpromotie. Dit omvat secties over merchandise, donaties, of info over met wie ze hebben samengewerkt.</string>
+    <string name="category_interaction">Interactieherinnering (liken en abonneren)</string>
+    <string name="category_interaction_description">Als er een korte herinnering is om te liken, abonneren of volgen in het midden van de inhoud. Als het lang is of over iets specifieks gaat, moet het in plaats daarvan zelfpromotie zijn.</string>
     <string name="category_intro">Pauze/Intro Animatie</string>
     <string name="youtube">YouTube</string>
-    <string name="playOnBackground">Speel op achtergrond</string>
+    <string name="playOnBackground">Speel op de achtergrond</string>
     <string name="subscriptions">Abonnementen</string>
     <string name="yes">Ja</string>
-    <string name="category_intro_description">Een interval zonder eigenlijke inhoud. Kan een pauze zijn, een statisch frame, een herhalende animatie. Dit mag niet worden gebruikt voor overgangen die informatie bevatten.</string>
-    <string name="category_outro">Eindkaarten/Credits</string>
-    <string name="category_outro_description">Credits of wanneer de YouTube endcards verschijnen. Niet voor conclusies met informatie.</string>
+    <string name="category_intro_description">Een interval zonder eigenlijke inhoud. Kan een pauze zijn, een statisch frame, een herhalende animatie. Mag niet worden gebruikt voor overgangen die informatie bevatten.</string>
+    <string name="category_outro">Eindkaarten en aftiteling</string>
+    <string name="category_outro_description">Info na afloop. Niet voor conclusies met info.</string>
     <string name="license">Licentie</string>
-    <string name="color_accent">Kleur Accent</string>
-    <string name="color_red">Rood</string>
-    <string name="color_blue">Pixel Blauw</string>
-    <string name="color_yellow">Geel</string>
-    <string name="color_green">Groen</string>
-    <string name="color_purple">Paars</string>
-    <string name="oledTheme">OLED-thema</string>
-    <string name="material_you">Materiaal Jij</string>
+    <string name="color_accent">Accenten</string>
+    <string name="color_red">Rust rood</string>
+    <string name="color_blue">Gelukzalig blauw</string>
+    <string name="color_yellow">Yeeting geel</string>
+    <string name="color_green">Groovy groen</string>
+    <string name="color_purple">Plezierig paars</string>
+    <string name="oledTheme">Zwart</string>
+    <string name="material_you">Mystiek Materiaal 3</string>
     <string name="sponsorblock_notifications">Meldingen</string>
-    <string name="app_icon">App-pictogram</string>
-    <string name="enabled">Ingeschakeld</string>
-    <string name="disabled">Uitgeschakeld</string>
+    <string name="app_icon">Pictogram</string>
+    <string name="enabled">Aan</string>
+    <string name="disabled">Uit</string>
     <string name="piped">Piped</string>
     <string name="update_available">Versie %1$s is beschikbaar</string>
-    <string name="update_available_text">Er is een nieuwe update beschikbaar. Klik op oké om doorgestuurd te worden naar de update pagina op GitHub.</string>
+    <string name="update_available_text">Ga naar releases op GitHub om het te downloaden\?</string>
     <string name="createPlaylist">Afspeellijst maken</string>
     <string name="loggedIn">Ingelogd.</string>
     <string name="emptyPlaylistName">De naam van de afspeellijst mag niet leeg zijn</string>
     <string name="fail">Mislukt :(</string>
-    <string name="customization">Aanpassing</string>
+    <string name="customization">Aanpassingen</string>
     <string name="emptyList">Niets hier.</string>
     <string name="deletePlaylist">Afspeellijst verwijderen</string>
     <string name="areYouSure">De afspeellijst verwijderen\?</string>
-    <string name="playlistCreated">Afspeellijst gemaakt!</string>
+    <string name="playlistCreated">Afspeellijst gemaakt.</string>
     <string name="about">Over</string>
-    <string name="lightTheme">Licht Thema</string>
-    <string name="darkTheme">Donker Thema</string>
+    <string name="lightTheme">Licht</string>
+    <string name="darkTheme">Donker</string>
     <string name="settings">Instellingen</string>
     <string name="videoCount">%1$s video\'s</string>
     <string name="server_error">Er is een probleem met de server. Probeer een andere instantie\?</string>
     <string name="empty">U moet een gebruikersnaam en een wachtwoord invoeren.</string>
     <string name="addToPlaylist">Toevoegen aan afspeellijst</string>
-    <string name="success">Succes!</string>
+    <string name="success">Gedaan.</string>
     <string name="location">Locatie</string>
-    <string name="changeLanguage">Taal Wijzigen</string>
-    <string name="systemDefault">Systeem Standaard</string>
+    <string name="changeLanguage">Taal</string>
+    <string name="systemDefault">Systeem</string>
     <string name="subscribers">%1$s abonnees</string>
     <string name="instance">Instantie</string>
     <string name="website">Website</string>
+    <string name="reset">Standaardwaarden herstellen</string>
+    <string name="reset_message">Weet je het zeker\? Dit zult u uitloggen en al uw instellingen resetten!</string>
+    <string name="app_behavior">Gedrag</string>
+    <string name="video_format">Video formaat</string>
+    <string name="downloads">Downloads</string>
+    <string name="no_replies">Deze commentaar heeft geen reacties.</string>
+    <string name="authors">Auteurs</string>
+    <string name="authors_summary">Maak kennis met iedereen die betrokken is bij de ontwikkeling en verbetering van de app.</string>
+    <string name="internal_storage">Interne opslag</string>
+    <string name="sdcard">SD-kaart</string>
+    <string name="views">%1$s weergaven</string>
+    <string name="defaultIcon">Standaard</string>
+    <string name="download_directory_summary">Waar gedownloade media wordt opgeslagen.</string>
+    <string name="contributing_summary">Bied ideeën, vertalingen, ontwerpwijzigingen, maak schoon en schrijf de code. Hoe meer er wordt gedaan, hoe beter het wordt!</string>
+    <string name="license_summary">De GPLv3+ is een auteursplichtelijk libre licentie. Gebruiken, bestuderen, veranderen en delen; met iedereen.</string>
+    <string name="donate_summary">Geef wat dit je waard is, als u kunt. Team LibreTube is kleiner dan uw donatie of hulp.</string>
+    <string name="download_directory">Download naar</string>
+    <string name="update">Zoek naar nieuwe versie</string>
+    <string name="download_folder">Naam</string>
+    <string name="advanced_summary">Downloads, geschiedenis</string>
+    <string name="shareTo">URL delen naar</string>
+    <string name="legacyIcon">Verloren erfenis</string>
+    <string name="gradientIcon">Glib gradiënt</string>
+    <string name="fireIcon">Modieus vuur</string>
+    <string name="torchIcon">Trendy zaklamp</string>
+    <string name="shapedIcon">Dwaas gevormd</string>
+    <string name="invalid_url">Voer een URL in die werkt</string>
+    <string name="version">Versie %1$s</string>
+    <string name="about_summary">Maak kennis met team LibreTube en hoe het allemaal gebeurt.</string>
+    <string name="category_filler">Filler Tangens/Grappen</string>
+    <string name="category_music_offtopic">Muziek: Niet-Muziek Sectie</string>
+    <string name="category_preview">Voorbeschouwing/Samenvatting</string>
+    <string name="appearance">Uiterlijk</string>
+    <string name="video_format_summary">Conversie van bestanden als zowel audio als video worden gedownload.</string>
+    <string name="update_summary">Klik om te zien of de app up-to-date is.</string>
+    <string name="app_uptodate">De nieuwste versie wordt gedraaid.</string>
+    <string name="no_update_available">U gebruikt de nieuwste versie.</string>
+    <string name="playback_speed">Standaard afspeelsnelheid</string>
+    <string name="advanced">Geavanceerd</string>
+    <string name="player">Audio en video</string>
+    <string name="appearance_summary">Pas de app aan naar uw wens.</string>
+    <string name="live">Live</string>
+    <string name="download_folder_summary">De naam van de map waarin gedownloade media wordt opgeslagen.</string>
+    <string name="downloads_directory">Download map</string>
+    <string name="music_directory">Muziek map</string>
+    <string name="movies_directory">Film map</string>
+    <string name="flameIcon">Vliegende vlam</string>
+    <string name="birdIcon">Verhoogde vogel</string>
+    <string name="instance_summary">Piped, login, abonnementen</string>
+    <string name="customInstance_summary">Voeg een aangepaste instantie toe (op eigen risico)</string>
+    <string name="instance_name">Instantienaam</string>
+    <string name="instance_api_url">URL naar instantie-API</string>
+    <string name="addInstance">Instantie Toevoegen</string>
+    <string name="empty_instance">Vul de naam en de API URL in.</string>
+    <string name="clear_customInstances">Aangepaste instanties wissen</string>
+    <string name="related_streams">Verwante inhoud</string>
+    <string name="show_chapters">Hoofdstukken weergeven</string>
+    <string name="hide_chapters">Hoofdstukken verbergen</string>
+    <string name="category_filler_description">Voor bijkomstige scènes die alleen als opvulling of ter vermaak zijn toegevoegd en niet noodzakelijk zijn om de hoofdinhoud van de video te begrijpen.</string>
+    <string name="category_music_offtopic_description">Alleen voor gebruik in muziekvideo\'s. Het moet betrekking hebben op delen van de video die geen deel uitmaken van de officiële mixen. Uiteindelijk moet de video zo goed mogelijk lijken op de Spotify- of andere gemixte versie, of minder praten of andere afleidingen bevatten.</string>
+    <string name="category_preview_description">Voor segmenten die de komende inhoud in deze of toekomstige video\'s in zijn serie beschrijven, maar geen extra info geven. Als het clips bevat die alleen hier verschijnen, is dit zeer waarschijnlijk de verkeerde categorie.</string>
+    <string name="related_streams_summary">Toon verwante streams naast wat u bekijkt.</string>
+    <string name="buffering_goal">Voorladen</string>
+    <string name="buffering_goal_summary">Max. aantal seconden video om te bufferen.</string>
+    <string name="playerVideoFormat">Videoformaat voor speler</string>
+    <string name="website_summary">Bezoek de website voor meer info over de app en de functies.</string>
+    <string name="contributing">Bijdragen</string>
+    <string name="donate">Doneer</string>
+    <string name="no_audio">Geen audio</string>
+    <string name="no_video">Geen video</string>
+    <string name="audio">Audio</string>
+    <string name="video">Video</string>
+    <string name="downloading">Downloaden</string>
+    <string name="player_autoplay">Autospel</string>
+    <string name="hideTrendingPage">Trending pagina verbergen</string>
+    <string name="instance_frontend_url">URL naar instantie front-end</string>
+    <string name="quality">Kwaliteit</string>
+    <string name="behavior">Gedrag</string>
+    <string name="player_summary">Kwaliteit en spelersgedrag</string>
+    <string name="seek_increment">Zoek toename</string>
+    <string name="piped_summary">Piped is een open-bron alternatieve web-front-end voor YouTube en levert de API die wij gebruiken. Zonder Piped zou LibreTube niet bestaan. Enorm bedankt aan hun ontwikkelaars!</string>
+    <string name="pauseOnScreenOff">Autopauze</string>
+    <string name="pauseOnScreenOff_summary">Pauzeer de speler wanneer het scherm wordt uitgeschakeld.</string>
+    <string name="autoplay_summary">Speel automatisch de volgende video af wanneer de huidige is afgelopen.</string>
+    <string name="clonePlaylist">Afspeellijst klonen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f6bb3ccb4..b4d50f7f1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -132,7 +132,7 @@
     <string name="gradientIcon">Гладкий градиент</string>
     <string name="update_available_text">Перейти к выпускам на GitHub, чтобы загрузить его\?</string>
     <string name="app_behavior">Поведение</string>
-    <string name="authors_summary">Познакомьтесь со всеми.</string>
+    <string name="authors_summary">Познакомьтесь со всеми, кто участвует в разработке и улучшении приложения.</string>
     <string name="download_folder_summary">Имя папки, в которой хранится загруженные медиафайлы.</string>
     <string name="birdIcon">Прикольная птица</string>
     <string name="fireIcon">Огненный огонь</string>
@@ -179,9 +179,9 @@
     <string name="no_update_available">Вы используете последнюю версию.</string>
     <string name="playback_speed">Скорость воспроизведения по умолчанию</string>
     <string name="advanced">Продвинутое</string>
-    <string name="player">Плеер</string>
+    <string name="player">Аудио и видео</string>
     <string name="appearance_summary">Настройте приложение по своему вкусу.</string>
-    <string name="advanced_summary">Плеер, загрузки, история</string>
+    <string name="advanced_summary">Загрузки, история</string>
     <string name="live">В прямом эфире</string>
     <string name="playerVideoFormat">Формат видео для плеера</string>
     <string name="audio">Аудио</string>
@@ -191,4 +191,16 @@
     <string name="hideTrendingPage">Скрыть вкладку \"тренды\"</string>
     <string name="no_video">Нет видео</string>
     <string name="no_audio">Нет звука</string>
+    <string name="reset">Восстановить настройки по-умолчанию</string>
+    <string name="piped_summary">Piped — это альтернативный веб-интерфейс с открытым исходным кодом для YouTube, предоставляющий API, который мы используем. Без Piped не существовало бы LibreTube. Огромное спасибо их разработчикам!</string>
+    <string name="reset_message">Вы уверены\? Это выведет вас из системы и сбросит все ваши настройки!</string>
+    <string name="instance_frontend_url">URL-адрес экземпляра</string>
+    <string name="quality">Качество</string>
+    <string name="behavior">Поведение</string>
+    <string name="player_summary">Качество и поведение плеера</string>
+    <string name="seek_increment">Шаг перемотки</string>
+    <string name="pauseOnScreenOff">Автопауза</string>
+    <string name="pauseOnScreenOff_summary">Ставить плеер на паузу, когда экран выключен.</string>
+    <string name="autoplay_summary">Автоматически воспроизводить следующее видео после завершения текущего.</string>
+    <string name="clonePlaylist">Клонировать плейлист</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index eddc36f52..7dab3d58f 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -12,7 +12,7 @@
     <string name="app_theme">Görünüm</string>
     <string name="unknown_error">Bağlantı hatası.</string>
     <string name="empty">Kullanıcı adı ve parola girmelisiniz.</string>
-    <string name="notgmail">Bu bir LibreTube hesabı içindir.</string>
+    <string name="notgmail">Bu, LibreTube hesabı içindir.</string>
     <string name="defres">Varsayılan Video Çözünürlüğü</string>
     <string name="deletePlaylist">Oynatma listesini sil</string>
     <string name="createPlaylist">Oynatma Listesi Oluştur</string>
@@ -36,7 +36,7 @@
     <string name="importsuccess">Abone olundu</string>
     <string name="subscribeIsEmpty">Önce birkaç kanala abone olun.</string>
     <string name="cannotDownload">Bu görüntü indirilemiyor.</string>
-    <string name="vlc">VLC\'de aç</string>
+    <string name="vlc">VLC\'de Aç</string>
     <string name="import_from_yt">Abonelikleri İçe Aktar</string>
     <string name="error">Bir şeyler ters gitti.</string>
     <string name="emptyList">Burada hiçbir şey yok.</string>
@@ -47,9 +47,9 @@
     <string name="playlistName">Oynatma listesi adı</string>
     <string name="about">Hakkında</string>
     <string name="vlcerror">VLC\'de açılamıyor. Kurulmamış olabilir.</string>
-    <string name="instances">Erişim Aracı Seç</string>
-    <string name="customInstance">Özel erişim aracı</string>
-    <string name="server_error">Sunucu bir engelle karşılaştı, başka bir erişim aracını deneyebilir misiniz\?</string>
+    <string name="instances">Sunucu seç</string>
+    <string name="customInstance">Özel sunucu</string>
+    <string name="server_error">Sunucu bir engelle karşılaştı, başka sunucunu deneyebilir misiniz\?</string>
     <string name="grid">Ağ sütunları</string>
     <string name="import_from_yt_summary">YouTube veya NewPipe\'tan</string>
     <string name="emptyPlaylistName">Oynatma listesi adı boş olamaz</string>
@@ -57,7 +57,7 @@
     <string name="library">Kütüphane</string>
     <string name="systemDefault">Sistem</string>
     <string name="darkTheme">Koyu</string>
-    <string name="subscribers">%1$s Abone</string>
+    <string name="subscribers">%1$s abone</string>
     <string name="lightTheme">Açık</string>
     <string name="videos">Videolar</string>
     <string name="startpage">Ana Sayfa</string>
@@ -69,7 +69,7 @@
     <string name="retry">Yeniden Dene</string>
     <string name="location">Konum</string>
     <string name="settings">Ayarlar</string>
-    <string name="instance">Erişim Aracı</string>
+    <string name="instance">Sunucu</string>
     <string name="customization">Ayarlamalar</string>
     <string name="website">İnternet Sitesi</string>
     <string name="defaultTab">Varsayılan Sekme</string>
@@ -89,12 +89,12 @@
     <string name="category_sponsor">Bağışçı</string>
     <string name="segment_skipped">Bölüm atlandı</string>
     <string name="category_sponsor_description">Ücretli promosyon, yönlendirmeler ve doğrudan reklamlar. Kendi reklamını yapmak veya amaçlara, yaratıcılara, internet sitelerine ve ürünlere ücretsiz hakiki duyurular için değil.</string>
-    <string name="category_selfpromo">Ödenmemiş/Kendini Tanıtmak</string>
+    <string name="category_selfpromo">Ödenmemiş/Kendi Reklamı</string>
     <string name="category_interaction">Etkileşim hatırlatıcısı (beğen ve abone ol)</string>
     <string name="category_intro">Ara Verme/Giriş Animasyonu</string>
     <string name="category_intro_description">Gerçek içeriği olmayan bir aralık. Duraklatma, statik kare, yinelenen animasyon olabilir. Bilgi içeren geçişler için kullanılmamalıdır.</string>
-    <string name="category_interaction_description">İçeriğin ortasında beğenmek, abone olmak veya takip etmek için kısa bir hatırlatma olduğunda. Uzun veya belirli bir şey hakkındaysa, bunun yerine kendini tanıtmalıdır.</string>
-    <string name="category_selfpromo_description">Ücretsiz veya kendini tanıtım dışında \"bağışçı\" ile benzer. Bu, mallar, bağışlar veya kiminle işbirliği yaptığına dair bilgilerle ilgili bölümleri içerir.</string>
+    <string name="category_interaction_description">İçeriğin ortasında beğenmek, abone olmak veya takip etmek için kısa bir hatırlatma olduğunda. Uzun veya belirli bir şey hakkındaysa, bunun yerine kendi reklamıdır.</string>
+    <string name="category_selfpromo_description">Ücretsiz veya kendi reklamı dışında \"bağışçı\" ile benzer. Bu, mallar, bağışlar veya kiminle işbirliği yaptığına dair bilgilerle ilgili bölümleri içerir.</string>
     <string name="category_outro">Bitiş kartları ve kanal simgesi</string>
     <string name="music_songs">YT Müzik Şarkıları</string>
     <string name="music_albums">YT Müzik Albümleri</string>
@@ -147,7 +147,7 @@
     <string name="internal_storage">Dahili depolama</string>
     <string name="download_folder_summary">İndirilen medyanın saklandığı klasörün adı.</string>
     <string name="movies_directory">Filmler klasörü</string>
-    <string name="shareTo">URL\'yi şununla paylaş:</string>
+    <string name="shareTo">URL\'yi şununla paylaş</string>
     <string name="download_folder">Ad</string>
     <string name="downloads_directory">İndirme klasörü</string>
     <string name="sdcard">Hafıza kartı</string>
@@ -162,12 +162,12 @@
     <string name="shapedIcon">Aptal şekilli</string>
     <string name="flameIcon">Uçan alev</string>
     <string name="instance_summary">Piped, giriş, abonelikler</string>
-    <string name="addInstance">Oluşum ekle</string>
-    <string name="clear_customInstances">Özel oluşumları temizle</string>
-    <string name="instance_api_url">Erişim aracı API\'sinin URL\'si</string>
-    <string name="customInstance_summary">Özel bir oluşum ekleyin (riski size ait olmak üzere)</string>
+    <string name="addInstance">Sunucu Ekle</string>
+    <string name="clear_customInstances">Özel sunucuları temizle</string>
+    <string name="instance_api_url">Sunucu API\'sinin URL\'si</string>
+    <string name="customInstance_summary">Özel bir sunucu ekleyin (kendi sorumluluğunuzdadır)</string>
     <string name="empty_instance">Adı ve API URL\'sini girin.</string>
-    <string name="instance_name">Oluşumun adı</string>
+    <string name="instance_name">Sunucu adı</string>
     <string name="invalid_url">Lütfen, çalışan bir URL girin</string>
     <string name="version">Sürüm %1$s</string>
     <string name="about_summary">LibreTube ekibini tanıyın ve tüm bunların nasıl gerçekleştiğini öğrenin.</string>
@@ -176,7 +176,7 @@
     <string name="category_filler">Alakasız/Şakalar</string>
     <string name="category_filler_description">Videonun ana içeriğini anlamak için gerekli olmayan yalnızca dolgu veya mizah için eklenen teğet sahneler için.</string>
     <string name="category_music_offtopic">Müzik: Müzik Dışı Bölüm</string>
-    <string name="category_music_offtopic_description">Sadece müzik videolarında kullanım içindir. Resmi mikslerin değil videonun bazı kısımlarını kapsamalıdır. Sonuç olarak, video Spotify\'a veya diğer karışık versiyonlara mümkün olduğunca yakın olmalı veya konuşmayı ve diğer dikkat dağıtıcı unsurları azaltmalıdır.</string>
+    <string name="category_music_offtopic_description">Sadece müzik videolarında kullanım içindir. Resmi mikslerin değil videonun bazı kısımlarını kapsamalıdır. Sonuç olarak, video Spotify\'a veya diğer miks versiyona mümkün olduğunca yakın olmalı veya konuşmayı ve diğer dikkat dağıtıcı unsurları azaltmalıdır.</string>
     <string name="category_preview">Önizleme/Özet</string>
     <string name="category_preview_description">Bu veya serisindeki gelecekteki videolarda gelecek içeriği detaylandıran, ancak ek bilgi sağlamayan segmentler için. Yalnızca burada görünen klipleri içeriyorsa, bu büyük olasılıkla yanlış kategoridir.</string>
     <string name="related_streams">İlgili içerik</string>
@@ -189,4 +189,18 @@
     <string name="audio">Ses</string>
     <string name="video">Video</string>
     <string name="downloading">İndiriliyor</string>
+    <string name="player_autoplay">Oto.oynat</string>
+    <string name="hideTrendingPage">Popüler sayfasını gizle</string>
+    <string name="quality">Kalite</string>
+    <string name="behavior">Davranış</string>
+    <string name="player_summary">Kalite ve oynatıcı davranışı</string>
+    <string name="piped_summary">Piped, kullandığımız API\'yi sağlayan YouTube için açık kaynaklı alternatif bir internet ön yüzüdür. Piped olmasaydı LibreTube olmazdı. Geliştiricilerine çok teşekkürler!</string>
+    <string name="instance_frontend_url">Sunucu ön ucuna giden URL</string>
+    <string name="seek_increment">Aramayı artırın</string>
+    <string name="pauseOnScreenOff">Oto.duraklama</string>
+    <string name="pauseOnScreenOff_summary">Ekran kapatıldığında oynatıcıyı duraklatın.</string>
+    <string name="autoplay_summary">Akım bittiğinde sonraki videoyu otomatik olarak oynatın.</string>
+    <string name="clonePlaylist">Oynatma listesini klonla</string>
+    <string name="reset">Varsayılanlara sıfırla</string>
+    <string name="reset_message">Emin misin\? Bu, oturumunuzu kapatacak ve tüm ayarlarınızı sıfırlayacaktır!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 9e69cc7a0..8050be497 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -92,11 +92,11 @@
     <string name="donate">Ủng hộ</string>
     <string name="playback_speed">Tốc độ phát mặc định</string>
     <string name="advanced">Nâng cao</string>
-    <string name="player">Trình phát</string>
+    <string name="player">Âm thanh và video</string>
     <string name="appearance_summary">Tinh chỉnh ứng dụng theo ý thích của bạn.</string>
-    <string name="advanced_summary">Trình phát, tải xuống, lịch sử</string>
+    <string name="advanced_summary">Tải xuống, lịch sử</string>
     <string name="live">Trực tiếp</string>
-    <string name="no_replies">Bình luận gì không có phản hồi nào.</string>
+    <string name="no_replies">Bình luận này không có phản hồi nào.</string>
     <string name="authors">Tác giả</string>
     <string name="download_folder">Tên</string>
     <string name="internal_storage">Kho lưu trữ nội bộ</string>
@@ -184,4 +184,23 @@
     <string name="about_summary">Tìm hiểu về nhóm LibreTube và cách mà tất cả diễn ra.</string>
     <string name="related_streams">Các nội dung liên quan</string>
     <string name="playerVideoFormat">Định dạng video cho trình phát</string>
+    <string name="reset">Khôi phục mặc định</string>
+    <string name="reset_message">Bạn chắc chứ\? Điều này sẽ đăng xuất bạn ra và đặt lại tất cả các cài đặt của bạn!</string>
+    <string name="no_audio">Không có âm thanh</string>
+    <string name="no_video">Không có video</string>
+    <string name="audio">Âm thanh</string>
+    <string name="video">Video</string>
+    <string name="downloading">Đang tải xuống</string>
+    <string name="player_autoplay">Tự động phát</string>
+    <string name="hideTrendingPage">Ẩn trang thịnh hành</string>
+    <string name="instance_frontend_url">URL dẫn đến instance frontend</string>
+    <string name="quality">Chất lượng</string>
+    <string name="behavior">Hành vi</string>
+    <string name="player_summary">Chất lượng và hành vi của trình phát</string>
+    <string name="seek_increment">Tìm kiếm sự gia tăng</string>
+    <string name="piped_summary">Piped là một giao diện web thay thế mã nguồn mở cho YouTube, cung cấp API mà chúng tôi sử dụng. Nếu không có Piped, LibreTube sẽ không thể tồn tại. Cảm ơn rất nhiều đến các nhà phát triển của họ!</string>
+    <string name="pauseOnScreenOff">Tự động dừng</string>
+    <string name="pauseOnScreenOff_summary">Dừng trình phát khi màn hình tắt.</string>
+    <string name="autoplay_summary">Tự động phát video tiếp theo khi video hiện tại kết thúc.</string>
+    <string name="clonePlaylist">Nhân bản danh sách phát</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4ed4cc6c8..c5031eebe 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -47,7 +47,7 @@
     <string name="login">登录</string>
     <string name="loggedIn">已登录。</string>
     <string name="already_logged_in">您已登录。您可以退出您的帐号。</string>
-    <string name="registered">注册成功。您现在可以订阅频道了。</string>
+    <string name="registered">注册成功。现在您可以订阅频道了。</string>
     <string name="login_first">请登录并重试。</string>
     <string name="loggedout">已退出登录。</string>
     <string name="customInstance">自定义实例</string>
@@ -95,7 +95,7 @@
     <string name="category_sponsor_description">有偿推广、有偿推荐和直接广告。不是自我宣传或无偿发自内心的赞美动机、创造者、网站和产品。</string>
     <string name="category_selfpromo">无偿/自我推广</string>
     <string name="category_selfpromo_description">除了无偿或自我宣传，与 \"赞助商 \"类似。这包括有关商品、捐赠或与谁合作的信息。</string>
-    <string name="sponsorblock">SponsorBlock</string>
+    <string name="sponsorblock">赞助板块</string>
     <string name="sponsorblock_summary">使用 https://sponsor.ajay.app 的 API</string>
     <string name="sponsorblock_state">开</string>
     <string name="category_sponsor">赞助商</string>
@@ -108,13 +108,99 @@
     <string name="color_yellow">黄</string>
     <string name="color_green">绿</string>
     <string name="oledTheme">黑</string>
-    <string name="material_you">Mystic Material 3</string>
+    <string name="material_you">Material 3</string>
     <string name="sponsorblock_notifications">通知</string>
     <string name="enabled">开</string>
     <string name="disabled">关</string>
     <string name="app_icon">图标</string>
-    <string name="piped">Piped</string>
+    <string name="piped">管道</string>
     <string name="youtube">YouTube</string>
     <string name="playOnBackground">后台播放</string>
     <string name="update_available">版本 %1$s 可用</string>
+    <string name="update_available_text">是否前往GitHub下载最新版本？</string>
+    <string name="download_directory_summary">选择下载视频（音频）的存储位置。</string>
+    <string name="website_summary">访问LibreTube的官方网站获取LibreTube应用了解更多信息。</string>
+    <string name="contributing_summary">提供想法、翻译、设计、更改、清理和编写代码。做得越多越好！</string>
+    <string name="video_format_summary">如果同时下载了音频与视频，则转换成视频文件。</string>
+    <string name="download_directory">下载到</string>
+    <string name="donate_summary">如果可以的话，把这对你有价值的东西给你。 LibreTube 团队比您的捐赠或帮助更小。</string>
+    <string name="update">检测新版本</string>
+    <string name="update_summary">单击检查应用是否是最新版。</string>
+    <string name="license_summary">LibreTube使用了GPLv3+许可证。你可以用来学习、研究和分享。</string>
+    <string name="category_preview">预览/回放</string>
+    <string name="video_format">视频格式</string>
+    <string name="appearance">外观</string>
+    <string name="app_behavior">排版</string>
+    <string name="downloads">下载</string>
+    <string name="contributing">贡献</string>
+    <string name="donate">捐赠</string>
+    <string name="authors">作者</string>
+    <string name="downloads_directory">下载文件夹</string>
+    <string name="sdcard">SD 卡</string>
+    <string name="download_folder_summary">保存视频或音频的文件夹名称。</string>
+    <string name="download_folder">文件夹名称</string>
+    <string name="internal_storage">内部存储</string>
+    <string name="playback_speed">默认播放速度</string>
+    <string name="advanced">高级</string>
+    <string name="player">音频和视频</string>
+    <string name="appearance_summary">根据您自己的喜好调整应用程序。</string>
+    <string name="advanced_summary">下载， 历史记录</string>
+    <string name="no_replies">此评论没有人回复。</string>
+    <string name="music_directory">音乐文件夹</string>
+    <string name="movies_directory">电影文件夹</string>
+    <string name="authors_summary">了解参与开发和改进LibreTube的每个人。</string>
+    <string name="app_uptodate">正在使用最新的版本。</string>
+    <string name="no_update_available">您正在运行最新的版本。</string>
+    <string name="live">直播</string>
+    <string name="views">%1$s 次观看</string>
+    <string name="defaultIcon">默认</string>
+    <string name="shapedIcon">简约图形</string>
+    <string name="flameIcon">飞舞的火焰</string>
+    <string name="birdIcon">小鸟</string>
+    <string name="gradientIcon">渐变</string>
+    <string name="torchIcon">时尚火炬</string>
+    <string name="fireIcon">简约火焰</string>
+    <string name="instance_summary">管道，登录，订阅</string>
+    <string name="instance_api_url">URL或API</string>
+    <string name="addInstance">添加实例</string>
+    <string name="empty_instance">需要填写名称与实例URL或链接才能保存。</string>
+    <string name="clear_customInstances">删除所有自定义实例</string>
+    <string name="invalid_url">请输入有效的URL</string>
+    <string name="related_streams">相关内容</string>
+    <string name="related_streams_summary">在您正在观看的内容旁边显示相关的内容。</string>
+    <string name="customInstance_summary">添加自定义实例（后果自负）</string>
+    <string name="instance_name">实例名称</string>
+    <string name="version">当前版本 %1$s</string>
+    <string name="about_summary">了解LibreTube 团队以及更多信息。</string>
+    <string name="show_chapters">显示章节</string>
+    <string name="hide_chapters">隐藏章节</string>
+    <string name="buffering_goal">预加载</string>
+    <string name="buffering_goal_summary">缓冲视频的最长时间。</string>
+    <string name="playerVideoFormat">播放器的视频格式</string>
+    <string name="no_audio">没有音频</string>
+    <string name="no_video">没有视频</string>
+    <string name="legacyIcon">遗失的遗产</string>
+    <string name="shareTo">分享链接到</string>
+    <string name="category_filler">填充 切线/笑话</string>
+    <string name="category_filler_description">对于只为填充或幽默而添加的切身场景，不需要理解视频的主要内容。</string>
+    <string name="category_music_offtopic">音乐：非音乐部分</string>
+    <string name="audio">音频</string>
+    <string name="video">视频</string>
+    <string name="downloading">下载中</string>
+    <string name="player_autoplay">自动播放</string>
+    <string name="hideTrendingPage">隐藏热门页面</string>
+    <string name="instance_frontend_url">实例前端的URL</string>
+    <string name="quality">清晰度</string>
+    <string name="behavior">布局</string>
+    <string name="player_summary">清晰度和播放器行为</string>
+    <string name="seek_increment">寻求增量</string>
+    <string name="piped_summary">Piped是YouTube的一个开源替代网络前端，提供我们使用的API。没有Piped，LibreTube就不会存在。衷心感谢他们的开发者!</string>
+    <string name="pauseOnScreenOff">自动暂停</string>
+    <string name="pauseOnScreenOff_summary">当屏幕关闭时暂停播放视频。</string>
+    <string name="autoplay_summary">当前的视频播完后，自动播放下一个视频。</string>
+    <string name="clonePlaylist">复制播放列表</string>
+    <string name="category_music_offtopic_description">仅用于音乐视频。它应该涵盖视频的一部分，而不是官方混音的一部分。最后，视频应尽可能类似于 Spotify 或任何其他混合版本，或减少谈话或其他干扰。</string>
+    <string name="category_preview_description">对于详细说明此系列视频或未来视频中即将出现的内容的片段，但不提供其他信息。如果它包含仅出现在此处的剪辑，则这很可能是错误的类别。</string>
+    <string name="reset">恢复默认值</string>
+    <string name="reset_message">你确定吗？这会让你退出账户并重置你的所有设置！</string>
 </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 13f95ac83..1ac1a750e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,7 +43,7 @@
     <string name="unknown_error">Network error.</string>
     <string name="error">Something went wrong.</string>
     <string name="empty">You have to enter a username and password.</string>
-    <string name="notgmail">This is for a LibreTube account.</string>
+    <string name="notgmail">This is for a Piped account.</string>
     <string name="defres">Default video resolution</string>
     <string name="grid">Grid columns</string>
     <string name="emptyList">Nothing here.</string>
@@ -202,5 +202,9 @@
     <string name="autoplay_summary">Automatically play the next video when the current is finished.</string>
     <string name="clonePlaylist">Clone playlist</string>
     <string name="reset">Restore defaults</string>
-    <string name="reset_message">Are you sure you want to reset all the apps settings to its default?</string>
+    <string name="reset_message">Are you sure? This will log you out and reset all your settings!</string>
+    <string name="deleteAccount">Delete account</string>
+    <string name="deleteAccount_summary">Delete your Piped account</string>
+    <string name="account">Account</string>
+    <string name="restore">Restore</string>
 </resources>
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 1cbbeeca2..7b03d823a 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -44,31 +44,31 @@
 
     </style>
 
-    <style name="CustomDialogButton">
+    <style name="CustomDialogButton" parent="@style/Widget.Material3.Button.TextButton">
+
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">right</item>
-        <item name="android:layout_marginRight">16dp</item>
         <item name="android:layout_marginBottom">8dp</item>
         <item name="android:padding">8dp</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:backgroundTint">@android:color/transparent</item>
-        <item name="android:textColor">?attr/colorPrimary</item>
+
     </style>
 
     <style name="CustomDialogTextInputLayout" parent="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="hintEnabled">false</item>
-        <item name="android:layout_marginLeft">10dp</item>
-        <item name="android:layout_marginRight">10dp</item>
-        <item name="android:layout_marginTop">16dp</item>
-        <item name="android:layout_marginBottom">4dp</item>
+        <item name="android:layout_marginLeft">15dp</item>
+        <item name="android:layout_marginRight">15dp</item>
+        <item name="android:layout_marginTop">10dp</item>
+        <item name="android:layout_marginBottom">5dp</item>
 
         <item name="boxCornerRadiusBottomStart">15dp</item>
         <item name="boxCornerRadiusBottomEnd">15dp</item>
         <item name="boxCornerRadiusTopEnd">15dp</item>
         <item name="boxCornerRadiusTopStart">15dp</item>
+
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/activity_main_scene.xml b/app/src/main/res/xml/activity_main_scene.xml
index 7cc4eddb9..503feedc9 100644
--- a/app/src/main/res/xml/activity_main_scene.xml
+++ b/app/src/main/res/xml/activity_main_scene.xml
@@ -9,21 +9,21 @@
         motion:layoutDuringTransition="honorRequest">
         <KeyFrameSet>
             <KeyAttribute
-                motion:motionTarget="@+id/bottomNav"
+                android:translationY="0dp"
                 motion:framePosition="0"
-                android:translationY="0dp" />
+                motion:motionTarget="@+id/bottomNav" />
             <KeyAttribute
-                motion:motionTarget="@+id/bottomNav"
+                android:translationY="55dp"
                 motion:framePosition="75"
-                android:translationY="55dp" />
+                motion:motionTarget="@+id/bottomNav" />
             <KeyAttribute
-                motion:motionTarget="@+id/container"
+                android:scaleY="1"
                 motion:framePosition="50"
-                android:scaleY="1" />
+                motion:motionTarget="@+id/container" />
             <KeyAttribute
-                motion:motionTarget="@+id/container"
+                android:translationY="-80dp"
                 motion:framePosition="100"
-                android:translationY="-80dp" />
+                motion:motionTarget="@+id/container" />
         </KeyFrameSet>
     </Transition>
 
diff --git a/app/src/main/res/xml/instance_settings.xml b/app/src/main/res/xml/instance_settings.xml
index a3ab05caf..b411d31b7 100644
--- a/app/src/main/res/xml/instance_settings.xml
+++ b/app/src/main/res/xml/instance_settings.xml
@@ -13,15 +13,19 @@
             app:title="@string/instances" />
 
         <Preference
+            android:icon="@drawable/ic_add_instance"
             app:key="customInstance"
-            app:title="@string/customInstance"
             app:summary="@string/customInstance_summary"
-            android:icon="@drawable/ic_add_instance" />
+            app:title="@string/customInstance" />
 
         <Preference
+            android:icon="@drawable/ic_trash"
             app:key="clearCustomInstances"
-            app:title="@string/clear_customInstances"
-            android:icon="@drawable/ic_trash" />
+            app:title="@string/clear_customInstances" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory app:title="@string/account">
 
         <Preference
             android:icon="@drawable/ic_login_filled"
@@ -29,6 +33,16 @@
             app:key="login_register"
             app:title="@string/login_register" />
 
+        <Preference
+            android:icon="@drawable/ic_reset"
+            android:summary="@string/deleteAccount_summary"
+            app:key="delete_account"
+            app:title="@string/deleteAccount" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory app:title="@string/restore">
+
         <Preference
             android:icon="@drawable/ic_upload"
             android:summary="@string/import_from_yt_summary"
diff --git a/app/src/main/res/xml/player_scene.xml b/app/src/main/res/xml/player_scene.xml
index bb4092578..c26b55130 100644
--- a/app/src/main/res/xml/player_scene.xml
+++ b/app/src/main/res/xml/player_scene.xml
@@ -10,24 +10,24 @@
         motion:motionInterpolator="easeInOut">
         <KeyFrameSet>
             <KeyAttribute
-                motion:motionTarget="@+id/close_imageView"
+                android:alpha="0"
                 motion:framePosition="90"
-                android:alpha="0" />
+                motion:motionTarget="@+id/close_imageView" />
             <KeyAttribute
-                motion:motionTarget="@+id/play_imageView"
+                android:alpha="0"
                 motion:framePosition="90"
-                android:alpha="0" />
+                motion:motionTarget="@+id/play_imageView" />
             <KeyAttribute
-                motion:motionTarget="@+id/title_textView"
+                android:alpha="0"
                 motion:framePosition="95"
-                android:alpha="0" />
+                motion:motionTarget="@+id/title_textView" />
         </KeyFrameSet>
         <OnSwipe
-            motion:touchAnchorId="@+id/main_container"
             motion:dragDirection="dragDown"
-            motion:touchAnchorSide="bottom"
+            motion:dragScale="6"
             motion:maxAcceleration="40"
-            motion:dragScale="6" />
+            motion:touchAnchorId="@+id/main_container"
+            motion:touchAnchorSide="bottom" />
     </Transition>
 
     <ConstraintSet android:id="@+id/start">
@@ -36,97 +36,97 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             motion:layout_constraintBottom_toBottomOf="@id/main_container"
-            motion:layout_constraintTop_toTopOf="@id/main_container"
-            motion:layout_constraintStart_toStartOf="@id/main_container" />
+            motion:layout_constraintStart_toStartOf="@id/main_container"
+            motion:layout_constraintTop_toTopOf="@id/main_container" />
         <Constraint
             android:id="@+id/player"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             motion:layout_constraintBottom_toBottomOf="@id/main_container"
-            motion:layout_constraintTop_toTopOf="@id/main_container"
-            motion:layout_constraintStart_toStartOf="@id/main_container" />
+            motion:layout_constraintStart_toStartOf="@id/main_container"
+            motion:layout_constraintTop_toTopOf="@id/main_container" />
         <Constraint
             android:id="@+id/player"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             motion:layout_constraintBottom_toBottomOf="@id/main_container"
-            motion:layout_constraintTop_toTopOf="@id/main_container"
-            motion:layout_constraintStart_toStartOf="@id/main_container" />
+            motion:layout_constraintStart_toStartOf="@id/main_container"
+            motion:layout_constraintTop_toTopOf="@id/main_container" />
         <Constraint
             android:id="@+id/player"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             motion:layout_constraintBottom_toBottomOf="@id/main_container"
-            motion:layout_constraintTop_toTopOf="@id/main_container"
-            motion:layout_constraintStart_toStartOf="@id/main_container" />
+            motion:layout_constraintStart_toStartOf="@id/main_container"
+            motion:layout_constraintTop_toTopOf="@id/main_container" />
         <Constraint
             android:id="@+id/player"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             motion:layout_constraintBottom_toBottomOf="@id/main_container"
-            motion:layout_constraintTop_toTopOf="@id/main_container"
-            motion:layout_constraintStart_toStartOf="@id/main_container" />
+            motion:layout_constraintStart_toStartOf="@id/main_container"
+            motion:layout_constraintTop_toTopOf="@id/main_container" />
     </ConstraintSet>
 
     <ConstraintSet android:id="@+id/end">
         <Constraint
             android:id="@+id/scrollView2"
-            motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="0dp"
             android:layout_height="1dp"
             motion:layout_constraintBottom_toBottomOf="parent"
-            motion:layout_constraintTop_toBottomOf="@+id/main_container"
+            motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintHorizontal_bias="0.5"
             motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/main_container"
             motion:layout_constraintVertical_bias="1.0" />
         <Constraint
             android:id="@+id/main_container"
-            motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="match_parent"
             android:layout_height="54dp"
-            motion:layout_constraintHorizontal_bias="0.5"
-            motion:layout_constraintTop_toTopOf="parent"
-            motion:layout_constraintStart_toStartOf="parent"
             motion:layout_constraintBottom_toBottomOf="parent"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintHorizontal_bias="0.5"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toTopOf="parent"
             motion:layout_constraintVertical_bias="1.0" />
         <Constraint
             android:id="@+id/player"
             android:layout_width="100dp"
             android:layout_height="0dp"
             motion:layout_constraintBottom_toBottomOf="@id/main_container"
-            motion:layout_constraintTop_toTopOf="@id/main_container"
-            motion:layout_constraintStart_toStartOf="@id/main_container" />
+            motion:layout_constraintStart_toStartOf="@id/main_container"
+            motion:layout_constraintTop_toTopOf="@id/main_container" />
         <Constraint
             android:id="@+id/close_imageView"
-            motion:layout_constraintEnd_toEndOf="@id/main_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            motion:layout_constraintBottom_toBottomOf="@id/main_container"
             android:layout_marginEnd="16dp"
             android:alpha="1"
-            motion:layout_constraintTop_toTopOf="@id/main_container"
-            android:visibility="visible" />
+            android:visibility="visible"
+            motion:layout_constraintBottom_toBottomOf="@id/main_container"
+            motion:layout_constraintEnd_toEndOf="@id/main_container"
+            motion:layout_constraintTop_toTopOf="@id/main_container" />
         <Constraint
             android:id="@+id/play_imageView"
-            motion:layout_constraintEnd_toStartOf="@+id/close_imageView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            motion:layout_constraintBottom_toBottomOf="@+id/close_imageView"
             android:layout_marginEnd="24dp"
             android:alpha="1"
-            motion:layout_constraintTop_toTopOf="@+id/close_imageView"
-            android:visibility="visible" />
+            android:visibility="visible"
+            motion:layout_constraintBottom_toBottomOf="@+id/close_imageView"
+            motion:layout_constraintEnd_toStartOf="@+id/close_imageView"
+            motion:layout_constraintTop_toTopOf="@+id/close_imageView" />
         <Constraint
             android:id="@+id/title_textView"
-            motion:layout_constraintEnd_toStartOf="@+id/play_imageView"
-            motion:layout_constraintStart_toEndOf="@+id/player"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            motion:layout_constraintBottom_toBottomOf="@+id/play_imageView"
+            android:layout_marginStart="8dp"
             android:layout_marginEnd="12dp"
             android:alpha="1"
-            android:layout_marginStart="8dp"
-            motion:layout_constraintTop_toTopOf="@+id/play_imageView"
-            android:visibility="visible" />
+            android:visibility="visible"
+            motion:layout_constraintBottom_toBottomOf="@+id/play_imageView"
+            motion:layout_constraintEnd_toStartOf="@+id/play_imageView"
+            motion:layout_constraintStart_toEndOf="@+id/player"
+            motion:layout_constraintTop_toTopOf="@+id/play_imageView" />
     </ConstraintSet>
 </MotionScene>
\ No newline at end of file
diff --git a/app/src/main/res/xml/player_settings.xml b/app/src/main/res/xml/player_settings.xml
index 30cce400c..b7f9ed9a9 100644
--- a/app/src/main/res/xml/player_settings.xml
+++ b/app/src/main/res/xml/player_settings.xml
@@ -55,15 +55,15 @@
 
         <SwitchPreferenceCompat
             android:icon="@drawable/ic_play_filled"
+            android:summary="@string/autoplay_summary"
             app:key="autoplay"
-            app:title="@string/player_autoplay"
-            android:summary="@string/autoplay_summary" />
+            app:title="@string/player_autoplay" />
 
         <SwitchPreferenceCompat
             android:icon="@drawable/ic_pause_filled"
+            android:summary="@string/pauseOnScreenOff_summary"
             app:key="pause_screen_off"
-            app:title="@string/pauseOnScreenOff"
-            android:summary="@string/pauseOnScreenOff_summary" />
+            app:title="@string/pauseOnScreenOff" />
 
     </PreferenceCategory>
 
diff --git a/app/src/main/res/xml/sponsorblock_settings.xml b/app/src/main/res/xml/sponsorblock_settings.xml
index c22cce27a..5a0f6a077 100644
--- a/app/src/main/res/xml/sponsorblock_settings.xml
+++ b/app/src/main/res/xml/sponsorblock_settings.xml
@@ -3,61 +3,61 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <SwitchPreferenceCompat
-        app:key="sb_enabled_key"
-        app:title="@string/sponsorblock"
         android:summaryOff="@string/disabled"
         android:summaryOn="@string/enabled"
-        app:defaultValue="true" />
+        app:defaultValue="true"
+        app:key="sb_enabled_key"
+        app:title="@string/sponsorblock" />
 
     <SwitchPreferenceCompat
-        app:key="sb_notifications_key"
-        app:title="@string/sponsorblock_notifications"
         android:summaryOff="@string/disabled"
         android:summaryOn="@string/enabled"
-        app:defaultValue="true" />
+        app:defaultValue="true"
+        app:key="sb_notifications_key"
+        app:title="@string/sponsorblock_notifications" />
 
     <PreferenceCategory app:title="@string/category_segments">
 
         <SwitchPreferenceCompat
+            app:defaultValue="true"
             app:key="sponsors_category_key"
-            app:title="@string/category_sponsor"
             app:summary="@string/category_sponsor_description"
-            app:defaultValue="true" />
+            app:title="@string/category_sponsor" />
 
         <SwitchPreferenceCompat
             app:key="selfpromo_category_key"
-            app:title="@string/category_selfpromo"
-            app:summary="@string/category_selfpromo_description" />
+            app:summary="@string/category_selfpromo_description"
+            app:title="@string/category_selfpromo" />
 
         <SwitchPreferenceCompat
             app:key="interaction_category_key"
-            app:title="@string/category_interaction"
-            app:summary="@string/category_interaction_description" />
+            app:summary="@string/category_interaction_description"
+            app:title="@string/category_interaction" />
 
         <SwitchPreferenceCompat
             app:key="intro_category_key"
-            app:title="@string/category_intro"
-            app:summary="@string/category_intro_description" />
+            app:summary="@string/category_intro_description"
+            app:title="@string/category_intro" />
 
         <SwitchPreferenceCompat
             app:key="outro_category_key"
-            app:title="@string/category_outro"
-            app:summary="@string/category_outro_description" />
+            app:summary="@string/category_outro_description"
+            app:title="@string/category_outro" />
 
         <SwitchPreferenceCompat
             app:key="filler_category_key"
-            app:title="@string/category_filler"
-            app:summary="@string/category_filler_description" />
+            app:summary="@string/category_filler_description"
+            app:title="@string/category_filler" />
 
         <SwitchPreferenceCompat
             app:key="music_offtopic_category_key"
-            app:title="@string/category_music_offtopic"
-            app:summary="@string/category_music_offtopic_description" />
+            app:summary="@string/category_music_offtopic_description"
+            app:title="@string/category_music_offtopic" />
 
         <SwitchPreferenceCompat
             app:key="preview_category_key"
-            app:title="@string/category_preview"
-            app:summary="@string/category_preview_description" />
+            app:summary="@string/category_preview_description"
+            app:title="@string/category_preview" />
 
     </PreferenceCategory>
 
diff --git a/build.gradle b/build.gradle
index 0a229bb5e..719afea14 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,8 @@
+//plugins {
+  //  id 'com.android.application' apply false version '7.2.1'
+    //id 'org.jetbrains.kotlin.android' apply false version '1.7.0'
+//}
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
@@ -15,4 +20,4 @@ buildscript {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
\ No newline at end of file
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 000000000..2e6834caa
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,45 @@
+[versions]
+appcompat = "1.4.1"
+constraintlayout = "2.1.3"
+material = "1.6.0"
+navigation = "2.4.2"
+legacySupport = "1.0.0"
+preference = "1.2.0"
+extJunit = "1.1.3"
+espresso = "3.4.0"
+picasso = "2.8"
+circleimageview = "3.1.0"
+exoplayer = "2.17.1"
+multidex = "2.0.1"
+retrofit = "2.9.0"
+jacksonAnnotations = "2.13.3"
+mobileffmpeg = "4.5.1.LTS"
+desugaring = "1.1.5"
+cronetEmbedded = "101.4951.41"
+leakcanary = "2.8.1"
+gson = "2.9.0"
+
+[libraries]
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigation" }
+androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigation" }
+androidx-legacySupport = { group = "androidx.legacy", name = "legacy-support-v4", version.ref = "legacySupport" }
+androidx-preference = { group = "androidx.preference", name = "preference-ktx", version.ref = "preference" }
+androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "extJunit" }
+androidx-test-espressoCore = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
+square-picasso = { group = "com.squareup.picasso", name = "picasso", version.ref = "picasso" }
+circleimageview = { group = "de.hdodenhof", name = "circleimageview", version.ref = "circleimageview" }
+exoplayer = { group = "com.google.android.exoplayer", name = "exoplayer", version.ref = "exoplayer" }
+exoplayer-extension-mediasession = { group = "com.google.android.exoplayer", name = "extension-mediasession", version.ref = "exoplayer" }
+androidx-multidex = { group = "androidx.multidex", name = "multidex", version.ref = "multidex" }
+square-retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
+square-retrofit-converterJackson = { group = "com.squareup.retrofit2", name = "converter-jackson", version.ref = "retrofit" }
+jacksonAnnotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version.ref = "jacksonAnnotations" }
+mobileffmpeg = { group = "com.arthenica", name = "ffmpeg-kit-min", version.ref = "mobileffmpeg" }
+desugaring = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugaring" }
+exoplayer-extension-cronet = { group = "com.google.android.exoplayer", name = "extension-cronet", version.ref = "exoplayer" }
+cronet-embedded = { group = "org.chromium.net", name = "cronet-embedded", version.ref = "cronetEmbedded" }
+square-leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "leakcanary" }
+gson = { group = "com.google.code.gson", name="gson", version.ref = "gson"}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dbfa5e60e..2a99b6d35 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Dec 09 16:25:51 GST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index be6d8ccca..8ef48f67a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,11 @@
+//pluginManagement {
+  //  repositories {
+        //gradlePluginPortal()
+      //  google()
+    //    mavenCentral()
+  //  }
+//}
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
@@ -5,5 +13,6 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
+
 rootProject.name = "LibreTube"
 include ':app'