diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f52d6e5e..b0798e44 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -50,7 +50,8 @@ android {
         }
     }
 
-    compileSdk = 33
+    // https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading
+    compileSdk = 33 // android 14 is fucked
     buildToolsVersion = "34.0.0"
 
     defaultConfig {
@@ -58,8 +59,8 @@ android {
         minSdk = 21
         targetSdk = 33
 
-        versionCode = 59
-        versionName = "4.1.8"
+        versionCode = 62
+        versionName = "4.2.1"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
         resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "")
@@ -154,25 +155,29 @@ repositories {
 dependencies {
     implementation("com.google.android.mediahome:video:1.0.0")
     implementation("androidx.test.ext:junit-ktx:1.1.5")
-    testImplementation("org.json:json:20180813")
+    testImplementation("org.json:json:20230618")
 
-    implementation("androidx.core:core-ktx:1.10.1")
+    implementation("androidx.core:core-ktx:1.10.1") // need 34 for higher
     implementation("androidx.appcompat:appcompat:1.6.1") // need target 32 for 1.5.0
 
     // dont change this to 1.6.0 it looks ugly af
     implementation("com.google.android.material:material:1.5.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+
+    // need 34 for higher
     implementation("androidx.navigation:navigation-fragment-ktx:2.6.0")
     implementation("androidx.navigation:navigation-ui-ktx:2.6.0")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.1")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
+
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     androidTestImplementation("androidx.test:core")
 
-    //implementation("io.karn:khttp-android:0.1.2") //okhttp instead
+    // implementation("io.karn:khttp-android:0.1.2") //okhttp instead
     // implementation("org.jsoup:jsoup:1.13.1")
+    // DONT UPDATE, WILL CRASH ANDROID TV ????
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1")
 
     implementation("androidx.preference:preference-ktx:1.2.0")
@@ -199,28 +204,26 @@ dependencies {
     // Custom ffmpeg extension for audio codecs
     implementation("com.github.recloudstream:media-ffmpeg:1.1.0")
 
-    //implementation("com.google.android.exoplayer:extension-leanback:2.14.0")
-
     // Bug reports
-    implementation("ch.acra:acra-core:5.11.0")
-    implementation("ch.acra:acra-toast:5.11.0")
+    implementation("ch.acra:acra-core:5.11.2")
+    implementation("ch.acra:acra-toast:5.11.2")
 
-    compileOnly("com.google.auto.service:auto-service-annotations:1.0")
+    compileOnly("com.google.auto.service:auto-service-annotations:1.1.1")
     //either for java sources:
-    annotationProcessor("com.google.auto.service:auto-service:1.0")
+    annotationProcessor("com.google.auto.service:auto-service:1.1.1")
     //or for kotlin sources (requires kapt gradle plugin):
-    kapt("com.google.auto.service:auto-service:1.0")
+    kapt("com.google.auto.service:auto-service:1.1.1")
 
     // subtitle color picker
     implementation("com.jaredrummler:colorpicker:1.1.0")
 
-    //run JS
+    // run JS
     // do not upgrade to 1.7.14, since in 1.7.14 Rhino uses the `SourceVersion` class, which is not
     // available on Android (even when using desugaring), and `NoClassDefFoundError` is thrown
     implementation("org.mozilla:rhino:1.7.13")
 
     // TorrentStream
-    //implementation("com.github.TorrentStream:TorrentStream-Android:2.7.0")
+    // implementation("com.github.TorrentStream:TorrentStream-Android:2.7.0")
 
     // Downloading
     implementation("androidx.work:work-runtime:2.8.1")
@@ -231,16 +234,16 @@ dependencies {
     // implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1")
     implementation("com.github.Blatzar:NiceHttp:0.4.3")
     // To fix SSL fuckery on android 9
-    implementation("org.conscrypt:conscrypt-android:2.2.1")
+    implementation("org.conscrypt:conscrypt-android:2.5.2")
     // Util to skip the URI file fuckery 🙏
     implementation("com.github.LagradOst:SafeFile:0.0.5")
 
     // API because cba maintaining it myself
-    implementation("com.uwetrottmann.tmdb2:tmdb-java:2.6.0")
+    implementation("com.uwetrottmann.tmdb2:tmdb-java:2.10.0")
 
     implementation("com.github.discord:OverlappingPanels:0.1.5")
     // debugImplementation because LeakCanary should only run in debug builds.
-    //debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
+    // debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
 
     // for shimmer when loading
     implementation("com.facebook.shimmer:shimmer:0.5.0")
@@ -252,7 +255,7 @@ dependencies {
 
     // newpipe yt taken from https://github.com/TeamNewPipe/NewPipeExtractor/commits/dev
     // this should be updated frequently to avoid trailer fu*kery
-    implementation("com.github.teamnewpipe:NewPipeExtractor:1f08d28")
+    implementation("com.github.teamnewpipe:NewPipeExtractor:917554a")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.6")
 
     // Library/extensions searching with Levenshtein distance
@@ -260,6 +263,8 @@ dependencies {
 
     // color palette for images -> colors
     implementation("androidx.palette:palette-ktx:1.0.0")
+    // seekbar https://github.com/rubensousa/PreviewSeekBar
+    implementation("com.github.rubensousa:previewseekbar-media3:1.1.1.0")
 }
 
 tasks.register("androidSourcesJar", Jar::class) {
diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
index df41ef91..a84b2457 100644
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
@@ -9,6 +9,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.databinding.FragmentHomeBinding
 import com.lagradost.cloudstream3.databinding.FragmentHomeTvBinding
+import com.lagradost.cloudstream3.databinding.FragmentLibraryBinding
+import com.lagradost.cloudstream3.databinding.FragmentLibraryTvBinding
 import com.lagradost.cloudstream3.databinding.FragmentPlayerBinding
 import com.lagradost.cloudstream3.databinding.FragmentPlayerTvBinding
 import com.lagradost.cloudstream3.databinding.FragmentResultBinding
@@ -120,6 +122,8 @@ class ExampleInstrumentedTest {
                 testAllLayouts<HomepageParentTvBinding>(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent)
                 testAllLayouts<HomepageParentBinding>(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent)
 
+                testAllLayouts<FragmentLibraryTvBinding>(activity, R.layout.fragment_library_tv, R.layout.fragment_library)
+                testAllLayouts<FragmentLibraryBinding>(activity, R.layout.fragment_library_tv, R.layout.fragment_library)
             }
         }
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 15767d7b..e0d43338 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,8 @@
     <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" /> <!-- Used for updates without prompt -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- Used for update service -->
 
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /> <!-- Required for getting arbitrary Aniyomi packages  -->
     <!-- Fixes android tv fuckery -->
     <uses-feature
@@ -61,7 +63,9 @@
             android:exported="true"
             android:resizeableActivity="true"
             android:screenOrientation="userLandscape"
-            android:supportsPictureInPicture="true">
+            android:supportsPictureInPicture="true"
+            android:taskAffinity="com.lagradost.cloudstream3.downloadedplayer"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -175,6 +179,7 @@
         </receiver>
 
         <service
+            android:foregroundServiceType="dataSync"
             android:name=".services.VideoDownloadService"
             android:enabled="true"
             android:exported="false" />
@@ -184,6 +189,7 @@
             android:exported="false" />
 
         <service
+            android:foregroundServiceType="dataSync"
             android:name=".utils.PackageInstallerService"
             android:exported="false" />
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index a7d899b6..759f99d4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -65,6 +65,11 @@ object CommonActivity {
             _activity = WeakReference(value)
         }
 
+    @MainThread
+    fun setActivityInstance(newActivity: Activity?) {
+        activity = newActivity
+    }
+
     @MainThread
     fun Activity?.getCastSession(): CastSession? {
         return (this as MainActivity?)?.mSessionManager?.currentCastSession
@@ -203,23 +208,25 @@ object CommonActivity {
         setLocale(this, localeCode)
     }
 
-    fun init(act: ComponentActivity?) {
-        if (act == null) return
-        activity = act
+    fun init(act: Activity) {
+        setActivityInstance(act)
+
+        val componentActivity = activity as? ComponentActivity ?: return
+
         //https://stackoverflow.com/questions/52594181/how-to-know-if-user-has-disabled-picture-in-picture-feature-permission
         //https://developer.android.com/guide/topics/ui/picture-in-picture
         canShowPipMode =
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && // OS SUPPORT
-                    act.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) && // HAS FEATURE, MIGHT BE BLOCKED DUE TO POWER DRAIN
-                    act.hasPIPPermission() // CHECK IF FEATURE IS ENABLED IN SETTINGS
+                    componentActivity.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) && // HAS FEATURE, MIGHT BE BLOCKED DUE TO POWER DRAIN
+                    componentActivity.hasPIPPermission() // CHECK IF FEATURE IS ENABLED IN SETTINGS
 
-        act.updateLocale()
-        act.updateTv()
+        componentActivity.updateLocale()
+        componentActivity.updateTv()
         NewPipe.init(DownloaderTestImpl.getInstance())
 
         for (resumeApp in resumeApps) {
             resumeApp.launcher =
-                act.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                componentActivity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
                     val resultCode = result.resultCode
                     val data = result.data
                     if (resultCode == AppCompatActivity.RESULT_OK && data != null && resumeApp.position != null && resumeApp.duration != null) {
@@ -236,11 +243,11 @@ object CommonActivity {
         // Ask for notification permissions on Android 13
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
             ContextCompat.checkSelfPermission(
-                act,
+                componentActivity,
                 Manifest.permission.POST_NOTIFICATIONS
             ) != PackageManager.PERMISSION_GRANTED
         ) {
-            val requestPermissionLauncher = act.registerForActivityResult(
+            val requestPermissionLauncher = componentActivity.registerForActivityResult(
                 ActivityResultContracts.RequestPermission()
             ) { isGranted: Boolean ->
                 Log.d(TAG, "Notification permission: $isGranted")
@@ -295,12 +302,15 @@ object CommonActivity {
         val currentOverlayTheme =
             when (settingsManager.getString(act.getString(R.string.primary_color_key), "Normal")) {
                 "Normal" -> R.style.OverlayPrimaryColorNormal
+                "DandelionYellow" -> R.style.OverlayPrimaryColorDandelionYellow
                 "CarnationPink" -> R.style.OverlayPrimaryColorCarnationPink
+                "Orange" -> R.style.OverlayPrimaryColorOrange
                 "DarkGreen" -> R.style.OverlayPrimaryColorDarkGreen
                 "Maroon" -> R.style.OverlayPrimaryColorMaroon
                 "NavyBlue" -> R.style.OverlayPrimaryColorNavyBlue
                 "Grey" -> R.style.OverlayPrimaryColorGrey
                 "White" -> R.style.OverlayPrimaryColorWhite
+                "CoolBlue" -> R.style.OverlayPrimaryColorCoolBlue
                 "Brown" -> R.style.OverlayPrimaryColorBrown
                 "Purple" -> R.style.OverlayPrimaryColorPurple
                 "Green" -> R.style.OverlayPrimaryColorGreen
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index 0175e0d0..5b674c4c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -179,6 +179,13 @@ object APIHolder {
 
     private var trackerCache: HashMap<String, AniSearch> = hashMapOf()
 
+    /** backwards compatibility, use getTracker4 instead */
+    suspend fun getTracker(
+        titles: List<String>,
+        types: Set<TrackerType>?,
+        year: Int?,
+    ): Tracker? = getTracker(titles, types, year, false)
+
     /**
      * Get anime tracker information based on title, year and type.
      * Both titles are attempted to be matched with both Romaji and English title.
@@ -192,7 +199,7 @@ object APIHolder {
         titles: List<String>,
         types: Set<TrackerType>?,
         year: Int?,
-        lessAccurate: Boolean = false
+        lessAccurate: Boolean
     ): Tracker? {
         return try {
             require(titles.isNotEmpty()) { "titles must no be empty when calling getTracker" }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index a07ae2c2..4e0d93c9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -67,6 +67,7 @@ import com.lagradost.cloudstream3.CommonActivity.onColorSelectedEvent
 import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
 import com.lagradost.cloudstream3.CommonActivity.onUserLeaveHint
 import com.lagradost.cloudstream3.CommonActivity.screenHeight
+import com.lagradost.cloudstream3.CommonActivity.setActivityInstance
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.CommonActivity.updateLocale
 import com.lagradost.cloudstream3.databinding.ActivityMainBinding
@@ -128,6 +129,7 @@ import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.setKey
+import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.migrateResumeWatching
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.IOnBackPressed
@@ -281,6 +283,7 @@ var app = Requests(responseParser = object : ResponseParser {
 class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
     companion object {
         const val TAG = "MAINACT"
+        const val ANIMATED_OUTLINE : Boolean = false
         var lastError: String? = null
 
         /**
@@ -305,6 +308,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
         // kinda shitty solution, but cant com main->home otherwise for popups
         val bookmarksUpdatedEvent = Event<Boolean>()
+        /**
+         * Used by data store helper to fully reload home when switching accounts
+         */
+        val reloadHomeEvent = Event<Boolean>()
 
 
         /**
@@ -492,6 +499,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             R.id.navigation_results_phone,
             R.id.navigation_results_tv,
             R.id.navigation_player,
+            R.id.navigation_quick_search,
         ).contains(destination.id)
 
         binding?.navHostFragment?.apply {
@@ -536,9 +544,13 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             navRailView.isVisible = isNavVisible && landscape
 
             // Hide library on TV since it is not supported yet :(
-            val isTrueTv = isTrueTvSettings()
-            navView.menu.findItem(R.id.navigation_library)?.isVisible = !isTrueTv
-            navRailView.menu.findItem(R.id.navigation_library)?.isVisible = !isTrueTv
+            //val isTrueTv = isTrueTvSettings()
+            //navView.menu.findItem(R.id.navigation_library)?.isVisible = !isTrueTv
+            //navRailView.menu.findItem(R.id.navigation_library)?.isVisible = !isTrueTv
+
+            // Hide downloads on TV
+            //navView.menu.findItem(R.id.navigation_downloads)?.isVisible = !isTrueTv
+            //navRailView.menu.findItem(R.id.navigation_downloads)?.isVisible = !isTrueTv
         }
     }
 
@@ -580,6 +592,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
     override fun onResume() {
         super.onResume()
         afterPluginsLoadedEvent += ::onAllPluginsLoaded
+        setActivityInstance(this)
         try {
             if (isCastApiAvailable()) {
                 //mCastSession = mSessionManager.currentCastSession
@@ -1058,7 +1071,22 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         }
     }
 
-
+    private fun centerView(view : View?) {
+        if(view == null) return
+        try {
+            Log.v(TAG, "centerView: $view")
+            val r = Rect(0, 0, 0, 0)
+            view.getDrawingRect(r)
+            val x = r.centerX()
+            val y = r.centerY()
+            val dx = r.width() / 2 //screenWidth / 2
+            val dy = screenHeight / 2
+            val r2 = Rect(x - dx, y - dy, x + dx, y + dy)
+            view.requestRectangleOnScreen(r2, false)
+            // TvFocus.current =TvFocus.current.copy(y=y.toFloat())
+        } catch (_: Throwable) {
+        }
+    }
     override fun onCreate(savedInstanceState: Bundle?) {
         app.initClient(this)
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
@@ -1092,15 +1120,19 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         updateTv()
 
         // backup when we update the app, I don't trust myself to not boot lock users, might want to make this a setting?
-        try {
+        normalSafeApiCall {
             val appVer = BuildConfig.VERSION_NAME
             val lastAppAutoBackup: String = getKey("VERSION_NAME") ?: ""
             if (appVer != lastAppAutoBackup) {
                 setKey("VERSION_NAME", BuildConfig.VERSION_NAME)
-                backup()
+                normalSafeApiCall {
+                    backup(this)
+                }
+                normalSafeApiCall {
+                    // Recompile oat on new version
+                    PluginManager.deleteAllOatFiles(this)
+                }
             }
-        } catch (t: Throwable) {
-            logError(t)
         }
 
         // just in case, MAIN SHOULD *NEVER* BOOT LOOP CRASH
@@ -1108,37 +1140,27 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             if (isTvSettings()) {
                 val newLocalBinding = ActivityMainTvBinding.inflate(layoutInflater, null, false)
                 setContentView(newLocalBinding.root)
-                TvFocus.focusOutline = WeakReference(newLocalBinding.focusOutline)
-                newLocalBinding.root.viewTreeObserver.addOnGlobalFocusChangeListener { _, newFocus ->
-                    // println("refocus $oldFocus -> $newFocus")
-                    try {
-                        val r = Rect(0,0,0,0)
-                        newFocus.getDrawingRect(r)
-                        val x = r.centerX()
-                        val y = r.centerY()
-                        val dx = 0 //screenWidth / 2
-                        val dy = screenHeight / 2
-                        val r2 = Rect(x-dx,y-dy,x+dx,y+dy)
-                        newFocus.requestRectangleOnScreen(r2, false)
-                       // TvFocus.current =TvFocus.current.copy(y=y.toFloat())
-                    } catch (_ : Throwable) { }
-                    TvFocus.updateFocusView(newFocus)
-                    /*var focus = newFocus
 
-                    while(focus != null) {
-                        if(focus is ScrollingView && focus.canScrollVertically()) {
-                            focus.scrollBy()
-                        }
-                        when(focus.parent) {
-                            is View -> focus = newFocus
-                            else -> break
-                        }
-                    }*/
+                if(isTrueTvSettings() && ANIMATED_OUTLINE) {
+                    TvFocus.focusOutline = WeakReference(newLocalBinding.focusOutline)
+                    newLocalBinding.root.viewTreeObserver.addOnScrollChangedListener {
+                        TvFocus.updateFocusView(TvFocus.lastFocus.get(), same = true)
+                    }
+                    newLocalBinding.root.viewTreeObserver.addOnGlobalFocusChangeListener { _, newFocus ->
+                        TvFocus.updateFocusView(newFocus)
+                    }
+                } else {
+                    newLocalBinding.focusOutline.isVisible = false
                 }
-                newLocalBinding.root.viewTreeObserver.addOnScrollChangedListener {
-                    TvFocus.updateFocusView(TvFocus.lastFocus.get(), same = true)
+
+                if(isTrueTvSettings()) {
+                    newLocalBinding.root.viewTreeObserver.addOnGlobalFocusChangeListener { _, newFocus ->
+                        centerView(newFocus)
+                    }
                 }
 
+
+
                 ActivityMainBinding.bind(newLocalBinding.root) // this may crash
             } else {
                 val newLocalBinding = ActivityMainBinding.inflate(layoutInflater, null, false)
@@ -1182,7 +1204,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             }
         } else if (lastError == null) {
             ioSafe {
-                getKey<String>(USER_SELECTED_HOMEPAGE_API)?.let { homeApi ->
+                DataStoreHelper.currentHomePage?.let { homeApi ->
                     mainPluginsLoadedEvent.invoke(loadSinglePlugin(this@MainActivity, homeApi))
                 } ?: run {
                     mainPluginsLoadedEvent.invoke(false)
@@ -1543,6 +1565,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             migrateResumeWatching()
         }
 
+        getKey<String>(USER_SELECTED_HOMEPAGE_API)?.let { homepage ->
+            DataStoreHelper.currentHomePage = homepage
+            removeKey(USER_SELECTED_HOMEPAGE_API)
+        }
+
         try {
             if (getKey(HAS_DONE_SETUP_KEY, false) != true) {
                 navController.navigate(R.id.navigation_setup_language)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt
index bcf8848c..a9fafc39 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt
@@ -29,7 +29,7 @@ open class Chillx : ExtractorApi() {
     override val requiresReferer = true
 
     companion object {
-        private const val KEY = "m4H6D9%0\$N&F6rQ&"
+        private const val KEY = "eN0^>\$^#M08uFv%c"
     }
 
     override suspend fun getUrl(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Gofile.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Gofile.kt
index d76b0e11..eaf9c65f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Gofile.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Gofile.kt
@@ -19,7 +19,7 @@ open class Gofile : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val id = Regex("/(?:\\?c=|d/)([\\da-zA-Z]+)").find(url)?.groupValues?.get(1)
+        val id = Regex("/(?:\\?c=|d/)([\\da-zA-Z-]+)").find(url)?.groupValues?.get(1)
         val token = app.get("$mainApi/createAccount").parsedSafe<Account>()?.data?.get("token")
         val websiteToken = app.get("$mainUrl/dist/js/alljs.js").text.let {
             Regex("websiteToken\\s*=\\s*\"([^\"]+)").find(it)?.groupValues?.get(1)
@@ -59,4 +59,4 @@ open class Gofile : ExtractorApi() {
         @JsonProperty("data") val data: Data? = null,
     )
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Minoplres.kt
similarity index 74%
rename from app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt
rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Minoplres.kt
index 213ecdf3..702501a1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Minoplres.kt
@@ -7,21 +7,12 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 
-class SpeedoStream2 : SpeedoStream() {
-    override val mainUrl = "https://speedostream.mom"
-}
+open class Minoplres : ExtractorApi() {
 
-class SpeedoStream1 : SpeedoStream() {
-    override val mainUrl = "https://speedostream.pm"
-}
-
-open class SpeedoStream : ExtractorApi() {
-    override val name = "SpeedoStream"
-    override val mainUrl = "https://speedostream.bond"
+    override val name = "Minoplres" // formerly SpeedoStream
     override val requiresReferer = true
-
-    // .bond, .pm, .mom redirect to .bond
-    private val hostUrl = "https://speedostream.bond"
+    override val mainUrl = "https://minoplres.xyz" // formerly speedostream.bond
+    private val hostUrl = "https://minoplres.xyz"
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
         val sources = mutableListOf<ExtractorLink>()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index 87b0ba3b..8e87cc99 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -137,6 +137,20 @@ object PluginManager {
         }
     }
 
+    /**
+     * Deletes all generated oat files which will force Android to recompile the dex extensions.
+     * This might fix unrecoverable SIGSEGV exceptions when old oat files are loaded in a new app update.
+     */
+    fun deleteAllOatFiles(context: Context) {
+        File("${context.filesDir}/${ONLINE_PLUGINS_FOLDER}").listFiles()?.forEach { repo ->
+            repo.listFiles { file -> file.name == "oat" && file.isDirectory }?.forEach { file ->
+                val success = file.deleteRecursively()
+                Log.i(TAG, "Deleted oat directory: ${file.absolutePath} Success=$success")
+            }
+        }
+    }
+
+
     fun getPluginsOnline(): Array<PluginData> {
         return getKey(PLUGINS_KEY) ?: emptyArray()
     }
@@ -463,6 +477,14 @@ object PluginManager {
         Log.i(TAG, "Loading plugin: $data")
 
         return try {
+            /* in case of android 14 then
+            try {
+                File(filePath).setReadOnly()
+            } catch (t : Throwable) {
+                Log.e(TAG, "Failed to set dex as readonly")
+                logError(t)
+            }*/
+
             val loader = PathClassLoader(filePath, context.classLoader)
             var manifest: Plugin.Manifest
             loader.getResourceAsStream("manifest.json").use { stream ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/BackupWorkManager.kt b/app/src/main/java/com/lagradost/cloudstream3/services/BackupWorkManager.kt
new file mode 100644
index 00000000..6ed7a447
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/BackupWorkManager.kt
@@ -0,0 +1,96 @@
+package com.lagradost.cloudstream3.services
+
+import android.content.Context
+import androidx.core.app.NotificationCompat
+import androidx.work.Constraints
+import androidx.work.CoroutineWorker
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.ForegroundInfo
+import androidx.work.PeriodicWorkRequest
+import androidx.work.WorkManager
+import androidx.work.WorkerParameters
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.utils.AppUtils.createNotificationChannel
+import com.lagradost.cloudstream3.utils.BackupUtils
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import java.util.concurrent.TimeUnit
+
+const val BACKUP_CHANNEL_ID = "cloudstream3.backups"
+const val BACKUP_WORK_NAME = "work_backup"
+const val BACKUP_CHANNEL_NAME = "Backups"
+const val BACKUP_CHANNEL_DESCRIPTION = "Notifications for background backups"
+const val BACKUP_NOTIFICATION_ID = 938712898 // Random unique
+
+class BackupWorkManager(val context: Context, workerParams: WorkerParameters) :
+    CoroutineWorker(context, workerParams) {
+    companion object {
+        fun enqueuePeriodicWork(context: Context?, intervalHours: Long) {
+            if (context == null) return
+
+            if (intervalHours == 0L) {
+                WorkManager.getInstance(context).cancelUniqueWork(BACKUP_WORK_NAME)
+                return
+            }
+
+            val constraints = Constraints.Builder()
+                .setRequiresStorageNotLow(true)
+                .build()
+
+            val periodicSyncDataWork =
+                PeriodicWorkRequest.Builder(
+                    BackupWorkManager::class.java,
+                    intervalHours,
+                    TimeUnit.HOURS
+                )
+                    .addTag(BACKUP_WORK_NAME)
+                    .setConstraints(constraints)
+                    .build()
+
+            WorkManager.getInstance(context).enqueueUniquePeriodicWork(
+                BACKUP_WORK_NAME,
+                ExistingPeriodicWorkPolicy.UPDATE,
+                periodicSyncDataWork
+            )
+
+            // Uncomment below for testing
+
+//            val oneTimeBackupWork =
+//                OneTimeWorkRequest.Builder(BackupWorkManager::class.java)
+//                    .addTag(BACKUP_WORK_NAME)
+//                    .setConstraints(constraints)
+//                    .build()
+//
+//            WorkManager.getInstance(context).enqueue(oneTimeBackupWork)
+        }
+    }
+
+    private val backupNotificationBuilder =
+        NotificationCompat.Builder(context, BACKUP_CHANNEL_ID)
+            .setColorized(true)
+            .setOnlyAlertOnce(true)
+            .setSilent(true)
+            .setAutoCancel(true)
+            .setContentTitle(context.getString(R.string.pref_category_backup))
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setColor(context.colorFromAttribute(R.attr.colorPrimary))
+            .setSmallIcon(R.drawable.ic_cloudstream_monochrome_big)
+
+    override suspend fun doWork(): Result {
+        context.createNotificationChannel(
+            BACKUP_CHANNEL_ID,
+            BACKUP_CHANNEL_NAME,
+            BACKUP_CHANNEL_DESCRIPTION
+        )
+
+        setForeground(
+            ForegroundInfo(
+                BACKUP_NOTIFICATION_ID,
+                backupNotificationBuilder.build()
+            )
+        )
+
+        BackupUtils.backup(context)
+
+        return Result.success()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/CustomRecyclerViews.kt
similarity index 79%
rename from app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt
rename to app/src/main/java/com/lagradost/cloudstream3/ui/CustomRecyclerViews.kt
index 28ced48c..1a9549e1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/CustomRecyclerViews.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.ui
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
+import androidx.core.view.children
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import kotlin.math.abs
@@ -70,8 +71,8 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) :
         val orientation = this.orientation
 
         // fixes arabic by inverting left and right layout focus
-        val correctDirection = if(this.isLayoutRTL) {
-            when(direction) {
+        val correctDirection = if (this.isLayoutRTL) {
+            when (direction) {
                 View.FOCUS_RIGHT -> View.FOCUS_LEFT
                 View.FOCUS_LEFT -> View.FOCUS_RIGHT
                 else -> direction
@@ -83,12 +84,15 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) :
                 View.FOCUS_DOWN -> {
                     return spanCount
                 }
+
                 View.FOCUS_UP -> {
                     return -spanCount
                 }
+
                 View.FOCUS_RIGHT -> {
                     return 1
                 }
+
                 View.FOCUS_LEFT -> {
                     return -1
                 }
@@ -98,12 +102,15 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) :
                 View.FOCUS_DOWN -> {
                     return 1
                 }
+
                 View.FOCUS_UP -> {
                     return -1
                 }
+
                 View.FOCUS_RIGHT -> {
                     return spanCount
                 }
+
                 View.FOCUS_LEFT -> {
                     return -spanCount
                 }
@@ -155,4 +162,32 @@ class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: Att
 
         layoutManager = manager
     }
+}
+
+/**
+ * Recyclerview wherein the max item width or height is set by the biggest view to prevent inconsistent view sizes.
+ */
+class MaxRecyclerView(ctx: Context, attrs: AttributeSet) : RecyclerView(ctx, attrs) {
+    private var biggestObserved: Int = 0
+    private val orientation = LayoutManager.getProperties(context, attrs, 0, 0).orientation
+    private val isHorizontal = orientation == HORIZONTAL
+    private fun View.updateMaxSize() {
+        if (isHorizontal) {
+            this.minimumHeight = biggestObserved
+        } else {
+            this.minimumWidth = biggestObserved
+        }
+    }
+
+    override fun onChildAttachedToWindow(child: View) {
+        child.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED)
+        val observed = if (isHorizontal) child.measuredHeight else child.measuredWidth
+        if (observed > biggestObserved) {
+            biggestObserved = observed
+            children.forEach { it.updateMaxSize() }
+        } else {
+            child.updateMaxSize()
+        }
+        super.onChildAttachedToWindow(child)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index b84c619e..4d940123 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -7,7 +7,6 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.content.res.Configuration
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -23,18 +22,12 @@ import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.button.MaterialButton
 import com.google.android.material.chip.Chip
-import com.google.android.material.chip.ChipGroup
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
-import com.lagradost.cloudstream3.MainActivity.Companion.bookmarksUpdatedEvent
-import com.lagradost.cloudstream3.MainActivity.Companion.mainPluginsLoadedEvent
 import com.lagradost.cloudstream3.databinding.FragmentHomeBinding
 import com.lagradost.cloudstream3.databinding.HomeEpisodesExpandedBinding
 import com.lagradost.cloudstream3.databinding.HomeSelectMainpageBinding
@@ -45,38 +38,26 @@ import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.noneApi
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.randomApi
-import com.lagradost.cloudstream3.ui.WatchType
-import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
 import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.ui.search.*
 import com.lagradost.cloudstream3.ui.search.SearchHelper.handleSearchClickCallback
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
-import com.lagradost.cloudstream3.utils.AppUtils.addProgramsToContinueWatching
 import com.lagradost.cloudstream3.utils.AppUtils.isRecyclerScrollable
-import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.AppUtils.ownHide
 import com.lagradost.cloudstream3.utils.AppUtils.ownShow
 import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.DataStore.getKey
-import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
-import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
-
 import java.util.*
 
 
-const val HOME_BOOKMARK_VALUE_LIST = "home_bookmarked_last_list"
-const val HOME_PREF_HOMEPAGE = "home_pref_homepage"
-
 class HomeFragment : Fragment() {
     companion object {
         val configEvent = Event<Int>()
@@ -378,10 +359,7 @@ class HomeFragment : Fragment() {
                 var currentApiName = selectedApiName
 
                 var currentValidApis: MutableList<MainAPI> = mutableListOf()
-                val preSelectedTypes = this.getKey<List<String>>(HOME_PREF_HOMEPAGE)
-                    ?.mapNotNull { listName -> TvType.values().firstOrNull { it.name == listName } }
-                    ?.toMutableList()
-                    ?: mutableListOf(TvType.Movie, TvType.TvSeries)
+                val preSelectedTypes = DataStoreHelper.homePreference.toMutableList()
 
                 binding.cancelBtt.setOnClickListener {
                     dialog.dismissSafe()
@@ -409,7 +387,7 @@ class HomeFragment : Fragment() {
                 }
 
                 fun updateList() {
-                    this.setKey(HOME_PREF_HOMEPAGE, preSelectedTypes)
+                    DataStoreHelper.homePreference = preSelectedTypes
 
                     arrayAdapter.clear()
                     currentValidApis = validAPIs.filter { api ->
@@ -669,7 +647,7 @@ class HomeFragment : Fragment() {
         }
 
         homeViewModel.reloadStored()
-        homeViewModel.loadAndCancel(getKey(USER_SELECTED_HOMEPAGE_API), false)
+        homeViewModel.loadAndCancel(DataStoreHelper.currentHomePage, false)
         //loadHomePage(false)
 
         // nice profile pic on homepage
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
index 1d8e1399..d7956f39 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
@@ -461,6 +461,11 @@ class HomeParentItemAdapterPreview(
                     }
                 }
 
+                homePreviewSearchButton.setOnClickListener { _ ->
+                    // Open blank screen.
+                    viewModel.queryTextSubmit("")
+                }
+
                 // This makes the hidden next buttons only available when on the info button
                 // Otherwise you might be able to go to the next item without being at the info button
                 homePreviewInfoBtt.setOnFocusChangeListener { _, hasFocus ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index b27223ec..ad75aa9d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -12,7 +12,6 @@ import com.lagradost.cloudstream3.APIHolder.filterSearchResultByFilmQuality
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.AcraApplication.Companion.context
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
@@ -49,7 +48,6 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.getBookmarkedData
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getLastWatched
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getResultWatchState
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
-import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -171,10 +169,7 @@ class HomeViewModel : ViewModel() {
         currentWatchTypes.remove(WatchType.NONE)
 
         if (currentWatchTypes.size <= 0) {
-            setKey(
-                HOME_BOOKMARK_VALUE_LIST,
-                intArrayOf()
-            )
+            DataStoreHelper.homeBookmarkedList = intArrayOf()
             _availableWatchStatusTypes.postValue(setOf<WatchType>() to setOf())
             _bookmarks.postValue(Pair(false, ArrayList()))
             return@launchSafe
@@ -182,16 +177,14 @@ class HomeViewModel : ViewModel() {
 
         val watchPrefNotNull = preferredWatchStatus ?: EnumSet.of(currentWatchTypes.first())
         //if (currentWatchTypes.any { watchPrefNotNull.contains(it) }) watchPrefNotNull else listOf(currentWatchTypes.first())
-        setKey(
-            HOME_BOOKMARK_VALUE_LIST,
-            watchPrefNotNull.map { it.internalId }.toIntArray()
-        )
+
+        DataStoreHelper.homeBookmarkedList = watchPrefNotNull.map { it.internalId }.toIntArray()
         _availableWatchStatusTypes.postValue(
-            Pair(
-                watchPrefNotNull,
-                currentWatchTypes,
+
+            watchPrefNotNull to
+                    currentWatchTypes,
+
             )
-        )
 
         val list = withContext(Dispatchers.IO) {
             watchStatusIds.filter { watchPrefNotNull.contains(it.second) }
@@ -426,23 +419,29 @@ class HomeViewModel : ViewModel() {
     }
 
     private fun afterPluginsLoaded(forceReload: Boolean) {
-        loadAndCancel(getKey(USER_SELECTED_HOMEPAGE_API), forceReload)
+        loadAndCancel(DataStoreHelper.currentHomePage, forceReload)
     }
 
     private fun afterMainPluginsLoaded(unused: Boolean = false) {
-        loadAndCancel(getKey(USER_SELECTED_HOMEPAGE_API), false)
+        loadAndCancel(DataStoreHelper.currentHomePage, false)
+    }
+
+    private fun reloadHome(unused: Boolean = false) {
+        loadAndCancel(DataStoreHelper.currentHomePage, true)
     }
 
     init {
         MainActivity.bookmarksUpdatedEvent += ::bookmarksUpdated
         MainActivity.afterPluginsLoadedEvent += ::afterPluginsLoaded
         MainActivity.mainPluginsLoadedEvent += ::afterMainPluginsLoaded
+        MainActivity.reloadHomeEvent += ::reloadHome
     }
 
     override fun onCleared() {
         MainActivity.bookmarksUpdatedEvent -= ::bookmarksUpdated
         MainActivity.afterPluginsLoadedEvent -= ::afterPluginsLoaded
         MainActivity.mainPluginsLoadedEvent -= ::afterMainPluginsLoaded
+        MainActivity.reloadHomeEvent -= ::reloadHome
         super.onCleared()
     }
 
@@ -458,7 +457,7 @@ class HomeViewModel : ViewModel() {
 
     fun loadStoredData() {
         val list = EnumSet.noneOf(WatchType::class.java)
-        getKey<IntArray>(HOME_BOOKMARK_VALUE_LIST)?.map { WatchType.fromInternalId(it) }?.let {
+        DataStoreHelper.homeBookmarkedList.map { WatchType.fromInternalId(it) }.let {
             list.addAll(it)
         }
         loadStoredData(list)
@@ -495,7 +494,7 @@ class HomeViewModel : ViewModel() {
             val api = getApiFromNameNull(preferredApiName)
             if (preferredApiName == noneApi.name) {
                 // just set to random
-                if (fromUI) setKey(USER_SELECTED_HOMEPAGE_API, noneApi.name)
+                if (fromUI) DataStoreHelper.currentHomePage = noneApi.name
                 loadAndCancel(noneApi)
             } else if (preferredApiName == randomApi.name) {
                 // randomize the api, if none exist like if not loaded or not installed
@@ -506,7 +505,7 @@ class HomeViewModel : ViewModel() {
                 } else {
                     val apiRandom = validAPIs.random()
                     loadAndCancel(apiRandom)
-                    if (fromUI) setKey(USER_SELECTED_HOMEPAGE_API, apiRandom.name)
+                    if (fromUI) DataStoreHelper.currentHomePage = apiRandom.name
                 }
             } else if (api == null) {
                 // API is not found aka not loaded or removed, post the loading
@@ -520,7 +519,7 @@ class HomeViewModel : ViewModel() {
                 }
             } else {
                 // if the api is found, then set it to it and save key
-                if (fromUI) setKey(USER_SELECTED_HOMEPAGE_API, api.name)
+                if (fromUI) DataStoreHelper.currentHomePage = api.name
                 loadAndCancel(api)
             }
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
index 04ef3d96..85f0aedd 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
@@ -1,40 +1,56 @@
 package com.lagradost.cloudstream3.ui.library
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.FOCUS_AFTER_DESCENDANTS
+import android.view.ViewGroup.FOCUS_BLOCK_DESCENDANTS
 import android.view.animation.AlphaAnimation
+import android.widget.LinearLayout
+import android.widget.TextView
+import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.SearchView
+import androidx.core.view.allViews
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.viewpager2.widget.ViewPager2
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.allProviders
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.FragmentLibraryBinding
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.debugAssert
+import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
+import com.lagradost.cloudstream3.ui.AutofitRecyclerView
 import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
 import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_SHOW_METADATA
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment
 import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.AppUtils.reduceDragSensitivity
+import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
@@ -78,9 +94,21 @@ class LibraryFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
-        val localBinding = FragmentLibraryBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root
+        val layout =
+            if (SettingsFragment.isTvSettings()) R.layout.fragment_library_tv else R.layout.fragment_library
+        val root = inflater.inflate(layout, container, false)
+        binding = try {
+            FragmentLibraryBinding.bind(root)
+        } catch (t: Throwable) {
+            CommonActivity.showToast(
+                txt(R.string.unable_to_inflate, t.message ?: ""),
+                Toast.LENGTH_LONG
+            )
+            logError(t)
+            null
+        }
+
+        return root
 
         //return inflater.inflate(R.layout.fragment_library, container, false)
     }
@@ -97,24 +125,16 @@ class LibraryFragment : Fragment() {
         super.onSaveInstanceState(outState)
     }
 
+    @SuppressLint("ResourceType", "CutPasteId")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         fixPaddingStatusbar(binding?.searchStatusBarPadding)
 
-        binding?.sortFab?.setOnClickListener {
-            val methods = libraryViewModel.sortingMethods.map {
-                txt(it.stringRes).asString(view.context)
-            }
+        binding?.sortFab?.setOnClickListener(sortChangeClickListener)
+        binding?.librarySort?.setOnClickListener(sortChangeClickListener)
 
-            activity?.showBottomDialog(methods,
-                libraryViewModel.sortingMethods.indexOf(libraryViewModel.currentSortingMethod),
-                txt(R.string.sort_by).asString(view.context),
-                false,
-                {},
-                {
-                    val method = libraryViewModel.sortingMethods[it]
-                    libraryViewModel.sort(method)
-                })
+        binding?.libraryRoot?.findViewById<TextView>(R.id.search_src_text)?.apply {
+            tag = "tv_no_focus_tag"
         }
 
         binding?.mainSearch?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
@@ -180,7 +200,7 @@ class LibraryFragment : Fragment() {
 
             val items = baseOptions.map { txt(it.stringRes).asString(this) } + availableProviders
 
-            val savedSelection = getKey<LibraryOpener>(LIBRARY_FOLDER, key)
+            val savedSelection = getKey<LibraryOpener>("$currentAccount/$LIBRARY_FOLDER", key)
             val selectedIndex =
                 when {
                     savedSelection == null -> 0
@@ -215,7 +235,7 @@ class LibraryFragment : Fragment() {
                 }
 
                 setKey(
-                    LIBRARY_FOLDER,
+                    "$currentAccount/$LIBRARY_FOLDER",
                     key,
                     savedData,
                 )
@@ -228,6 +248,7 @@ class LibraryFragment : Fragment() {
         }
 
         binding?.viewpager?.setPageTransformer(LibraryScrollTransformer())
+
         binding?.viewpager?.adapter =
             binding?.viewpager?.adapter ?: ViewpagerAdapter(
                 mutableListOf(),
@@ -262,8 +283,11 @@ class LibraryFragment : Fragment() {
                         // This basically first selects the individual opener and if that is default then
                         // selects the whole list opener
                         val savedListSelection =
-                            getKey<LibraryOpener>(LIBRARY_FOLDER, syncName.name)
-                        val savedSelection = getKey<LibraryOpener>(LIBRARY_FOLDER, syncId).takeIf {
+                            getKey<LibraryOpener>("$currentAccount/$LIBRARY_FOLDER", syncName.name)
+                        val savedSelection = getKey<LibraryOpener>(
+                            "$currentAccount/$LIBRARY_FOLDER",
+                            syncId
+                        ).takeIf {
                             it?.openType != LibraryOpenerType.Default
                         } ?: savedListSelection
 
@@ -351,11 +375,18 @@ class LibraryFragment : Fragment() {
                         }
 
                         (viewpager.adapter as? ViewpagerAdapter)?.pages = pages
+                        //fix focus on the viewpager itself
+                        (viewpager.getChildAt(0) as RecyclerView).apply {
+                            tag = "tv_no_focus_tag"
+                            //isFocusable = false
+                        }
+
                         // Using notifyItemRangeChanged keeps the animations when sorting
                         viewpager.adapter?.notifyItemRangeChanged(
                             0,
                             viewpager.adapter?.itemCount ?: 0
                         )
+                        binding?.viewpager?.setCurrentItem(libraryViewModel.currentPage, false)
 
                         // Only stop loading after 300ms to hide the fade effect the viewpager produces when updating
                         // Without this there would be a flashing effect:
@@ -392,6 +423,9 @@ class LibraryFragment : Fragment() {
                             viewpager,
                         ) { tab, position ->
                             tab.text = pages.getOrNull(position)?.title?.asStringNull(context)
+                            tab.view.tag = "tv_no_focus_tag"
+                            tab.view.nextFocusDownId = R.id.search_result_root
+
                             tab.view.setOnClickListener {
                                 val currentItem =
                                     binding?.viewpager?.currentItem ?: return@setOnClickListener
@@ -414,12 +448,45 @@ class LibraryFragment : Fragment() {
                 }
             }
         }
-    }
+        binding?.viewpager?.registerOnPageChangeCallback(object :
+            ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                val all = binding?.viewpager?.allViews?.toList()
+                    ?.filterIsInstance<AutofitRecyclerView>()
 
+                all?.forEach { view ->
+                    view.isVisible = view.tag == position
+                    view.isFocusable = view.tag == position
+
+                    if (view.tag == position)
+                        view.descendantFocusability = FOCUS_AFTER_DESCENDANTS
+                    else
+                        view.descendantFocusability = FOCUS_BLOCK_DESCENDANTS
+                }
+                super.onPageSelected(position)
+            }
+        })
+    }
     override fun onConfigurationChanged(newConfig: Configuration) {
         (binding?.viewpager?.adapter as? ViewpagerAdapter)?.rebind()
         super.onConfigurationChanged(newConfig)
     }
+
+    private val sortChangeClickListener = View.OnClickListener { view ->
+        val methods = libraryViewModel.sortingMethods.map {
+            txt(it.stringRes).asString(view.context)
+        }
+
+        activity?.showBottomDialog(methods,
+            libraryViewModel.sortingMethods.indexOf(libraryViewModel.currentSortingMethod),
+            txt(R.string.sort_by).asString(view.context),
+            false,
+            {},
+            {
+                val method = libraryViewModel.sortingMethods[it]
+                libraryViewModel.sort(method)
+            })
+    }
 }
 
 class MenuSearchView(context: Context) : SearchView(context) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt
index 14d31356..b44913d9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt
@@ -6,11 +6,14 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 
 enum class ListSorting(@StringRes val stringRes: Int) {
     Query(R.string.none),
@@ -28,6 +31,8 @@ class LibraryViewModel : ViewModel() {
     private val _pages: MutableLiveData<Resource<List<SyncAPI.Page>>> = MutableLiveData(null)
     val pages: LiveData<Resource<List<SyncAPI.Page>>> = _pages
 
+    var currentPage: Int = 0
+
     private val _currentApiName: MutableLiveData<String> = MutableLiveData("")
     val currentApiName: LiveData<String> = _currentApiName
 
@@ -35,12 +40,12 @@ class LibraryViewModel : ViewModel() {
         get() = SyncApis.filter { it.hasAccount() }
 
     var currentSyncApi = availableSyncApis.let { allApis ->
-        val lastSelection = getKey<String>(LAST_SYNC_API_KEY)
+        val lastSelection = getKey<String>("$currentAccount/$LAST_SYNC_API_KEY")
         availableSyncApis.firstOrNull { it.name == lastSelection } ?: allApis.firstOrNull()
     }
         private set(value) {
             field = value
-            setKey(LAST_SYNC_API_KEY, field?.name)
+            setKey("$currentAccount/$LAST_SYNC_API_KEY", field?.name)
         }
 
     val availableApiNames: List<String>
@@ -58,13 +63,21 @@ class LibraryViewModel : ViewModel() {
         reloadPages(true)
     }
 
-    fun sort(method: ListSorting, query: String? = null) {
-        val currentList = pages.value ?: return
+    fun sort(method: ListSorting, query: String? = null) = ioSafe {
+        val value = _pages.value ?: return@ioSafe
+        if (value is Resource.Success) {
+            sort(method, query, value.value)
+        }
+    }
+
+    private fun sort(method: ListSorting, query: String? = null, items: List<SyncAPI.Page>) {
         currentSortingMethod = method
-        (currentList as? Resource.Success)?.value?.forEachIndexed { _, page ->
+        DataStoreHelper.librarySortingMode = method.ordinal
+
+        items.forEach { page ->
             page.sort(method, query)
         }
-        _pages.postValue(currentList)
+        _pages.postValue(Resource.Success(items))
     }
 
     fun reloadPages(forceReload: Boolean) {
@@ -85,8 +98,6 @@ class LibraryViewModel : ViewModel() {
                 val library = (libraryResource as? Resource.Success)?.value ?: return@let
 
                 sortingMethods = library.supportedListSorting.toList()
-                currentSortingMethod = null
-
                 repo.requireLibraryRefresh = false
 
                 val pages = library.allLibraryLists.map {
@@ -96,8 +107,24 @@ class LibraryViewModel : ViewModel() {
                     )
                 }
 
-                _pages.postValue(Resource.Success(pages))
+                val desiredSortingMethod =
+                    ListSorting.values().getOrNull(DataStoreHelper.librarySortingMode)
+                if (desiredSortingMethod != null && library.supportedListSorting.contains(desiredSortingMethod)) {
+                    sort(desiredSortingMethod, null, pages)
+                } else {
+                    // null query = no sorting
+                    sort(ListSorting.Query, null, pages)
+                }
             }
         }
     }
+
+    init {
+        MainActivity.reloadHomeEvent += ::reloadPages
+    }
+
+    override fun onCleared() {
+        MainActivity.reloadHomeEvent -= ::reloadPages
+        super.onCleared()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt
index 95fefcbe..76028487 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt
@@ -25,7 +25,7 @@ class ViewpagerAdapter(
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         when (holder) {
             is PageViewHolder -> {
-                holder.bind(pages[position], unbound.remove(position))
+                holder.bind(pages[position], position, unbound.remove(position))
             }
         }
     }
@@ -43,7 +43,8 @@ class ViewpagerAdapter(
 
     inner class PageViewHolder(private val binding: LibraryViewpagerPageBinding) :
         RecyclerView.ViewHolder(binding.root) {
-        fun bind(page: SyncAPI.Page, rebind: Boolean) {
+        fun bind(page: SyncAPI.Page, position: Int, rebind: Boolean) {
+            binding.pageRecyclerview.tag = position
             binding.pageRecyclerview.apply {
                 spanCount =
                     this@PageViewHolder.itemView.context.getSpanCount() ?: 3
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
index 4316bbc6..17a90da9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
@@ -18,10 +18,9 @@ import android.widget.ProgressBar
 import android.widget.Toast
 import androidx.annotation.LayoutRes
 import androidx.annotation.StringRes
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import androidx.preference.PreferenceManager
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import androidx.media3.common.PlaybackException
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.session.MediaSession
@@ -30,12 +29,15 @@ import androidx.media3.ui.DefaultTimeBar
 import androidx.media3.ui.PlayerView
 import androidx.media3.ui.SubtitleView
 import androidx.media3.ui.TimeBar
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import androidx.preference.PreferenceManager
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
+import com.github.rubensousa.previewseekbar.PreviewBar
+import com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
 import com.lagradost.cloudstream3.CommonActivity.canEnterPipMode
 import com.lagradost.cloudstream3.CommonActivity.isInPIPMode
 import com.lagradost.cloudstream3.CommonActivity.keyEventListener
 import com.lagradost.cloudstream3.CommonActivity.playerEventListener
+import com.lagradost.cloudstream3.CommonActivity.screenWidth
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
@@ -45,6 +47,7 @@ import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.AppUtils.requestLocalAudioFocus
+import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
@@ -77,12 +80,12 @@ abstract class AbstractPlayerFragment(
     var isBuffering = true
     protected open var hasPipModeSupport = true
 
-    var playerPausePlayHolderHolder : FrameLayout? = null
-    var playerPausePlay : ImageView? = null
-    var playerBuffering : ProgressBar? = null
-    var playerView : PlayerView? = null
-    var piphide : FrameLayout? = null
-    var subtitleHolder : FrameLayout? = null
+    var playerPausePlayHolderHolder: FrameLayout? = null
+    var playerPausePlay: ImageView? = null
+    var playerBuffering: ProgressBar? = null
+    var playerView: PlayerView? = null
+    var piphide: FrameLayout? = null
+    var subtitleHolder: FrameLayout? = null
 
     @LayoutRes
     protected open var layout: Int = R.layout.fragment_player
@@ -95,11 +98,11 @@ abstract class AbstractPlayerFragment(
         throw NotImplementedError()
     }
 
-    open fun playerPositionChanged(position: Long, duration : Long) {
+    open fun playerPositionChanged(position: Long, duration: Long) {
         throw NotImplementedError()
     }
 
-    open fun playerDimensionsLoaded(width: Int, height : Int) {
+    open fun playerDimensionsLoaded(width: Int, height: Int) {
         throw NotImplementedError()
     }
 
@@ -135,8 +138,10 @@ abstract class AbstractPlayerFragment(
         }
     }
 
-    private fun updateIsPlaying(wasPlaying : CSPlayerLoading,
-                                isPlaying : CSPlayerLoading) {
+    private fun updateIsPlaying(
+        wasPlaying: CSPlayerLoading,
+        isPlaying: CSPlayerLoading
+    ) {
         val isPlayingRightNow = CSPlayerLoading.IsPlaying == isPlaying
         val isPausedRightNow = CSPlayerLoading.IsPaused == isPlaying
 
@@ -184,7 +189,11 @@ abstract class AbstractPlayerFragment(
         canEnterPipMode = isPlayingRightNow && hasPipModeSupport
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             activity?.let { act ->
-                PlayerPipHelper.updatePIPModeActions(act, isPlayingRightNow, player.getAspectRatio())
+                PlayerPipHelper.updatePIPModeActions(
+                    act,
+                    isPlayingRightNow,
+                    player.getAspectRatio()
+                )
             }
         }
     }
@@ -373,49 +382,61 @@ abstract class AbstractPlayerFragment(
     /** This receives the events from the player, if you want to append functionality you do it here,
      * do note that this only receives events for UI changes,
      * and returning early WONT stop it from changing in eg the player time or pause status */
-    open fun mainCallback(event : PlayerEvent) {
+    open fun mainCallback(event: PlayerEvent) {
         Log.i(TAG, "Handle event: $event")
-        when(event) {
+        when (event) {
             is ResizedEvent -> {
                 playerDimensionsLoaded(event.width, event.height)
             }
+
             is PlayerAttachedEvent -> {
                 playerUpdated(event.player)
             }
+
             is SubtitlesUpdatedEvent -> {
                 subtitlesChanged()
             }
+
             is TimestampSkippedEvent -> {
                 onTimestampSkipped(event.timestamp)
             }
+
             is TimestampInvokedEvent -> {
                 onTimestamp(event.timestamp)
             }
+
             is TracksChangedEvent -> {
                 onTracksInfoChanged()
             }
+
             is EmbeddedSubtitlesFetchedEvent -> {
                 embeddedSubtitlesFetched(event.tracks)
             }
+
             is ErrorEvent -> {
                 playerError(event.error)
             }
+
             is RequestAudioFocusEvent -> {
                 requestAudioFocus()
             }
+
             is EpisodeSeekEvent -> {
-                when(event.offset) {
+                when (event.offset) {
                     -1 -> prevEpisode()
                     1 -> nextEpisode()
                     else -> {}
                 }
             }
+
             is StatusEvent -> {
                 updateIsPlaying(wasPlaying = event.wasPlaying, isPlaying = event.isPlaying)
             }
+
             is PositionEvent -> {
                 playerPositionChanged(position = event.toMs, duration = event.durationMs)
             }
+
             is VideoEndedEvent -> {
                 context?.let { ctx ->
                     // Only play next episode if autoplay is on (default)
@@ -432,6 +453,7 @@ abstract class AbstractPlayerFragment(
                     }
                 }
             }
+
             is PauseEvent -> Unit
             is PlayEvent -> Unit
         }
@@ -439,7 +461,7 @@ abstract class AbstractPlayerFragment(
 
     @SuppressLint("SetTextI18n", "UnsafeOptInUsageError")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        resizeMode = getKey(RESIZE_MODE_KEY) ?: 0
+        resizeMode = DataStoreHelper.resizeMode
         resize(resizeMode, false)
 
         player.releaseCallbacks()
@@ -454,22 +476,73 @@ abstract class AbstractPlayerFragment(
         )
 
         if (player is CS3IPlayer) {
+            // preview bar
+            val progressBar: PreviewTimeBar? = playerView?.findViewById(R.id.exo_progress)
+            val previewImageView: ImageView? = playerView?.findViewById(R.id.previewImageView)
+            val previewFrameLayout: FrameLayout? = playerView?.findViewById(R.id.previewFrameLayout)
+            if (progressBar != null && previewImageView != null && previewFrameLayout != null) {
+                var resume = false
+                progressBar.addOnScrubListener(object : PreviewBar.OnScrubListener {
+                    override fun onScrubStart(previewBar: PreviewBar?) {
+                        val hasPreview = player.hasPreview()
+                        progressBar.isPreviewEnabled = hasPreview
+                        resume = player.getIsPlaying()
+                        if (resume) player.handleEvent(
+                            CSPlayerEvent.Pause,
+                            PlayerEventSource.Player
+                        )
+                    }
+
+                    override fun onScrubMove(
+                        previewBar: PreviewBar?,
+                        progress: Int,
+                        fromUser: Boolean
+                    ) {
+                    }
+
+                    override fun onScrubStop(previewBar: PreviewBar?) {
+                        if (resume) player.handleEvent(CSPlayerEvent.Play, PlayerEventSource.Player)
+                    }
+                })
+                progressBar.attachPreviewView(previewFrameLayout)
+                progressBar.setPreviewLoader { currentPosition, max ->
+                    val bitmap = player.getPreview(currentPosition.toFloat().div(max.toFloat()))
+                    previewImageView.isGone = bitmap == null
+                    previewImageView.setImageBitmap(bitmap)
+                }
+            }
+
             subView = playerView?.findViewById(R.id.exo_subtitles)
             subStyle = SubtitlesFragment.getCurrentSavedStyle()
             player.initSubtitles(subView, subtitleHolder, subStyle)
+            (player.imageGenerator as? PreviewGenerator)?.params = ImageParams.new16by9(screenWidth)
 
+            /*previewImageView?.doOnLayout {
+                (player.imageGenerator as? PreviewGenerator)?.params = ImageParams(
+                    it.measuredWidth,
+                    it.measuredHeight
+                )
+            }*/
             /** this might seam a bit fucky and that is because it is, the seek event is captured twice, once by the player
              * and once by the UI even if it should only be registered once by the UI */
-            playerView?.findViewById<DefaultTimeBar>(R.id.exo_progress)?.addListener(object : TimeBar.OnScrubListener {
-                override fun onScrubStart(timeBar: TimeBar, position: Long) = Unit
-                override fun onScrubMove(timeBar: TimeBar, position: Long) = Unit
-                override fun onScrubStop(timeBar: TimeBar, position: Long, canceled: Boolean) {
-                    if (canceled) return
-                    val playerDuration = player.getDuration() ?: return
-                    val playerPosition = player.getPosition() ?: return
-                    mainCallback(PositionEvent(source = PlayerEventSource.UI, durationMs = playerDuration, fromMs = playerPosition, toMs = position))
-                }
-            })
+            playerView?.findViewById<DefaultTimeBar>(R.id.exo_progress)
+                ?.addListener(object : TimeBar.OnScrubListener {
+                    override fun onScrubStart(timeBar: TimeBar, position: Long) = Unit
+                    override fun onScrubMove(timeBar: TimeBar, position: Long) = Unit
+                    override fun onScrubStop(timeBar: TimeBar, position: Long, canceled: Boolean) {
+                        if (canceled) return
+                        val playerDuration = player.getDuration() ?: return
+                        val playerPosition = player.getPosition() ?: return
+                        mainCallback(
+                            PositionEvent(
+                                source = PlayerEventSource.UI,
+                                durationMs = playerDuration,
+                                fromMs = playerPosition,
+                                toMs = position
+                            )
+                        )
+                    }
+                })
 
             SubtitlesFragment.applyStyleEvent += ::onSubStyleChanged
 
@@ -517,6 +590,7 @@ abstract class AbstractPlayerFragment(
         canEnterPipMode = false
         mMediaSession?.release()
         mMediaSession = null
+        playerView?.player = null
         SubtitlesFragment.applyStyleEvent -= ::onSubStyleChanged
 
         keepScreenOn(false)
@@ -534,7 +608,7 @@ abstract class AbstractPlayerFragment(
 
     @SuppressLint("UnsafeOptInUsageError")
     fun resize(resize: PlayerResize, showToast: Boolean) {
-        setKey(RESIZE_MODE_KEY, resize.ordinal)
+        DataStoreHelper.resizeMode = resize.ordinal
         val type = when (resize) {
             PlayerResize.Fill -> AspectRatioFrameLayout.RESIZE_MODE_FILL
             PlayerResize.Fit -> AspectRatioFrameLayout.RESIZE_MODE_FIT
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index fe4e3423..8d1eb7df 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.ui.player
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Handler
 import android.os.Looper
@@ -51,10 +52,12 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.mvvm.debugAssert
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.utils.AppUtils.isUsingMobileData
+import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.DrmExtractorLink
 import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -85,10 +88,20 @@ const val toleranceAfterUs = 300_000L
 class CS3IPlayer : IPlayer {
     private var isPlaying = false
     private var exoPlayer: ExoPlayer? = null
+        set(value) {
+            // If the old value is not null then the player has not been properly released.
+            debugAssert(
+                { field != null && value != null },
+                { "Previous player instance should be released!" })
+            field = value
+        }
+
     var cacheSize = 0L
     var simpleCacheSize = 0L
     var videoBufferMs = 0L
 
+    val imageGenerator = IPreviewGenerator.new()
+
     private val seekActionTime = 30000L
 
     private var ignoreSSL: Boolean = true
@@ -175,6 +188,14 @@ class CS3IPlayer : IPlayer {
         subtitleHelper.initSubtitles(subView, subHolder, style)
     }
 
+    override fun getPreview(fraction: Float): Bitmap? {
+        return imageGenerator.getPreviewImage(fraction)
+    }
+
+    override fun hasPreview(): Boolean {
+        return imageGenerator.hasPreview()
+    }
+
     override fun loadPlayer(
         context: Context,
         sameEpisode: Boolean,
@@ -183,7 +204,8 @@ class CS3IPlayer : IPlayer {
         startPosition: Long?,
         subtitles: Set<SubtitleData>,
         subtitle: SubtitleData?,
-        autoPlay: Boolean?
+        autoPlay: Boolean?,
+        preview: Boolean,
     ) {
         Log.i(TAG, "loadPlayer")
         if (sameEpisode) {
@@ -202,11 +224,30 @@ class CS3IPlayer : IPlayer {
 
         // release the current exoplayer and cache
         releasePlayer()
+
         if (link != null) {
+            // only video support atm
+            (imageGenerator as? PreviewGenerator)?.let { gen ->
+                if (preview) {
+                    gen.load(link, sameEpisode)
+                } else {
+                    gen.clear(sameEpisode)
+                }
+            }
             loadOnlinePlayer(context, link)
         } else if (data != null) {
+            (imageGenerator as? PreviewGenerator)?.let { gen ->
+                if (preview) {
+                    gen.load(context, data, sameEpisode)
+                } else {
+                    gen.clear(sameEpisode)
+                }
+            }
             loadOfflinePlayer(context, data)
+        } else {
+            throw IllegalArgumentException("Requires link or uri")
         }
+
     }
 
     override fun setActiveSubtitles(subtitles: Set<SubtitleData>) {
@@ -487,6 +528,7 @@ class CS3IPlayer : IPlayer {
     }
 
     override fun release() {
+        imageGenerator.release()
         releasePlayer()
     }
 
@@ -501,12 +543,15 @@ class CS3IPlayer : IPlayer {
          **/
         var preferredAudioTrackLanguage: String? = null
             get() {
-                return field ?: getKey(PREFERRED_AUDIO_LANGUAGE_KEY, field)?.also {
+                return field ?: getKey(
+                    "$currentAccount/$PREFERRED_AUDIO_LANGUAGE_KEY",
+                    field
+                )?.also {
                     field = it
                 }
             }
             set(value) {
-                setKey(PREFERRED_AUDIO_LANGUAGE_KEY, value)
+                setKey("$currentAccount/$PREFERRED_AUDIO_LANGUAGE_KEY", value)
                 field = value
             }
 
@@ -682,13 +727,13 @@ class CS3IPlayer : IPlayer {
                             metadataRendererOutput
                         ).map {
                             if (it is TextRenderer) {
-                                currentTextRenderer = CustomTextRenderer(
+                                val currentTextRenderer = CustomTextRenderer(
                                     subtitleOffset,
                                     textRendererOutput,
                                     eventHandler.looper,
                                     CustomSubtitleDecoderFactory()
-                                )
-                                currentTextRenderer!!
+                                ).also { this.currentTextRenderer = it }
+                                currentTextRenderer
                             } else it
                         }.toTypedArray()
                     }
@@ -864,8 +909,20 @@ class CS3IPlayer : IPlayer {
 
                     CSPlayerEvent.SeekForward -> seekTime(seekActionTime, source)
                     CSPlayerEvent.SeekBack -> seekTime(-seekActionTime, source)
-                    CSPlayerEvent.NextEpisode -> event(EpisodeSeekEvent(offset = 1, source = source))
-                    CSPlayerEvent.PrevEpisode -> event(EpisodeSeekEvent(offset = -1, source = source))
+                    CSPlayerEvent.NextEpisode -> event(
+                        EpisodeSeekEvent(
+                            offset = 1,
+                            source = source
+                        )
+                    )
+
+                    CSPlayerEvent.PrevEpisode -> event(
+                        EpisodeSeekEvent(
+                            offset = -1,
+                            source = source
+                        )
+                    )
+
                     CSPlayerEvent.SkipCurrentChapter -> {
                         //val dur = this@CS3IPlayer.getDuration() ?: return@apply
                         getCurrentTimestamp()?.let { lastTimeStamp ->
@@ -1323,7 +1380,7 @@ class CS3IPlayer : IPlayer {
     override fun reloadPlayer(context: Context) {
         Log.i(TAG, "reloadPlayer")
 
-        exoPlayer?.release()
+        releasePlayer(false)
         currentLink?.let {
             loadOnlinePlayer(context, it)
         } ?: currentDownloadedFile?.let {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
index d181e175..4c3376bb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
@@ -110,4 +110,9 @@ class DownloadedPlayerActivity : AppCompatActivity() {
             return
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        CommonActivity.setActivityInstance(this)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index e698191d..819e50ba 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -49,6 +49,7 @@ import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper
 import com.lagradost.cloudstream3.ui.result.setText
 import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.AppUtils.isUsingMobileData
+import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
@@ -356,7 +357,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
     private fun setPlayBackSpeed(speed: Float) {
         try {
-            setKey(PLAYBACK_SPEED_KEY, speed)
+            DataStoreHelper.playBackSpeed = speed
             playerBinding?.playerSpeedBtt?.text =
                 getString(R.string.player_speed_text_format).format(speed)
                     .replace(".0x", "x")
@@ -1194,7 +1195,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         // init variables
-        setPlayBackSpeed(getKey(PLAYBACK_SPEED_KEY) ?: 1.0f)
+        setPlayBackSpeed(DataStoreHelper.playBackSpeed)
         savedInstanceState?.getLong(SUBTITLE_DELAY_BUNDLE_KEY)?.let {
             subtitleDelay = it
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index b2542ffa..1c751897 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -180,6 +180,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 (if (sameEpisode) currentSelectedSubtitles else null) ?: getAutoSelectSubtitle(
                     currentSubs, settings = true, downloads = true
                 ),
+                preview = isFullScreenPlayer
             )
         }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
index ec006234..0e54e2cb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.ui.player
 
 import android.content.Context
+import android.graphics.Bitmap
 import android.util.Rational
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.utils.EpisodeSkip
@@ -198,17 +199,8 @@ data class CurrentTracks(
 class InvalidFileException(msg: String) : Exception(msg)
 
 //http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4
-const val STATE_RESUME_WINDOW = "resumeWindow"
-const val STATE_RESUME_POSITION = "resumePosition"
-const val STATE_PLAYER_FULLSCREEN = "playerFullscreen"
-const val STATE_PLAYER_PLAYING = "playerOnPlay"
 const val ACTION_MEDIA_CONTROL = "media_control"
 const val EXTRA_CONTROL_TYPE = "control_type"
-const val PLAYBACK_SPEED = "playback_speed"
-const val RESIZE_MODE_KEY = "resize_mode" // Last used resize mode
-const val PLAYBACK_SPEED_KEY = "playback_speed" // Last used playback speed
-const val PREFERRED_SUBS_KEY = "preferred_subtitles" // Last used resize mode
-//const val PLAYBACK_FASTFORWARD = "playback_fastforward" // Last used resize mode
 
 /** Abstract Exoplayer logic, can be expanded to other players */
 interface IPlayer {
@@ -246,11 +238,15 @@ interface IPlayer {
         startPosition: Long? = null,
         subtitles: Set<SubtitleData>,
         subtitle: SubtitleData?,
-        autoPlay: Boolean? = true
+        autoPlay: Boolean? = true,
+        preview : Boolean = true,
     )
 
     fun reloadPlayer(context: Context)
 
+    fun getPreview(fraction : Float) : Bitmap?
+    fun hasPreview() : Boolean
+
     fun setActiveSubtitles(subtitles: Set<SubtitleData>)
     fun setPreferredSubtitles(subtitle: SubtitleData?): Boolean // returns true if the player requires a reload, null for nothing
     fun getCurrentPreferredSubtitle(): SubtitleData?
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
index 42659f8d..3179cb9f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
@@ -7,6 +7,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.launchSafe
+import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
@@ -15,6 +16,7 @@ import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorUri
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 
 class PlayerGeneratorViewModel : ViewModel() {
     companion object {
@@ -38,6 +40,11 @@ class PlayerGeneratorViewModel : ViewModel() {
     private val _currentSubtitleYear = MutableLiveData<Int?>(null)
     val currentSubtitleYear: LiveData<Int?> = _currentSubtitleYear
 
+    /**
+     * Save the Episode ID to prevent starting multiple link loading Jobs when preloading links.
+     */
+    private var currentLoadingEpisodeId: Int? = null
+
     fun setSubtitleYear(year: Int?) {
         _currentSubtitleYear.postValue(year)
     }
@@ -72,18 +79,32 @@ class PlayerGeneratorViewModel : ViewModel() {
     }
 
     fun preLoadNextLinks() {
+        val id = getId()
+        // Do not preload if already loading
+        if (id == currentLoadingEpisodeId) return
+
         Log.i(TAG, "preLoadNextLinks")
         currentJob?.cancel()
-        currentJob = viewModelScope.launchSafe {
-            if (generator?.hasCache == true && generator?.hasNext() == true) {
-                safeApiCall {
-                    generator?.generateLinks(
-                        type = LoadType.InApp,
-                        clearCache = false,
-                        callback = {},
-                        subtitleCallback = {},
-                        offset = 1
-                    )
+        currentLoadingEpisodeId = id
+
+        currentJob = viewModelScope.launch {
+            try {
+                if (generator?.hasCache == true && generator?.hasNext() == true) {
+                    safeApiCall {
+                        generator?.generateLinks(
+                            type = LoadType.InApp,
+                            clearCache = false,
+                            callback = {},
+                            subtitleCallback = {},
+                            offset = 1
+                        )
+                    }
+                }
+            } catch (t: Throwable) {
+                logError(t)
+            } finally {
+                if (currentLoadingEpisodeId == id) {
+                    currentLoadingEpisodeId = null
                 }
             }
         }
@@ -162,14 +183,14 @@ class PlayerGeneratorViewModel : ViewModel() {
             // load more data
             _loadingLinks.postValue(Resource.Loading())
             val loadingState = safeApiCall {
-                generator?.generateLinks(type = type,clearCache = clearCache, callback =  {
+                generator?.generateLinks(type = type, clearCache = clearCache, callback = {
                     currentLinks.add(it)
                     // Clone to prevent ConcurrentModificationException
                     normalSafeApiCall {
                         // Extra normalSafeApiCall since .toSet() iterates.
                         _currentLinks.postValue(currentLinks.toSet())
                     }
-                }, subtitleCallback =  {
+                }, subtitleCallback = {
                     currentSubs.add(it)
                     normalSafeApiCall {
                         _currentSubs.postValue(currentSubs.toSet())
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PreviewGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PreviewGenerator.kt
new file mode 100644
index 00000000..6414374b
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PreviewGenerator.kt
@@ -0,0 +1,541 @@
+package com.lagradost.cloudstream3.ui.player
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.media.MediaMetadataRetriever
+import android.net.Uri
+import android.os.Build
+import android.util.Log
+import androidx.annotation.WorkerThread
+import androidx.core.graphics.scale
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.ExtractorUri
+import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.M3u8Helper2
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.withContext
+import kotlin.math.absoluteValue
+import kotlin.math.ceil
+import kotlin.math.log2
+
+const val MAX_LOD = 6
+const val MIN_LOD = 3
+
+data class ImageParams(
+    val width: Int,
+    val height: Int,
+) {
+    companion object {
+        val DEFAULT = ImageParams(200, 320)
+        fun new16by9(width: Int): ImageParams {
+            if (width < 100) {
+                return DEFAULT
+            }
+            return ImageParams(
+                width / 4,
+                (width * 9) / (4 * 16)
+            )
+        }
+    }
+
+    init {
+        assert(width > 0 && height > 0)
+    }
+}
+
+interface IPreviewGenerator {
+    fun hasPreview(): Boolean
+    fun getPreviewImage(fraction: Float): Bitmap?
+    fun release()
+
+    var params: ImageParams
+
+    var durationMs: Long
+    var loadedImages: Int
+
+    companion object {
+        fun new(): IPreviewGenerator {
+            /** because TV has low ram + not show we disable this for now */
+            return if (SettingsFragment.isTrueTvSettings()) {
+                empty()
+            } else {
+                PreviewGenerator()
+            }
+        }
+
+        fun empty(): IPreviewGenerator {
+            return NoPreviewGenerator()
+        }
+    }
+}
+
+private fun rescale(image: Bitmap, params: ImageParams): Bitmap {
+    if (image.width <= params.width && image.height <= params.height) return image
+    val new = image.scale(params.width, params.height)
+    // throw away the old image
+    if (new != image) {
+        image.recycle()
+    }
+    return new
+}
+
+/** rescale to not take up as much memory */
+private fun MediaMetadataRetriever.image(timeUs: Long, params: ImageParams): Bitmap? {
+    /*if (timeUs <= 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+        try {
+            val primary = this.primaryImage
+            if (primary != null) {
+                return rescale(primary, params)
+            }
+        } catch (t: Throwable) {
+            logError(t)
+        }
+    }*/
+
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+        this.getScaledFrameAtTime(
+            timeUs,
+            MediaMetadataRetriever.OPTION_CLOSEST_SYNC,
+            params.width,
+            params.height
+        )
+    } else {
+        return rescale(this.getFrameAtTime(timeUs) ?: return null, params)
+    }
+}
+
+/** PreviewGenerator that hides the implementation details of the sub generators that is used, used for source switch cache */
+class PreviewGenerator : IPreviewGenerator {
+
+    /** the most up to date generator, will always mirror the actual source in the player */
+    private var currentGenerator: IPreviewGenerator = NoPreviewGenerator()
+
+    /** the longest generated preview of the same episode */
+    private var lastGenerator: IPreviewGenerator = NoPreviewGenerator()
+
+    /** always NoPreviewGenerator, used as a cache for nothing */
+    private val dummy: IPreviewGenerator = NoPreviewGenerator()
+
+    /** if the current generator is the same as the last by checking time */
+    private fun isSameLength(): Boolean =
+        currentGenerator.durationMs.minus(lastGenerator.durationMs).absoluteValue < 10_000L
+
+    /** use the backup if the current generator is init or if they have the same length */
+    private val backupGenerator: IPreviewGenerator
+        get() {
+            if (currentGenerator.durationMs == 0L || isSameLength()) {
+                return lastGenerator
+            }
+            return dummy
+        }
+
+    override fun hasPreview(): Boolean {
+        return currentGenerator.hasPreview() || backupGenerator.hasPreview()
+    }
+
+    override fun getPreviewImage(fraction: Float): Bitmap? {
+        return try {
+            currentGenerator.getPreviewImage(fraction) ?: backupGenerator.getPreviewImage(fraction)
+        } catch (t: Throwable) {
+            logError(t)
+            null
+        }
+    }
+
+    override fun release() {
+        lastGenerator.release()
+        currentGenerator.release()
+        lastGenerator = NoPreviewGenerator()
+        currentGenerator = NoPreviewGenerator()
+    }
+
+    override var params: ImageParams = ImageParams.DEFAULT
+        set(value) {
+            field = value
+            lastGenerator.params = value
+            backupGenerator.params = value
+            currentGenerator.params = value
+        }
+
+    override var durationMs: Long
+        get() = currentGenerator.durationMs
+        set(_) {}
+    override var loadedImages: Int
+        get() = currentGenerator.loadedImages
+        set(_) {}
+
+    fun clear(keepCache: Boolean) {
+        if (keepCache) {
+            if (!isSameLength() || currentGenerator.loadedImages >= lastGenerator.loadedImages || lastGenerator.durationMs == 0L) {
+                // the current generator is better than the last generator, therefore keep the current
+                // or the lengths are not the same, therefore favoring the more recent selection
+
+                // if they are the same we favor the current generator
+                lastGenerator.release()
+                lastGenerator = currentGenerator
+            } else {
+                // otherwise just keep the last generator and throw away the current generator
+                currentGenerator.release()
+            }
+        } else {
+            // we switched the episode, therefore keep nothing
+            lastGenerator.release()
+            lastGenerator = NoPreviewGenerator()
+            currentGenerator.release()
+            // we assume that we set currentGenerator right after this, so currentGenerator != NoPreviewGenerator
+        }
+    }
+
+    fun load(link: ExtractorLink, keepCache: Boolean) {
+        clear(keepCache)
+
+        when (link.type) {
+            ExtractorLinkType.M3U8 -> {
+                currentGenerator = M3u8PreviewGenerator(params).apply {
+                    load(url = link.url, headers = link.getAllHeaders())
+                }
+            }
+
+            ExtractorLinkType.VIDEO -> {
+                currentGenerator = Mp4PreviewGenerator(params).apply {
+                    load(url = link.url, headers = link.getAllHeaders())
+                }
+            }
+
+            else -> {
+                Log.i("PreviewImg", "unsupported format for $link")
+            }
+        }
+    }
+
+    fun load(context: Context, link: ExtractorUri, keepCache: Boolean) {
+        clear(keepCache)
+        currentGenerator = Mp4PreviewGenerator(params).apply {
+            load(keepCache = keepCache, context = context, uri = link.uri)
+        }
+    }
+}
+
+@Suppress("UNUSED_PARAMETER")
+private class NoPreviewGenerator : IPreviewGenerator {
+    override fun hasPreview(): Boolean = false
+    override fun getPreviewImage(fraction: Float): Bitmap? = null
+    override fun release() = Unit
+    override var params: ImageParams
+        get() = ImageParams(0, 0)
+        set(value) {}
+    override var durationMs: Long = 0L
+    override var loadedImages: Int = 0
+}
+
+private class M3u8PreviewGenerator(override var params: ImageParams) : IPreviewGenerator {
+    // generated images 1:1 to idx of hsl
+    private var images: Array<Bitmap?> = arrayOf()
+
+    private val TAG = "PreviewImgM3u8"
+
+    // prefixSum[i] = sum(hsl.ts[0..i].time)
+    // where [0] = 0, [1] = hsl.ts[0].time aka time at start of segment, do [b] - [a] for range a,b
+    private var prefixSum: Array<Double> = arrayOf()
+
+    // how many images has been generated
+    override var loadedImages: Int = 0
+
+    // how many images we can generate in total, == hsl.size ?: 0
+    private var totalImages: Int = 0
+
+    override fun hasPreview(): Boolean {
+        return totalImages > 0 && loadedImages >= minOf(totalImages, 4)
+    }
+
+    override fun getPreviewImage(fraction: Float): Bitmap? {
+        var bestIdx = -1
+        var bestDiff = Double.MAX_VALUE
+        synchronized(images) {
+            // just find the best one in a for loop, we don't care about bin searching rn
+            for (i in 0..images.size) {
+                val diff = prefixSum[i].minus(fraction).absoluteValue
+                if (diff > bestDiff) {
+                    break
+                }
+                if (images[i] != null) {
+                    bestIdx = i
+                    bestDiff = diff
+                }
+            }
+            return images.getOrNull(bestIdx)
+        }
+        /*
+        val targetIndex = prefixSum.binarySearch(target)
+        var ret = images[targetIndex]
+        if (ret != null) {
+            return ret
+        }
+        for (i in 0..images.size) {
+            ret = images.getOrNull(i+targetIndex) ?:
+        }*/
+    }
+
+    private fun clear() {
+        synchronized(images) {
+            currentJob?.cancel()
+            // for (i in images.indices) {
+            //     images[i]?.recycle()
+            // }
+            images = arrayOf()
+            prefixSum = arrayOf()
+            loadedImages = 0
+            totalImages = 0
+        }
+    }
+
+    override fun release() {
+        clear()
+        images = arrayOf()
+    }
+
+    override var durationMs: Long = 0L
+
+    private var currentJob: Job? = null
+    fun load(url: String, headers: Map<String, String>) {
+        clear()
+        currentJob?.cancel()
+        currentJob = ioSafe {
+            withContext(Dispatchers.IO) {
+                Log.i(TAG, "Loading with url = $url headers = $headers")
+                //tmpFile =
+                //    File.createTempFile("video", ".ts", context.cacheDir).apply {
+                //        deleteOnExit()
+                //    }
+                val retriever = MediaMetadataRetriever()
+                val hsl = M3u8Helper2.hslLazy(
+                    listOf(
+                        M3u8Helper.M3u8Stream(
+                            streamUrl = url,
+                            headers = headers
+                        )
+                    ),
+                    selectBest = false
+                )
+
+                // no support for encryption atm
+                if (hsl.isEncrypted) {
+                    Log.i(TAG, "m3u8 is encrypted")
+                    totalImages = 0
+                    return@withContext
+                }
+
+                // total duration of the entire m3u8 in seconds
+                val duration = hsl.allTsLinks.sumOf { it.time ?: 0.0 }
+                durationMs = (duration * 1000.0).toLong()
+                val durationInv = 1.0 / duration
+
+                // if the total duration is less then 10s then something is very wrong or
+                // too short playback to matter
+                if (duration <= 10.0) {
+                    totalImages = 0
+                    return@withContext
+                }
+
+                totalImages = hsl.allTsLinks.size
+
+                // we cant init directly as it is no guarantee of in order
+                prefixSum = Array(hsl.allTsLinks.size + 1) { 0.0 }
+                var runningSum = 0.0
+                for (i in hsl.allTsLinks.indices) {
+                    runningSum += (hsl.allTsLinks[i].time ?: 0.0)
+                    prefixSum[i + 1] = runningSum * durationInv
+                }
+                synchronized(images) {
+                    images = Array(hsl.size) { null }
+                    loadedImages = 0
+                }
+
+                val maxLod = ceil(log2(duration)).toInt().coerceIn(MIN_LOD, MAX_LOD)
+                val count = hsl.allTsLinks.size
+                for (l in 1..maxLod) {
+                    val items = (1 shl (l - 1))
+                    for (i in 0 until items) {
+                        val index = (count.div(1 shl l) + (i * count) / items).coerceIn(0, hsl.size)
+                        if (synchronized(images) { images[index] } != null) {
+                            continue
+                        }
+                        Log.i(TAG, "Generating preview for $index")
+
+                        val ts = hsl.allTsLinks[index]
+                        try {
+                            retriever.setDataSource(ts.url, hsl.headers)
+                            if (!isActive) {
+                                return@withContext
+                            }
+                            val img = retriever.image(0, params)
+                            if (!isActive) {
+                                return@withContext
+                            }
+                            if (img == null || img.width <= 1 || img.height <= 1) continue
+                            synchronized(images) {
+                                images[index] = img
+                                loadedImages += 1
+                            }
+                        } catch (t: Throwable) {
+                            logError(t)
+                            continue
+                        }
+
+                        /*
+                        val buffer = hsl.resolveLinkSafe(index) ?: continue
+                        tmpFile?.writeBytes(buffer)
+                        val buff = FileOutputStream(tmpFile)
+                        retriever.setDataSource(buff.fd)
+                        val frame = retriever.getFrameAtTime(0L)*/
+                    }
+                }
+
+            }
+        }
+    }
+}
+
+private class Mp4PreviewGenerator(override var params: ImageParams) : IPreviewGenerator {
+    // lod = level of detail where the number indicates how many ones there is
+    // 2^(lod-1) = images
+    private var loadedLod = 0
+    override var loadedImages = 0
+    private var images = Array<Bitmap?>((1 shl MAX_LOD) - 1) {
+        null
+    }
+
+    override fun hasPreview(): Boolean {
+        synchronized(images) {
+            return loadedLod >= MIN_LOD
+        }
+    }
+
+    val TAG = "PreviewImgMp4"
+
+    override fun getPreviewImage(fraction: Float): Bitmap? {
+        synchronized(images) {
+            if (loadedLod < MIN_LOD) {
+                Log.i(TAG, "Requesting preview for $fraction but $loadedLod < $MIN_LOD")
+                return null
+            }
+            Log.i(TAG, "Requesting preview for $fraction")
+
+            var bestIdx = 0
+            var bestDiff = 0.5f.minus(fraction).absoluteValue
+
+            // this should be done mathematically, but for now we just loop all images
+            for (l in 1..loadedLod + 1) {
+                val items = (1 shl (l - 1))
+                for (i in 0 until items) {
+                    val idx = items - 1 + i
+                    if (idx > loadedImages) {
+                        break
+                    }
+                    if (images[idx] == null) {
+                        continue
+                    }
+                    val currentFraction =
+                        (1.0f.div((1 shl l).toFloat()) + i * 1.0f.div(items.toFloat()))
+                    val diff = currentFraction.minus(fraction).absoluteValue
+                    if (diff < bestDiff) {
+                        bestDiff = diff
+                        bestIdx = idx
+                    }
+                }
+            }
+            Log.i(TAG, "Best diff found at ${bestDiff * 100}% diff (${bestIdx})")
+            return images[bestIdx]
+        }
+    }
+
+    // also check out https://github.com/wseemann/FFmpegMediaMetadataRetriever
+    private val retriever: MediaMetadataRetriever = MediaMetadataRetriever()
+
+    private fun clear(keepCache: Boolean) {
+        if (keepCache) return
+        synchronized(images) {
+            loadedLod = 0
+            loadedImages = 0
+            // for (i in images.indices) {
+            //    images[i]?.recycle()
+            //     images[i] = null
+            //}
+            images.fill(null)
+        }
+    }
+
+    private var currentJob: Job? = null
+    fun load(url: String, headers: Map<String, String>) {
+        currentJob?.cancel()
+        currentJob = ioSafe {
+            Log.i(TAG, "Loading with url = $url headers = $headers")
+            clear(true)
+            retriever.setDataSource(url, headers)
+            start(this)
+        }
+    }
+
+    fun load(keepCache: Boolean, context: Context, uri: Uri) {
+        currentJob?.cancel()
+        currentJob = ioSafe {
+            Log.i(TAG, "Loading with uri = $uri")
+            clear(keepCache)
+            retriever.setDataSource(context, uri)
+            start(this)
+        }
+    }
+
+    override fun release() {
+        currentJob?.cancel()
+        clear(false)
+    }
+
+    override var durationMs: Long = 0L
+
+    @Throws
+    @WorkerThread
+    private fun start(scope: CoroutineScope) {
+        Log.i(TAG, "Started loading preview")
+
+        val durationMs =
+            retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong()
+                ?: throw IllegalArgumentException("Bad video duration")
+        this.durationMs = durationMs
+        val durationUs = (durationMs * 1000L).toFloat()
+        //val width = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt() ?: throw IllegalArgumentException("Bad video width")
+        //val height = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt() ?: throw IllegalArgumentException("Bad video height")
+
+        // log2 # 10s durations in the video ~= how many segments we have
+        val maxLod = ceil(log2((durationMs / 10_000).toFloat())).toInt().coerceIn(MIN_LOD, MAX_LOD)
+
+        for (l in 1..maxLod) {
+            val items = (1 shl (l - 1))
+            for (i in 0 until items) {
+                val idx = items - 1 + i // as sum(prev) = cur-1
+                // frame = 100 / 2^lod + i * 100 / 2^(lod-1) = duration % where lod is one indexed
+                val fraction = (1.0f.div((1 shl l).toFloat()) + i * 1.0f.div(items.toFloat()))
+                Log.i(TAG, "Generating preview for ${fraction * 100}%")
+                val frame = durationUs * fraction
+                val img = retriever.image(frame.toLong(), params);
+                if (!scope.isActive) return
+                if (img == null || img.width <= 1 || img.height <= 1) continue
+                synchronized(images) {
+                    images[idx] = img
+                    loadedImages = maxOf(loadedImages, idx)
+                }
+            }
+
+            synchronized(images) {
+                loadedLod = maxOf(loadedLod, l)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
index 89a09ae2..53c7c2fa 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
@@ -33,6 +33,7 @@ import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchHelper
 import com.lagradost.cloudstream3.ui.search.SearchViewModel
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.ownShow
 import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
@@ -269,6 +270,10 @@ class QuickSearchFragment : Fragment() {
             activity?.popCurrentPage()
         }
 
+        if (isTrueTvSettings()) {
+            binding?.quickSearch?.requestFocus()
+        }
+
         arguments?.getString(AUTOSEARCH_KEY)?.let {
             binding?.quickSearch?.setQuery(it, true)
             arguments?.remove(AUTOSEARCH_KEY)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt
index 531cb5d2..7b743388 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt
@@ -3,6 +3,8 @@ package com.lagradost.cloudstream3.ui.result
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.IdRes
+import androidx.annotation.LayoutRes
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
@@ -12,7 +14,10 @@ import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.CastItemBinding
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
 
-class ActorAdaptor(private val focusCallback : (View?) -> Unit = {}) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class ActorAdaptor(
+    private var nextFocusUpId: Int? = null,
+    private val focusCallback: (View?) -> Unit = {}
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     data class ActorMetaData(
         var isInverted: Boolean,
         val actor: ActorData,
@@ -22,7 +27,8 @@ class ActorAdaptor(private val focusCallback : (View?) -> Unit = {}) : RecyclerV
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return CardViewHolder(
-            CastItemBinding.inflate(LayoutInflater.from(parent.context), parent, false), focusCallback
+            CastItemBinding.inflate(LayoutInflater.from(parent.context), parent, false),
+            focusCallback
         )
     }
 
@@ -64,10 +70,10 @@ class ActorAdaptor(private val focusCallback : (View?) -> Unit = {}) : RecyclerV
         }
     }
 
-    private class CardViewHolder
+    private inner class CardViewHolder
     constructor(
         val binding: CastItemBinding,
-        private val focusCallback : (View?) -> Unit = {}
+        private val focusCallback: (View?) -> Unit = {}
     ) :
         RecyclerView.ViewHolder(binding.root) {
 
@@ -78,8 +84,18 @@ class ActorAdaptor(private val focusCallback : (View?) -> Unit = {}) : RecyclerV
                 Pair(actor.voiceActor?.image, actor.actor.image)
             }
 
+            // Fix tv focus escaping the recyclerview
+            if (position == 0) {
+                itemView.nextFocusLeftId = R.id.result_cast_items
+            } else if ((position - 1) == itemCount) {
+                itemView.nextFocusRightId = R.id.result_cast_items
+            }
+            nextFocusUpId?.let {
+                itemView.nextFocusUpId = it
+            }
+
             itemView.setOnFocusChangeListener { v, hasFocus ->
-                if(hasFocus) {
+                if (hasFocus) {
                     focusCallback(v)
                 }
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index ef2ed0df..e5f16dd5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -151,7 +151,8 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                         startPosition = 0L,
                         subtitles = emptySet(),
                         subtitle = null,
-                        autoPlay = false
+                        autoPlay = false,
+                        preview = false
                     )
                     true
                 } ?: run {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
index be3de52b..5e4869cc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
@@ -114,10 +114,20 @@ class ResultFragmentTv : Fragment() {
         }
     }
 
-    private fun hasNoFocus(): Boolean {
-        val focus = activity?.currentFocus
-        if (focus == null || !focus.isVisible) return true
-        return focus == binding?.resultRoot
+//    private fun hasNoFocus(): Boolean {
+//        val focus = activity?.currentFocus
+//        if (focus == null || !focus.isVisible) return true
+//        return focus == binding?.resultRoot
+//    }
+
+    /**
+     * Force focus any play button.
+     * Note that this will steal any focus if the episode loading is too slow (unlikely).
+     */
+    private fun focusPlayButton() {
+        binding?.resultPlayMovie?.requestFocus()
+        binding?.resultPlaySeries?.requestFocus()
+        binding?.resultResumeSeries?.requestFocus()
     }
 
     private fun setRecommendations(rec: List<SearchResponse>?, validApiName: String?) {
@@ -177,7 +187,7 @@ class ResultFragmentTv : Fragment() {
             isVisible = true
         }
 
-        this.animate().alpha(if (turnVisible) 1.0f else 0.0f).apply {
+        this.animate().alpha(if (turnVisible) 0.97f else 0.0f).apply {
             duration = 200
             interpolator = DecelerateInterpolator()
             setListener(object : Animator.AnimatorListener {
@@ -206,11 +216,9 @@ class ResultFragmentTv : Fragment() {
             episodesShadow.fade(show)
             episodeHolderTv.fade(show)
             if (episodesShadow.isRtl()) {
-                episodesShadow.scaleX = -1.0f
-                episodesShadow.scaleY = -1.0f
+                episodesShadowBackground.scaleX = -1f
             } else {
-                episodesShadow.scaleX = 1.0f
-                episodesShadow.scaleY = 1.0f
+                episodesShadowBackground.scaleX = 1f
             }
         }
     }
@@ -294,9 +302,9 @@ class ResultFragmentTv : Fragment() {
                 toggleEpisodes(true)
                 binding?.apply {
                     val views = listOf(
+                        resultDubSelection,
                         resultSeasonSelection,
                         resultRangeSelection,
-                        resultDubSelection,
                         resultEpisodes,
                         resultPlayTrailer,
                     )
@@ -413,7 +421,13 @@ class ResultFragmentTv : Fragment() {
                 setHorizontal()
             }
 
-            resultCastItems.adapter = ActorAdaptor {
+            val aboveCast = listOf(
+                binding?.resultEpisodesShow,
+                binding?.resultBookmarkButton,
+            ).firstOrNull {
+                it?.isVisible == true
+            }
+            resultCastItems.adapter = ActorAdaptor(aboveCast?.id) {
                 toggleEpisodes(false)
             }
         }
@@ -454,9 +468,7 @@ class ResultFragmentTv : Fragment() {
                 resultPlaySeries.isVisible = false
                 resultResumeSeries.isVisible = true
 
-                if (hasNoFocus()) {
-                    resultResumeSeries.requestFocus()
-                }
+                focusPlayButton()
 
                 resultResumeSeries.text =
                     if (resume.isMovie) context?.getString(R.string.play_movie_button) else context?.getNameFull(
@@ -539,9 +551,7 @@ class ResultFragmentTv : Fragment() {
                         )
                         return@setOnLongClickListener true
                     }
-                    if (hasNoFocus()) {
-                        resultPlayMovie.requestFocus()
-                    }
+                    focusPlayButton()
                 }
             }
         }
@@ -636,6 +646,9 @@ class ResultFragmentTv : Fragment() {
                     .show()
             }
         }
+
+        // Used to request focus the first time the episodes are loaded.
+        var hasLoadedEpisodesOnce = false
         observeNullable(viewModel.episodes) { episodes ->
             binding?.apply {
                 resultEpisodes.isVisible = episodes is Resource.Success
@@ -663,6 +676,10 @@ class ResultFragmentTv : Fragment() {
                             )
                             return@setOnLongClickListener true
                         }
+                        if (!hasLoadedEpisodesOnce) {
+                            hasLoadedEpisodesOnce = true
+                            focusPlayButton()
+                        }
                     }
 
                     /*
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index b398b54e..6acf476a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -518,7 +518,8 @@ class ResultViewModel2 : ViewModel() {
                         val episodeNumber = episodes[currentIndex].episode
                         if (episodeNumber < currentMin) {
                             currentMin = episodeNumber
-                        } else if (episodeNumber > currentMax) {
+                        }
+                        if (episodeNumber > currentMax) {
                             currentMax = episodeNumber
                         }
                         ++currentIndex
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index bdf82377..ce92d723 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -11,6 +11,7 @@ import android.widget.AbsListView
 import android.widget.ArrayAdapter
 import android.widget.ImageView
 import android.widget.ListView
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
@@ -22,17 +23,22 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
-import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.APIHolder.filterSearchResultByFilmQuality
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
 import com.lagradost.cloudstream3.APIHolder.getApiSettings
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.AllLanguagesName
+import com.lagradost.cloudstream3.AnimeSearchResponse
+import com.lagradost.cloudstream3.HomePageList
+import com.lagradost.cloudstream3.MainAPI
+import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.databinding.FragmentSearchBinding
 import com.lagradost.cloudstream3.databinding.HomeSelectMainpageBinding
 import com.lagradost.cloudstream3.mvvm.Resource
@@ -53,8 +59,8 @@ import com.lagradost.cloudstream3.utils.AppUtils.ownHide
 import com.lagradost.cloudstream3.utils.AppUtils.ownShow
 import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.Coroutines.main
-import com.lagradost.cloudstream3.utils.DataStore.getKey
-import com.lagradost.cloudstream3.utils.DataStore.setKey
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
@@ -62,9 +68,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import java.util.concurrent.locks.ReentrantLock
 
-const val SEARCH_PREF_TAGS = "search_pref_tags"
-const val SEARCH_PREF_PROVIDERS = "search_pref_providers"
-
 class SearchFragment : Fragment() {
     companion object {
         fun List<SearchResponse>.filterSearchResponse(): List<SearchResponse> {
@@ -193,7 +196,7 @@ class SearchFragment : Fragment() {
                 validAPIs.flatMap { api -> api.supportedTypes }.distinct()
             ) { list ->
                 if (selectedSearchTypes.toSet() != list.toSet()) {
-                    setKey(SEARCH_PREF_TAGS, selectedSearchTypes)
+                    DataStoreHelper.searchPreferenceTags = list
                     selectedSearchTypes.clear()
                     selectedSearchTypes.addAll(list)
                     search(binding?.mainSearch?.query?.toString())
@@ -219,7 +222,7 @@ class SearchFragment : Fragment() {
                     SearchHelper.handleSearchClickCallback(callback)
                 }
 
-
+            searchRoot.findViewById<TextView>(R.id.search_src_text)?.tag = "tv_no_focus_tag"
             searchAutofitResults.adapter = adapter
             searchLoadingBar.alpha = 0f
         }
@@ -232,13 +235,7 @@ class SearchFragment : Fragment() {
         //searchMagIcon.scaleX = 0.65f
         //searchMagIcon.scaleY = 0.65f
 
-        context?.let { ctx ->
-            val validAPIs = ctx.filterProviderByPreferredMedia()
-            selectedApis = ctx.getKey(
-                SEARCH_PREF_PROVIDERS,
-                defVal = validAPIs.map { it.name }
-            )!!.toMutableSet()
-        }
+        selectedApis = DataStoreHelper.searchPreferenceProviders.toMutableSet()
 
         binding?.searchFilter?.setOnClickListener { searchView ->
             searchView?.context?.let { ctx ->
@@ -286,7 +283,7 @@ class SearchFragment : Fragment() {
                     }
 
                     fun updateList(types: List<TvType>) {
-                        setKey(SEARCH_PREF_TAGS, types.map { it.name })
+                        DataStoreHelper.searchPreferenceTags = types
 
                         arrayAdapter.clear()
                         currentValidApis = validAPIs.filter { api ->
@@ -311,12 +308,7 @@ class SearchFragment : Fragment() {
                         arrayAdapter.notifyDataSetChanged()
                     }
 
-                    val selectedSearchTypes = getKey<List<String>>(SEARCH_PREF_TAGS)
-                        ?.mapNotNull { listName ->
-                            TvType.values().firstOrNull { it.name == listName }
-                        }
-                        ?.toMutableList()
-                        ?: mutableListOf(TvType.Movie, TvType.TvSeries)
+                    val selectedSearchTypes = DataStoreHelper.searchPreferenceTags
 
                     bindChips(
                         binding.tvtypesChipsScroll.tvtypesChips,
@@ -342,7 +334,7 @@ class SearchFragment : Fragment() {
                     }
 
                     dialog.setOnDismissListener {
-                        context?.setKey(SEARCH_PREF_PROVIDERS, currentSelectedApis.toList())
+                        DataStoreHelper.searchPreferenceProviders = currentSelectedApis.toList()
                         selectedApis = currentSelectedApis
                     }
                     updateList(selectedSearchTypes.toList())
@@ -353,10 +345,7 @@ class SearchFragment : Fragment() {
         val settingsManager = context?.let { PreferenceManager.getDefaultSharedPreferences(it) }
         val isAdvancedSearch = settingsManager?.getBoolean("advanced_search", true) ?: true
 
-        selectedSearchTypes = context?.getKey<List<String>>(SEARCH_PREF_TAGS)
-            ?.mapNotNull { listName -> TvType.values().firstOrNull { it.name == listName } }
-            ?.toMutableList()
-            ?: mutableListOf(TvType.Movie, TvType.TvSeries)
+        selectedSearchTypes = DataStoreHelper.searchPreferenceTags.toMutableList()
 
         if (isTrueTvSettings()) {
             binding?.searchFilter?.isFocusable = true
@@ -398,7 +387,7 @@ class SearchFragment : Fragment() {
                     DialogInterface.OnClickListener { _, which ->
                         when (which) {
                             DialogInterface.BUTTON_POSITIVE -> {
-                                removeKeys(SEARCH_HISTORY_KEY)
+                                removeKeys("$currentAccount/$SEARCH_HISTORY_KEY")
                                 searchViewModel.updateHistory()
                             }
                             DialogInterface.BUTTON_NEGATIVE -> {
@@ -510,7 +499,7 @@ class SearchFragment : Fragment() {
                     binding?.mainSearch?.setQuery(searchItem.searchText, true)
                 }
                 SEARCH_HISTORY_REMOVE -> {
-                    removeKey(SEARCH_HISTORY_KEY, searchItem.key)
+                    removeKey("$currentAccount/$SEARCH_HISTORY_KEY", searchItem.key)
                     searchViewModel.updateHistory()
                 }
                 else -> {
@@ -559,4 +548,4 @@ class SearchFragment : Fragment() {
             .commit()*/
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
index 320687f8..839b9d3f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
@@ -14,6 +14,7 @@ import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -64,7 +65,7 @@ class SearchViewModel : ViewModel() {
 
     fun updateHistory() = viewModelScope.launch {
         ioSafe {
-            val items = getKeys(SEARCH_HISTORY_KEY)?.mapNotNull {
+            val items = getKeys("$currentAccount/$SEARCH_HISTORY_KEY")?.mapNotNull {
                 getKey<SearchHistoryItem>(it)
             }?.sortedByDescending { it.searchedAt } ?: emptyList()
             _currentHistory.postValue(items)
@@ -87,7 +88,7 @@ class SearchViewModel : ViewModel() {
             if (!isQuickSearch) {
                 val key = query.hashCode().toString()
                 setKey(
-                    SEARCH_HISTORY_KEY,
+                    "$currentAccount/$SEARCH_HISTORY_KEY",
                     key,
                     SearchHistoryItem(
                         searchedAt = System.currentTimeMillis(),
@@ -140,4 +141,4 @@ class SearchViewModel : ViewModel() {
                 _searchResponse.postValue(Resource.Success(list))
             }
         }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
index e53fa91a..4895b0d2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
@@ -205,6 +205,11 @@ class SettingsFragment : Fragment() {
                     }
                 }
             }
+
+            // Default focus on TV
+            if (isTrueTv) {
+                settingsGeneral.requestFocus()
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index ae5f0aab..17efd276 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -80,6 +80,7 @@ val appLanguages = arrayListOf(
     Triple("", "日本語 (にほんご)", "ja"),
     Triple("", "ಕನ್ನಡ", "kn"),
     Triple("", "한국어", "ko"),
+    Triple("", "lietuvių kalba", "lt"),
     Triple("", "latviešu valoda", "lv"),
     Triple("", "македонски", "mk"),
     Triple("", "മലയാളം", "ml"),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
index 0bef5e9a..7e57fc5b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
@@ -14,7 +14,7 @@ import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
-import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
+import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
@@ -96,7 +96,7 @@ class SettingsProviders : PreferenceFragmentCompat() {
                     this.getString(R.string.prefer_media_type_key),
                     selectedList.map { it.toString() }.toMutableSet()
                 ).apply()
-                removeKey(USER_SELECTED_HOMEPAGE_API)
+                DataStoreHelper.currentHomePage = null
                 //(context ?: AcraApplication.context)?.let { ctx -> app.initClient(ctx) }
             }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
index 62e46c08..2f796801 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
@@ -19,14 +19,16 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.databinding.LogcatBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.network.initClient
+import com.lagradost.cloudstream3.services.BackupWorkManager
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
-import com.lagradost.cloudstream3.utils.BackupUtils.backup
+import com.lagradost.cloudstream3.utils.BackupUtils
 import com.lagradost.cloudstream3.utils.BackupUtils.restorePrompt
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
@@ -48,7 +50,30 @@ class SettingsUpdates : PreferenceFragmentCompat() {
         //val settingsManager = PreferenceManager.getDefaultSharedPreferences(requireContext())
 
         getPref(R.string.backup_key)?.setOnPreferenceClickListener {
-            activity?.backup()
+            BackupUtils.backup(activity)
+            return@setOnPreferenceClickListener true
+        }
+
+        getPref(R.string.automatic_backup_key)?.setOnPreferenceClickListener {
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(requireContext())
+
+            val prefNames = resources.getStringArray(R.array.periodic_work_names)
+            val prefValues = resources.getIntArray(R.array.periodic_work_values)
+            val current = settingsManager.getInt(getString(R.string.automatic_backup_key), 0)
+
+            activity?.showDialog(
+                prefNames.toList(),
+                prefValues.indexOf(current),
+                getString(R.string.backup_frequency),
+                true,
+                {}) { index ->
+                settingsManager.edit()
+                    .putInt(getString(R.string.automatic_backup_key), prefValues[index]).apply()
+                BackupWorkManager.enqueuePeriodicWork(
+                    context ?: AcraApplication.context,
+                    prefValues[index].toLong()
+                )
+            }
             return@setOnPreferenceClickListener true
         }
 
@@ -65,7 +90,7 @@ class SettingsUpdates : PreferenceFragmentCompat() {
             val builder =
                 AlertDialog.Builder(pref.context, R.style.AlertDialogCustom)
 
-            val binding = LogcatBinding.inflate(layoutInflater,null,false )
+            val binding = LogcatBinding.inflate(layoutInflater, null, false)
             builder.setView(binding.root)
 
             val dialog = builder.create()
@@ -176,7 +201,8 @@ class SettingsUpdates : PreferenceFragmentCompat() {
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(it.context)
 
             val prefNames = resources.getStringArray(R.array.auto_download_plugin)
-            val prefValues = enumValues<AutoDownloadMode>().sortedBy { x -> x.value }.map { x -> x.value }
+            val prefValues =
+                enumValues<AutoDownloadMode>().sortedBy { x -> x.value }.map { x -> x.value }
 
             val current = settingsManager.getInt(getString(R.string.auto_download_plugins_key), 0)
 
@@ -186,7 +212,8 @@ class SettingsUpdates : PreferenceFragmentCompat() {
                 getString(R.string.automatic_plugin_download_mode_title),
                 true,
                 {}) {
-                settingsManager.edit().putInt(getString(R.string.auto_download_plugins_key), prefValues[it]).apply()
+                settingsManager.edit()
+                    .putInt(getString(R.string.auto_download_plugins_key), prefValues[it]).apply()
                 (context ?: AcraApplication.context)?.let { ctx -> app.initClient(ctx) }
             }
             return@setOnPreferenceClickListener true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt
index 6916cafe..f9197213 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt
@@ -15,8 +15,8 @@ import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.databinding.FragmentSetupMediaBinding
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 
 
 class SetupFragmentMedia : Fragment() {
@@ -77,7 +77,7 @@ class SetupFragmentMedia : Fragment() {
                             .apply()
 
                         // Regenerate set homepage
-                        removeKey(USER_SELECTED_HOMEPAGE_API)
+                        DataStoreHelper.currentHomePage = null
                     }
                 }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
index 96593769..e50131fe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
@@ -10,6 +10,7 @@ import androidx.annotation.WorkerThread
 import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.module.kotlin.readValue
+import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
@@ -90,9 +91,11 @@ object BackupUtils {
     )
 
     @Suppress("UNCHECKED_CAST")
-    fun Context.getBackup(): BackupFile {
-        val allData = getSharedPrefs().all.filter { it.key.isTransferable() }
-        val allSettings = getDefaultSharedPrefs().all.filter { it.key.isTransferable() }
+    private fun getBackup(context: Context?): BackupFile? {
+        if (context == null) return null
+
+        val allData = context.getSharedPrefs().all.filter { it.key.isTransferable() }
+        val allSettings = context.getDefaultSharedPrefs().all.filter { it.key.isTransferable() }
 
         val allDataSorted = BackupVars(
             allData.filter { it.value is Boolean } as? Map<String, Boolean>,
@@ -119,46 +122,50 @@ object BackupUtils {
     }
 
     @WorkerThread
-    fun Context.restore(
+    fun restore(
+        context: Context?,
         backupFile: BackupFile,
         restoreSettings: Boolean,
         restoreDataStore: Boolean
     ) {
+        if (context == null) return
         if (restoreSettings) {
-            restoreMap(backupFile.settings._Bool, true)
-            restoreMap(backupFile.settings._Int, true)
-            restoreMap(backupFile.settings._String, true)
-            restoreMap(backupFile.settings._Float, true)
-            restoreMap(backupFile.settings._Long, true)
-            restoreMap(backupFile.settings._StringSet, true)
+            context.restoreMap(backupFile.settings._Bool, true)
+            context.restoreMap(backupFile.settings._Int, true)
+            context.restoreMap(backupFile.settings._String, true)
+            context.restoreMap(backupFile.settings._Float, true)
+            context.restoreMap(backupFile.settings._Long, true)
+            context.restoreMap(backupFile.settings._StringSet, true)
         }
 
         if (restoreDataStore) {
-            restoreMap(backupFile.datastore._Bool)
-            restoreMap(backupFile.datastore._Int)
-            restoreMap(backupFile.datastore._String)
-            restoreMap(backupFile.datastore._Float)
-            restoreMap(backupFile.datastore._Long)
-            restoreMap(backupFile.datastore._StringSet)
+            context.restoreMap(backupFile.datastore._Bool)
+            context.restoreMap(backupFile.datastore._Int)
+            context.restoreMap(backupFile.datastore._String)
+            context.restoreMap(backupFile.datastore._Float)
+            context.restoreMap(backupFile.datastore._Long)
+            context.restoreMap(backupFile.datastore._StringSet)
         }
     }
 
     @SuppressLint("SimpleDateFormat")
-    fun FragmentActivity.backup() = ioSafe {
+    fun backup(context: Context?) = ioSafe {
+        if (context == null) return@ioSafe
+
         var fileStream: OutputStream? = null
         var printStream: PrintWriter? = null
         try {
-            if (!checkWrite()) {
+            if (!context.checkWrite()) {
                 showToast(R.string.backup_failed, Toast.LENGTH_LONG)
-                requestRW()
+                context.getActivity()?.requestRW()
                 return@ioSafe
             }
 
             val date = SimpleDateFormat("yyyy_MM_dd_HH_mm").format(Date(currentTimeMillis()))
             val ext = "txt"
             val displayName = "CS3_Backup_${date}"
-            val backupFile = getBackup()
-            val stream = setupStream(this@backup, displayName, null, ext, false)
+            val backupFile = getBackup(context)
+            val stream = setupStream(context, displayName, null, ext, false)
 
             fileStream = stream.openNew()
             printStream = PrintWriter(fileStream)
@@ -198,7 +205,8 @@ object BackupUtils {
                             val restoredValue =
                                 mapper.readValue<BackupFile>(input)
 
-                            activity.restore(
+                            restore(
+                                activity,
                                 restoredValue,
                                 restoreSettings = true,
                                 restoreDataStore = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
index 2eb2ab01..952422a4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
@@ -10,7 +10,9 @@ import androidx.core.widget.doOnTextChanged
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
+import com.lagradost.cloudstream3.AcraApplication.Companion.context
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
@@ -24,6 +26,7 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.WhoIsWatchingAdapter
+import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.UiImage
 import com.lagradost.cloudstream3.ui.result.VideoWatchState
@@ -31,6 +34,8 @@ import com.lagradost.cloudstream3.ui.result.setImage
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import kotlin.reflect.KClass
+import kotlin.reflect.KProperty
 
 const val VIDEO_POS_DUR = "video_pos_dur"
 const val VIDEO_WATCH_STATE = "video_watch_state"
@@ -44,6 +49,28 @@ const val RESULT_EPISODE = "result_episode"
 const val RESULT_SEASON = "result_season"
 const val RESULT_DUB = "result_dub"
 
+
+class UserPreferenceDelegate<T : Any>(
+    private val key: String, private val default: T //, private val klass: KClass<T>
+) {
+    private val klass: KClass<out T> = default::class
+    private val realKey get() = "${DataStoreHelper.currentAccount}/$key"
+    operator fun getValue(self: Any?, property: KProperty<*>) =
+        AcraApplication.getKeyClass(realKey, klass.java) ?: default
+
+    operator fun setValue(
+        self: Any?,
+        property: KProperty<*>,
+        t: T?
+    ) {
+        if (t == null) {
+            removeKey(realKey)
+        } else {
+            AcraApplication.setKeyClass(realKey, t)
+        }
+    }
+}
+
 object DataStoreHelper {
     // be aware, don't change the index of these as Account uses the index for the art
     private val profileImages = arrayOf(
@@ -56,6 +83,49 @@ object DataStoreHelper {
         R.drawable.profile_bg_teal
     )
 
+    private var searchPreferenceProvidersStrings : List<String> by UserPreferenceDelegate(
+        /** java moment right here, as listOf()::class.java != List(0) { "" }::class.java */
+        "search_pref_providers", List(0) { "" }
+    )
+
+    private fun serializeTv(data : List<TvType>) : List<String> = data.map { it.name }
+
+    private fun deserializeTv(data : List<String>) : List<TvType> {
+        return data.mapNotNull { listName ->
+            TvType.values().firstOrNull { it.name == listName }
+        }
+    }
+
+    var searchPreferenceProviders : List<String>
+        get() {
+            val ret = searchPreferenceProvidersStrings
+            return ret.ifEmpty {
+                context?.filterProviderByPreferredMedia()?.map { it.name } ?: emptyList()
+            }
+        } set(value) {
+            searchPreferenceProvidersStrings = value
+        }
+
+    private var searchPreferenceTagsStrings : List<String> by UserPreferenceDelegate("search_pref_tags", listOf(TvType.Movie, TvType.TvSeries).map { it.name })
+    var searchPreferenceTags : List<TvType>
+        get() = deserializeTv(searchPreferenceTagsStrings)
+        set(value) {
+            searchPreferenceTagsStrings = serializeTv(value)
+        }
+
+
+    private var homePreferenceStrings : List<String> by UserPreferenceDelegate("home_pref_homepage", listOf(TvType.Movie, TvType.TvSeries).map { it.name })
+    var homePreference : List<TvType>
+        get() = deserializeTv(homePreferenceStrings)
+        set(value) {
+            homePreferenceStrings = serializeTv(value)
+        }
+
+    var homeBookmarkedList : IntArray by UserPreferenceDelegate("home_bookmarked_last_list", IntArray(0))
+    var playBackSpeed : Float by UserPreferenceDelegate("playback_speed", 1.0f)
+    var resizeMode : Int by UserPreferenceDelegate("resize_mode", 0)
+    var librarySortingMode : Int by UserPreferenceDelegate("library_sorting_mode", ListSorting.AlphabeticalA.ordinal)
+
     data class Account(
         @JsonProperty("keyIndex")
         val keyIndex: Int,
@@ -77,10 +147,28 @@ object DataStoreHelper {
     var selectedKeyIndex by PreferenceDelegate("$TAG/account_key_index", 0)
     val currentAccount: String get() = selectedKeyIndex.toString()
 
-    private fun setAccount(account: Account) {
+    /**
+     * Get or set the current account homepage.
+     * Setting this does not automatically reload the homepage.
+     */
+    var currentHomePage: String?
+        get() = getKey("$currentAccount/$USER_SELECTED_HOMEPAGE_API")
+        set(value) {
+            val key = "$currentAccount/$USER_SELECTED_HOMEPAGE_API"
+            if (value == null) {
+                removeKey(key)
+            } else {
+                setKey(key, value)
+            }
+        }
+
+    private fun setAccount(account: Account, refreshHomePage: Boolean) {
         selectedKeyIndex = account.keyIndex
         showToast(account.name)
         MainActivity.bookmarksUpdatedEvent(true)
+        if (refreshHomePage) {
+            MainActivity.reloadHomeEvent(true)
+        }
     }
 
     private fun editAccount(context: Context, account: Account, isNewAccount: Boolean) {
@@ -112,8 +200,7 @@ object DataStoreHelper {
                             accounts = currentAccounts.toTypedArray()
 
                             // update UI
-                            setAccount(getDefaultAccount(context))
-                            MainActivity.bookmarksUpdatedEvent(true)
+                            setAccount(getDefaultAccount(context), true)
                             dialog?.dismissSafe()
                         }
 
@@ -161,8 +248,13 @@ object DataStoreHelper {
                 currentAccounts.add(currentEditAccount)
             }
 
+            // Save the current homepage for new accounts
+            val currentHomePage = DataStoreHelper.currentHomePage
+
             // set the new default account as well as add the key for the new account
-            setAccount(currentEditAccount)
+            setAccount(currentEditAccount, false)
+            DataStoreHelper.currentHomePage = currentHomePage
+
             accounts = currentAccounts.toTypedArray()
 
             dialog.dismissSafe()
@@ -204,7 +296,7 @@ object DataStoreHelper {
         )
         binding.profilesRecyclerview.adapter = WhoIsWatchingAdapter(
             selectCallBack = { account ->
-                setAccount(account)
+                setAccount(account, true)
                 builder.dismissSafe()
             },
             addAccountCallback = {
@@ -353,7 +445,7 @@ object DataStoreHelper {
         removeKeys(folder2)
     }
 
-    fun deleteBookmarkedData(id : Int?) {
+    fun deleteBookmarkedData(id: Int?) {
         if (id == null) return
         removeKey("$currentAccount/$RESULT_WATCH_STATE", id.toString())
         removeKey("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString())
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 5edff7a1..d89e67fa 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -82,6 +82,7 @@ import com.lagradost.cloudstream3.extractors.Maxstream
 import com.lagradost.cloudstream3.extractors.Mcloud
 import com.lagradost.cloudstream3.extractors.Megacloud
 import com.lagradost.cloudstream3.extractors.Meownime
+import com.lagradost.cloudstream3.extractors.Minoplres
 import com.lagradost.cloudstream3.extractors.MixDrop
 import com.lagradost.cloudstream3.extractors.MixDropBz
 import com.lagradost.cloudstream3.extractors.MixDropCh
@@ -118,9 +119,6 @@ import com.lagradost.cloudstream3.extractors.Sbthe
 import com.lagradost.cloudstream3.extractors.Sendvid
 import com.lagradost.cloudstream3.extractors.ShaveTape
 import com.lagradost.cloudstream3.extractors.Solidfiles
-import com.lagradost.cloudstream3.extractors.SpeedoStream
-import com.lagradost.cloudstream3.extractors.SpeedoStream1
-import com.lagradost.cloudstream3.extractors.SpeedoStream2
 import com.lagradost.cloudstream3.extractors.Ssbstream
 import com.lagradost.cloudstream3.extractors.StreamM4u
 import com.lagradost.cloudstream3.extractors.StreamSB
@@ -380,6 +378,15 @@ open class ExtractorLink constructor(
     val isM3u8 : Boolean get() = type == ExtractorLinkType.M3U8
     val isDash : Boolean get() = type == ExtractorLinkType.DASH
 
+    fun getAllHeaders() : Map<String, String> {
+        if (referer.isBlank()) {
+            return headers
+        } else if (headers.keys.none { it.equals("referer", ignoreCase = true) }) {
+            return headers + mapOf("referer" to referer)
+        }
+        return headers
+    }
+
     constructor(
         source: String,
         name: String,
@@ -748,9 +755,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Vido(),
     Linkbox(),
     Acefile(),
-    SpeedoStream(),
-    SpeedoStream1(),
-    SpeedoStream2(),
+    Minoplres(), // formerly SpeedoStream
     Zorofile(),
     Embedgram(),
     Mvidoo(),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
index b2c4aa5c..0dce0b2a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -109,18 +109,19 @@ class InAppUpdater {
                 releases.sortedWith(compareBy {
                     versionRegex.find(it.name)?.groupValues?.get(2)
                 }).toList().lastOrNull()*/
-            val found =
+            val foundList =
                 response.filter { rel ->
                     !rel.prerelease
                 }.sortedWith(compareBy { release ->
-                    release.assets.filter { it.content_type == "application/vnd.android.package-archive" }
-                        .getOrNull(0)?.name?.let { it1 ->
+                    release.assets.firstOrNull { it.content_type == "application/vnd.android.package-archive" }?.name?.let { it1 ->
                             versionRegex.find(
                                 it1
-                            )?.groupValues?.get(2)
+                            )?.groupValues?.let {
+                                it[3].toInt() * 100_000_000 + it[4].toInt() * 10_000 + it[5].toInt()
+                            }
                         }
-                }).toList().lastOrNull()
-
+                }).toList()
+            val found = foundList.lastOrNull()
             val foundAsset = found?.assets?.getOrNull(0)
             val currentVersion = packageName?.let {
                 packageManager.getPackageInfo(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/M3u8Helper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/M3u8Helper.kt
index 11dfa441..298f1601 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/M3u8Helper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/M3u8Helper.kt
@@ -71,7 +71,7 @@ object M3u8Helper2 {
     private val QUALITY_REGEX =
         Regex("""#EXT-X-STREAM-INF:(?:(?:.*?(?:RESOLUTION=\d+x(\d+)).*?\s+(.*))|(?:.*?\s+(.*)))""")
     private val TS_EXTENSION_REGEX =
-        Regex("""#EXTINF:.*\n(.+?\n)""") // fuck it we ball, who cares about the type anyways
+        Regex("""#EXTINF:(([0-9]*[.])?[0-9]+|).*\n(.+?\n)""") // fuck it we ball, who cares about the type anyways
         //Regex("""(.*\.(ts|jpg|html).*)""") //.jpg here 'case vizcloud uses .jpg instead of .ts
 
     private fun absoluteExtensionDetermination(url: String): String? {
@@ -115,13 +115,22 @@ object M3u8Helper2 {
 
     private fun selectBest(qualities: List<M3u8Helper.M3u8Stream>): M3u8Helper.M3u8Stream? {
         val result = qualities.sortedBy {
-            if (it.quality != null && it.quality <= 1080) it.quality else 0
-        }.filter {
+            it.quality ?: Qualities.Unknown.value //if (it.quality != null && it.quality <= 1080)  else 0
+        }/*.filter {
             listOf("m3u", "m3u8").contains(absoluteExtensionDetermination(it.streamUrl))
-        }
+        }*/
         return result.lastOrNull()
     }
 
+    private fun selectWorst(qualities: List<M3u8Helper.M3u8Stream>): M3u8Helper.M3u8Stream? {
+        val result = qualities.sortedBy {
+            it.quality ?: Qualities.Unknown.value //if (it.quality != null && it.quality <= 1080)  else 0
+        }/*.filter {
+            listOf("m3u", "m3u8").contains(absoluteExtensionDetermination(it.streamUrl))
+        }*/
+        return result.firstOrNull()
+    }
+
     private fun getParentLink(uri: String): String {
         val split = uri.split("/").toMutableList()
         split.removeLast()
@@ -173,14 +182,20 @@ object M3u8Helper2 {
         return list
     }
 
+    data class TsLink(
+        val url : String,
+        val time : Double?,
+    )
+
     data class LazyHlsDownloadData(
         private val encryptionData: ByteArray,
         private val encryptionIv: ByteArray,
-        private val isEncrypted: Boolean,
-        private val allTsLinks: List<String>,
-        private val relativeUrl: String,
-        private val headers: Map<String, String>,
+        val isEncrypted: Boolean,
+        val allTsLinks: List<TsLink>,
+        val relativeUrl: String,
+        val headers: Map<String, String>,
     ) {
+
         val size get() = allTsLinks.size
 
         suspend fun resolveLinkWhileSafe(
@@ -228,9 +243,9 @@ object M3u8Helper2 {
         @Throws
         suspend fun resolveLink(index: Int): ByteArray {
             if (index < 0 || index >= size) throw IllegalArgumentException("index must be in the bounds of the ts")
-            val url = allTsLinks[index]
+            val ts = allTsLinks[index]
 
-            val tsResponse = app.get(url, headers = headers, verify = false)
+            val tsResponse = app.get(ts.url, headers = headers, verify = false)
             val tsData = tsResponse.body.bytes()
             if (tsData.isEmpty()) throw ErrorLoadingException("no data")
 
@@ -244,15 +259,16 @@ object M3u8Helper2 {
 
     @Throws
     suspend fun hslLazy(
-        qualities: List<M3u8Helper.M3u8Stream>
+        qualities: List<M3u8Helper.M3u8Stream>, selectBest : Boolean = true
     ): LazyHlsDownloadData {
         if (qualities.isEmpty()) throw IllegalArgumentException("qualities must be non empty")
-        val selected = selectBest(qualities) ?: qualities.first()
+        val selected = if(selectBest) { selectBest(qualities) } else { selectWorst(qualities) } ?: qualities.first()
         val headers = selected.headers
         val streams = qualities.map { m3u8Generation(it, false) }.flatten()
         // this selects the best quality of the qualities offered,
         // due to the recursive nature of m3u8, we only go 2 depth
-        val secondSelection = selectBest(streams.ifEmpty { listOf(selected) })
+        val innerStreams = streams.ifEmpty { listOf(selected) }
+        val secondSelection = if(selectBest) { selectBest(innerStreams) } else { selectWorst(innerStreams) }
             ?: throw IllegalArgumentException("qualities has no streams")
 
         val m3u8Response =
@@ -285,12 +301,14 @@ object M3u8Helper2 {
         }
         val relativeUrl = getParentLink(secondSelection.streamUrl)
         val allTsList = TS_EXTENSION_REGEX.findAll(m3u8Response + "\n").map { ts ->
-            val value = ts.groupValues[1]
-            if (isNotCompleteUrl(value)) {
+            val time = ts.groupValues[1]
+            val value = ts.groupValues[3]
+            val url = if (isNotCompleteUrl(value)) {
                 "$relativeUrl/${value}"
             } else {
                 value
             }
+            TsLink(url = url, time = time.toDoubleOrNull())
         }.toList()
         if (allTsList.isEmpty()) throw IllegalArgumentException("ts must be non empty")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt
index dcb1e047..7ff7b067 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt
@@ -1,12 +1,12 @@
 package com.lagradost.cloudstream3.utils
 
-import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.app.Service
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
 import android.os.Build
 import android.os.IBinder
 import android.util.Log
@@ -54,7 +54,11 @@ class PackageInstallerService : Service() {
             UPDATE_CHANNEL_NAME,
             UPDATE_CHANNEL_DESCRIPTION
         )
-        startForeground(UPDATE_NOTIFICATION_ID, baseNotification.build())
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            startForeground(UPDATE_NOTIFICATION_ID, baseNotification.build(), FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+        } else{
+            startForeground(UPDATE_NOTIFICATION_ID, baseNotification.build())
+        }
     }
 
     private val updateLock = Mutex()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
index 038a2f11..9b40e70e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
@@ -71,7 +71,7 @@ object UIHelper {
     val Int.toDp: Int get() = (this / Resources.getSystem().displayMetrics.density).toInt()
     val Float.toDp: Float get() = (this / Resources.getSystem().displayMetrics.density)
 
-    fun Activity.checkWrite(): Boolean {
+    fun Context.checkWrite(): Boolean {
         return (ContextCompat.checkSelfPermission(
             this,
             Manifest.permission.WRITE_EXTERNAL_STORAGE
diff --git a/app/src/main/res/drawable/episodes_shadow.xml b/app/src/main/res/drawable/episodes_shadow.xml
index b4cdd382..a77cbf25 100644
--- a/app/src/main/res/drawable/episodes_shadow.xml
+++ b/app/src/main/res/drawable/episodes_shadow.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:startColor="@color/transparent"
-        android:endColor="?attr/primaryBlackBackground"/>
+        android:centerColor="?attr/primaryBlackBackground"
+        android:centerX="0.2"
+        android:endColor="?attr/primaryBlackBackground"
+        android:startColor="@color/transparent" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/outline.xml b/app/src/main/res/drawable/outline.xml
index 30077a98..7b436c7d 100644
--- a/app/src/main/res/drawable/outline.xml
+++ b/app/src/main/res/drawable/outline.xml
@@ -2,11 +2,9 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
     <stroke android:width="2dp"
             android:color="?attr/white"/>
-   <!-- <corners
+    <corners
             android:bottomLeftRadius="@dimen/rounded_image_radius"
             android:bottomRightRadius="@dimen/rounded_image_radius"
             android:topLeftRadius="@dimen/rounded_image_radius"
             android:topRightRadius="@dimen/rounded_image_radius" />
--->
-
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/outline_drawable.xml b/app/src/main/res/drawable/outline_drawable.xml
index 8eec2d0b..16eba83c 100644
--- a/app/src/main/res/drawable/outline_drawable.xml
+++ b/app/src/main/res/drawable/outline_drawable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!--<item android:state_focused="true"
-          android:drawable="@drawable/outline"/>--> <!-- focused -->
+    <item android:state_focused="true"
+          android:drawable="@drawable/outline"/> <!-- focused -->
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/outline_drawable_less.xml b/app/src/main/res/drawable/outline_drawable_less.xml
index db74a092..aa3a8d0d 100644
--- a/app/src/main/res/drawable/outline_drawable_less.xml
+++ b/app/src/main/res/drawable/outline_drawable_less.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!--<item android:state_focused="true" android:drawable="@drawable/outline_less" />--> <!-- focused -->
+   <item android:state_focused="true" android:drawable="@drawable/outline_less" /> <!-- focused -->
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/video_frame.xml b/app/src/main/res/drawable/video_frame.xml
new file mode 100644
index 00000000..19fcf26d
--- /dev/null
+++ b/app/src/main/res/drawable/video_frame.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="@dimen/video_frame_width"
+        android:color="@android:color/white" />
+
+    <solid android:color="@android:color/black" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/cast_item.xml b/app/src/main/res/layout/cast_item.xml
index 54df59a8..368fa770 100644
--- a/app/src/main/res/layout/cast_item.xml
+++ b/app/src/main/res/layout/cast_item.xml
@@ -17,6 +17,7 @@
         android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:orientation="vertical"
+        android:focusable="true"
         android:padding="5dp">
         <!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
         <FrameLayout
@@ -34,7 +35,6 @@
 
                     android:id="@+id/actor_image"
                     android:layout_width="match_parent"
-
                     android:layout_height="match_parent"
                     android:contentDescription="@string/episode_poster_img_des"
                     android:scaleType="centerCrop"
diff --git a/app/src/main/res/layout/fragment_downloads.xml b/app/src/main/res/layout/fragment_downloads.xml
index 65f36209..5623bc7e 100644
--- a/app/src/main/res/layout/fragment_downloads.xml
+++ b/app/src/main/res/layout/fragment_downloads.xml
@@ -137,6 +137,7 @@
         android:background="?attr/primaryBlackBackground"
         android:descendantFocusability="afterDescendants"
         android:nextFocusLeft="@id/nav_rail_view"
+        android:tag = "@string/tv_no_focus_tag"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:listitem="@layout/download_header_episode" />
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index ac660ccd..36cb5f42 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -114,6 +114,22 @@
                 android:nextFocusRight="@id/home_switch_account"
 />
 
+            <ImageView
+                android:id="@+id/home_preview_search_button"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="end"
+                android:background="@drawable/player_button_tv_attr_no_bg"
+                android:contentDescription="@string/search"
+                android:nextFocusLeft="@id/home_change_api"
+                android:nextFocusRight="@id/home_preview_switch_account"
+                android:nextFocusDown="@id/home_preview_info_btt"
+                android:padding="10dp"
+                android:visibility="gone"
+                android:src="@drawable/search_icon"
+                android:tag="@string/tv_no_focus_tag"
+                app:tint="@color/player_on_button_tv_attr" />
+
             <ImageView
                 android:id="@+id/home_switch_account"
 
diff --git a/app/src/main/res/layout/fragment_home_head_tv.xml b/app/src/main/res/layout/fragment_home_head_tv.xml
index 03766d79..05cb3a41 100644
--- a/app/src/main/res/layout/fragment_home_head_tv.xml
+++ b/app/src/main/res/layout/fragment_home_head_tv.xml
@@ -45,9 +45,25 @@
                 android:background="@drawable/player_button_tv_attr_no_bg"
                 android:gravity="center_vertical"
                 android:nextFocusLeft="@id/nav_rail_view"
-                android:nextFocusRight="@id/home_preview_switch_account"
+                android:nextFocusRight="@id/home_preview_search_button"
                 android:nextFocusDown="@id/home_preview_play_btt" />
 
+            <ImageView
+                android:id="@+id/home_preview_search_button"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="end"
+                android:background="@drawable/player_button_tv_attr_no_bg"
+                android:contentDescription="@string/search"
+                android:focusable="true"
+                android:nextFocusLeft="@id/home_preview_change_api"
+                android:nextFocusRight="@id/home_preview_switch_account"
+                android:nextFocusDown="@id/home_preview_info_btt"
+                android:padding="10dp"
+                android:src="@drawable/search_icon"
+                android:tag="@string/tv_no_focus_tag"
+                app:tint="@color/player_on_button_tv_attr" />
+
             <ImageView
                 android:id="@+id/home_preview_switch_account"
                 android:layout_width="wrap_content"
@@ -55,7 +71,9 @@
                 android:layout_gravity="end"
                 android:background="@drawable/player_button_tv_attr_no_bg"
                 android:contentDescription="@string/account"
-                android:nextFocusLeft="@id/home_preview_change_api"
+                android:focusable="true"
+                android:nextFocusLeft="@id/home_preview_search_button"
+                android:nextFocusRight="@id/home_preview_switch_account"
                 android:nextFocusDown="@id/home_preview_info_btt"
 
                 android:padding="10dp"
diff --git a/app/src/main/res/layout/fragment_home_tv.xml b/app/src/main/res/layout/fragment_home_tv.xml
index b946de2d..e44457d9 100644
--- a/app/src/main/res/layout/fragment_home_tv.xml
+++ b/app/src/main/res/layout/fragment_home_tv.xml
@@ -113,7 +113,25 @@
                 android:background="@drawable/player_button_tv_attr_no_bg"
                 android:gravity="center_vertical"
                 android:nextFocusLeft="@id/nav_rail_view"
-                android:nextFocusRight="@id/home_switch_account" />
+                android:nextFocusRight="@id/home_preview_search_button"
+                android:nextFocusDown="@id/home_preview_play_btt" />
+
+            <ImageView
+                android:id="@+id/home_preview_search_button"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="end"
+                android:background="@drawable/player_button_tv_attr_no_bg"
+                android:clickable="true"
+                android:contentDescription="@string/search"
+                android:focusable="true"
+                android:nextFocusLeft="@id/home_change_api"
+                android:nextFocusRight="@id/home_switch_account"
+                android:nextFocusDown="@id/home_preview_info_btt"
+                android:padding="10dp"
+                android:src="@drawable/search_icon"
+                android:tag="@string/tv_no_focus_tag"
+                app:tint="@color/player_on_button_tv_attr" />
 
             <ImageView
                 android:id="@+id/home_switch_account"
@@ -122,7 +140,9 @@
                 android:layout_gravity="end"
                 android:background="@drawable/player_button_tv_attr_no_bg"
                 android:contentDescription="@string/account"
-                android:nextFocusLeft="@id/home_change_api"
+                android:nextFocusLeft="@id/home_preview_search_button"
+                android:nextFocusRight="@id/home_switch_account"
+                android:nextFocusDown="@id/home_change_api"
 
                 android:padding="10dp"
                 android:src="@drawable/ic_outline_account_circle_24"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 985d055d..879ddbd9 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -41,6 +41,20 @@
                 android:src="@drawable/ic_baseline_extension_24"
                 app:tint="?attr/textColor" />
 
+            <ImageView
+                android:id="@+id/library_sort"
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginStart="10dp"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@string/change_providers_img_des"
+                android:padding="5dp"
+                android:visibility="gone"
+                tools:visibility="visible"
+                android:src="@drawable/ic_baseline_sort_24"
+                app:tint="?attr/textColor" />
+
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
@@ -160,8 +174,7 @@
         android:layout_height="40dp"
         android:layout_gravity="bottom"
         android:background="?attr/primaryGrayBackground"
-        android:descendantFocusability="blocksDescendants"
-        android:focusable="false"
+        android:focusable="true"
         android:paddingHorizontal="5dp"
         app:layout_scrollFlags="noScroll"
         app:tabGravity="center"
diff --git a/app/src/main/res/layout/fragment_library_tv.xml b/app/src/main/res/layout/fragment_library_tv.xml
new file mode 100644
index 00000000..8d2da9f2
--- /dev/null
+++ b/app/src/main/res/layout/fragment_library_tv.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/library_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/empty_list_textview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="30dp"
+        android:gravity="center"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/search_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/primaryGrayBackground">
+
+        <LinearLayout
+            android:id="@+id/search_status_bar_padding"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/provider_selector"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginStart="10dp"
+                android:padding="2dp"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@string/change_providers_img_des"
+                android:nextFocusLeft="@id/nav_rail_view"
+                android:nextFocusRight="@id/library_sort"
+                android:tag="@string/tv_no_focus_tag"
+                android:src="@drawable/ic_baseline_extension_24"
+                app:tint="?attr/textColor" />
+
+            <ImageView
+                android:id="@+id/library_sort"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginStart="10dp"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@string/change_providers_img_des"
+                android:nextFocusLeft="@id/provider_selector"
+                android:nextFocusRight="@id/list_selector"
+                android:tag="@string/tv_no_focus_tag"
+                android:src="@drawable/ic_baseline_sort_24"
+                app:tint="?attr/textColor" />
+
+            <ImageView
+                android:id="@+id/list_selector"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_gravity="end|center_vertical"
+                android:padding="1dp"
+                android:layout_marginStart="10dp"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@string/change_providers_img_des"
+                android:nextFocusLeft="@id/library_sort"
+                android:nextFocusRight="@id/main_search"
+                android:tag="@string/tv_no_focus_tag"
+                android:src="@drawable/ic_baseline_filter_list_24"
+                app:tint="?attr/textColor" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_margin="10dp"
+                android:background="@drawable/search_background"
+                android:visibility="visible"
+                app:layout_scrollFlags="scroll|enterAlways">
+
+                <androidx.appcompat.widget.SearchView
+                    android:id="@+id/main_search"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="end"
+
+                    android:iconifiedByDefault="false"
+                    android:imeOptions="actionSearch"
+                    android:inputType="text"
+                    android:focusable="true"
+                    android:tag="tv_no_focus_tag"
+                    android:nextFocusLeft="@id/list_selector"
+                    android:nextFocusDown="@id/search_result_root"
+                    android:paddingStart="-10dp"
+                    app:iconifiedByDefault="false"
+                    app:queryBackground="@color/transparent"
+                    app:queryHint="@string/search_hint"
+                    app:searchIcon="@drawable/search_icon"
+                    tools:ignore="RtlSymmetry">
+
+                </androidx.appcompat.widget.SearchView>
+            </FrameLayout>
+        </LinearLayout>
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/library_tab_layout"
+            style="@style/Theme.Widget.Tabs"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_gravity="top"
+            android:nextFocusDown="@id/search_result_root"
+            android:background="?attr/primaryGrayBackground"
+            android:paddingHorizontal="5dp"
+            app:layout_scrollFlags="noScroll"
+            app:tabGravity="center"
+            app:tabIndicator="@drawable/indicator_background"
+            app:tabIndicatorColor="?attr/white"
+            app:tabIndicatorGravity="center"
+            app:tabIndicatorHeight="30dp"
+            app:tabMode="scrollable"
+            app:tabSelectedTextColor="?attr/primaryBlackBackground"
+            app:tabTextAppearance="@style/TabNoCaps"
+            app:tabTextColor="?attr/textColor" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/viewpager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:paddingBottom="40dp"
+            android:focusable="true"
+            android:tag="@string/tv_no_focus_tag"
+            tools:listitem="@layout/library_viewpager_page" />
+
+        <LinearLayout
+            android:id="@+id/library_loading_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:focusable="false"
+            android:tag="@string/tv_no_focus_tag"
+            android:background="?attr/primaryBlackBackground"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <com.facebook.shimmer.ShimmerFrameLayout
+                android:id="@+id/library_loading_shimmer"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_margin="2dp"
+                app:shimmer_auto_start="true"
+                app:shimmer_base_alpha="0.2"
+                android:focusable="false"
+                android:tag="@string/tv_no_focus_tag"
+                app:shimmer_duration="@integer/loading_time"
+                app:shimmer_highlight_alpha="0.3">
+
+                <GridView
+                    android:id="@+id/gridview"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:clipToPadding="false"
+                    android:gravity="center"
+                    android:horizontalSpacing="10dp"
+                    android:numColumns="3"
+                    android:paddingBottom="120dp"
+                    android:focusable="false"
+                    android:tag="@string/tv_no_focus_tag"
+                    android:verticalSpacing="10dp"
+                    tools:listitem="@layout/loading_poster_dynamic" />
+            </com.facebook.shimmer.ShimmerFrameLayout>
+        </LinearLayout>
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="40dp">
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/sort_fab"
+            style="@style/ExtendedFloatingActionButton"
+            android:text="@string/sort"
+            android:textColor="?attr/textColor"
+            android:visibility="gone"
+            tools:visibility="visible"
+            app:icon="@drawable/ic_baseline_sort_24"
+            tools:ignore="ContentDescription" />
+    </FrameLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index 87de7186..9d748c5a 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -875,7 +875,7 @@
                                 android:descendantFocusability="afterDescendants"
                                 android:paddingBottom="100dp"
                                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                                tools:listitem="@layout/result_episode_both_tv" />
+                                tools:listitem="@layout/result_episode" />
                         </LinearLayout>
                     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml
index 4d236d78..feaf6fbc 100644
--- a/app/src/main/res/layout/fragment_result_tv.xml
+++ b/app/src/main/res/layout/fragment_result_tv.xml
@@ -535,129 +535,151 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
-    <FrameLayout
-        android:visibility="gone"
-        tools:visibility="visible"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/episodes_shadow"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="end"
-            android:clickable="false"
-            android:focusable="false"
-            android:focusableInTouchMode="false"
-            android:importantForAccessibility="no"
-            android:src="@drawable/episodes_shadow"/>
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="end"
-            android:clickable="false"
-            android:focusable="false"
-            android:focusableInTouchMode="false"
-            android:importantForAccessibility="no"
-            android:src="@drawable/episodes_shadow"/>
-    </FrameLayout>
-
-
-    <LinearLayout
-        android:id="@+id/episode_holder_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-
+        android:layout_height="match_parent"
         android:layout_gravity="end"
-        android:orientation="horizontal"
-        android:paddingStart="@dimen/result_padding"
-        android:paddingEnd="@dimen/result_padding"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="RtlHardcoded"
-        tools:visibility="gone">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/result_season_selection"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clipToPadding="false"
-
-            android:descendantFocusability="afterDescendants"
-            android:nextFocusLeft="@id/result_episodes_show"
-            android:nextFocusRight="@id/result_range_selection"
-            android:orientation="vertical"
-            android:paddingVertical="@dimen/result_padding"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:listitem="@layout/result_selection" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/result_range_selection"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clipToPadding="false"
-            android:descendantFocusability="afterDescendants"
-
-            android:nextFocusLeft="@id/result_season_selection"
-            android:nextFocusRight="@id/result_dub_selection"
-            android:orientation="vertical"
-            android:paddingVertical="@dimen/result_padding"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:listitem="@layout/result_selection"
-            tools:visibility="visible" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/result_dub_selection"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clipToPadding="false"
-
-            android:descendantFocusability="afterDescendants"
-            android:nextFocusLeft="@id/result_range_selection"
-            android:nextFocusRight="@id/result_episodes"
-            android:orientation="vertical"
-            android:paddingVertical="@dimen/result_padding"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:listitem="@layout/result_selection" />
+        tools:visibility="visible">
 
 
-        <!--<androidx.core.widget.ContentLoadingProgressBar
-                android:id="@+id/result_episode_loading"
+        <!--
+         These two shadow spaces are used to create a view which always x% bigger
+         than the episode_holder_tv. This is required for creating a consistent shadow.
+        -->
+        <Space
+            android:id="@+id/shadow_space_1"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintEnd_toEndOf="@+id/episode_holder_tv"
+            app:layout_constraintStart_toStartOf="@+id/episode_holder_tv" />
 
-                style="@style/Widget.AppCompat.ProgressBar"
-                android:layout_gravity="center"
-                android:layout_width="50dp"
-                android:layout_height="50dp" />-->
+        <!--
+        The dimension ratio should and episodes_shadow centerX should add up to
+        100% for the best results. For example (100:80 + 0.2) or (100:70 + 0.3).
+        Bigger centerX => Larger fade distance.
+         -->
+        <Space
+            android:id="@+id/shadow_space_2"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="100:80"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/shadow_space_1" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/result_episodes"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clipToPadding="false"
-            android:descendantFocusability="afterDescendants"
-            android:nextFocusLeft="@id/result_dub_selection"
-            android:orientation="vertical"
-            android:paddingVertical="@dimen/result_padding"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:listitem="@layout/result_episode" />
-
-        <View
-            android:id="@+id/temporary_no_focus"
-            android:layout_width="1dp"
-            android:layout_height="1dp"
+        <ImageView
+            android:id="@+id/episodes_shadow_background"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="end"
+            android:clickable="false"
             android:focusable="false"
-            android:nextFocusLeft="@id/temporary_no_focus"
-            android:nextFocusRight="@id/temporary_no_focus"
-            android:nextFocusUp="@id/temporary_no_focus"
-            android:nextFocusDown="@id/temporary_no_focus" />
-    </LinearLayout>
+            android:focusableInTouchMode="false"
+            android:importantForAccessibility="no"
+            android:src="@drawable/episodes_shadow"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/shadow_space_2"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <LinearLayout
+            android:id="@+id/episode_holder_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:orientation="horizontal"
+            android:paddingStart="@dimen/result_padding"
+            android:paddingEnd="@dimen/result_padding"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlHardcoded"
+            tools:visibility="visible">
+
+            <com.lagradost.cloudstream3.ui.MaxRecyclerView
+                android:id="@+id/result_dub_selection"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clipToPadding="false"
+                android:descendantFocusability="afterDescendants"
+                android:nextFocusLeft="@id/result_episodes_show"
+                android:nextFocusRight="@id/result_season_selection"
+                android:orientation="vertical"
+                android:paddingVertical="@dimen/result_padding"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/result_selection"
+                tools:visibility="gone" />
+
+            <com.lagradost.cloudstream3.ui.MaxRecyclerView
+                android:id="@+id/result_season_selection"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clipToPadding="false"
+                android:descendantFocusability="afterDescendants"
+                android:nextFocusLeft="@id/result_dub_selection"
+                android:nextFocusRight="@id/result_range_selection"
+                android:orientation="vertical"
+                android:paddingVertical="@dimen/result_padding"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/result_selection"
+                tools:visibility="gone" />
+
+            <com.lagradost.cloudstream3.ui.MaxRecyclerView
+                android:id="@+id/result_range_selection"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clipToPadding="false"
+                android:descendantFocusability="afterDescendants"
+                android:nextFocusLeft="@id/result_season_selection"
+                android:nextFocusRight="@id/result_episodes"
+                android:orientation="vertical"
+                android:paddingVertical="@dimen/result_padding"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/result_selection"
+                tools:visibility="visible" />
+
+
+            <!--<androidx.core.widget.ContentLoadingProgressBar
+                    android:id="@+id/result_episode_loading"
+
+                    style="@style/Widget.AppCompat.ProgressBar"
+                    android:layout_gravity="center"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp" />-->
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/result_episodes"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipToPadding="false"
+                android:descendantFocusability="afterDescendants"
+                android:nextFocusLeft="@id/result_range_selection"
+                android:orientation="vertical"
+                android:paddingVertical="@dimen/result_padding"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/result_episode" />
+
+            <View
+                android:id="@+id/temporary_no_focus"
+                android:layout_width="1dp"
+                android:layout_height="1dp"
+                android:focusable="false"
+                android:nextFocusLeft="@id/temporary_no_focus"
+                android:nextFocusRight="@id/temporary_no_focus"
+                android:nextFocusUp="@id/temporary_no_focus"
+                android:nextFocusDown="@id/temporary_no_focus" />
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_search_tv.xml b/app/src/main/res/layout/fragment_search_tv.xml
index 4c4af404..e34b0ac3 100644
--- a/app/src/main/res/layout/fragment_search_tv.xml
+++ b/app/src/main/res/layout/fragment_search_tv.xml
@@ -84,7 +84,8 @@
                 android:nextFocusLeft="@id/main_search"
                 android:nextFocusRight="@id/main_search"
                 android:nextFocusUp="@id/nav_rail_view"
-                android:nextFocusDown="@id/search_autofit_results"
+                android:nextFocusDown="@id/tvtypes_chips_scroll"
+                android:tag = "@string/tv_no_focus_tag"
                 android:src="@drawable/ic_baseline_tune_24"
                 app:tint="?attr/textColor" />
         </FrameLayout>
@@ -99,7 +100,7 @@
         android:id="@+id/search_autofit_results"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-
+        android:layout_marginStart="@dimen/navbar_width"
         android:background="?attr/primaryBlackBackground"
         android:clipToPadding="false"
         android:descendantFocusability="afterDescendants"
@@ -141,6 +142,7 @@
             android:nextFocusLeft="@id/nav_rail_view"
             android:nextFocusUp="@id/tvtypes_chips"
             android:nextFocusDown="@id/search_clear_call_history"
+            android:tag = "@string/tv_no_focus_tag"
             android:paddingBottom="50dp"
             android:visibility="visible"
             tools:listitem="@layout/search_history_item" />
diff --git a/app/src/main/res/layout/library_viewpager_page.xml b/app/src/main/res/layout/library_viewpager_page.xml
index 7d278cff..aa9745fb 100644
--- a/app/src/main/res/layout/library_viewpager_page.xml
+++ b/app/src/main/res/layout/library_viewpager_page.xml
@@ -5,5 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
+    android:focusable="false"
+    android:tag="tv_no_focus_tag"
     tools:listitem="@layout/home_result_grid_expanded" />
 
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 5592f3a6..38df4c5b 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -86,7 +86,6 @@
         </FrameLayout>
         <!-- atm this is useless, however it might be used for PIP one day? -->
         <ImageView
-            android:visibility="gone"
             android:id="@+id/player_fullscreen"
             android:layout_width="30dp"
             android:layout_height="30dp"
@@ -94,7 +93,9 @@
             android:layout_marginEnd="20dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:src="@drawable/baseline_fullscreen_24"
+            android:visibility="gone"
             app:tint="@color/white" />
+
         <FrameLayout
             android:id="@+id/player_intro_play"
             android:layout_width="0dp"
@@ -108,8 +109,8 @@
             android:clickable="false"
             android:focusable="false"
             android:focusableInTouchMode="false"
-            android:visibility="gone"
-            android:importantForAccessibility="no" />
+            android:importantForAccessibility="no"
+            android:visibility="gone" />
 
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -117,6 +118,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
+
             <FrameLayout
                 android:id="@+id/player_top_holder"
                 android:layout_width="match_parent"
@@ -272,6 +274,7 @@
                         app:tint="@color/white"
                         tools:ignore="ContentDescription" />
                 </FrameLayout>
+
                 <FrameLayout
                     android:id="@+id/player_pause_play_holder_holder"
                     android:layout_width="100dp"
@@ -298,6 +301,7 @@
                         app:tint="@color/white"
                         tools:ignore="ContentDescription" />
                 </FrameLayout>
+
                 <FrameLayout
                     android:id="@+id/player_ffwd_holder"
                     android:layout_width="0dp"
@@ -345,14 +349,15 @@
                 android:layout_width="150dp"
                 android:layout_height="40dp"
                 android:layout_marginEnd="100dp"
+                android:layout_marginTop="60dp"
                 android:backgroundTint="@color/skipOpTransparent"
                 android:maxLines="1"
                 android:padding="10dp"
                 android:textColor="@color/white"
                 android:visibility="gone"
                 app:cornerRadius="@dimen/rounded_button_radius"
-                app:layout_constraintBottom_toTopOf="@+id/bottom_player_bar"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/player_top_holder"
                 app:strokeColor="@color/white"
                 app:strokeWidth="1dp"
                 tools:text="Skip Opening"
@@ -427,20 +432,21 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent">
 
-                <LinearLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/player_video_bar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    tools:visibility="visible"
                     android:layoutDirection="ltr"
                     android:orientation="horizontal">
 
                     <TextView
                         android:id="@id/exo_position"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="30dp"
                         android:layout_gravity="center"
                         android:layout_marginStart="20dp"
-                        android:gravity="end"
+                        android:gravity="end|center_vertical"
                         android:includeFontPadding="false"
                         android:minWidth="50dp"
                         android:paddingLeft="4dp"
@@ -448,14 +454,46 @@
                         android:textColor="@android:color/white"
                         android:textSize="14sp"
                         android:textStyle="normal"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
                         tools:text="15:30" />
-                    <!--app:buffered_color="@color/videoCache"-->
-                    <androidx.media3.ui.DefaultTimeBar
+
+                    <FrameLayout
+                        android:id="@+id/previewFrameLayout"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginBottom="16dp"
+                        android:background="@drawable/video_frame"
+                        android:visibility="invisible"
+                        app:layout_constraintBottom_toTopOf="@+id/exo_progress"
+                        app:layout_constraintDimensionRatio="16:9"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.0"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintWidth_default="percent"
+                        app:layout_constraintWidth_percent="0.25"
+                        tools:visibility="visible">
+
+                        <ImageView
+                            android:id="@+id/previewImageView"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_margin="@dimen/video_frame_width"
+                            android:importantForAccessibility="no"
+                            android:scaleType="centerCrop" />
+                    </FrameLayout>
+
+                    <com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
                         android:id="@id/exo_progress"
                         android:layout_width="0dp"
                         android:layout_height="30dp"
                         android:layout_weight="1"
                         app:bar_height="2dp"
+                        app:layout_constraintBottom_toBottomOf="@id/exo_position"
+                        app:layout_constraintEnd_toStartOf="@id/exo_duration"
+                        app:layout_constraintStart_toEndOf="@+id/exo_position"
                         app:played_color="?attr/colorPrimary"
 
                         app:scrubber_color="?attr/colorPrimary"
@@ -463,12 +501,12 @@
                         app:scrubber_enabled_size="24dp"
                         app:unplayed_color="@color/videoProgress" />
 
-                    <!-- exo_duration-->
                     <TextView
                         android:id="@id/exo_duration"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center|center_vertical"
+
                         android:layout_marginEnd="20dp"
                         android:includeFontPadding="false"
                         android:minWidth="50dp"
@@ -477,9 +515,10 @@
                         android:textColor="@android:color/white"
                         android:textSize="14sp"
                         android:textStyle="normal"
+                        app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
+                        app:layout_constraintEnd_toEndOf="parent"
                         tools:text="23:20" />
-
-                </LinearLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <HorizontalScrollView
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/player_custom_layout_tv.xml b/app/src/main/res/layout/player_custom_layout_tv.xml
index e9805d31..12c61baa 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -503,13 +503,12 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent">
 
-                <LinearLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/player_video_bar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layoutDirection="ltr"
                     android:orientation="horizontal">
-
                     <ImageView
                         android:id="@+id/player_pause_play"
 
@@ -526,14 +525,17 @@
 
                         android:tag="@string/tv_no_focus_tag"
                         app:tint="@color/player_button_tv"
-                        tools:ignore="ContentDescription" />
+                        tools:ignore="ContentDescription"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent" />
 
                     <TextView
                         android:id="@id/exo_position"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="30dp"
                         android:layout_gravity="center"
-                        android:gravity="end"
+                        android:layout_marginStart="20dp"
+                        android:gravity="end|center_vertical"
                         android:includeFontPadding="false"
                         android:minWidth="50dp"
                         android:paddingLeft="4dp"
@@ -541,29 +543,59 @@
                         android:textColor="@android:color/white"
                         android:textSize="14sp"
                         android:textStyle="normal"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="@id/player_pause_play"
                         tools:text="15:30" />
-                    <!--app:buffered_color="@color/videoCache"-->
-                    <androidx.media3.ui.DefaultTimeBar
+
+                    <FrameLayout
+                        android:id="@+id/previewFrameLayout"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginBottom="16dp"
+                        android:background="@drawable/video_frame"
+                        android:visibility="invisible"
+                        app:layout_constraintBottom_toTopOf="@+id/exo_progress"
+                        app:layout_constraintDimensionRatio="16:9"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.0"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintWidth_default="percent"
+                        app:layout_constraintWidth_percent="0.25"
+                        tools:visibility="visible">
+
+                        <ImageView
+                            android:id="@+id/previewImageView"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_margin="@dimen/video_frame_width"
+                            android:importantForAccessibility="no"
+                            android:scaleType="centerCrop" />
+                    </FrameLayout>
+
+                    <com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
                         android:id="@id/exo_progress"
                         android:layout_width="0dp"
                         android:layout_height="30dp"
-                        android:layout_gravity="center"
                         android:layout_weight="1"
-                        android:focusable="false"
-                        android:focusableInTouchMode="false"
                         app:bar_height="2dp"
+                        app:layout_constraintBottom_toBottomOf="@id/exo_position"
+                        app:layout_constraintEnd_toStartOf="@id/exo_duration"
+                        app:layout_constraintStart_toEndOf="@+id/exo_position"
                         app:played_color="?attr/colorPrimary"
+
                         app:scrubber_color="?attr/colorPrimary"
                         app:scrubber_dragged_size="26dp"
                         app:scrubber_enabled_size="24dp"
                         app:unplayed_color="@color/videoProgress" />
 
-                    <!-- exo_duration-->
                     <TextView
                         android:id="@id/exo_duration"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center|center_vertical"
+
                         android:layout_marginEnd="20dp"
                         android:includeFontPadding="false"
                         android:minWidth="50dp"
@@ -572,9 +604,11 @@
                         android:textColor="@android:color/white"
                         android:textSize="14sp"
                         android:textStyle="normal"
+                        app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
+                        app:layout_constraintEnd_toEndOf="parent"
                         tools:text="23:20" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-                </LinearLayout>
 
                 <HorizontalScrollView
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/player_prioritize_item.xml b/app/src/main/res/layout/player_prioritize_item.xml
index b78863f8..a8a9729d 100644
--- a/app/src/main/res/layout/player_prioritize_item.xml
+++ b/app/src/main/res/layout/player_prioritize_item.xml
@@ -22,6 +22,7 @@
         android:layout_toStartOf="@id/priority_number"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="10dp"
+        android:focusable="true"
         android:src="@drawable/baseline_remove_24" />
 
     <TextView
@@ -43,6 +44,7 @@
         android:layout_centerVertical="true"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="10dp"
+        android:focusable="true"
         android:src="@drawable/ic_baseline_add_24" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/player_quality_profile_item.xml b/app/src/main/res/layout/player_quality_profile_item.xml
index 0eab2407..5178a12f 100644
--- a/app/src/main/res/layout/player_quality_profile_item.xml
+++ b/app/src/main/res/layout/player_quality_profile_item.xml
@@ -10,6 +10,7 @@
         android:id="@+id/card_view"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:focusable="true"
         app:layout_constraintDimensionRatio="1"
         android:layout_marginStart="10dp"
         android:animateLayoutChanges="true"
diff --git a/app/src/main/res/layout/player_select_source_and_subs.xml b/app/src/main/res/layout/player_select_source_and_subs.xml
index 7351a41f..6bf8006b 100644
--- a/app/src/main/res/layout/player_select_source_and_subs.xml
+++ b/app/src/main/res/layout/player_select_source_and_subs.xml
@@ -27,6 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_rowWeight="1"
                 android:layout_marginTop="10dp"
+                android:focusable="true"
                 android:foreground="@drawable/outline_drawable_forced"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
@@ -66,8 +67,9 @@
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
                 android:listSelector="@drawable/outline_drawable_forced"
-                android:nextFocusLeft="@id/sort_subtitles"
-                android:nextFocusRight="@id/apply_btt"
+                android:nextFocusUp="@id/profiles_click_settings"
+                android:nextFocusRight="@id/sort_subtitles"
+                android:nextFocusDown="@id/apply_btt"
                 android:requiresFadingEdge="vertical"
                 tools:layout_height="100dp"
                 tools:listitem="@layout/sort_bottom_single_choice" />
@@ -94,6 +96,7 @@
                     android:layout_height="wrap_content"
                     android:layout_rowWeight="1"
                     android:layout_marginTop="10dp"
+                    android:focusable="true"
                     android:foreground="@drawable/outline_drawable_forced"
                     android:orientation="horizontal"
                     android:paddingTop="10dp"
@@ -139,8 +142,10 @@
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
                 android:listSelector="@drawable/outline_drawable_forced"
+                android:nextFocusUp="@id/subtitles_click_settings"
                 android:nextFocusLeft="@id/sort_providers"
-                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusRight="@id/apply_btt"
+                android:nextFocusDown="@id/apply_btt"
                 android:requiresFadingEdge="vertical"
                 tools:layout_height="200dp"
                 tools:listfooter="@layout/sort_bottom_footer_add_choice"
diff --git a/app/src/main/res/layout/player_select_source_priority.xml b/app/src/main/res/layout/player_select_source_priority.xml
index 86a8a756..2af3c339 100644
--- a/app/src/main/res/layout/player_select_source_priority.xml
+++ b/app/src/main/res/layout/player_select_source_priority.xml
@@ -42,8 +42,8 @@
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
                 android:listSelector="@drawable/outline_drawable_less"
-                android:nextFocusLeft="@id/sort_subtitles"
-                android:nextFocusRight="@id/apply_btt"
+                android:nextFocusRight="@id/sort_subtitles"
+                android:nextFocusDown="@id/profile_text_editable"
                 android:requiresFadingEdge="vertical"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:layout_height="100dp"
@@ -92,6 +92,8 @@
                         android:layout_height="50dp"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:padding="12dp"
+                        android:focusable="true"
+                        android:nextFocusLeft="@id/sort_sources"
                         android:src="@drawable/baseline_help_outline_24"
                         android:contentDescription="@string/help" />
 
@@ -115,8 +117,10 @@
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
                 android:listSelector="@drawable/outline_drawable_less"
-                android:nextFocusLeft="@id/sort_providers"
-                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusLeft="@id/sort_sources"
+                android:nextFocusRight="@id/apply_btt"
+                android:nextFocusUp="@id/help_btt"
+                android:nextFocusDown="@id/apply_btt"
                 android:requiresFadingEdge="vertical"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:layout_height="200dp"
diff --git a/app/src/main/res/layout/result_episode.xml b/app/src/main/res/layout/result_episode.xml
index 80ff4bec..b56cdb1d 100644
--- a/app/src/main/res/layout/result_episode.xml
+++ b/app/src/main/res/layout/result_episode.xml
@@ -11,7 +11,9 @@
     android:nextFocusRight="@id/download_button"
     app:cardBackgroundColor="@color/transparent"
     app:cardCornerRadius="@dimen/rounded_image_radius"
-    app:cardElevation="0dp">
+    app:cardElevation="0dp"
+    android:foreground="@drawable/outline_drawable"
+    >
     <!--
         android:nextFocusLeft="@id/result_episode_download"
         -->
diff --git a/app/src/main/res/layout/result_episode_both.xml b/app/src/main/res/layout/result_episode_both.xml
deleted file mode 100644
index 61102e84..00000000
--- a/app/src/main/res/layout/result_episode_both.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:foreground="@drawable/outline_drawable"
-        android:layout_height="wrap_content">
-
-    <include android:visibility="gone" layout="@layout/result_episode" />
-    <include android:visibility="visible" layout="@layout/result_episode_large" />
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_episode_both_old.xml b/app/src/main/res/layout/result_episode_both_old.xml
new file mode 100644
index 00000000..6472ecc1
--- /dev/null
+++ b/app/src/main/res/layout/result_episode_both_old.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:foreground="@drawable/outline_drawable">
+
+    <include
+        layout="@layout/result_episode"
+        android:visibility="gone" />
+
+    <include
+        layout="@layout/result_episode_large"
+        android:visibility="visible" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_episode_both_tv.xml b/app/src/main/res/layout/result_episode_both_tv.xml
deleted file mode 100644
index 13888b7e..00000000
--- a/app/src/main/res/layout/result_episode_both_tv.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="wrap_content"
-        android:foreground="@drawable/outline_drawable"
-        android:layout_height="wrap_content">
-
-    <include
-            tools:visibility="visible"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            layout="@layout/result_episode_tv" />
-
-    <include
-            tools:visibility="gone"
-            android:visibility="gone"
-            android:layout_width="450dp"
-            android:layout_height="wrap_content"
-            layout="@layout/result_episode_large_tv" />
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_episode_both_tv_old.xml b/app/src/main/res/layout/result_episode_both_tv_old.xml
new file mode 100644
index 00000000..f273a118
--- /dev/null
+++ b/app/src/main/res/layout/result_episode_both_tv_old.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:foreground="@drawable/outline_drawable">
+
+    <include
+        layout="@layout/result_episode_tv_old"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <include
+        layout="@layout/result_episode_large_tv_old"
+        android:layout_width="450dp"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        tools:visibility="gone" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_episode_large.xml b/app/src/main/res/layout/result_episode_large.xml
index 75292965..76e8c434 100644
--- a/app/src/main/res/layout/result_episode_large.xml
+++ b/app/src/main/res/layout/result_episode_large.xml
@@ -8,6 +8,7 @@
 
     android:layout_height="wrap_content"
     android:layout_marginBottom="10dp"
+    android:foreground="@drawable/outline_drawable"
     android:nextFocusRight="@id/download_button"
     app:cardBackgroundColor="?attr/boxItemBackground"
 
diff --git a/app/src/main/res/layout/result_episode_large_tv.xml b/app/src/main/res/layout/result_episode_large_tv.xml
deleted file mode 100644
index 5a9dee30..00000000
--- a/app/src/main/res/layout/result_episode_large_tv.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-
-        android:id="@+id/episode_holder_large"
-
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        app:cardBackgroundColor="?attr/boxItemBackground"
-
-        android:layout_marginBottom="10dp">
-
-    <LinearLayout
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:padding="10dp"
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-        <LinearLayout
-                android:layout_width="match_parent"
-                android:orientation="horizontal"
-                android:layout_height="wrap_content">
-            <!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
-            <androidx.cardview.widget.CardView
-                    android:layout_width="126dp"
-                    android:layout_height="72dp"
-                    android:foreground="@drawable/outline_drawable">
-
-                <ImageView
-                        android:id="@+id/episode_poster"
-                        tools:src="@drawable/example_poster"
-                        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-
-                        android:scaleType="centerCrop"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/episode_poster_img_des" />
-
-                <ImageView
-                        android:src="@drawable/play_button"
-                        android:layout_gravity="center"
-                        android:layout_width="36dp"
-                        android:layout_height="36dp"
-                        android:contentDescription="@string/play_episode" />
-
-                <androidx.core.widget.ContentLoadingProgressBar
-                        android:layout_marginBottom="-1.5dp"
-                        android:id="@+id/episode_progress"
-                        android:progressTint="?attr/colorPrimary"
-                        android:progressBackgroundTint="?attr/colorPrimary"
-                        style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                        android:layout_width="match_parent"
-                        tools:progress="50"
-                        android:layout_gravity="bottom"
-                        android:layout_height="5dp" />
-            </androidx.cardview.widget.CardView>
-
-            <LinearLayout
-                    android:layout_marginStart="15dp"
-                    android:orientation="vertical"
-                    android:layout_gravity="center"
-                    android:layout_width="match_parent"
-                    android:layout_marginEnd="50dp"
-                    android:layout_height="wrap_content">
-
-                <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-
-                    <com.google.android.material.button.MaterialButton
-                            android:layout_gravity="start"
-                            style="@style/SmallWhiteButton"
-                            android:layout_marginEnd="10dp"
-                            android:text="@string/filler"
-                            android:id="@+id/episode_filler" />
-
-                    <TextView
-                            android:layout_gravity="center_vertical"
-                            android:id="@+id/episode_text"
-                            tools:text="1. Jobless"
-                            android:textStyle="bold"
-                            android:textColor="?attr/textColor"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
-                </LinearLayout>
-
-                <TextView
-                        android:id="@+id/episode_rating"
-                        tools:text="Rated: 8.8"
-                        android:textColor="?attr/grayTextColor"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <TextView
-                android:maxLines="4"
-                android:ellipsize="end"
-                android:paddingTop="10dp"
-                android:paddingBottom="10dp"
-                android:id="@+id/episode_descript"
-                android:textColor="?attr/grayTextColor"
-                tools:text="Jon and Daenerys arrive in Winterfell and are met with skepticism. Sam learns about the fate of his family. Cersei gives Euron the reward he aims for. Theon follows his heart. Jon and Daenerys arrive in Winterfell and are met with skepticism. Sam learns about the fate of his family. Cersei gives Euron the reward he aims for. Theon follows his heart."
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-    </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_episode_large_tv_old.xml b/app/src/main/res/layout/result_episode_large_tv_old.xml
new file mode 100644
index 00000000..3a7cef3c
--- /dev/null
+++ b/app/src/main/res/layout/result_episode_large_tv_old.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+
+    android:id="@+id/episode_holder_large"
+
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="10dp"
+    android:background="@drawable/outline_drawable"
+    app:cardBackgroundColor="?attr/boxItemBackground"
+
+    app:cardCornerRadius="@dimen/rounded_image_radius">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/outline_drawable"
+        android:orientation="vertical"
+        android:padding="10dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
+            <androidx.cardview.widget.CardView
+                android:layout_width="126dp"
+                android:layout_height="72dp"
+                android:foreground="@drawable/outline_drawable">
+
+                <ImageView
+                    android:id="@+id/episode_poster"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+
+                    android:contentDescription="@string/episode_poster_img_des"
+                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:scaleType="centerCrop"
+                    tools:src="@drawable/example_poster" />
+
+                <ImageView
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_gravity="center"
+                    android:contentDescription="@string/play_episode"
+                    android:src="@drawable/play_button" />
+
+                <androidx.core.widget.ContentLoadingProgressBar
+                    android:id="@+id/episode_progress"
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="5dp"
+                    android:layout_gravity="bottom"
+                    android:layout_marginBottom="-1.5dp"
+                    android:progressBackgroundTint="?attr/colorPrimary"
+                    android:progressTint="?attr/colorPrimary"
+                    tools:progress="50" />
+            </androidx.cardview.widget.CardView>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="50dp"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/episode_filler"
+                        style="@style/SmallWhiteButton"
+                        android:layout_gravity="start"
+                        android:layout_marginEnd="10dp"
+                        android:text="@string/filler" />
+
+                    <TextView
+                        android:id="@+id/episode_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:textColor="?attr/textColor"
+                        android:textStyle="bold"
+                        tools:text="1. Jobless" />
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/episode_rating"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/grayTextColor"
+                    tools:text="Rated: 8.8" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/episode_descript"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="4"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:textColor="?attr/grayTextColor"
+            tools:text="Jon and Daenerys arrive in Winterfell and are met with skepticism. Sam learns about the fate of his family. Cersei gives Euron the reward he aims for. Theon follows his heart. Jon and Daenerys arrive in Winterfell and are met with skepticism. Sam learns about the fate of his family. Cersei gives Euron the reward he aims for. Theon follows his heart." />
+    </LinearLayout>
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_episode_tv.xml b/app/src/main/res/layout/result_episode_tv.xml
deleted file mode 100644
index 53590b6b..00000000
--- a/app/src/main/res/layout/result_episode_tv.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-
-        android:id="@+id/episode_holder"
-        android:layout_width="wrap_content"
-        android:layout_height="50dp"
-
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        app:cardBackgroundColor="@color/transparent"
-        app:cardElevation="0dp"
-        android:layout_marginBottom="5dp">
-
-    <androidx.core.widget.ContentLoadingProgressBar
-            android:layout_marginBottom="-1.5dp"
-            android:id="@+id/episode_progress"
-            android:progressTint="?attr/colorPrimary"
-            android:progressBackgroundTint="?attr/colorPrimary"
-            style="@android:style/Widget.Material.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            tools:progress="50"
-            android:layout_gravity="bottom"
-            android:layout_height="5dp" />
-
-    <LinearLayout
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:gravity="center"
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <!--marquee_forever-->
-        <com.google.android.material.button.MaterialButton
-                android:layout_marginEnd="10dp"
-                tools:visibility="visible"
-                android:gravity="center"
-                android:layout_gravity="center"
-                style="@style/SmallWhiteButton"
-                android:text="@string/filler"
-                android:id="@+id/episode_filler" />
-
-        <TextView
-                android:id="@+id/episode_text"
-                android:layout_gravity="center_vertical"
-                android:gravity="center"
-                tools:text="Episode 1"
-                android:textColor="?attr/textColor"
-
-                android:scrollHorizontally="true"
-                android:ellipsize="marquee"
-
-                android:marqueeRepeatLimit="0"
-                android:singleLine="true"
-
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent" />
-    </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_episode_tv_old.xml b/app/src/main/res/layout/result_episode_tv_old.xml
new file mode 100644
index 00000000..62546cf9
--- /dev/null
+++ b/app/src/main/res/layout/result_episode_tv_old.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+
+    android:id="@+id/episode_holder"
+    android:layout_width="wrap_content"
+    android:layout_height="50dp"
+
+    android:layout_marginBottom="5dp"
+    app:cardBackgroundColor="@color/transparent"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    app:cardElevation="0dp">
+
+    <androidx.core.widget.ContentLoadingProgressBar
+        android:id="@+id/episode_progress"
+        style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="-1.5dp"
+        android:progressBackgroundTint="?attr/colorPrimary"
+        android:progressTint="?attr/colorPrimary"
+        tools:progress="50" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp">
+
+        <!--marquee_forever-->
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/episode_filler"
+            style="@style/SmallWhiteButton"
+            android:layout_gravity="center"
+            android:layout_marginEnd="10dp"
+            android:gravity="center"
+            android:text="@string/filler"
+            tools:visibility="visible" />
+
+        <TextView
+            android:id="@+id/episode_text"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:ellipsize="marquee"
+
+            android:gravity="center"
+            android:marqueeRepeatLimit="0"
+
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+
+            android:textColor="?attr/textColor"
+            tools:text="Episode 1" />
+    </LinearLayout>
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_history_item.xml b/app/src/main/res/layout/search_history_item.xml
index 3e9ee833..4c50d0c0 100644
--- a/app/src/main/res/layout/search_history_item.xml
+++ b/app/src/main/res/layout/search_history_item.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/outline_drawable_less"
-
+    android:focusable="true"
     android:nextFocusRight="@id/home_history_remove"
     android:orientation="horizontal">
     <!-- android:foreground="?android:attr/selectableItemBackgroundBorderless"
@@ -30,7 +30,7 @@
         android:layout_gravity="center_vertical|end"
 
         android:background="@drawable/outline_drawable_less"
-
+        android:focusable="true"
         android:nextFocusLeft="@id/home_history_tab"
         android:padding="10dp"
         android:src="@drawable/ic_baseline_close_24"
diff --git a/app/src/main/res/layout/subtitle_offset.xml b/app/src/main/res/layout/subtitle_offset.xml
index a98fafef..c17c5eff 100644
--- a/app/src/main/res/layout/subtitle_offset.xml
+++ b/app/src/main/res/layout/subtitle_offset.xml
@@ -35,6 +35,7 @@
             android:layout_gravity="center"
             android:layout_weight="1"
             android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:focusable="true"
             android:nextFocusRight="@id/subtitle_offset_subtract"
             android:padding="10dp"
             android:src="@drawable/ic_baseline_keyboard_arrow_left_24"
@@ -48,6 +49,7 @@
             android:layout_gravity="center"
             android:layout_weight="1"
             android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:focusable="true"
             android:nextFocusLeft="@id/subtitle_offset_subtract_more"
             android:padding="10dp"
             android:src="@drawable/baseline_remove_24"
@@ -70,6 +72,7 @@
             android:layout_gravity="center"
             android:layout_weight="1"
             android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:focusable="true"
             android:nextFocusRight="@id/subtitle_offset_add_more"
             android:padding="10dp"
             android:src="@drawable/ic_baseline_add_24"
@@ -83,7 +86,9 @@
             android:layout_gravity="center"
             android:layout_weight="1"
             android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:focusable="true"
             android:nextFocusLeft="@id/subtitle_offset_add"
+            android:nextFocusDown="@id/apply_btt"
             android:padding="10dp"
             android:src="@drawable/ic_baseline_keyboard_arrow_right_24"
             app:tint="?attr/white"
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index 736d114c..b367fc53 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -212,7 +212,6 @@
             tools:visibility="visible" />
 
 
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/player_center_menu"
             android:layout_width="match_parent"
@@ -294,6 +293,7 @@
                     app:tint="@color/white"
                     tools:ignore="ContentDescription" />
             </FrameLayout>
+
             <FrameLayout
                 android:id="@+id/player_ffwd_holder"
                 android:layout_width="0dp"
@@ -420,20 +420,20 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent">
 
-            <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/player_video_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layoutDirection="ltr"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@id/exo_position"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="30dp"
                     android:layout_gravity="center"
                     android:layout_marginStart="20dp"
-                    android:gravity="end"
+                    android:gravity="end|center_vertical"
                     android:includeFontPadding="false"
                     android:minWidth="50dp"
                     android:paddingLeft="4dp"
@@ -441,14 +441,46 @@
                     android:textColor="@android:color/white"
                     android:textSize="14sp"
                     android:textStyle="normal"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     tools:text="15:30" />
-                <!--app:buffered_color="@color/videoCache"-->
-                <androidx.media3.ui.DefaultTimeBar
+
+                <FrameLayout
+                    android:id="@+id/previewFrameLayout"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginBottom="16dp"
+                    android:background="@drawable/video_frame"
+                    android:visibility="invisible"
+                    app:layout_constraintBottom_toTopOf="@+id/exo_progress"
+                    app:layout_constraintDimensionRatio="16:9"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintWidth_default="percent"
+                    app:layout_constraintWidth_percent="0.25"
+                    tools:visibility="visible">
+
+                    <ImageView
+                        android:id="@+id/previewImageView"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_margin="@dimen/video_frame_width"
+                        android:importantForAccessibility="no"
+                        android:scaleType="centerCrop" />
+                </FrameLayout>
+
+                <com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
                     android:id="@id/exo_progress"
                     android:layout_width="0dp"
                     android:layout_height="30dp"
                     android:layout_weight="1"
                     app:bar_height="2dp"
+                    app:layout_constraintBottom_toBottomOf="@id/exo_position"
+                    app:layout_constraintEnd_toStartOf="@id/exo_duration"
+                    app:layout_constraintStart_toEndOf="@+id/exo_position"
                     app:played_color="?attr/colorPrimary"
 
                     app:scrubber_color="?attr/colorPrimary"
@@ -456,13 +488,13 @@
                     app:scrubber_enabled_size="24dp"
                     app:unplayed_color="@color/videoProgress" />
 
-                <!-- exo_duration-->
                 <TextView
                     android:id="@id/exo_duration"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginEnd="20dp"
+                    android:layout_height="30dp"
+                    android:layout_gravity="center|center_vertical"
+
+                    android:layout_marginEnd="30dp"
                     android:includeFontPadding="false"
                     android:minWidth="50dp"
                     android:paddingLeft="4dp"
@@ -470,19 +502,23 @@
                     android:textColor="@android:color/white"
                     android:textSize="14sp"
                     android:textStyle="normal"
+                    app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
+                    app:layout_constraintEnd_toEndOf="@id/player_fullscreen"
                     tools:text="23:20" />
 
-            </LinearLayout>
+                <ImageView
+                    android:id="@+id/player_fullscreen"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginEnd="20dp"
+
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:src="@drawable/baseline_fullscreen_24"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:tint="@color/white" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <ImageView
-                android:id="@+id/player_fullscreen"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginEnd="20dp"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/baseline_fullscreen_24"
-                app:tint="@color/white" />
 
             <HorizontalScrollView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/who_is_watching_account.xml b/app/src/main/res/layout/who_is_watching_account.xml
index afa1a2a7..4970d004 100644
--- a/app/src/main/res/layout/who_is_watching_account.xml
+++ b/app/src/main/res/layout/who_is_watching_account.xml
@@ -11,6 +11,7 @@
     android:foreground="?attr/selectableItemBackgroundBorderless"
     app:cardCornerRadius="@dimen/rounded_image_radius"
     android:layout_margin="5dp"
+    android:focusable="true"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintDimensionRatio="1"
     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/who_is_watching_account_add.xml b/app/src/main/res/layout/who_is_watching_account_add.xml
index ed67e144..91c7e419 100644
--- a/app/src/main/res/layout/who_is_watching_account_add.xml
+++ b/app/src/main/res/layout/who_is_watching_account_add.xml
@@ -11,6 +11,7 @@
     android:foreground="?attr/selectableItemBackgroundBorderless"
     app:cardCornerRadius="@dimen/rounded_image_radius"
     android:layout_margin="5dp"
+    android:focusable="true"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintDimensionRatio="1"
     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/who_is_watching_account_edit.xml b/app/src/main/res/layout/who_is_watching_account_edit.xml
index 74553517..cec37a4f 100644
--- a/app/src/main/res/layout/who_is_watching_account_edit.xml
+++ b/app/src/main/res/layout/who_is_watching_account_edit.xml
@@ -88,6 +88,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
                 android:layout_gravity="center"
+                android:focusable="true"
                 android:contentDescription="@string/preview_background_img_des"
                 android:scaleType="centerCrop"
                 android:src="@drawable/profile_bg_blue" />
diff --git a/app/src/main/res/values-ajp/strings.xml b/app/src/main/res/values-ajp/strings.xml
index 42eba3cc..47c69a28 100644
--- a/app/src/main/res/values-ajp/strings.xml
+++ b/app/src/main/res/values-ajp/strings.xml
@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources/>
+<resources>
+    <string name="player_speed_text_format" formatted="true">السرعة (%.2fx)</string>
+    <string name="home_change_provider_img_des">غير المصدر</string>
+    <string name="next_episode_format" formatted="true">حتنزل الحلقة %d ب</string>
+    <string name="title_downloads">التنزيلات</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s الحلقة %d</string>
+</resources>
diff --git a/app/src/main/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml
index 5a799eb4..32f4dcd7 100644
--- a/app/src/main/res/values-am/strings.xml
+++ b/app/src/main/res/values-am/strings.xml
@@ -2,4 +2,112 @@
 <resources>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s ክፍል %d</string>
     <string name="cast_format" formatted="true">ተዋናዮች: %s</string>
+    <string name="player_speed_text_format" formatted="true">ፍጥነት(%.2fx)</string>
+    <string name="home_next_random_img_des">ቀጣይ በዘፈቀደ</string>
+    <string name="preview_background_img_des">ዳራ ቅድም እይታ</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dሰዓት %dደቂቃ</string>
+    <string name="search_poster_img_des">ፖስተር</string>
+    <string name="title_downloads">የወረዱ</string>
+    <string name="new_update_format" formatted="true">አዲስ ማሻሻያ ተገኝቷል!
+\n%s -&gt; %s</string>
+    <string name="go_back_img_des">ተመለስ</string>
+    <string name="episode_more_options_des">ተጨማሪ አማራጮች</string>
+    <string name="type_watching">በማየት ላይ</string>
+    <string name="result_tags">ዘውጎች</string>
+    <string name="episode_poster_img_des">የክፍሉ ፖስተር</string>
+    <string name="search_hint_site" formatted="true">%sን ፈልግ…</string>
+    <string name="filler" formatted="true">መሙያ</string>
+    <string name="home_change_provider_img_des">አቅራቢ ቀይር</string>
+    <string name="search_hint">ፍለጋ…</string>
+    <string name="rated_format" formatted="true">ተመዘነ: %.1f</string>
+    <string name="browser">አሳሽ</string>
+    <string name="next_episode_time_day_format" formatted="true">%dቀን %dሰዓት %dደቂቃ</string>
+    <string name="next_episode">ቀጣይ ክፍል</string>
+    <string name="next_episode_time_min_format" formatted="true">%dደቂቃ</string>
+    <string name="duration_format" formatted="true">%d ደቂቃ</string>
+    <string name="result_poster_img_des">ፖስተር</string>
+    <string name="result_open_in_browser">በአሳሽ ውስጥ ይክፈቱ</string>
+    <string name="no_data">ውሂብ የለም</string>
+    <string name="title_home">መነሻ</string>
+    <string name="skip_loading">መጫንን ዝለል</string>
+    <string name="next_episode_format" formatted="true">ክፍል %d በ ይለቀቃል</string>
+    <string name="result_share">ማጋሪያ</string>
+    <string name="home_main_poster_img_des">ዋና ፖስተር</string>
+    <string name="title_settings">ቅንብሮች</string>
+    <string name="title_search">መፈለጊያ</string>
+    <string name="loading">በመጫን ላይ…</string>
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">በCloudStream አጫውት</string>
+    <string name="action_remove_from_bookmarks">ያስወግዱ</string>
+    <string name="error_bookmarks_text">ዕልባቶች</string>
+    <string name="download_started">ማውረድ ተጀምሯል</string>
+    <string name="play_movie_button">ሙቪ አጫውት</string>
+    <string name="sort_clear">አጽዳ</string>
+    <string name="subs_outline_color">የዳርቻ ቀለም</string>
+    <string name="filter_bookmarks">ዕልባቶችን ማጣሪያ</string>
+    <string name="type_plan_to_watch">በእቅድ ላይ</string>
+    <string name="update_started">ማዘመን ተጀምሯል</string>
+    <string name="sort_copy">ቅዳ</string>
+    <string name="home_more_info">ተጨማሪ መረጃ</string>
+    <string name="error_loading_links_toast">አገናኞችን መጫን ላይ ስህተት</string>
+    <string name="subs_edge_type">የጠርዝ ዓይነት</string>
+    <string name="download_done">ማውረድ ተከናውኗል</string>
+    <string name="downloading">በማውረድ ላይ</string>
+    <string name="play_episode">ክፍልን አጫውት</string>
+    <string name="player_speed">የአጫዋች ፍጥነት</string>
+    <string name="type_dropped">የተተወ</string>
+    <string name="subs_background_color">የዳራ ቀለም</string>
+    <string name="popup_pause_download">ማውረድ ለአፍታ አቁም</string>
+    <string name="app_dubbed_text">ትርጉም ድምጽ</string>
+    <string name="subtitles_settings">የትርጉም ጽሑፍ ቅንብሮች</string>
+    <string name="subs_window_color">የዊንዶው ቀለም</string>
+    <string name="play_torrent_button">Torrent አጫውት</string>
+    <string name="download_canceled">ማውረድ ተቋርጧል</string>
+    <string name="home_expanded_hide">ደብቅ</string>
+    <string name="sort_apply">አጽድቅ</string>
+    <string name="pick_subtitle">የትርጉም ጽሑፎች</string>
+    <string name="download_paused">ማውረድ ቆሟል</string>
+    <string name="download">ማውረጃ</string>
+    <string name="reload_error">ግንኙነትን እንደገና ይሞሩ…</string>
+    <string name="popup_delete_file">ፋይል አጥፋ</string>
+    <string name="downloaded">ወርዷል</string>
+    <string name="popup_resume_download">ማውረድ ቀጥል</string>
+    <string name="subs_text_color">የጽሑፍ ቀለም</string>
+    <string name="type_completed">የተጠናቀቀ</string>
+    <string name="type_none">ምንም</string>
+    <string name="play_trailer_button">የፊልም ማስታወቂያ አጫውት</string>
+    <string name="play_livestream_button">የቀጥታ ስርጭት አጫውት</string>
+    <string name="popup_play_file">ፋይል አጫውት</string>
+    <string name="type_re_watching">እንደገና በማየት ላይ</string>
+    <string name="sort_cancel">ሰርዝ</string>
+    <string name="go_back">ወደ ኋላ መመለሻ</string>
+    <string name="home_info">መረጃ</string>
+    <string name="sort_save">ያስቀምጡ</string>
+    <string name="download_failed">ማውረድ አልተሳካም</string>
+    <string name="pick_source">ምንጮች</string>
+    <string name="app_subbed_text">ትርጉም ጽሁፍ</string>
+    <string name="stream">ዥረት</string>
+    <string name="type_on_hold">በመቆየት ላይ</string>
+    <string name="home_play">አጫውት</string>
+    <string name="download_storage_text">ውስጣዊ ማከማቻ</string>
+    <string name="sort_close">ዝጋ</string>
+    <string name="action_add_to_bookmarks">የምልከታ ሁኔታን ያቀናብሩ</string>
+    <string name="subs_hold_to_reset_to_default">ወደ ነባሪ ዳግም ለማስጀመር ጫን አድርገው ይያዙ</string>
+    <string name="subs_font_size">የቅርጸ-ቁምፊ መጠን</string>
+    <string name="subs_auto_select_language">ቋንቋን በራስ ይምረጥ</string>
+    <string name="continue_watching">መመልከትዎን ይቀጥሉ</string>
+    <string name="subs_download_languages">ቋንቋዎችን ያውርዱ</string>
+    <string name="search_provider_text_providers">አቅራቢዎችን በመጠቀም ይፈልጉ</string>
+    <string name="benene_count_text">%d ሙዝ ለዴቭሎፐሮቹ ተሰጥቷል</string>
+    <string name="vpn_might_be_needed">ይህ አቅራቢ በትክክል እንዲሰራ ቪፒኤን ሊያስፈልግ ይችላል</string>
+    <string name="benene_count_text_none">ምንም ሙዝ አልተሰጠም</string>
+    <string name="subs_subtitle_languages">የትርጉም ጽሑፍ ቋንቋ</string>
+    <string name="provider_info_meta">ሜታዳታ በድረ-ገጹ ላይ አይገኝም፣ ቪድዮ መጫን ሜታዳታ ድረ-ገጹ ላይ ከሌለ አይሳካም።</string>
+    <string name="vpn_torrent">ይህ አቅራቢ ቶረንት ነው፣ ቪፒኤን ይመከራል</string>
+    <string name="subs_font">ቅርጸ-ቁምፊ</string>
+    <string name="torrent_plot">መግለጫ</string>
+    <string name="action_remove_watching">ያስወግዱ</string>
+    <string name="action_open_watching">ተጨማሪ መረጃ</string>
+    <string name="search_provider_text_types">ዓይነቶችን በመጠቀም ይፈልጉ</string>
+    <string name="subs_import_text" formatted="true">ቅርጸ-ቁምፊዎችን በ%s ውስጥ በማስቀመጥ ያጫኑ</string>
 </resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 0c11f7e9..8805ec5d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -99,13 +99,13 @@
     <string name="subs_hold_to_reset_to_default">إضغط بإستمرار لإعادة التعيين للإعدادات الافتراضية</string>
     <string name="subs_import_text" formatted="true">إستيراد خطوط بوضعها هنا %s</string>
     <string name="continue_watching">متابعة المشاهدة</string>
-    <string name="action_remove_watching">حذف</string>
-    <string name="action_open_watching">مزيد من المعلومات</string>
+    <string name="action_remove_watching">ازالة</string>
+    <string name="action_open_watching">المزيد من المعلومات</string>
     <string name="vpn_might_be_needed">قد تكون هناك حاجة إلى VPN لكي يعمل هذا المزود بشكل صحيح</string>
-    <string name="vpn_torrent">هذا المزود هو تورنت ، يوصى باستخدام شبكة ظاهرية خاصة</string>
+    <string name="vpn_torrent">هذا المزود هو تورنت، يوصى باستخدام شبكة ظاهرية خاصة</string>
     <string name="provider_info_meta">لا يتم توفير البيانات الوصفية بواسطة الموقع، وسيفشل تحميل الفيديو إذا لم يكن موجودًا في الموقع.</string>
     <string name="torrent_plot">الوصف</string>
-    <string name="normal_no_plot">لم يتم العثور على وصف</string>
+    <string name="normal_no_plot">لم يتم العثور على حبكة</string>
     <string name="torrent_no_plot">لم يتم العثور على وصف</string>
     <string name="show_log_cat">عرض سجل الاخطاء 🐈</string>
     <string name="picture_in_picture">نافذة منبثقة</string>
@@ -585,4 +585,5 @@
     <string name="no_plugins_found_error">لا توجد اضافة في المستودع</string>
     <string name="no_repository_found_error">المستودع لم يتم العثور عليه، تحقق من العنوان اوجرب شبكة افتراضية خاصة(vpn)</string>
     <string name="already_voted">لقد صوتت بالفعل</string>
+    <string name="backup_frequency">معدل النسخ الإحتياطي</string>
 </resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index d76aa94b..e9ae65a1 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -159,7 +159,7 @@
     <string name="pref_filter_search_quality">Скрий избраното видео качество в резултатите от търсенето</string>
     <string name="automatic_plugin_updates">Автоматични актуализации на плъгини</string>
     <string name="updates_settings">Показвай актуализации на приложението</string>
-    <string name="updates_settings_des">Автоматично търси нови актуализации при стартиране</string>
+    <string name="updates_settings_des">Автоматично търси нови актуализации при стартиране на приложението.</string>
     <string name="uprereleases_settings">Актуализация до експериментални версии</string>
     <string name="uprereleases_settings_des">Търсете експериментални актуализации вместо само пълни версии</string>
     <string name="github">Github</string>
@@ -223,8 +223,8 @@
     <string name="movies_singular">Филм</string>
     <string name="tv_series_singular">Серия</string>
     <string name="cartoons_singular">Анимационен филм</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">Аниме</string>
+    <string name="ova_singular">ОВА</string>
     <string name="torrent_singular">Торент</string>
     <string name="documentaries_singular">Документален филм</string>
     <string name="asian_drama_singular">Азиатска драма</string>
@@ -260,7 +260,7 @@
     <string name="dont_show_again">Не показвай отново</string>
     <string name="skip_update">Пропуснете тази актуализация</string>
     <string name="update">Актуализация</string>
-    <string name="watch_quality_pref">Предпочитано качество за гледане</string>
+    <string name="watch_quality_pref">Предпочитано качество за гледане (през WiFi)</string>
     <string name="limit_title">Максимален брой знаци за заглавие във видеоплейъра</string>
     <string name="limit_title_rez">Разделителна способност на видео плейъра</string>
     <string name="video_buffer_size_settings">Размер на видео буфера</string>
@@ -505,4 +505,45 @@
     <string name="library">Библиотека</string>
     <string name="watch_quality_pref_data">Предпочитано качество за гледане (Мобилни данни)</string>
     <string name="start">Начало</string>
+    <string name="automatic_plugin_download_mode_title">Избери режим, да филтрира изтегляне на добавки</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com Прокси</string>
+    <string name="jsdelivr_enabled">Неуспешно свързване с GitHub. Включване на jsDelivr прокси…</string>
+    <string name="jsdelivr_proxy_summary">Заобикаля блокирането на GitHub с помощта на jsDelivr. Може да доведе до забавяне на актуализациите с няколко дни.</string>
+    <string name="category_provider_test">Тест на доставчик</string>
+    <string name="disable">Деактивиране</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="pref_category_bypass">Заобикаляне на интернет доставчик</string>
+    <string name="no_plugins_found_error">Няма намерени добавки в този архив.</string>
+    <string name="no_repository_found_error">Архивът не е намерен, проверете уеб-адреса и пробвайте с VPN</string>
+    <string name="sort_rating_desc">Оценка (От висока до ниска)</string>
+    <string name="sort_by">Сортирай по</string>
+    <string name="stop">Стоп</string>
+    <string name="restart">Рестартиране</string>
+    <string name="sort">Сортиране</string>
+    <string name="sort_rating_asc">Оценка (от ниска до висока)</string>
+    <string name="subscription_new">Абонирани сте за %s</string>
+    <string name="subscription_in_progress_notification">Обновяване на абонирани сериали</string>
+    <string name="mobile_data">Мобилни данни</string>
+    <string name="subscription_list_name">Абонаменти</string>
+    <string name="revert">Връщане</string>
+    <string name="select_library">Избиране на библиотека</string>
+    <string name="subscription_deleted">Отписахте се от %s</string>
+    <string name="profiles">Профили</string>
+    <string name="sort_alphabetical_z">По азбучен ред (Z до A)</string>
+    <string name="unable_to_inflate">Създаването на потребителският интерфейс е неуспешно, това е ГОЛЯМ БЪГ и трябва да бъде докладван незабавно %s</string>
+    <string name="edit">Редактиране</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="help">Помощ</string>
+    <string name="empty_library_logged_in_message">Списъкът е празен. Опитайте да превключите на друг.</string>
+    <string name="profile_number">Профил %d</string>
+    <string name="sort_alphabetical_a">По азбучен ред (A до Z)</string>
+    <string name="open_with">Отваряне с</string>
+    <string name="empty_library_no_accounts_message">Вашата библиотека е празна :(
+\nВпишете се в акаунт с библиотеки или добавете сериали в локалната Ви библиотека.</string>
+    <string name="use">Използване</string>
+    <string name="subscription_episode_released">Епизод %d е публикуван!</string>
+    <string name="safe_mode_file">Намерен е файл за безопасен режим!
+\nНяма да се зареждат никакви разширения при стартиране, докато файлът не бъде премахнат.</string>
+    <string name="already_voted">Вече сте гласували</string>
+    <string name="set_default">Задаване по подразбиране</string>
 </resources>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index ba754fa5..c55c8943 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -127,9 +127,9 @@
     <string name="double_tap_to_pause_settings_des">বিরতি দিতে মাঝে চাপুন</string>
     <string name="use_system_brightness_settings">সিস্টেম এর উজ্জ্বলতা ব্যবহার করুন</string>
     <string name="play_trailer_button">ট্রেইলার চালু করুন</string>
-    <string name="swipe_to_seek_settings_des">ভিডিওপ্লেয়ার এ সময় নিয়ন্ত্রণ করতে, ডানে অথবা বামে সোয়াইপ করুন</string>
+    <string name="swipe_to_seek_settings_des">ভিডিওর সময় নিয়ন্ত্রণ করতে, ডানে অথবা বামে সোয়াইপ করুন</string>
     <string name="swipe_to_change_settings">সেটিংস পরিবর্তন করতে সোয়াইপ করুন</string>
-    <string name="swipe_to_change_settings_des">উজ্জ্বলতা অথবা স্বরমাত্রা পরিবর্তন করতে যথাক্রমে বামে অথবা ডানে সোয়াইপ করুন</string>
+    <string name="swipe_to_change_settings_des">উজ্জ্বলতা বা ভলিউম পরিবর্তন করতে বাম বা ডান দিকে উপরে বা নিচে স্লাইড করুন</string>
     <string name="autoplay_next_settings">স্বয়ংক্রিয়ভাবে পরবর্তী পর্ব চালান</string>
     <string name="autoplay_next_settings_des">বর্তমান পর্বটি শেষ হলে পরের পর্বটি চালান</string>
     <string name="double_tap_to_pause_settings">থামতে দুইবার চাপুন</string>
@@ -143,10 +143,11 @@
     <string name="category_updates">হালনাগাদ ও ব্যাকআপ</string>
     <string name="updates_settings">অ্যাপ এর হালনাগাদ দেখান</string>
     <string name="swipe_to_seek_settings">খুঁজতে সোয়াইপ করুন</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">পোস্টার</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="double_tap_to_seek_settings">আগাতে ডবল ট্যাপ করুন</string>
     <string name="eigengraumode_settings">আইজেনগ্রাভি মোড</string>
     <string name="update_started">আপডেট শুরু হয়েছে</string>
     <string name="browser">ব্রাউজার</string>
+    <string name="test_log">লগ</string>
 </resources>
diff --git a/app/src/main/res/values-bp/strings.xml b/app/src/main/res/values-bp/strings.xml
index 016fbe43..7116a167 100644
--- a/app/src/main/res/values-bp/strings.xml
+++ b/app/src/main/res/values-bp/strings.xml
@@ -127,14 +127,14 @@
     <string name="eigengraumode_settings">Modo Eigengravy</string>
     <string name="eigengraumode_settings_des">Adiciona um botão de velocidade no player</string>
     <string name="swipe_to_seek_settings">Deslize para avançar o vídeo</string>
-    <string name="swipe_to_seek_settings_des">Deslize para a esq. ou dir. para controlar o tempo no player</string>
+    <string name="swipe_to_seek_settings_des">Deslize de lado à lado para controlar a posição no vídeo</string>
     <string name="swipe_to_change_settings">Deslize para mudar as configurações</string>
-    <string name="swipe_to_change_settings_des">Deslize para o lado esq. ou dir. para ajustar brilho ou volume</string>
+    <string name="swipe_to_change_settings_des">Deslize para cima ou para baixo, para ajustar brilho ou volume</string>
     <string name="double_tap_to_seek_settings">Toque duplo para avançar o vídeo</string>
     <string name="double_tap_to_pause_settings">Toque duplo para pausar</string>
     <string name="double_tap_to_seek_amount_settings">Segundos avançados no player</string>
     <string name="double_tap_to_seek_settings_des">Toque duplo no lado direito ou esquerdo para regredir ou avançar vídeo</string>
-    <string name="double_tap_to_pause_settings_des">Toque no meio para pausar</string>
+    <string name="double_tap_to_pause_settings_des">Toque duas vezes no meio para pausar</string>
     <string name="use_system_brightness_settings">Usar brilho do sistema</string>
     <string name="use_system_brightness_settings_des">Usar brilho do sistema no player ao invés da sobreposição escura</string>
     <string name="episode_sync_settings">Atualizar progresso assistido</string>
@@ -143,8 +143,8 @@
     <string name="backup_settings">Fazer Backup</string>
     <string name="restore_success">Arquivo de Backup carregado</string>
     <string name="restore_failed_format" formatted="true">Falha em restaurar dados do arquivo %s</string>
-    <string name="backup_success">Dados salvos com sucesso</string>
-    <string name="backup_failed">Permissões de armazenamento faltando, por favor tente de novo</string>
+    <string name="backup_success">Dados salvos</string>
+    <string name="backup_failed">Permissões de armazenamento faltando. Por favor tente novamente.</string>
     <string name="backup_failed_error_format">Erro no backup de %s</string>
     <string name="search">Procurar</string>
     <string name="category_account">Contas</string>
@@ -160,7 +160,7 @@
     <string name="pref_filter_search_quality">Esconder qualidades de vídeo selecionadas nos resultados da pesquisa</string>
     <string name="automatic_plugin_updates">Atualizações de plugin automáticas</string>
     <string name="updates_settings">Mostrar atualizações do app</string>
-    <string name="updates_settings_des">Automaticamente procurar por novas atualizações ao abrir</string>
+    <string name="updates_settings_des">Automaticamente procurar por novas atualizações ao abrir.</string>
     <string name="uprereleases_settings">Atualizar para pré-lançamento</string>
     <string name="uprereleases_settings_des">Procura atualizações do pré-lançamento ao invés de apenas do lançamento oficial</string>
     <string name="github">Github</string>
@@ -223,7 +223,7 @@
     <string name="tv_series_singular">Série</string>
     <string name="cartoons_singular">Desenho Animado</string>
     <string name="anime_singular">Anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documentário</string>
     <string name="asian_drama_singular">Drama Asiático</string>
@@ -264,7 +264,7 @@
     <string name="video_buffer_length_settings">Comprimento do buffer do vídeo</string>
     <string name="video_buffer_disk_settings">Cache do vídeo em disco</string>
     <string name="video_buffer_clear_settings">Limpar cache de vídeo e imagem</string>
-    <string name="video_ram_description">Causará travamentos aleatórios se definido muito alto. Não mude caso tiver pouca memória RAM, como um Android TV ou um telefone antigo</string>
+    <string name="video_ram_description">Causará travamentos se o valor escolhido for muito alto em dispositivos com pouca memória RAM, como um Android TV.</string>
     <string name="video_disk_description">Causa problemas em sistemas com pouco espaço de armazenamento se definido muito alto, como em dispositivos Android TV.</string>
     <string name="dns_pref">DNS sobre HTTPS</string>
     <string name="dns_pref_summary">Útil para burlar bloqueios de provedores de internet</string>
@@ -326,7 +326,7 @@
     <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s autenticado</string>
-    <string name="authenticated_user_fail" formatted="true">Falha em autenticar para %s</string>
+    <string name="authenticated_user_fail" formatted="true">Não foi possível fazer login em %s</string>
     <!-- ============ -->
     <string name="none">Nenhum</string>
     <string name="normal">Normal</string>
@@ -340,8 +340,8 @@
     <string name="subtitle_offset">Sincronizar legendas</string>
     <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Atraso de legenda</string>
-    <string name="subtitle_offset_extra_hint_later_format">Use isto se as legendas forem mostradas %dms adiantadas</string>
-    <string name="subtitle_offset_extra_hint_before_format">Use isto se as legendas forem mostradas %dms atrasadas</string>
+    <string name="subtitle_offset_extra_hint_later_format">Use isto se as legendas forem mostradas %d ms adiantadas</string>
+    <string name="subtitle_offset_extra_hint_before_format">Use isto se as legendas forem mostradas %d ms atrasadas</string>
     <string name="subtitle_offset_extra_hint_none_format">Sem atraso de legenda</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
@@ -405,7 +405,7 @@
     <string name="repository_url_hint">URL do repositório</string>
     <string name="plugin_loaded">Plugin Carregado</string>
     <string name="plugin_deleted">Plugin Apagado</string>
-    <string name="plugin_load_fail" formatted="true">Falha ao carregar %s</string>
+    <string name="plugin_load_fail" formatted="true">Não consegui carregar %s :-(</string>
     <string name="batch_download_start_format" formatted="true">Iniciada a transferência %d %s…</string>
     <string name="batch_download_finish_format" formatted="true">Transferido %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Tudo %s já transferido</string>
@@ -448,7 +448,7 @@
     <string name="empty_library_logged_in_message">Essa lista está vazia. Tente mudar para outra.</string>
     <string name="play_livestream_button">Reproduzir Livestream</string>
     <string name="test_log">Log do Teste</string>
-    <string name="automatic_plugin_download">Baixa plugins automaticamente</string>
+    <string name="automatic_plugin_download">Baixar plugins automaticamente</string>
     <string name="automatic_plugin_download_mode_title">Selecione o modo para filtrar os plugins baixados</string>
     <string name="test_failed">Teste falhou</string>
     <string name="android_tv_interface_on_seek_settings_summary">A Barra de Progresso pode ser usada quando o player estiver visível</string>
@@ -494,9 +494,9 @@
     <string name="safe_mode_file">Arquivo de modo de segurança encontrado!
 \nNão carregar nenhuma extensão na inicialização até que o arquivo seja removido.</string>
     <string name="subscription_new">Inscrito em %s</string>
-    <string name="subscription_episode_released">Episódio %d Lançado</string>
+    <string name="subscription_episode_released">Episódio %d lançado</string>
     <string name="set_default">Selecionar padrão</string>
-    <string name="subscription_deleted">Desinscrito de %s</string>
+    <string name="subscription_deleted">Inscrição cancelada de %s</string>
     <string name="apk_installer_settings_des">Alguns aparelhos não possuem suporte para este pacote de instalação. Tente a opção legada se a atualização não instalar.</string>
     <string name="mobile_data">Dados móveis</string>
     <string name="profile_number">Perfil %d</string>
@@ -562,9 +562,19 @@
     <string name="network_adress_example">Link da stream</string>
     <string name="pref_category_gestures">Gestos</string>
     <string name="plugin_downloaded">Plugin baixado</string>
-    <string name="jsdelivr_enabled">Não foi possível se conectar ao GitHub. Ativando proxy jsDelivr…</string>
+    <string name="jsdelivr_enabled">Não foi possível se conectar ao GitHub. Ativando proxy JsDelivr…</string>
     <string name="pref_category_cache">Cache</string>
     <string name="other_singular">Vídeo</string>
     <string name="pref_category_android_tv">Android TV</string>
     <string name="wifi">Wi-Fi</string>
+    <string name="player_settings_play_in_web">Lista de videos da web</string>
+    <string name="unable_to_inflate">A interface de usuário não foi gerada corretamente. Isto se trata de um bug importante e deve ser reportado imediatamente %s</string>
+    <string name="default_account">Legendas padrão da conta</string>
+    <string name="pref_category_ui_features">Características da interface de usuário</string>
+    <string name="category_provider_test">Provedor de teste</string>
+    <string name="pref_category_player_layout">Layout</string>
+    <string name="pref_category_defaults">Padrões</string>
+    <string name="jsdelivr_proxy">Proxy: raw.githubusercontent.com</string>
+    <string name="jsdelivr_proxy_summary">Contorna o bloqueio do GitHub usando jsDelivr. Pode atrasar as atualizações por alguns dias.</string>
+    <string name="pref_category_bypass">Rotas alternativas</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3efc4072..85d9ab71 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -552,4 +552,5 @@
     <string name="no_repository_found_error">Repository nicht gefunden, überprüf die URL und versuch ein VPN</string>
     <string name="unable_to_inflate">Die Benutzeroberfläche konnte nicht korrekt erstellt werden. Dies ist ein SCHWERWIEGENDER FEHLER und sollte sofort gemeldet werden. %s</string>
     <string name="disable">Deaktivieren</string>
+    <string name="default_account">@string/default_subtitles</string>
 </resources>
diff --git a/app/src/main/res/values-es/array.xml b/app/src/main/res/values-es/array.xml
index d1e5be2f..47df8e70 100644
--- a/app/src/main/res/values-es/array.xml
+++ b/app/src/main/res/values-es/array.xml
@@ -194,12 +194,15 @@
 
     <string-array name="themes_overlay_names">
         <item>Normal</item>
+        <item>Diente de león amarilla</item>
         <item>Rosa clavel</item>
+        <item>Naranja</item>
         <item>Verde oscuro</item>
         <item>Vino</item>
         <item>Azul marino</item>
         <item>Gris</item>
         <item>Blanco</item>
+        <item>Azul fresco</item>
         <item>Marrón</item>
         <item>Fresco</item>
         <item>Fuego</item>
@@ -214,12 +217,15 @@
     </string-array>
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
+        <item>DandelionYellow</item>
         <item>CarnationPink</item>
+        <item>Orange</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
         <item>NavyBlue</item>
         <item>Grey</item>
         <item>White</item>
+        <item>CoolBlue</item>
         <item>Brown</item>
         <item>Blue</item>
         <item>Red</item>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8e9f9c2c..51063b4d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -32,7 +32,7 @@
     <string name="phone_layout">Diseño para teléfonos</string>
     <string name="player_subtitles_settings">Subtítulos</string>
     <string name="subtitles_encoding">Codificación de subtítulos</string>
-    <string name="app_layout_subtext">Cambia el aspecto de la aplicación para que se adapte a tu dispositivo</string>
+    <string name="app_layout_subtext">Cambiar el aspecto de la aplicación para que se adapte a tu dispositivo</string>
     <string name="subtitles_settings">Configurar Subtítulos</string>
     <string name="player_subtitles_settings_des">Configuración de subtítulos del reproductor</string>
     <string name="subtitles_shadow">Sombra</string>
@@ -52,7 +52,7 @@
     <string name="subtitle_offset_extra_hint_later_format">Use esto si los subtítulos se muestran %d ms muy pronto</string>
     <string name="subtitle_offset_extra_hint_before_format">Use esto si los subtítulos se muestran %d ms tarde</string>
     <string name="swipe_to_seek_settings_des">Desliza el dedo de lado a lado para controlar la posición en un video</string>
-    <string name="subtitles_filter_lang">Filtrar por idioma de medios preferido</string>
+    <string name="subtitles_filter_lang">Filtrar por idioma preferido</string>
     <string name="subtitles_remove_captions">Eliminar Closed Captions (CC) de los subtítulos</string>
     <string name="double_tap_to_seek_amount_settings">Cantidad de búsquedas del reproductor (segundos)</string>
     <string name="use_system_brightness_settings_des">Use el brillo del sistema en el reproductor de la app en lugar de una superposición oscura</string>
@@ -94,7 +94,7 @@
     <string name="home_main_poster_img_des">Poster Principal</string>
     <string name="app_language">Idioma de la aplicación</string>
     <string name="provider_languages_tip">Ver videos en estos idiomas</string>
-    <string name="search_poster_img_des">Cartel</string>
+    <string name="search_poster_img_des">Poster</string>
     <string name="home_next_random_img_des">Siguiente al azar</string>
     <string name="all_languages_preference">Todos los Idiomas</string>
     <string name="go_back_img_des">Volver</string>
@@ -105,9 +105,9 @@
 \n%s -&gt; %s</string>
     <string name="download">Descargar</string>
     <string name="popup_pause_download">Pausar Descarga</string>
-    <string name="subs_font">Fuente</string>
+    <string name="subs_font">Formato de fuente</string>
     <string name="subs_background_color">Color de Fondo</string>
-    <string name="subs_font_size">Tamaño Fuente</string>
+    <string name="subs_font_size">Tamaño de Fuente</string>
     <string name="player_speed_text_format" formatted="true">Velocidad (%.2fx)</string>
     <string name="skip_loading">Omitir carga</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
@@ -195,7 +195,7 @@
     <string name="action_remove_watching">Remover</string>
     <string name="action_open_watching">Más info</string>
     <string name="action_open_play">@string/home_play</string>
-    <string name="vpn_might_be_needed">Una VPN puede ser necesaria para que este proveedor funcione correctamente</string>
+    <string name="vpn_might_be_needed">Tal vez se requiera una VPN para que este proveedor funcione correctamente</string>
     <string name="vpn_torrent">Este proveedor es un torrent, se recomienda una VPN</string>
     <string name="provider_info_meta">El sitio no proporciona los metadatos, la carga del video fallará si no existe en el sitio.</string>
     <string name="torrent_plot">Descripción</string>
@@ -230,10 +230,10 @@
     <string name="search">Buscar</string>
     <string name="category_account">Cuentas</string>
     <string name="category_updates">Actualizaciones y copias de seguridad</string>
-    <string name="settings_info">Info</string>
+    <string name="settings_info">Información</string>
     <string name="advanced_search">Búsqueda Avanzada</string>
-    <string name="advanced_search_des">Da los resultados de la búsqueda separados por proveedor</string>
-    <string name="bug_report_settings_off">Solo envía datos si la App termina / falla inesperadamente (crash)</string>
+    <string name="advanced_search_des">Mostrar los resultados de la búsqueda por proveedor</string>
+    <string name="bug_report_settings_off">Solo envíar los datos si la App se cierra / falla inesperadamente</string>
     <string name="bug_report_settings_on">No enviar datos</string>
     <string name="show_trailers_settings">Mostrar Trailers (avances)</string>
     <string name="kitsu_settings">Mostrar pósters de Kitsu</string>
@@ -270,9 +270,9 @@
     <string name="status">Estado</string>
     <string name="limit_title">Máxima cantidad de caracteres en el título del reproductor</string>
     <string name="pref_category_app_updates">Actualizaciones de la aplicación</string>
-    <string name="automatic">Auto</string>
+    <string name="automatic">Automático</string>
     <string name="pref_category_actions">Acciones</string>
-    <string name="enable_nsfw_on_providers">Activa NSFW (contenido adulto) en proveedores soportados</string>
+    <string name="enable_nsfw_on_providers">Activar NSFW (contenido adulto) en proveedores soportados</string>
     <string name="category_providers">Proveedores</string>
     <string name="pref_category_defaults">Predeterminados</string>
     <string name="preferred_media_settings">Medios preferidos</string>
@@ -283,7 +283,7 @@
     <string name="skip_setup">Omitir configuración</string>
     <string name="preferred_media_subtext">Qué quieres ver</string>
     <string name="uppercase_all_subtitles">Poner en MAYÚSCULAS todos los subtítulos</string>
-    <string name="apply_on_restart">Se aplican los cambios al reiniciar la App</string>
+    <string name="apply_on_restart">Se aplicarán los cambios al reiniciar la App</string>
     <string name="player_settings_play_in_app">Reproductor interno</string>
     <string name="extension_language">Idioma</string>
     <string name="apk_installer_legacy">Legacy (método antiguo)</string>
@@ -305,9 +305,9 @@
     <string name="automatic_plugin_download_summary">Instala automáticamente todos los plugins aún no instalados de los repositorios agregados.</string>
     <string name="pref_category_looks">Aspecto</string>
     <string name="pref_category_ui_features">Características</string>
-    <string name="random_button_settings">Botón de Al azar</string>
+    <string name="random_button_settings">Botón aleatorio</string>
     <string name="random_button_settings_desc">Mostrar el botón aleatorio en la página de inicio</string>
-    <string name="account">cuenta</string>
+    <string name="account">Cuenta</string>
     <string name="logout">Cerrar sesión</string>
     <string name="switch_account">Cambiar cuenta</string>
     <string name="add_account">Añadir cuenta</string>
@@ -319,7 +319,7 @@
     <string name="poster_image">Imagen del póster</string>
     <string name="trailer">Tráiler</string>
     <string name="coming_soon">Próximamente…</string>
-    <string name="home_random">Al azar</string>
+    <string name="home_random">Aleatorio</string>
     <string name="actor_main">Principal</string>
     <string name="error_invalid_data">Datos no válidos</string>
     <string name="add_sync">Añadir seguimiento</string>
@@ -460,7 +460,7 @@
     <string name="audio_tracks">Pistas de audio</string>
     <string name="video_tracks">Pistas de video</string>
     <string name="safe_mode_title">Modo seguro ON</string>
-    <string name="safe_mode_crash_info">Ver info de fallos</string>
+    <string name="safe_mode_crash_info">Ver información de fallos</string>
     <string name="extension_rating" formatted="true">Puntaje:%s</string>
     <string name="extension_version">Versión</string>
     <string name="extension_status">Estado</string>
@@ -545,12 +545,13 @@
     <string name="set_default">Establecer por defecto</string>
     <string name="use">Usar</string>
     <string name="qualities">Calidades</string>
-    <string name="profile_background_des">Perfil del fondo</string>
+    <string name="profile_background_des">Fondo de perfil</string>
     <string name="unable_to_inflate">La interfaz de usuario no se ha podido crear correctamente, se trata de un GRAN BUG y debe ser reportado inmediatamente %s</string>
-    <string name="automatic_plugin_download_mode_title">Selecciona el modo para filtrar la descarga de los plugins</string>
-    <string name="disable">Desactivar</string>
+    <string name="automatic_plugin_download_mode_title">Seleccionar modo para filtrar los plugins descargados</string>
+    <string name="disable">Deshabilitar</string>
     <string name="default_account">@string/default_subtitles</string>
     <string name="no_plugins_found_error">No se encontraron complementos en el repositorio</string>
     <string name="no_repository_found_error">Repositorio no encontrado, comprueba la URL y prueba la VPN</string>
     <string name="already_voted">Ya has votado</string>
+    <string name="backup_frequency">Frecuencia de la copia de seguridad</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 63d03a6b..53442e84 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -100,7 +100,7 @@
     <string name="app_storage">Application</string>
     <string name="movies">Films</string>
     <string name="tv_series">Séries TV</string>
-    <string name="cartoons">Dessin animés</string>
+    <string name="cartoons">Dessins animés</string>
     <string name="anime">Animés</string>
     <string name="torrent">Torrents</string>
     <string name="source_error">Erreur de la source</string>
@@ -114,7 +114,7 @@
     <string name="episode_action_play_in_format">Lecture dans %s</string>
     <string name="episode_action_play_in_browser">Lecture dans le navigateur</string>
     <string name="episode_action_copy_link">Copier le lien</string>
-    <string name="episode_action_auto_download">Téléchargement Automatique</string>
+    <string name="episode_action_auto_download">Téléchargement automatique</string>
     <string name="episode_action_download_mirror">Télécharger depuis le miroir</string>
     <string name="episode_action_reload_links">Recharger les liens</string>
     <string name="no_update_found">Pas de mise-à-jour trouvés</string>
@@ -160,19 +160,19 @@
     <string name="asian_drama">Dramas Asiatiques</string>
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Séries</string>
-    <string name="cartoons_singular">Dessins animés</string>
+    <string name="cartoons_singular">Dessin animé</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documentaire</string>
     <string name="asian_drama_singular">Drame Asiatique</string>
     <string name="episode_action_download_subtitle">Télécharger les sous-titres</string>
-    <string name="limit_title">Nombre de caractères maximal dans le titre du lecteur vidéo</string>
-    <string name="video_buffer_length_settings">Longueur de la vidéo tampon</string>
-    <string name="video_buffer_disk_settings">Longueur de la vidéo cache</string>
-    <string name="video_buffer_clear_settings">Effacer les vidéos et les images cache</string>
+    <string name="limit_title">Nombre maximal de caractères dans le titre du lecteur vidéo</string>
+    <string name="video_buffer_length_settings">Longueur de la mémoire vidéo tampon</string>
+    <string name="video_buffer_disk_settings">Longueur du cache de la vidéo</string>
+    <string name="video_buffer_clear_settings">Effacer les vidéos et les images en cache</string>
     <string name="video_ram_description">Causera des crashs si la valeur choisie est trop élevée sur un appareil avec peu de ram comme une télévision android.</string>
     <string name="video_disk_description">Cause des problèmes si la valeur choisie est trop élevée sur un appareil avec peu de stockage comme une télévision android.</string>
     <string name="random_button_settings">Bouton aléatoire</string>
-    <string name="random_button_settings_desc">Afficher le bouton aléatoire</string>
+    <string name="random_button_settings_desc">Afficher un bouton aléatoire sur la page d\'accueil</string>
     <string name="emulator_layout">Disposition émulateur</string>
     <string name="bottom_title_settings">Position du titre du poster</string>
     <string name="bottom_title_settings_des">Mettre le titre sous le poster</string>
@@ -225,13 +225,13 @@
     <string name="subs_background_color">Couleur d\'arrière-plan</string>
     <string name="subs_window_color">Couleur de la fenêtre</string>
     <string name="subs_edge_type">Type de bordure</string>
-    <string name="subs_subtitle_elevation">Elevation des sous-titres</string>
+    <string name="subs_subtitle_elevation">Élévation des sous-titres</string>
     <string name="subs_font">Police</string>
     <string name="subs_font_size">Taille de la police</string>
     <string name="search_provider_text_providers">Recherche par fournisseur</string>
     <string name="search_provider_text_types">Recherche par types</string>
     <string name="benene_count_text">%d Donner une banane aux devs</string>
-    <string name="benene_count_text_none">Aucun Bananes donné</string>
+    <string name="benene_count_text_none">Aucun Benenes données</string>
     <string name="subs_auto_select_language">Sélection automatique de la langue</string>
     <string name="subs_download_languages">Télécharger les langues</string>
     <string name="subs_subtitle_languages">Langue des sous-titres</string>
@@ -259,19 +259,19 @@
     <string name="eigengraumode_settings">Mode Eigengravy</string>
     <string name="eigengraumode_settings_des">Ajout d\'une option de vitesse dans le lecteur</string>
     <string name="swipe_to_seek_settings">Balayez pour chercher</string>
-    <string name="swipe_to_seek_settings_des">Swipez d\'un côté à l\'autre pour contrôler votre position dans une vidéo</string>
+    <string name="swipe_to_seek_settings_des">Balayez d\'un côté ou de l\'autre pour contrôler la position dans la vidéo</string>
     <string name="swipe_to_change_settings">Balayez pour modifier les paramètres</string>
-    <string name="swipe_to_change_settings_des">Glissez sur le côté gauche ou droit pour modifier la luminosité ou le volume</string>
+    <string name="swipe_to_change_settings_des">Glissez vers le haut ou le bas depuis le côté gauche ou droit pour modifier la luminosité ou le volume</string>
     <string name="autoplay_next_settings">Lecture automatique du prochain épisode</string>
     <string name="autoplay_next_settings_des">Démarrer l\'épisode suivant lorsque l\'épisode en cours se termine</string>
     <string name="double_tap_to_seek_settings">Double tape pour chercher</string>
     <string name="double_tap_to_pause_settings">Double tape pour mettre en pause</string>
-    <string name="double_tap_to_seek_amount_settings">Montant recherché par le joueur (Seconde)</string>
+    <string name="double_tap_to_seek_amount_settings">Temps de recherche du lecteur vidéo (secondes)</string>
     <string name="double_tap_to_seek_settings_des">Tapez deux fois sur le côté droit ou gauche pour aller en avant ou en arrière</string>
     <string name="double_tap_to_pause_settings_des">Tapez deux fois au milieu pour mettre en pause</string>
     <string name="use_system_brightness_settings">Utiliser la luminosité du système</string>
     <string name="use_system_brightness_settings_des">Utiliser la luminosité du système dans le lecteur d\'applications au lieu du sombre</string>
-    <string name="episode_sync_settings">Mise à jour de la progression de la veille</string>
+    <string name="episode_sync_settings">Mise à jour de la progression du visionnage</string>
     <string name="episode_sync_settings_des">Synchronisation automatique de la progression de votre épisode en cours</string>
     <string name="restore_settings">Restaurer des données à partir d\'une sauvegarde</string>
     <string name="backup_settings">Sauvegarde des données</string>
@@ -294,7 +294,7 @@
     <string name="pref_filter_search_quality">Masque la qualité vidéo sélectionnée dans les résultats de recherche</string>
     <string name="automatic_plugin_updates">Mises à jour automatiques des plugins</string>
     <string name="updates_settings">Afficher les mises à jour de l\'application</string>
-    <string name="updates_settings_des">Recherche automatique de nouvelles mises à jour au démarrage</string>
+    <string name="updates_settings_des">Recherche automatique de nouvelles mises à jour au démarrage.</string>
     <string name="uprereleases_settings">Mettre à jour vers une version bêta</string>
     <string name="uprereleases_settings_des">Recherche pour une mise à jour vers une version bêta au lieu des version complètes seulement</string>
     <string name="github">Github</string>
@@ -340,7 +340,7 @@
     <string name="show_dub">Étiquette Dub (doublage anglais)</string>
     <string name="show_sub">Étiquette sous titre</string>
     <string name="show_title">Titre</string>
-    <string name="enable_nsfw_on_providers">Active le nsfw sur les fournisseurs ayant cette option</string>
+    <string name="enable_nsfw_on_providers">Active le NSFW sur les fournisseurs ayant cette option</string>
     <string name="example_password">motdepasse123</string>
     <string name="example_username">MonNomDutilisateur</string>
     <string name="example_lang_name">Code de la langue (fr)</string>
@@ -350,7 +350,7 @@
     <string name="category_player">Lecteur</string>
     <string name="error_invalid_url">URL invalide</string>
     <string name="error">Erreur</string>
-    <string name="subtitles_remove_captions">Fermer les</string>
+    <string name="subtitles_remove_captions">Enlever les sous-titres pour sourds et malentendants</string>
     <string name="automatic_plugin_download">Télécharger automatiquement les plugins</string>
     <string name="poster_ui_settings">Activer ou désactiver les éléments du poster</string>
     <string name="skip_update">Ignorer cette mise-à-jour</string>
@@ -404,7 +404,7 @@
     <string name="uppercase_all_subtitles">Tous les sous-titres en majuscules</string>
     <string name="view_public_repositories_button">Voir les repository de la communauté</string>
     <string name="view_public_repositories_button_short">Liste publique</string>
-    <string name="action_mark_as_watched">Marquer comme regardé</string>
+    <string name="action_mark_as_watched">Marquer comme vu</string>
     <string name="repository_url_hint">Url du repository</string>
     <string name="setup_done">Finir</string>
     <string name="add_repository">Ajouter le repository</string>
@@ -456,7 +456,7 @@
     <string name="extension_authors">Auteurs</string>
     <string name="extension_types">Supporté</string>
     <string name="player_settings_play_in_app">Lecteur interne</string>
-    <string name="app_not_found_error">Application non trouvée</string>
+    <string name="app_not_found_error">Application introuvable</string>
     <string name="clipboard_too_large">Trop de texte. Impossible de sauvegarder dans le presse papier.</string>
     <string name="player_settings_play_in_mpv">MPV</string>
     <string name="apk_installer_package_installer">Installateur de paquet</string>
@@ -497,10 +497,10 @@
     <string name="sort_rating_desc">Note (haut à bas)</string>
     <string name="sort_alphabetical_a">Alphabétique (A à Z)</string>
     <string name="empty_library_no_accounts_message">Votre bibliothèque est vide :(
-\nConnectez-vous sur un compte de bibliothèque ou ajoutez des spectacles à votre bibliothèque locale.</string>
+\nConnectez-vous à un compte de bibliothèque ou ajoutez des séries à votre bibliothèque locale.</string>
     <string name="empty_library_logged_in_message">Cette liste est vide. Essayez d\'en changer.</string>
     <string name="pref_category_android_tv">Android TV</string>
-    <string name="sort_by">Trié par</string>
+    <string name="sort_by">Trier par</string>
     <string name="sort_alphabetical_z">Alphabétique (Z à A)</string>
     <string name="select_library">Sélectionnez la bibliothèque</string>
     <string name="open_with">Ouvrir avec</string>
@@ -509,7 +509,7 @@
     <string name="safe_mode_file">Fichier du mode sans échec trouvé !
 \nAucune extension ne sera chargée au démarrage avant que le fichier ne soit enlevé.</string>
     <string name="stop">Arrêter</string>
-    <string name="revert">Revenir à</string>
+    <string name="revert">Annuler</string>
     <string name="test_log">Enregistrer</string>
     <string name="watch_quality_pref_data">Qualité de visionnage préférée (données mobiles)</string>
     <string name="subscription_new">Abonné à %s</string>
@@ -519,17 +519,17 @@
     <string name="subscription_deleted">Désabonné de %s</string>
     <string name="restart">Redémarrer</string>
     <string name="subscription_list_name">Abonné</string>
-    <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
+    <string name="jsdelivr_proxy">Proxy raw.githubusercontent.com</string>
     <string name="pref_category_bypass">Contournements de FAI</string>
     <string name="subscription_episode_released">L\'épisode %d est sorti !</string>
-    <string name="test_failed">Échouer</string>
-    <string name="android_tv_interface_off_seek_settings_summary">Le montant de la recherche utilisé lorsque le joueur est caché</string>
-    <string name="subscription_in_progress_notification">Updating subscribed shows</string>
+    <string name="test_failed">Échec</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Le temps de recherche utilisé lorsque le lecteur est invisible</string>
+    <string name="subscription_in_progress_notification">Mise à jour des programmes auxquels vous êtes abonné(e)</string>
     <string name="jsdelivr_proxy_summary">Contourne le blocage de GitHub en utilisant jsDelivr. Les mises à jour peuvent être retardées de quelques jours.</string>
-    <string name="android_tv_interface_on_seek_settings_summary">La quantité de recherche utilisée lorsque le joueur est visible</string>
-    <string name="android_tv_interface_on_seek_settings">Joueur représenté - Montant de la recherche</string>
-    <string name="android_tv_interface_off_seek_settings">Joueur caché - Montant de la recherche</string>
-    <string name="jsdelivr_enabled">Impossible d\'accéder à GitHub. Activation du proxy jsDelivr…</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Le temps de recherche utilisé lorsque le lecteur vidéo est visible</string>
+    <string name="android_tv_interface_on_seek_settings">Lecteur Visible - Temps de recherche</string>
+    <string name="android_tv_interface_off_seek_settings">Lecteur Invisible - Temps de recherche</string>
+    <string name="jsdelivr_enabled">Impossible d\'atteindre GitHub. Activation du proxy jsDelivr…</string>
     <string name="already_voted">Vous avez déjà voté</string>
     <string name="disable">Désactivé</string>
     <string name="quality_profile_help">Ici, vous pouvez modifier la façon dont les sources sont ordonnées. Si une vidéo a une priorité plus élevée, elle apparaîtra plus haut dans la sélection de la source. La somme de la priorité source et de la priorité qualité est la priorité vidéo.
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 1401b3d8..31e0e28c 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1,158 +1,164 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
-    <string name="player_speed_text_format" formatted="true">रफ्तार (%.2fx)</string>
+    <string name="player_speed_text_format" formatted="true">स्पीड (%.2fx)</string>
     <string name="new_update_format" formatted="true">नया अपडेट आया है!
 \n%s -&gt; %s</string>
     <string name="title_home">होम</string>
     <string name="title_search">खोजें</string>
-    <string name="title_downloads">डाउनलोड</string>
-    <string name="title_settings">सेटिंग</string>
-    <string name="no_data">डेटा उपलब्ध नही है</string>
-    <string name="episode_more_options_des">अन्य ऑप्शन</string>
+    <string name="title_downloads">डाउनलोडस</string>
+    <string name="title_settings">सेटिंग्स</string>
+    <string name="no_data">डेटा उपलब्ध नहीं</string>
+    <string name="episode_more_options_des">और विकल्प</string>
     <string name="next_episode">अगला एपिसोड</string>
     <string name="result_tags">शैलियां</string>
-    <string name="result_share">शेयर</string>
+    <string name="result_share">साझा करें</string>
     <string name="result_open_in_browser">ब्राउज़र में खोलें</string>
     <string name="type_watching">देखा जा रहा है</string>
     <string name="type_on_hold">होल्ड पर</string>
     <string name="type_completed">पूरा देखा</string>
     <string name="type_dropped">अधूरा छोड़ा</string>
     <string name="type_plan_to_watch">देखने की योजना</string>
-    <string name="play_movie_button">मूवी चलाये</string>
-    <string name="play_torrent_button">टोरेंट चलाये</string>
-    <string name="pick_source">सूत्र</string>
-    <string name="reload_error">फिरसे प्रयास करे…</string>
+    <string name="play_movie_button">मूवी चलाएं</string>
+    <string name="play_torrent_button">टोरेंट चलाएं</string>
+    <string name="pick_source">सोर्स</string>
+    <string name="reload_error">पुनः प्रयास करें…</string>
     <string name="go_back">वापिस जाए</string>
-    <string name="play_episode">एपिसोड चलाये</string>
+    <string name="play_episode">एपिसोड चलाएं</string>
     <!--<string name="need_storage">Allow to download episodes</string>-->
     <string name="download">डाउनलोड</string>
     <string name="downloaded">डाउनलोड किया गया</string>
     <string name="downloading">डाउनलोड हो रहा</string>
     <string name="download_paused">डाउनलोड रोका गया</string>
-    <string name="download_started">डाउनलोड शुरू</string>
-    <string name="download_failed">डाउनलोड नही हो पाया</string>
+    <string name="download_started">डाउनलोड शुरू हुआ</string>
+    <string name="download_failed">डाउनलोड विफल</string>
     <string name="download_canceled">डाउनलोड रद्द</string>
-    <string name="download_done">डाउनलोड पूरा हुआ</string>
-    <string name="error_loading_links_toast">लिंक में गड़बड़ है</string>
+    <string name="download_done">डाउनलोड मुकम्मल</string>
+    <string name="error_loading_links_toast">लिंक लोड करने में त्रुटि</string>
     <string name="download_storage_text">अंदरूनी स्टोरेज</string>
-    <string name="popup_delete_file">फ़ाइल डिलीट</string>
-    <string name="popup_play_file">फ़ाइल चलाये</string>
-    <string name="popup_resume_download">डाउनलोड फिर शुरू करे</string>
-    <string name="popup_pause_download">डाउनलोड रोके</string>
-    <string name="pref_disable_acra">स्वचालित त्रुटि रिपोर्ट रोकें</string>
+    <string name="popup_delete_file">फ़ाइल मिटाएँ</string>
+    <string name="popup_play_file">फ़ाइल चलाएं</string>
+    <string name="popup_resume_download">डाउनलोड फिर शुरू करें</string>
+    <string name="popup_pause_download">डाउनलोड रोकें</string>
+    <string name="pref_disable_acra">स्वचालित बग रिपोर्टिंग अक्षम करें</string>
     <string name="home_more_info">और जानकारी</string>
-    <string name="home_expanded_hide">छिपाये</string>
-    <string name="home_play">चलाये</string>
+    <string name="home_expanded_hide">छिपाएं</string>
+    <string name="home_play">चलाएं</string>
     <string name="home_info">जानकारी</string>
     <string name="filter_bookmarks">बुकमार्क छांटे</string>
     <string name="error_bookmarks_text">बुकमार्क्स</string>
     <string name="action_remove_from_bookmarks">हटाएँ</string>
-    <string name="sort_apply">लागू करे</string>
-    <string name="sort_cancel">रद्द करे</string>
-    <string name="player_speed">प्लेयर की रफ्तार</string>
-    <string name="search_provider_text_providers">सूत्रों से छांटे</string>
-    <string name="search_provider_text_types">प्रकार से छांटे</string>
-    <string name="benene_count_text">%d केले दिए गए</string>
-    <string name="benene_count_text_none">कोई केले नही दिए गए</string>
-    <string name="subs_hold_to_reset_to_default">रिसेट करने ले किये दबाये रखे</string>
+    <string name="sort_apply">लागू करें</string>
+    <string name="sort_cancel">रद्द करें</string>
+    <string name="player_speed">प्लेयर स्पीड</string>
+    <string name="search_provider_text_providers">प्रोवाइडरों का उपयोग कर खोजें</string>
+    <string name="search_provider_text_types">प्रकार का उपयोग करके खोजें</string>
+    <string name="benene_count_text">%d केले डेवलपर्स को दिए गए</string>
+    <string name="benene_count_text_none">कोई केले नहीं दिए गए</string>
+    <string name="subs_hold_to_reset_to_default">डिफ़ॉल्ट पर रीसेट करने के लिए दबाए रखें</string>
     <string name="continue_watching">देखना जारी रखें</string>
     <string name="action_remove_watching">हटाएँ</string>
     <string name="action_open_watching">अधिक जानकारी</string>
-    <string name="vpn_might_be_needed">इस सूत्र को इस्तेमाल करने के लिए एक VPN की ज़रूरत पड़ सकती है</string>
-    <string name="vpn_torrent">यह सूत्र एक torrent है, एक VPN इस्तेमाल करने की सिफारिश की जाती है</string>
+    <string name="vpn_might_be_needed">इस प्रोवाइडर को सही ढंग से काम करने के लिए VPN की ज़रूरत पड़ सकती है</string>
+    <string name="vpn_torrent">यह प्रोवाइडर एक torrent है, एक VPN इस्तेमाल करने की सिफारिश की जाती है</string>
     <string name="torrent_plot">वर्णन</string>
-    <string name="normal_no_plot">कोई विषय नही मिला</string>
-    <string name="torrent_no_plot">कोई वर्णन नही मिला</string>
-    <string name="picture_in_picture_des">आपकी वीडियो एक छोटे से डब्बे में चलाता है</string>
-    <string name="player_size_settings_des">काले बॉर्डर को हटाता है</string>
-    <string name="player_subtitles_settings_des">प्लेयर की subtitle सेटिंग्स</string>
-    <string name="eigengraumode_settings_des">प्लेयर में वीडियो की रफ्तार धिमी या तेज़ करता है</string>
-    <string name="swipe_to_seek_settings_des">दाएं या बाएं तरफ स्वाइप करने से वीडियो को आगे पीछे करता है</string>
-    <string name="swipe_to_change_settings_des">दाएं तरफ या बाएं तरफ स्वाइप करने से रोशिनी और आवाज़ को ऊपर नीचे करता है</string>
-    <string name="double_tap_to_seek_settings_des">दो बार दाएं या बाएं तरफ दबाने से वीडियो को आगे या पीछे करा जा सकता है</string>
+    <string name="normal_no_plot">कोई विषय नहीं मिला</string>
+    <string name="torrent_no_plot">कोई वर्णन नहीं मिला</string>
+    <string name="picture_in_picture_des">अन्य ऐप्स के ऊपर एक लघु प्लेयर में प्लेबैक जारी रखता है</string>
+    <string name="player_size_settings_des">काले बॉर्डर हटाएँ</string>
+    <string name="player_subtitles_settings_des">प्लेयर उपशीर्षक सेटिंग्स</string>
+    <string name="eigengraumode_settings_des">प्लेयर में स्पीड विकल्प जोड़ता है</string>
+    <string name="swipe_to_seek_settings_des">किसी वीडियो में अपनी स्थिति नियंत्रित करने के लिए एक ओर से दूसरी ओर स्वाइप करें</string>
+    <string name="swipe_to_change_settings_des">चमक या वॉल्यूम बदलने के लिए बाईं या दाईं ओर ऊपर या नीचे स्लाइड करें</string>
+    <string name="double_tap_to_seek_settings_des">आगे या पीछे करने के लिए दाईं या बाईं ओर दो बार टैप करें</string>
     <string name="search">खोजें</string>
     <string name="settings_info">जानकारी</string>
-    <string name="advanced_search_des">नतीजों को सूत्रों के हिसाब से बांटकर दिखता है</string>
-    <string name="bug_report_settings_off">सिर्फ दुर्घटना होने पे आपकी कुछ जानकारी भेजी जाएगी</string>
-    <string name="bug_report_settings_on">आपकी जानकारी नही भेजी जाएगी</string>
-    <string name="updates_settings_des">हर बार खुलने पे नए अपडेट के लिए जांच करेगा</string>
-    <string name="uprereleases_settings_des">पूरी रिलीस के बजाए पूर्व रिलीस की जांच करेगा</string>
-    <string name="lightnovel">हमारा एक Light novel app</string>
-    <string name="anim">हमारा एक Anime app</string>
+    <string name="advanced_search_des">खोज नतीजों को प्रोवाइडरों के हिसाब से अलग-अलग आपको दिखाता है</string>
+    <string name="bug_report_settings_off">केवल क्रैश पर जानकारी भेजी जाएगी</string>
+    <string name="bug_report_settings_on">आपकी जानकारी नहीं भेजी जाएगी</string>
+    <string name="updates_settings_des">हर बार एप खुलने पर स्वचालित रूप से नए अपडेट खोजें।</string>
+    <string name="uprereleases_settings_des">केवल पूर्ण रिलीज़ के बजाय प्रीरिलीज़ अपडेट खोजें</string>
+    <string name="lightnovel">उन्हीं डेवलपर्स द्वारा Light novel ऐप</string>
+    <string name="anim">उन्हीं डेवलपर्स द्वारा Anime ऐप</string>
     <string name="discord">Discord से जुड़िये</string>
-    <string name="benene">इस प्रोग्राम के निर्माता को केला चढ़ाये</string>
+    <string name="benene">इस प्रोग्राम के निर्माता को केला दें</string>
     <string name="benene_des">केले दे दिए गए</string>
     <string name="app_language">एप्प की भाषा</string>
-    <string name="no_chromecast_support_toast">यह सूत्र क्रोमकास्ट का समर्थन नही करता</string>
-    <string name="no_links_found_toast">कोई लिंक नही मिले</string>
-    <string name="copy_link_toast">लिंक को क्लिपबोर्ड पे कॉपी करदिया गया</string>
-    <string name="play_episode_toast">चलाये</string>
-    <string name="acra_report_toast">असुविधा के लिए खेद है, यह एप्प क्रैश हो गया है । एक गुमनाम रिपोर्ट निर्माताओं को भेज दी गयी है ।</string>
+    <string name="no_chromecast_support_toast">यह प्रोवाइडर क्रोमकास्ट का समर्थन नहीं करता</string>
+    <string name="no_links_found_toast">कोई लिंक नहीं मिले</string>
+    <string name="copy_link_toast">लिंक क्लिपबोर्ड पर कॉपी किया गया</string>
+    <string name="play_episode_toast">एपिसोड चलायें</string>
+    <string name="acra_report_toast">क्षमा करें, एप्प क्रैश हो गया है । निर्माताओं को एक अनाम बग रिपोर्ट भेजी जाएगी</string>
     <string name="delete_file">फ़ाइल डिलीट करें</string>
     <string name="delete">डिलीट</string>
-    <string name="pause">रोके</string>
-    <string name="resume">वापिस चलाये</string>
-    <string name="delete_message">एज इस चीज़ को हमेशा के लिए नष्ट कर देगा %s
+    <string name="pause">रोकें</string>
+    <string name="resume">फिर से चलाएं</string>
+    <string name="delete_message">इससे %s स्थायी रूप से हट जाएगा
 \nक्या आपका निर्णय निश्चित है \?</string>
     <string name="status_ongoing">अभी चालू है</string>
-    <string name="status_completed">खत्म हो गया है</string>
-    <string name="status">स्तिथि</string>
+    <string name="status_completed">मुकम्मल हुया</string>
+    <string name="status">स्थिति</string>
     <string name="year">साल</string>
     <string name="rating">रेटिंग</string>
     <string name="duration">अवधि</string>
-    <string name="site">सूत्र</string>
-    <string name="synopsis">Synopsis</string>
-    <string name="free_storage">खाली</string>
+    <string name="site">साइट</string>
+    <string name="synopsis">सारांश</string>
+    <string name="free_storage">ख़ाली</string>
     <string name="used_storage">इस्तेमाल में</string>
     <string name="app_storage">एप्प</string>
-    <string name="movies">मूवी</string>
+    <string name="movies">मूवीज</string>
     <string name="tv_series">टीवी सीरियल</string>
     <string name="cartoons">कार्टून</string>
-    <string name="anime">अनिमे</string>
+    <string name="anime">एनिमे</string>
     <string name="torrent">टोरेंट</string>
     <string name="episode_action_chromecast_episode">क्रोमकास्ट एपिसोड</string>
-    <string name="episode_action_chromecast_mirror">कक्रोमकास्ट मिरर</string>
-    <string name="episode_action_play_in_app">एप्प मैं चलाये</string>
-    <string name="episode_action_play_in_format">%s में चलाए</string>
-    <string name="episode_action_play_in_browser">Browser में चलाए</string>
+    <string name="episode_action_chromecast_mirror">क्रोमकास्ट मिरर</string>
+    <string name="episode_action_play_in_app">एप्प में चलाएं</string>
+    <string name="episode_action_play_in_format">%s में चलाएं</string>
+    <string name="episode_action_play_in_browser">Browser में चलाएं</string>
     <string name="episode_action_copy_link">लिंक कॉपी करें</string>
-    <string name="episode_action_auto_download">डाउनलोड करे</string>
+    <string name="episode_action_auto_download">डाउनलोड करें</string>
     <string name="episode_action_download_mirror">मिरर डाउनलोड</string>
-    <string name="episode_action_reload_links">लिंक फिरसे लोड करें</string>
-    <string name="no_update_found">कोई अपडेट नही मिला</string>
-    <string name="check_for_update">अपडेट के लिए खोजे</string>
+    <string name="episode_action_reload_links">लिंक दोबारा लोड करें</string>
+    <string name="no_update_found">कोई अपडेट नहीं मिला</string>
+    <string name="check_for_update">अपडेट के लिये जांचें</string>
     <string name="video_lock">ताला</string>
-    <string name="video_aspect_ratio_resize">आकार</string>
-    <string name="video_source">सूत्र</string>
+    <string name="video_aspect_ratio_resize">आकार बदलें</string>
+    <string name="video_source">सोर्स</string>
     <string name="video_skip_op">OP स्किप करें</string>
-    <string name="dont_show_again">फिरसे ना दिखाए</string>
+    <string name="dont_show_again">फिर ना दिखाएँ</string>
     <string name="update">अपडेट</string>
-    <string name="watch_quality_pref">पसंदीदा देखने की क्वालिटी</string>
+    <string name="watch_quality_pref">देखने की तरजीही क्वालिटी (वाईफ़ाई)</string>
     <string name="dns_pref_summary">ISP ब्लॉक से छुटकारा पाएं</string>
-    <string name="provider_lang_settings">सूत्र की भाषाएं</string>
+    <string name="provider_lang_settings">प्रोवाइडर की भाषाएं</string>
     <string name="app_layout">ऐप का लेआउट</string>
-    <string name="preferred_media_settings">पसंदीदा मीडिया</string>
-    <string name="download_path_pref">डाउनलोड करने का मार्ग</string>
-    <string name="display_subbed_dubbed_settings">Dubbed या Subbed Anime दिखाये</string>
+    <string name="preferred_media_settings">तरजीही मीडिया</string>
+    <string name="download_path_pref">डाउनलोड पथ</string>
+    <string name="display_subbed_dubbed_settings">डब किए /सबब् किए एनीमे दिखाएं</string>
     <string name="tv_layout">टीवी लेआउट</string>
     <string name="phone_layout">फ़ोन लेआउट</string>
     <string name="primary_color_settings">मुख्य रंग</string>
-    <string name="app_theme_settings">ऐप का रंग</string>
+    <string name="app_theme_settings">ऐप का थीम</string>
     <string name="action_mark_as_watched">देखा हुआ चिह्नित करें</string>
     <string name="history">इतिहास</string>
-    <string name="next_episode_format" formatted="true">भाग %d जारी होगा</string>
+    <string name="next_episode_format" formatted="true">भाग %d रिलीज़ किया जाएगा</string>
     <string name="next_episode_time_day_format" formatted="true">%dd %dh %dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%dh %dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-    <string name="result_poster_img_des">विज्ञापन</string>
     <string name="home_next_random_img_des">अगला रैंडम</string>
-    <string name="go_back_img_des">वापस जाओ</string>
+    <string name="go_back_img_des">वापिस जाओ</string>
     <string name="search_poster_img_des">पोस्टर</string>
-    <string name="preview_background_img_des">पृष्ठभूमि का पूर्वावलोकन करें</string>
-    <string name="home_change_provider_img_des">प्रदाता बदलें</string>
+    <string name="preview_background_img_des">प्रीव्यू बैकग्राउंड</string>
+    <string name="home_change_provider_img_des">प्रोवाइडर बदलें</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
     <string name="home_main_poster_img_des">मुख्य पोस्टर</string>
     <string name="episode_poster_img_des">एपिसोड का पोस्टर</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="filler" formatted="true">पूरक</string>
+    <string name="rated_format" formatted="true">रेटिंग: %.1f</string>
+    <string name="search_hint_site" formatted="true">%s पर खोजें…</string>
+    <string name="search_hint">खोजें…</string>
+    <string name="duration_format" formatted="true">%d मिनट</string>
+    <string name="app_name">क्लाउडस्ट्रीम</string>
+    <string name="play_with_app_name">क्लाउडस्ट्रीम के साथ चलाएं</string>
 </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 477ab92b..84915a38 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -28,7 +28,7 @@
     <string name="preview_background_img_des">Preview Background</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Brzina (%.2fx)</string>
-    <string name="rated_format" formatted="true">Ocijenjeno: %.1f</string>
+    <string name="rated_format" formatted="true">Ocjena: %.1f</string>
     <string name="new_update_format" formatted="true">Pronađeno novo ažuriranje!
 \n%s -&gt; %s</string>
     <string name="filler" formatted="true">Umetak</string>
@@ -89,7 +89,7 @@
     <string name="home_info">Informacije</string>
     <string name="filter_bookmarks">Filtriraj oznake</string>
     <string name="error_bookmarks_text">Oznake</string>
-    <string name="action_remove_from_bookmarks">Makni</string>
+    <string name="action_remove_from_bookmarks">Ukloni</string>
     <string name="action_add_to_bookmarks">Postavi status gledanja</string>
     <string name="sort_apply">Primijeni</string>
     <string name="sort_cancel">Poništi</string>
@@ -117,7 +117,7 @@
     <string name="subs_hold_to_reset_to_default">Držite za vraćanje na zadane postavke</string>
     <string name="subs_import_text" formatted="true">Uvezi fontove tako da ih postavite u %s</string>
     <string name="continue_watching">Nastavite s gledanjem</string>
-    <string name="action_remove_watching">Makni</string>
+    <string name="action_remove_watching">Ukloni</string>
     <string name="action_open_watching">Više informacija</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Za ispravan rad ovog pružatelja usluga može biti potreban VPN</string>
@@ -130,7 +130,7 @@
     <string name="picture_in_picture">Picture-in-picture</string>
     <string name="picture_in_picture_des">Nastavlja reprodukciju u minijaturnom playeru povrh drugih aplikacija</string>
     <string name="player_size_settings">Gumb za promjenu veličine playera</string>
-    <string name="player_size_settings_des">Ukloni crne rubove</string>
+    <string name="player_size_settings_des">Uklaja crne rubove</string>
     <string name="player_subtitles_settings">Titlovi</string>
     <string name="player_subtitles_settings_des">Postavke titlova playera</string>
     <string name="chromecast_subtitles_settings">Chromecast Titlovi</string>
@@ -151,7 +151,7 @@
     <string name="use_system_brightness_settings">Koristi svijetlinu u sustavu</string>
     <string name="use_system_brightness_settings_des">Koristi svjetlinu sustava u playeru aplikacija umjesto tamnog preklopa</string>
     <string name="episode_sync_settings">Ažuriraj napredak gledanja</string>
-    <string name="episode_sync_settings_des">Automatski sinkroniziraj svoj trenutni napredak u epizodi</string>
+    <string name="episode_sync_settings_des">Automatski sinkronizira vaš trenutni napredak u filmu ili epizodi</string>
     <string name="restore_settings">Vraćanje podataka iz sigurnosne kopije</string>
     <string name="backup_settings">Sigurnosno kopiranje podataka</string>
     <string name="restore_success">Učitana datoteka sigurnosne kopije</string>
@@ -306,7 +306,7 @@
     <string name="enable_nsfw_on_providers">Omogući NSFW na podržanim pružateljima usluga</string>
     <string name="subtitles_encoding">Kodiranje titlova</string>
     <string name="category_providers">Pružatelji usluga</string>
-    <string name="category_ui">Respored</string>
+    <string name="category_ui">Raspored</string>
     <string name="automatic">Auto</string>
     <string name="tv_layout">TV izgled</string>
     <string name="phone_layout">Izgled za telefone</string>
@@ -314,7 +314,7 @@
     <string name="primary_color_settings">Primarna boja</string>
     <string name="app_theme_settings">Tema aplikacije</string>
     <string name="bottom_title_settings">Mjesto naslova postera</string>
-    <string name="bottom_title_settings_des">Stavi naslov ispod postera</string>
+    <string name="bottom_title_settings_des">Stavlja naslov ispod postera</string>
     <!-- account stuff -->
     <string name="example_password">lozinka123</string>
     <string name="example_username">MojeCoolIme</string>
@@ -398,7 +398,7 @@
     <string name="error_invalid_data">Nevažeći podaci</string>
     <string name="error_invalid_url">URL je nevažeći</string>
     <string name="error">Greška</string>
-    <string name="subtitles_remove_captions">Ukloni titlove iz titlova</string>
+    <string name="subtitles_remove_captions">Ukloni CC iz titlova</string>
     <string name="subtitles_remove_bloat">Ukloni reklame iz titlova</string>
     <string name="subtitles_filter_lang">Filtriraj po željenom jeziku medija</string>
     <string name="extras">Extras</string>
@@ -446,7 +446,7 @@
     <string name="tracks">Zapis</string>
     <string name="audio_tracks">Audio zapis</string>
     <string name="video_tracks">Video zapis</string>
-    <string name="apply_on_restart">Primijeni na ponovnom pokretanju</string>
+    <string name="apply_on_restart">Primjenjuje se na ponovnom pokretanju</string>
     <string name="safe_mode_title">Sigurnosni način rada omogućen</string>
     <string name="safe_mode_description">Sve su ekstenzije isključene zbog rušenja aplikacije kako biste lakše pronašli ono koje uzrokuje probleme.</string>
     <string name="safe_mode_crash_info">Pogledajte podatke o padu</string>
@@ -472,7 +472,7 @@
     <string name="all_languages_preference">Svi jezici</string>
     <string name="clipboard_too_large">Previše teksta. Nije moguće spremiti u međuspremnik.</string>
     <string name="action_mark_as_watched">Označi kao gledano</string>
-    <string name="enable_skip_op_from_database_des">Prikaži skočne prozore za preskakanje za početak/završetak</string>
+    <string name="enable_skip_op_from_database_des">Prikazuje skočni prozor za preskakanje početka ili završetka medija</string>
     <string name="yes">Da</string>
     <string name="update_notification_downloading">Preuzimanje ažuriranja aplikacije…</string>
     <string name="confirm_exit_dialog">Jeste li sigurni da želite izaći\?</string>
@@ -495,7 +495,7 @@
     <string name="pref_category_gestures">Geste</string>
     <string name="pref_category_player_features">Značajke playera</string>
     <string name="pref_category_subtitles">Titlovi</string>
-    <string name="pref_category_player_layout">Respored</string>
+    <string name="pref_category_player_layout">Raspored</string>
     <string name="pref_category_defaults">Zadane postavke</string>
     <string name="pref_category_looks">Izgled</string>
     <string name="pref_category_ui_features">Značajke</string>
@@ -527,7 +527,7 @@
     <string name="select_library">Odaberite biblioteku</string>
     <string name="open_with">Otvori sa</string>
     <string name="empty_library_no_accounts_message">Vaša je biblioteka prazna :(
-\nPrijavite se na račun biblioteke ili dodajte emisije u svoju lokalnu biblioteku.</string>
+\nPrijavite se na račun biblioteke ili dodajte filmove / serije u svoju lokalnu biblioteku.</string>
     <string name="empty_library_logged_in_message">Ova je lista prazna. Pokušajte se prebaciti na jednu drugu listu.</string>
     <string name="safe_mode_file">Pronađena datoteka sigurnog načina rada!
 \nNe učitavaju se ekstenzije pri pokretanju dok se datoteka ne ukloni.</string>
@@ -577,4 +577,6 @@
 \nImat će kombinirani prioritet videozapisa od 10.
 \n
 \nNAPOMENA: Ako je zbroj 10 ili više, video player će automatski preskočiti učitavanje kada se ta poveznica učita!</string>
+    <string name="already_voted">Već si glasao/la</string>
+    <string name="backup_frequency">Učestalost rezervne kopije</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index aaa65897..d6d5b7f6 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -132,7 +132,7 @@
     <string name="update_started">העדכון התחיל</string>
     <string name="settings_info">מידע</string>
     <string name="automatic_plugin_download_summary">התקן אוטומטית את כל התוספים שטרם הותקנו ממאגרים שנוספו.</string>
-    <string name="updates_settings_des">חפש אוטומטית עדכונים חדשים בפתיחת האפליקציה</string>
+    <string name="updates_settings_des">חפש אוטומטית עדכונים חדשים לאחר פתיחת האפליקציה.</string>
     <string name="updates_settings">הצג עדכונים לאפליקציה</string>
     <string name="redo_setup_process">בצע מחדש את תהליך ההגדרה</string>
     <string name="uprereleases_settings">עדכן למהדורות מוקדמות</string>
@@ -146,7 +146,7 @@
     <string name="no_episodes_found">לא נמצאו פרקים</string>
     <string name="delete_file">מחק קובץ</string>
     <string name="delete">מחק</string>
-    <string name="pause">עצור</string>
+    <string name="pause">השהה</string>
     <string name="resume">המשך</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
@@ -176,7 +176,7 @@
     <string name="dont_show_again">אל תראה שוב</string>
     <string name="skip_update">דלג על עדכון זה</string>
     <string name="update">עדכון</string>
-    <string name="watch_quality_pref">איכות צפייה מועדפת</string>
+    <string name="watch_quality_pref">איכות צפייה מועדפת (WiFi)</string>
     <string name="limit_title">נגן וידאו כותרת מקסימום תווים</string>
     <string name="limit_title_rez">רזולוציית נגן וידאו</string>
     <string name="add_sync">הוסף מעקב</string>
@@ -184,7 +184,7 @@
     <string name="next">הבא</string>
     <string name="library">ספריה</string>
     <string name="provider_info_meta">מטא-דאטה לא מסופק על ידי האתר, טעינת הסרטון תיכשל אם הוא לא קיים באתר.</string>
-    <string name="swipe_to_change_settings_des">החלק על הצד השמאלי או הימני כדי לשנות את הבהירות או עוצמת הקול</string>
+    <string name="swipe_to_change_settings_des">החלק בצד השמאלי או הימני כדי לשנות את הבהירות או עוצמת הקול</string>
     <string name="restore_failed_format" formatted="true">שחזור הנתונים מהקובץ נכשל %s</string>
     <string name="category_updates">עדכונים וגיבויים</string>
     <string name="advanced_search_des">נותן לך את תוצאות החיפוש מופרדות לפי ספק</string>
@@ -194,7 +194,7 @@
     <string name="benene_des">כמות בנינים שניתנו</string>
     <string name="season">עונה</string>
     <string name="acra_report_toast">מצטערים, האפליקציה קרסה. דוח באג אנונימי יישלח למפתחים</string>
-    <string name="torrent">טורנט</string>
+    <string name="torrent">טורנטים</string>
     <string name="nsfw">NSFW</string>
     <string name="render_error">שגיאת מעבד</string>
     <string name="episode_action_download_mirror">הורד מראה</string>
@@ -226,8 +226,8 @@
     <string name="pref_category_player_features">תכונות נגן</string>
     <string name="episode_sync_settings">עדכן התקדמות צפייה</string>
     <string name="dns_pref">DNS מעל HTTPS</string>
-    <string name="double_tap_to_pause_settings_des">לחץ באמצע כדי לעצור</string>
-    <string name="swipe_to_seek_settings_des">החלק שמאלה או ימינה כדי לשלוט על זמן בנגן הסרטונים</string>
+    <string name="double_tap_to_pause_settings_des">לחץ פעמיים באמצע כדי לעצור</string>
+    <string name="swipe_to_seek_settings_des">החלק מצד לצד כדי לשלוט על מיקומך בסרטון</string>
     <string name="autoplay_next_settings">נגן אוטומטית את הפרק הבא</string>
     <string name="autoplay_next_settings_des">התחל את הפרק הבא כאשר הפרק הנוכחי נגמר</string>
     <string name="double_tap_to_seek_settings_des">לחץ פעמיים על צד ימין או שמאל כדי להציץ קדימה או אחורה</string>
@@ -264,11 +264,11 @@
     <string name="quality_cam">איכות מצלמה</string>
     <string name="swipe_to_seek_settings">החלק כדי להציץ</string>
     <string name="pref_category_backup">גיבוי</string>
-    <string name="double_tap_to_seek_amount_settings">כמות הצצת הנגן</string>
+    <string name="double_tap_to_seek_amount_settings">כמות הזזת הנגן (שניות)</string>
     <string name="other_singular">סרטון</string>
     <string name="github">גיטהאב</string>
     <string name="quality_cam_rip">מצלמה</string>
-    <string name="swipe_to_change_settings">החלק לשינוי ההגדרות</string>
+    <string name="swipe_to_change_settings">החלק כדי לשנות הגדרות</string>
     <string name="browser">‪דפדפן</string>
     <string name="subs_window_color">צבע חלון</string>
     <string name="show_log_cat">הצג לוג</string>
@@ -438,7 +438,7 @@
     <string name="sort">מיין</string>
     <string name="select_library">בחר ספרייה</string>
     <string name="empty_library_no_accounts_message">נראה שהספרייה שלכם ריקה :(
-\nהתחברו לחשבון ספריה או הוסף סדרות לספרייה המקומית שלך</string>
+\nהתחברו לחשבון ספריה או הוסיפו סדרות לספרייה המקומית שלכם.</string>
     <string name="safe_mode_file">קובץ מצב בטוח נמצא!
 \nלא טוען שום תוספות בהפעלה עד להסרת הקובץ.</string>
     <string name="update_notification_failed">לא ניתן להתקין את הגרסה החדשה של האפליקציה</string>
@@ -505,5 +505,52 @@
     <string name="sort_alphabetical_a">אלפביתי (א \'עד ת\')</string>
     <string name="sort_alphabetical_z">אלפביתי (ת\' עד א\')</string>
     <string name="open_with">פתח עם</string>
-    <string name="empty_library_logged_in_message">נראה שהרשימה הזו ריקה, נסו לעבור לרשימה אחרת</string>
+    <string name="empty_library_logged_in_message">נראה שהרשימה הזו ריקה, נסו לעבור לרשימה אחרת.</string>
+    <string name="subscription_new">רשום ל%s</string>
+    <string name="subscription_in_progress_notification">מעדכן סדרות שנרשמת אליהן</string>
+    <string name="android_tv_interface_off_seek_settings">נגן מוסתר - כמות הזזה</string>
+    <string name="mobile_data">רשת סלולארית</string>
+    <string name="subscription_list_name">רשום</string>
+    <string name="revert">חזור</string>
+    <string name="subscription_deleted">הרשמה ל-%s מבוטלת</string>
+    <string name="jsdelivr_proxy">פרוקסי עבור raw.githubusercontent.com</string>
+    <string name="profiles">פרופילים</string>
+    <string name="unable_to_inflate">הממשק לא נוצר נכון. זוהי שגיאה רצינית, נא לדווח עליה מיידית ל-%s</string>
+    <string name="edit">עריכה</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="profile_background_des">רקע הפרופיל</string>
+    <string name="default_account">@string/default_subtitles</string>
+    <string name="test_log">רשומה</string>
+    <string name="help">עזרה</string>
+    <string name="start">התחלה</string>
+    <string name="stop">עצור</string>
+    <string name="profile_number">פרופיל %d</string>
+    <string name="android_tv_interface_on_seek_settings_summary">הזמן שיזוז כשהנגן מוצג</string>
+    <string name="android_tv_interface_on_seek_settings">נגן מוצג - כמות הזזה</string>
+    <string name="restart">אתחול</string>
+    <string name="jsdelivr_proxy_summary">עוקף את החסימה של GitHub באמצעות jsDelivr. עלול לגרום לעדכונים להתעכב בכמה ימים.</string>
+    <string name="automatic_plugin_download_mode_title">בחר מצב כדי לסנן תוספים להורדה</string>
+    <string name="qualities">איכויות</string>
+    <string name="use">השתמש</string>
+    <string name="category_provider_test">בדיקת ספק</string>
+    <string name="test_failed">נכשל</string>
+    <string name="subscription_episode_released">פרק %d שוחרר לצפיה!</string>
+    <string name="disable">ביטול</string>
+    <string name="watch_quality_pref_data">איכות צפיה מועדפת (אינטרנט סלולארי)</string>
+    <string name="no_repository_found_error">המאגר לא נמצא, נא לבדוק את ה-URL ולנסות VPN</string>
+    <string name="jsdelivr_enabled">ההתחברות אל GitHub נכשלה. מדליק פרוקסי אל jsDelivr…</string>
+    <string name="android_tv_interface_off_seek_settings_summary">הזמן שיזוז כשהנגן מוסתר</string>
+    <string name="already_voted">כבר הצבעת</string>
+    <string name="no_plugins_found_error">לא נמצאו תוספים במאגר</string>
+    <string name="pref_category_android_tv">טלוויזיית אנדרואיד</string>
+    <string name="set_default">קביעה כברירת מחדל</string>
+    <string name="test_passed">עבר</string>
+    <string name="pref_category_bypass">מעקף ספק אינטרנט</string>
+    <string name="quality_profile_help">כאן ניתן לשנות את סדר המקורות. אם לוידיאו יש עדיפות גבוהה יותר, הוא יופיע גבוה יותר בבחירת המקור. סכום עדיפות המקור ועדיפות האיכות היא עדיפות הוידיאו.
+\n
+\nמקור א: 3
+\nאיכות ב: 7
+\nיגרמו לעדיפות הסרטון להיות 10.
+\n
+\nשימו לב: אם הסכום הוא 10 או יותר, הנגן ידלג על טעינת הסרטון כאשר הלינק נטען!</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index af4ea695..7f10aad4 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -218,4 +218,5 @@
     <string name="subs_font_size">フォントサイズ</string>
     <string name="search_provider_text_providers">プロバイダーから探す</string>
     <string name="subs_auto_select_language">言語の自動選択</string>
+    <string name="error_loading_links_toast">リンクの読み込みエラー</string>
 </resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
new file mode 100644
index 00000000..a702a62f
--- /dev/null
+++ b/app/src/main/res/values-lt/strings.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="delete_file">Ištrinti failą</string>
+    <string name="action_remove_from_bookmarks">Pašalinti</string>
+    <string name="player_speed_text_format" formatted="true">Greitis (%.2fx)</string>
+    <string name="error_bookmarks_text">Žymos</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="download_started">Siuntimas pradėtas</string>
+    <string name="home_next_random_img_des">Sekantis atsitiktinai</string>
+    <string name="preview_background_img_des">Peržiūros fonas</string>
+    <string name="play_movie_button">Paleisti filmą</string>
+    <string name="pref_disable_acra">Išjungti automatini klaidų pateikimą</string>
+    <string name="subs_default_reset_toast">Atstatyti į numatytą reikšmę</string>
+    <string name="sort_clear">Išvalyti</string>
+    <string name="search_poster_img_des">Plakatas</string>
+    <string name="filter_bookmarks">Filtruoti žymas</string>
+    <string name="update_notification_failed">Nepavyko įrašyti naujos programos versijos</string>
+    <string name="updates_settings_des">Automatiškai ieškoti atnaujinimų, kai paleidžiama programa.</string>
+    <string name="movies_singular">Filmas</string>
+    <string name="torrent_singular">Torrentas</string>
+    <string name="show_fillers_settings">Rodyti tarpines serijas animei</string>
+    <string name="subs_font_size">Šrifto dydis</string>
+    <string name="no_links_found_toast">Nuorodos ne rastos</string>
+    <string name="type_plan_to_watch">Planuojama žiūrėti</string>
+    <string name="update_started">Atnaujinimas pradėtas</string>
+    <string name="sort_copy">Kopijuoti</string>
+    <string name="benene_des">Duoti bananai</string>
+    <string name="home_more_info">Daugiau informacijos</string>
+    <string name="title_downloads">Atsiuntimai</string>
+    <string name="subs_auto_select_language">Automatiškai pasirinkti kalbą</string>
+    <string name="error_loading_links_toast">Klaida kraunant nuorodas</string>
+    <string name="go_forward_30">+30</string>
+    <string name="download_done">Atsiuntimas baigtas</string>
+    <string name="continue_watching">Tęsti žiūrėjimą</string>
+    <string name="new_update_format" formatted="true">Rastas atnaujinimas!
+\n%s -&gt; %s</string>
+    <string name="subs_download_languages">Atsisiųsti kalbas</string>
+    <string name="search_provider_text_providers">Ieškoti naudojant tiekėjus</string>
+    <string name="go_back_img_des">Grįžti atgal</string>
+    <string name="downloading">Siunčiama</string>
+    <string name="episode_more_options_des">Daugiau pasirinkčiu</string>
+    <string name="play_episode">Paleisti seriją</string>
+    <string name="player_speed">Grotuvo greitis</string>
+    <string name="benene_count_text">%d Bananai duoti kūrėjams</string>
+    <string name="type_watching">Žiūrima</string>
+    <string name="pause">Pauzė</string>
+    <string name="result_tags">Žanrai</string>
+    <string name="go_back_30">-30</string>
+    <string name="episode_poster_img_des">Serijos plakatas</string>
+    <string name="vpn_might_be_needed">Gali reikėti VPN šitam tiekėjui, kad veiktų teisingai</string>
+    <string name="search_hint_site" formatted="true">Ieškoti %s…</string>
+    <string name="github">Github</string>
+    <string name="benene_count_text_none">Nėra duotu bananų</string>
+    <string name="subs_subtitle_languages">Subtitrų kalba</string>
+    <string name="home_change_provider_img_des">Keisti teikėją</string>
+    <string name="subs_background_color">Fono spalva</string>
+    <string name="search_hint">Ieškoti…</string>
+    <string name="no_season">Nėra Sezonų</string>
+    <string name="play_episode_toast">Leisti seriją</string>
+    <string name="category_account">Paskyros</string>
+    <string name="popup_pause_download">Sustabdyti siuntimą</string>
+    <string name="app_dubbed_text">Įgarsinimas</string>
+    <string name="subtitles_settings">Subtitrų nustatymai</string>
+    <string name="subs_window_color">Lango spalva</string>
+    <string name="documentaries">Dokumentika</string>
+    <string name="play_torrent_button">Transliuoti Torrentą</string>
+    <string name="delete">Ištrinti</string>
+    <string name="start">Pradėti</string>
+    <string name="eigengraumode_settings_des">Prideda greičio pasirinkti grotuve</string>
+    <string name="cartoons_singular">Filmukas</string>
+    <string name="download_canceled">Atsiuntimas atšauktas</string>
+    <string name="advanced_search">Išplėstinė paieška</string>
+    <string name="empty_library_logged_in_message">Tuščias sąrašas. Pabandykite pasirinkti kitą sąrašą.</string>
+    <string name="chromecast_subtitles_settings">Chromecast subtitrai</string>
+    <string name="rated_format" formatted="true">Įvertinimas: %.1f</string>
+    <string name="home_expanded_hide">Slėpti</string>
+    <string name="sort_apply">Pritaikyti</string>
+    <string name="browser">Naršyklė</string>
+    <string name="pick_subtitle">Subtitrai</string>
+    <string name="next_episode">Kita serija</string>
+    <string name="download_paused">Siuntimas sustabdytas</string>
+    <string name="updates_settings">Rodyti programos atnaujinimus</string>
+    <string name="download">Atsisiųsti</string>
+    <string name="library">Biblioteka</string>
+    <string name="video_disk_description">Kelią problemas jei nustatytas per didelis ant prietaisų su mažai turymos vietos, tokiu kaip Android TV.</string>
+    <string name="others">Kita</string>
+    <string name="popup_delete_file">Ištrinti failą</string>
+    <string name="downloaded">Atsisiųsta</string>
+    <string name="popup_resume_download">Pratęsti siuntimą</string>
+    <string name="asian_drama">Azijietiškos dramos</string>
+    <string name="episode">Serija</string>
+    <string name="empty_library_no_accounts_message">Jūsų biblioteka tuščia :(
+\nPrisijunkite prie bibliotekos paskyros arba pridėkite laidas prie vietinės bibliotekos.</string>
+    <string name="autoplay_next_settings_des">Pradėti sekančia seriją, kai dabartinė baigsis</string>
+    <string name="subs_text_color">Teksto spalva</string>
+    <string name="type_completed">Užbaigta</string>
+    <string name="use_system_brightness_settings_des">Naudoti sistemos ryškumą programos grotuve vietoj tamsumo</string>
+    <string name="type_none">Tuščia</string>
+    <string name="restore_failed_format" formatted="true">Nepavyko atstatyti duomenis iš failo %s</string>
+    <string name="play_trailer_button">Paleisti anonsa</string>
+    <string name="play_livestream_button">Paleisti gyva transliacija</string>
+    <string name="no_episodes_found">Nerasta serijų</string>
+    <string name="vpn_torrent">Šis tiekėjas yra iš Torrentų, VPN rekomenduojama naudoti</string>
+    <string name="test_failed">Nepavyko</string>
+    <string name="result_poster_img_des">Plakatas</string>
+    <string name="popup_play_file">Paleisti failą</string>
+    <string name="type_re_watching">Peržiūrima</string>
+    <string name="result_open_in_browser">Atidaryti Naršyklėje</string>
+    <string name="use_system_brightness_settings">Naudoti sistemos ryškumą</string>
+    <string name="sort_cancel">Atšaukti</string>
+    <string name="no_data">Nėra duomenų</string>
+    <string name="subs_font">Šriftas</string>
+    <string name="redo_setup_process">Perdaryti nustatymo procesą</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="benene">Duoti bananą kūrėjams</string>
+    <string name="go_back">Sugryšti</string>
+    <string name="copy_link_toast">Nuoroda nukopijuota į iškarpinę</string>
+    <string name="search">Paieška</string>
+    <string name="settings_info">Informacija</string>
+    <string name="skip_loading">Praleisti įkėlima</string>
+    <string name="home_info">Informacija</string>
+    <string name="next_episode_format" formatted="true">Serija %d bus išleista</string>
+    <string name="sort_save">Išsaugoti</string>
+    <string name="clipboard_too_large">Perdaug teksto. Nepavyko išsaugoti i iškarpynę.</string>
+    <string name="download_failed">Atsiuntimas nepavyko</string>
+    <string name="result_share">Pasidalinti</string>
+    <string name="home_main_poster_img_des">Pagrindinis Plakatas</string>
+    <string name="pick_source">Šaltiniai</string>
+    <string name="title_settings">Nustatymai</string>
+    <string name="title_search">Ieškoti</string>
+    <string name="loading">Kraunama…</string>
+    <string name="action_remove_watching">Pašalinti</string>
+    <string name="action_open_watching">Daugiau informacijos</string>
+    <string name="type_on_hold">Sustabdyta</string>
+    <string name="app_name">CloudStream</string>
+    <string name="home_play">Paleisti</string>
+    <string name="livestreams">Gyvos transliacijos</string>
+    <string name="apk_installer_settings">APK įrašymas</string>
+    <string name="download_storage_text">Vidinė atmintis</string>
+    <string name="autoplay_next_settings">Automatiškai paleisti kitą seriją</string>
+    <string name="player_subtitles_settings_des">Grotuvo subtitrų nustatymai</string>
+    <string name="app_language">Programos kalba</string>
+    <string name="sort_close">Uždaryti</string>
+    <string name="action_add_to_bookmarks">Nustatyti žiūrėjimo statusą</string>
+    <string name="play_with_app_name">Paleisti su CloudStream</string>
+    <string name="subs_subtitle_elevation">Subtitrų iškėlimas</string>
+    <string name="episodes">Serijos</string>
+    <string name="cast_format" formatted="true">Skleisti: %s</string>
+    <string name="season">Sezonas</string>
+    <string name="added_sync_format" formatted="true">Pridėta %s</string>
+    <string name="video_source">Šaltinis</string>
+    <string name="pref_category_app_updates">Programos atnaujinimai</string>
+    <string name="no_update_found">Nerasta atnaujinimų</string>
+    <string name="show_title">Pavadinimas</string>
+    <string name="download_path_pref">Atsiuntimo kelias</string>
+    <string name="normal">Normalu</string>
+    <string name="add_site_pref">Klonuoti puslapį</string>
+    <string name="update">Atnaujinimas</string>
+    <string name="episode_action_download_subtitle">Atsisiųsti subtitrus</string>
+    <string name="dont_show_again">Ne rodyti dar kartą</string>
+    <string name="video_skip_op">Praleisti OP</string>
+    <string name="live_singular">Gyva transliacija</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="unexpected_error">Netikėta grotuvo klaida</string>
+    <string name="sync_score">Įvertinta</string>
+    <string name="skip_update">Praleisti šį atnaujinimą</string>
+    <string name="pref_category_actions">Veiksmai</string>
+    <string name="episode_action_copy_link">Kopijuoti nuorodą</string>
+    <string name="episode_action_play_in_app">Paleisti programoje</string>
+    <string name="upload_sync">Sinchronizuoti</string>
+    <string name="episode_action_play_in_browser">Paleisti naršyklėje</string>
+    <string name="remove_site_pref">Pašalinti puslapį</string>
+    <string name="episode_action_reload_links">Perkrauti nuorodos</string>
+    <string name="disable">Išjungti</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="pref_category_links">Nuorodos</string>
+    <string name="resize_zoom">Pritraukti</string>
+    <string name="resize_fit">Sutalpinti į ekraną</string>
+    <string name="video_lock">Užrakinti</string>
+    <string name="storage_error">Atsiuntimo klaida, patikrinkite atminties leidimus</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="asian_drama_singular">Azijietiška drama</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="source_error">Šaltinio klaida</string>
+    <string name="view_public_repositories_button_short">Viešas sąrašas</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="batch_download_finish_format" formatted="true">Atsiųsta %d %s</string>
+    <string name="skip_type_format" formatted="true">Praleisti %s</string>
+    <string name="blank_repo_message">Pagal numatytuosius nustatymus „CloudStream“ neturi įdiegtų svetainių. Turite įdiegti svetaines iš saugyklų.
+\n
+\nDėl beprotiško DMCA reikalavimų, kurios atliko Sky UK Limited 🤮, negalime susieti saugyklos svetainės programoje.
+\n
+\nPrisijunkite prie mūsų Discord arba ieškokite internete.</string>
+    <string name="mobile_data">Mobilūs duomenys</string>
+    <string name="example_username">šaunusPrisijungimoVardas</string>
+    <string name="extension_authors">Autoriai</string>
+    <string name="player_settings_play_in_browser">Naršyklė</string>
+    <string name="all_languages_preference">Visos kalbos</string>
+    <string name="quality_4k">4K</string>
+    <string name="batch_download_start_format" formatted="true">Pradėta siųsti %d %s…</string>
+    <string name="extension_description">Aprašymas</string>
+    <string name="safe_mode_title">Saugus režimas įjungtas</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="plugins_not_downloaded" formatted="true">Ne atsiųsta: %d</string>
+    <string name="next">Kitas</string>
+    <string name="select_library">Pasirinkti biblioteką</string>
+    <string name="no">Ne</string>
+    <string name="example_lang_name">Kalbos kodas (lt)</string>
+    <string name="setup_done">Baigta</string>
+    <string name="clear_history">Išvalyti istoriją</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="edit">Redaguoti</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="coming_soon">Greitai būs…</string>
+    <string name="yes">Taip</string>
+    <string name="help">Pagalba</string>
+    <string name="app_not_found_error">Programa nerasta</string>
+    <string name="plugins_disabled" formatted="true">Išjungta: %d</string>
+    <string name="sort_by">Rūšiuoti pagal</string>
+    <string name="skip_type_op">Atidarymas</string>
+    <string name="example_password">Slaptazodis123</string>
+    <string name="open_with">Atidaryti su</string>
+    <string name="extension_language">Kalba</string>
+    <string name="quality_sd">SD</string>
+    <string name="example_email">sveikas@pasauli.com</string>
+    <string name="use">Naudoti</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="example_site_url">Pavyzdys.com</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="extension_size">Dydis</string>
+    <string name="extension_types">Palaikoma</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="example_site_name">ManoŠaunusPuslapis</string>
+    <string name="trailer">Anonsas</string>
+    <string name="history">Istorija</string>
+    <string name="subscription_episode_released">Serija %d išleista!</string>
+    <string name="update_notification_downloading">Atsiunčiamas programos atnaujinimas…</string>
+    <string name="plugins_downloaded" formatted="true">Atsiųsta: %d</string>
+    <string name="error">Klaida</string>
+    <string name="logout">Atsijungti</string>
+    <string name="sort">Rūšiuoti</string>
+    <string name="video_tracks">Vaizdo takelis</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="delayed_update_notice">Programa bus atnaujinta išėjus</string>
+    <string name="primary_color_settings">Pagrindinė kalba</string>
+    <string name="login">Prisijungti</string>
+    <string name="action_mark_as_watched">Pažymėti kaip žiūrima</string>
+    <string name="preferred_media_subtext">Ką norite matyti</string>
+    <string name="update_notification_installing">Įrašomas programos atnaujinimas…</string>
+    <string name="plugin_load_fail" formatted="true">Nepavyko įkelti %s</string>
+    <string name="extension_rating" formatted="true">Įvertinimas: %s</string>
+    <string name="extension_status">Statusas</string>
+    <string name="skip_type_ed">Pabaiga</string>
+    <string name="error_invalid_url">Klaidingas URL</string>
+    <string name="extension_version">Versija</string>
+    <string name="is_adult">18+</string>
+    <string name="single_plugin_disabled" formatted="true">%s (išjungta)</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="player_settings_play_in_app">Integruotas grotuvas</string>
+    <string name="setup_extensions_subtext">Atsisiųskite sąrašą puslapiu jūs norite naudoti</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ser %d</string>
+    <string name="confirm_exit_dialog">Ar tikrai norite išeiti\?</string>
+    <string name="action_remove_from_watched">Pašalinti iš žiūrimų</string>
+    <string name="audio_tracks">Garso takelis</string>
+</resources>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 17eeb883..222bef61 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -37,4 +37,23 @@
     <string name="player_speed_text_format" formatted="true">Kelajuan (%.2fx)</string>
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">Poster</string>
+    <string name="sort_copy">Salin</string>
+    <string name="title_downloads">Muat Turun</string>
+    <string name="result_tags">Genre</string>
+    <string name="search_hint_site" formatted="true">Cari %s…</string>
+    <string name="edit">Sunting</string>
+    <string name="search_hint">Carian…</string>
+    <string name="browser">Pelayar</string>
+    <string name="next_episode">Episod seterusnya</string>
+    <string name="download">Muat Turun</string>
+    <string name="open_with">Buka dengan</string>
+    <string name="popup_delete_file">Padam Fail</string>
+    <string name="result_open_in_browser">Buka Dalam Pelayar</string>
+    <string name="sort_cancel">Batal</string>
+    <string name="no_data">Tiada Data</string>
+    <string name="home_info">Info</string>
+    <string name="sort_save">Simpan</string>
+    <string name="result_share">Kongsi</string>
+    <string name="title_settings">Tetapan</string>
+    <string name="sort_close">Tutup</string>
 </resources>
diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml
index 177f7ea1..63dba53d 100644
--- a/app/src/main/res/values-or/strings.xml
+++ b/app/src/main/res/values-or/strings.xml
@@ -158,4 +158,5 @@
     <string name="search_hint_site" formatted="true">%s ସନ୍ଧାନ କରିବା…</string>
     <string name="next_episode">ପରବର୍ତ୍ତୀ ଅଧ୍ୟାୟ</string>
     <string name="no_data">କୌଣସି ତଥ୍ୟ ନାହିଁ</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s ଅ %d</string>
 </resources>
diff --git a/app/src/main/res/values-pl/array.xml b/app/src/main/res/values-pl/array.xml
index 30b6f4a1..8384187f 100644
--- a/app/src/main/res/values-pl/array.xml
+++ b/app/src/main/res/values-pl/array.xml
@@ -203,12 +203,15 @@
 
     <string-array name="themes_overlay_names">
         <item>Normalny</item>
+        <item>Żółty mniszek lekarski</item>
         <item>Goździk różowy</item>
+        <item>Pomarańczowy</item>
         <item>Ciemnozielony</item>
         <item>Kasztanowaty</item>
         <item>Ciemnoniebieski</item>
         <item>Szary</item>
         <item>Biały</item>
+        <item>Fajny niebieski</item>
         <item>Brązowy</item>
         <item>Niebieski</item>
         <item>Czerwony</item>
@@ -223,12 +226,15 @@
     </string-array>
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
+        <item>DandelionYellow</item>
         <item>CarnationPink</item>
+        <item>Orange</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
         <item>NavyBlue</item>
         <item>Grey</item>
         <item>White</item>
+        <item>CoolBlue</item>
         <item>Brown</item>
         <item>Blue</item>
         <item>Red</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index bcd3fc0f..e7b85b3d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -90,7 +90,7 @@
     <string name="player_speed">Скорость проигрыватель</string>
     <string name="play_episode_toast">Воспроизвести Эпизод</string>
     <string name="next_episode_time_day_format" formatted="true">%dд %dч %dм</string>
-    <string name="duration_format" formatted="true">%d мин.</string>
+    <string name="duration_format" formatted="true">%d мин</string>
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
     <string name="action_add_to_bookmarks">Установите смотреть состояние</string>
@@ -200,7 +200,7 @@
     <string name="automatic_plugin_download_summary">Автоматически загружать еще не установленные плагины из добавленных репозиториев.</string>
     <string name="discord">Присоединится в Discord</string>
     <string name="free_storage">Бесплатно</string>
-    <string name="next_episode_time_min_format" formatted="true">%d мин.</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%d ч. %d мин.</string>
     <string name="movies">Фильмы</string>
     <string name="cartoons_singular">Мультфильм</string>
@@ -529,4 +529,28 @@
     <string name="jsdelivr_proxy_summary">Обход ограничения доступа к GitHub с помощью jsDelivr может задержать обновления на несколько дней.</string>
     <string name="subscription_list_name">Подписные</string>
     <string name="subscription_deleted">Отказались от подписки на %s</string>
+    <string name="mobile_data">Мобильный интернет</string>
+    <string name="profiles">Профили</string>
+    <string name="unable_to_inflate">Пользовательский интерфейс не был доступен для правильного создания, это ГЛАВНАЯ ОШИБКА и должна быть сообщена немедленно %s</string>
+    <string name="edit">Изменить</string>
+    <string name="wifi">Интернет</string>
+    <string name="profile_background_des">Задний фон профиля</string>
+    <string name="default_account">\@строка/обычные_субтитры</string>
+    <string name="help">Помощь</string>
+    <string name="profile_number">Профиль %d</string>
+    <string name="automatic_plugin_download_mode_title">Выберите режим фильтера плагинов для загрузки</string>
+    <string name="qualities">Качество</string>
+    <string name="use">Использовать</string>
+    <string name="disable">Выключить</string>
+    <string name="no_repository_found_error">Хранилище не обнаружено, проверьте URL и попробуйте с ВПН</string>
+    <string name="already_voted">Вы уже проголосовали</string>
+    <string name="no_plugins_found_error">Никаких плагинов не обнаружено</string>
+    <string name="set_default">Поставить обычный</string>
+    <string name="quality_profile_help">Здесь вы можете изменить порядок расположения источников. Если видео имеет более высокий приоритет, оно будет отображаться выше в списке источников. Сумма приоритета источника и приоритета качества составляет приоритет видео.
+\n
+\nИсточник А: 3
+\nКачество Б: 7
+\nБудет иметь общий приоритет видео 10.
+\n
+\nПРИМЕЧАНИЕ. Если сумма равна 10 или более, плеер автоматически пропустит загрузку при загрузке этой ссылки!</string>
 </resources>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 3f4134e5..9c9a335b 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="search_hint">தேடுக</string>
-    <string name="search_hint_site" formatted="true">தேடல் %s…</string>
-    <string name="player_speed_text_format" formatted="true">வேகம்</string>
+    <string name="search_hint">தேடுக…</string>
+    <string name="search_hint_site" formatted="true">%s இல் தேடவும்…</string>
+    <string name="player_speed_text_format" formatted="true">வேகம் (%.2fx)</string>
     <string name="title_home">முகப்பு</string>
     <string name="title_search">தேடு</string>
     <string name="title_downloads">பதிவிறக்கம்</string>
@@ -60,7 +60,7 @@
     <string name="double_tap_to_seek_settings">தேடுவதற்கு இருமுறை தட்டவும்</string>
     <string name="double_tap_to_seek_amount_settings">பிளேயரில் தேடுதல் வேகம்</string>
     <string name="double_tap_to_pause_settings_des">இடைநிறுத்துவதற்கு நடுவில் தட்டவும்</string>
-    <string name="cast_format" formatted="true">நடிகர்கள்</string>
+    <string name="cast_format" formatted="true">நடிகர்கள்: %s</string>
     <string name="go_back_img_des">பின் செல்</string>
     <string name="title_settings">அமைப்புகள்</string>
     <string name="type_none">ஏதும் இல்லை</string>
@@ -117,4 +117,9 @@
     <string name="new_update_format" formatted="true">புதிய புதுப்பிப்பு உள்ளது
 \n%s-&gt;%s</string>
     <string name="filler" formatted="true">நிரப்பி</string>
+    <string name="search_poster_img_des">போஸ்டர்</string>
+    <string name="episode_poster_img_des">எபிசோட்டின் போஸ்டர்</string>
+    <string name="result_poster_img_des">போஸ்டர்</string>
+    <string name="home_main_poster_img_des">பிரதான போஸ்டர்</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
 </resources>
diff --git a/app/src/main/res/values-tr/array.xml b/app/src/main/res/values-tr/array.xml
index dca01736..d14a3e2a 100644
--- a/app/src/main/res/values-tr/array.xml
+++ b/app/src/main/res/values-tr/array.xml
@@ -229,12 +229,15 @@
 
     <string-array name="themes_overlay_names">
         <item>Normal</item>
+        <item>Karahindiba sarı</item>
         <item>Karanfil Pembesi</item>
+        <item>Turuncu</item>
         <item>Koyu Yeşil</item>
         <item>Kestane</item>
         <item>Lacivert</item>
         <item>Gri</item>
         <item>Beyaz</item>
+        <item>Soğuk Mavi</item>
         <item>Kahverengi</item>
         <item>Soğuk</item>
         <item>Ateş</item>
@@ -249,12 +252,15 @@
     </string-array>
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
+        <item>DandelionYellow</item>
         <item>CarnationPink</item>
+        <item>Orange</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
         <item>NavyBlue</item>
         <item>Grey</item>
         <item>White</item>
+        <item>CoolBlue</item>
         <item>Brown</item>
         <item>Blue</item>
         <item>Red</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index eef9bc95..e0d7e4cd 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -594,4 +594,6 @@
 \nNOT: Toplam 10 veya daha fazlaysa, bu bağlantı yüklendiğinde oynatıcı otomatik olarak yüklemeyi atlayacaktır!</string>
     <string name="qualities">Kaliteler</string>
     <string name="profile_background_des">Profil arkaplanı</string>
+    <string name="unable_to_inflate">UI was unable to be created correctly, this is a MAJOR BUG and should be reported immediately %s</string>
+    <string name="automatic_plugin_download_mode_title">Select mode to filter plugins download</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f9dccfc4..c069cae0 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -38,7 +38,7 @@
     <string name="play_movie_button">Переглянути фільм</string>
     <string name="play_trailer_button">Переглянути трейлер</string>
     <string name="play_torrent_button">Трансляція через торент</string>
-    <string name="reload_error">Повторити підключення…</string>
+    <string name="reload_error">Повторити з\'єднання…</string>
     <string name="go_back">Назад</string>
     <string name="play_episode">Переглянути епізод</string>
     <string name="downloaded">Завантажено</string>
@@ -136,7 +136,7 @@
     <string name="double_tap_to_seek_amount_settings">Крок перемотки (секунди)</string>
     <string name="double_tap_to_pause_settings_des">Натисніть двічі посередині, щоб призупинити відтворення відео</string>
     <string name="use_system_brightness_settings">Використовувати яскравість системи</string>
-    <string name="episode_sync_settings">Оновити прогрес перегляду</string>
+    <string name="episode_sync_settings">Оновлювати прогрес перегляду</string>
     <string name="restore_settings">Відновлення даних з резервної копії</string>
     <string name="backup_settings">Резервне копіювання даних</string>
     <string name="restore_failed_format" formatted="true">Не вдалося відновити дані з файлу %s</string>
@@ -193,7 +193,7 @@
     <string name="tv_series">Телесеріали</string>
     <string name="cartoons">Мультфільми</string>
     <string name="anime">Аніме</string>
-    <string name="ova">ОВА</string>
+    <string name="ova">OVA</string>
     <string name="asian_drama">Азіатські драми</string>
     <string name="livestreams">Прямі трансляції</string>
     <string name="others">Інше</string>
@@ -206,7 +206,7 @@
     <string name="other_singular">Відео</string>
     <string name="source_error">Помилка джерела</string>
     <string name="remote_error">Віддалена помилка</string>
-    <string name="render_error">Помилка рендеринга</string>
+    <string name="render_error">Помилка рендерингу</string>
     <string name="episode_action_chromecast_mirror">Дзеркало Chromecast</string>
     <string name="episode_action_play_in_app">Переглянути в застосунку</string>
     <string name="episode_action_play_in_format">Переглянути в %s</string>
@@ -214,7 +214,7 @@
     <string name="episode_action_download_mirror">Завантажити дзеркало</string>
     <string name="check_for_update">Перевірити наявність оновлень</string>
     <string name="video_lock">Заблокувати</string>
-    <string name="video_skip_op">Пропускати OP</string>
+    <string name="video_skip_op">Пропустити ОП</string>
     <string name="dont_show_again">Не показувати знову</string>
     <string name="update">Оновити</string>
     <string name="watch_quality_pref">Бажана якість перегляду (WiFi)</string>
@@ -233,7 +233,7 @@
     <string name="updates_settings_des">Автоматично шукає нові оновлення після запуску застосунку.</string>
     <string name="uprereleases_settings">Оновлення до бета-версій</string>
     <string name="copy_link_toast">Посилання скопійовано в буфер обміну</string>
-    <string name="apk_installer_settings_des">Деякі телефони не підтримують новий інсталятор пакетів. Спробуйте стару версію, якщо оновлення не встановлюються.</string>
+    <string name="apk_installer_settings_des">Деякі телефони не підтримують новий встановлювач пакетів. Спробуйте стару версію, якщо оновлення не встановлюються.</string>
     <string name="discord">Приєднуйтесь до Discord</string>
     <string name="benene_des">Дано бананів</string>
     <string name="year">Рік</string>
@@ -553,4 +553,5 @@
     <string name="no_repository_found_error">Репозиторій не знайдено, перевірте URL-адресу та спробуйте VPN</string>
     <string name="no_plugins_found_error">Не знайдено жодних плагінів у репозиторії</string>
     <string name="already_voted">Ви вже проголосували</string>
+    <string name="backup_frequency">Частота резервного копіювання</string>
 </resources>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 48b73efa..b9585d07 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -28,12 +28,12 @@
     <string name="episode_more_options_des">مزید آپشنز</string>
     <string name="next_episode">اگلا قسط</string>
     <string name="result_open_in_browser">براؤزر میں کھولیں</string>
-    <string name="skip_loading">لوڈ کرنا سکیپ کر دیں</string>
+    <string name="skip_loading">لوڈنگ چھوڑیں</string>
     <string name="loading">لوڈ ہو رہا ہے…</string>
-    <string name="type_watching">دیکھنا</string>
-    <string name="type_on_hold">آن ہولڈ</string>
-    <string name="type_dropped">گرا دیا</string>
-    <string name="type_plan_to_watch">دیکھنا ہے</string>
+    <string name="type_watching">دیکھ رہے ہیں</string>
+    <string name="type_on_hold">معطل</string>
+    <string name="type_dropped">چھوڑ دیا گیا</string>
+    <string name="type_plan_to_watch">دیکھنے کا منصوبہ</string>
     <string name="type_none">کوئی نہیں</string>
     <string name="type_re_watching">دوبارہ دیکھنا</string>
     <string name="play_movie_button">مووی لگائے</string>
@@ -95,7 +95,7 @@
     <string name="action_open_play">کھلا (آن)</string>
     <string name="vpn_torrent">یہ سورس Torrent ہے، ضرورت پڑنے پر VPN کا استعمال کریں</string>
     <string name="torrent_plot">تفصیل</string>
-    <string name="normal_no_plot">کوئی تفصیل نہیں ملی</string>
+    <string name="normal_no_plot">کوئی کہانی نہیں ملی</string>
     <string name="torrent_no_plot">کوئی تفصیل نہیں ملی</string>
     <string name="show_log_cat">غلطی کا لاگ دیکھیں 🐈</string>
     <string name="picture_in_picture">PIP</string>
@@ -134,14 +134,14 @@
     <string name="updates_settings">ایپ کی تازہ کاریاں نمایش کریں</string>
     <string name="redo_setup_process">سیٹ اپ کا عمل دوبارہ کریں</string>
     <string name="uprereleases_settings">پری ریلیز کے لیے اپ ڈیٹ کریں</string>
-    <string name="uprereleases_settings_des">صرف مکمل ریلیز کے بجائے پری ریلیز اپ ڈیٹس تلاش کریں</string>
+    <string name="uprereleases_settings_des">صرف مکمل جاریات کی بجائے پیش رلیز اپ ڈیٹس کی تلاش کریں</string>
     <string name="apk_installer_settings">APK انسٹالر</string>
     <string name="github">Github</string>
-    <string name="lightnovel">ایک ہی dev کی طرف سے light ناول اپلی کیشن</string>
-    <string name="anim">اسی devs کے ذریعے anime ایپ</string>
+    <string name="lightnovel">یہ لائٹ ناول ایپ وہی ڈویلپرز نے تیار کی ہے جو اس ایپ کو ڈویلپ کیا ہے</string>
+    <string name="anim">یہ اینمی ایپ وہی ڈویلپرز نے تیار کی ہے جو اس ایپ کو ڈویلپ کیا ہے</string>
     <string name="discord">ڈسکارڈ میں شامل ہوں</string>
-    <string name="benene">دیووں کو ایک بینین دیں</string>
-    <string name="benene_des">دی گئی بینین</string>
+    <string name="benene">شکریہ ڈویلپرز کو! آپ کا کام شاندار ہے</string>
+    <string name="benene_des">تعریفیں</string>
     <string name="app_language">ایپ کی زبان</string>
     <string name="no_chromecast_support_toast">اس فراہم کنندہ کے پاس کروم کاسٹ سپورٹ نہیں ہے</string>
     <string name="no_links_found_toast">کوئی لنکس نہیں ملے</string>
@@ -150,7 +150,7 @@
     <string name="subs_default_reset_toast">طے شدہ قدر پر ری سیٹ کریں</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s قسط %d</string>
     <string name="result_poster_img_des">پوسٹر</string>
-    <string name="result_share">شیئر</string>
+    <string name="result_share">شئیر کریں</string>
     <string name="result_tags">انواع</string>
     <string name="player_speed_text_format" formatted="true">رفتار (%.2fx)</string>
     <string name="type_completed">مکمل</string>
@@ -178,7 +178,7 @@
     <string name="show_fillers_settings">anime کے لیے فلر ایپیسوڈ دکھائیں</string>
     <string name="automatic_plugin_download">پلگ ان خود بخود ڈاؤن لوڈ کریں</string>
     <string name="automatic_plugin_download_summary">شامل کردہ ذخیروں سے خود بخود تمام ابھی تک انسٹال نہیں ہوئے پلگ ان انسٹال کریں۔</string>
-    <string name="updates_settings_des">شروع ہونے پر خودکار طور پر نئی اپ ڈیٹس تلاش کریں</string>
+    <string name="updates_settings_des">اپلیکیشن کو شروع کرنے کے بعد خود بخود نئی اپ ڈیٹس کی تلاش کریں۔</string>
     <string name="apk_installer_settings_des">کچھ فون نئے پیکیج انسٹالر کو سپورٹ نہیں کرتے ہیں. اگر اپ ڈیٹس انسٹال نہیں ہوتے ہیں تو لیگیسی آپشن کو آزمائیں.</string>
     <string name="acra_report_toast">معذرت، ایپلی کیشن کریش ہو گئی. ایک گمنام بگ رپورٹ ڈویلپرز کو بھیجی جائے گی</string>
     <string name="season">سیزن</string>
@@ -233,7 +233,7 @@
     <string name="ova_singular">اووا</string>
     <string name="torrent_singular">ٹورینٹ</string>
     <string name="documentaries_singular">دستاویزی فلم</string>
-    <string name="asian_drama_singular">ایشیائی ڈرامے</string>
+    <string name="asian_drama_singular">ایشین ڈرامہ</string>
     <string name="live_singular">لائیو اسٹریمز</string>
     <string name="other_singular">ویڈیو</string>
     <string name="source_error">ماخذ نقص</string>
@@ -333,15 +333,15 @@
     <string name="subtitles_shadow">سایہ</string>
     <string name="subtitle_offset">ذیلی ہم وقت سازی کریں</string>
     <string name="subtitle_offset_hint">1000 ms</string>
-    <string name="subtitle_offset_title">سب ٹائٹل تاخیر</string>
+    <string name="subtitle_offset_title">زیرنویس میں دیری</string>
     <string name="subtitle_offset_extra_hint_later_format">اگر سب ٹائٹلز %d ms بہت جلد دکھائے جائیں تو اسے استعمال کریں</string>
-    <string name="subtitle_offset_extra_hint_none_format">سب ٹائٹل تاخیر</string>
+    <string name="subtitle_offset_extra_hint_none_format">کوئی زیرنویس میں دیری نہیں</string>
     <string name="nsfw_singular">این ایس ایف ڈبلیو</string>
     <string name="episode_action_auto_download">آٹو ڈاؤن لوڈ</string>
     <string name="episode_action_play_in_browser">براؤزر میں چلائیں</string>
     <string name="video_ram_description">کم میموری والے آلات، جیسے کہ Android TV پر بہت زیادہ سیٹ ہونے پر کریشوں کا سبب بنتا ہے.</string>
     <string name="remove_site_pref">سائٹ ہٹائیں</string>
-    <string name="add_site_summary">ایک مختلف URL کے ساتھ ، موجودہ سائٹ کا کلون شامل کریں.</string>
+    <string name="add_site_summary">ایک مختلف URL کے ساتھ ، موجودہ سائٹ کا کلون شامل کریں</string>
     <string name="resize_fit">اسکرین پر فٹ</string>
     <string name="resize_fill">کھینچیں</string>
     <string name="create_account">اکاؤنٹ بنائیں</string>
@@ -488,7 +488,7 @@
     <string name="error_invalid_id">غلط ID</string>
     <string name="repository_name_hint">مخزن کا نام</string>
     <string name="skip_type_ed">ختم ہونے والا</string>
-    <string name="skip_type_op">کھل رہا</string>
+    <string name="skip_type_op">کھولنا</string>
     <string name="confirm_exit_dialog">کیا آپ کو یقین ہے کہ آپ ہیاں سے نکلنا چاہتے ہیں؟</string>
     <string name="quality_sd">ایس ڈی</string>
     <string name="all_languages_preference">تمام زبانیں</string>
@@ -519,12 +519,38 @@
     <string name="subtitles_remove_captions">سب ٹائٹلز سے بند کیپشنز کو ہٹا دیں</string>
     <string name="app_layout_subtext">اپنے آلے کے مطابق ایپ کی شکل تبدیل کریں</string>
     <string name="next">اگلے</string>
-    <string name="blank_repo_message">CloudStream میں بذریعہ ڈیفالٹ کوئی سائٹ انسٹال نہیں ہے۔ آپ کو ریپوزٹری سے سائٹس انسٹال کرنے کی ضرورت ہے۔
-\nSky UK Limited 🤮 کی طرف سے بے دماغ DMCA ہٹانے کی وجہ سے ہم ایپ میں ریپوزٹری سائٹ کو لنک نہیں کر سکتے۔
-\nہمارے ڈسکارڈ میں شامل ہوں یا آن لائن تلاش کریں۔</string>
+    <string name="blank_repo_message">CloudStream کے ساتھ پہلے سے کوئی ویب سائٹس انسٹال نہیں ہیں۔ آپ کو مخزنوں سے ویب سائٹس انسٹال کرنی ہوں گی۔
+\n
+\nSky UK Limited کی طرف سے DMCA کے تعلیم نامے کی بنا پر 🤮، ہم ایپ کے اندر مخزن سائٹ کی مستقیم لنک فراہم نہیں کر سکتے۔
+\n
+\nبراہ کرم ہمارے ڈسکارڈ کمیونٹی میں شامل ہونے کو مد نظر رکھیں یا مخزن کیلئے آن لائن تلاش کریں۔</string>
     <string name="safe_mode_description">تمام ایکسٹینشنز کریش کی وجہ سے آف کر دی گئیں تاکہ آپ کو پریشانی کا باعث تلاش کرنے میں مدد مل سکے۔</string>
     <string name="extension_install_first">پہلے ایکسٹینشن انسٹال کریں</string>
     <string name="clipboard_too_large">بہت زیادہ متن۔ کلپ بورڈ میں محفوظ کرنے سے قاصر۔</string>
     <string name="update_notification_installing">ایپ اپ ڈیٹ انسٹال ہو رہا ہے…</string>
     <string name="empty_library_logged_in_message">یہ فہرست خالی ہے۔ کسی اور پر سوئچ کرنے کی کوشش کریں۔</string>
+    <string name="mobile_data">موبائل ڈیٹا</string>
+    <string name="profiles">پروفائلز</string>
+    <string name="unable_to_inflate">یو آئی درست طریقے سے تخلیق نہیں کی جاسکتی تھی، یہ ایک بڑا بگ ہے اور فوراً رپورٹ کیا جانا چاہئے%s</string>
+    <string name="edit">ترتیب دیں</string>
+    <string name="wifi">وائی فائی</string>
+    <string name="profile_background_des">پروفائل پس منظر</string>
+    <string name="default_account">@string/default_subtitles</string>
+    <string name="help">مدد</string>
+    <string name="profile_number">پروفائل %d</string>
+    <string name="automatic_plugin_download_mode_title">پلگ انز کو ڈاؤن لوڈ کرنے کے لئے موڈ منتخب کریں</string>
+    <string name="qualities">کوالٹیز</string>
+    <string name="use">استعمال کریں</string>
+    <string name="disable">غیرفعال کریں</string>
+    <string name="no_repository_found_error">مخزن نہیں ملا، URL کو چیک کریں اور VPN استعمال کریں</string>
+    <string name="already_voted">آپ نے پہلے ہی ووٹ دیا ہے</string>
+    <string name="no_plugins_found_error">مخزن میں کوئی پلگ انز نہیں ملا</string>
+    <string name="set_default">ترجیحی تعین کریں</string>
+    <string name="quality_profile_help">یہاں آپ تبدیلی کرسکتے ہیں کہ سورسز کو کس طرح کی ترتیب دی جائے۔ اگر ایک ویڈیو کی زیادہ پرائیورٹی ہوتی ہے تو یہ سورس کی انتخاب میں زیادہ اوپر آئے گی۔ سورس کی پرائیورٹی اور کوالٹی کی پرائیورٹی کا مجموعہ ویڈیو کی پرائیورٹی ہوتی ہے۔
+\n
+\nسورس A: 3
+\nکوالٹی B: 7
+\nاس کا مجموعی ویڈیو پرائیورٹی 10 ہوتی ہے۔
+\n
+\nنوٹ: اگر مجموعہ 10 یا اس سے زیادہ ہو تو پلیر وہ لنک لوڈ کرنے کو خود بخود چھوڑ دے گا!</string>
 </resources>
diff --git a/app/src/main/res/values-vi/array.xml b/app/src/main/res/values-vi/array.xml
index a5145c9e..d32f37ce 100644
--- a/app/src/main/res/values-vi/array.xml
+++ b/app/src/main/res/values-vi/array.xml
@@ -195,12 +195,15 @@
 
     <string-array name="themes_overlay_names">
         <item>Mặc định</item>
+        <item>bồ công anh màu vàng</item>
         <item>Hồng nhạt</item>
+        <item>Quả cam</item>
         <item>Xanh lam đậm</item>
         <item>Nâu sẫm</item>
         <item>Xanh lục</item>
         <item>Xám</item>
         <item>Trắng</item>
+        <item>Màu xanh mát</item>
         <item>Nâu</item>
         <item>Xanh lục nhạt</item>
         <item>Đỏ</item>
@@ -215,12 +218,15 @@
     </string-array>
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
+        <item>DandelionYellow</item>
         <item>CarnationPink</item>
+        <item>Orange</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
         <item>NavyBlue</item>
         <item>Grey</item>
         <item>White</item>
+        <item>CoolBlue</item>
         <item>Brown</item>
         <item>Blue</item>
         <item>Red</item>
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index 1df7b9d6..e38dd5c9 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -41,7 +41,7 @@
         <item>0</item>
         <item>1</item>
     </array>
-    
+
     <!-- MainAPI enum: AutoDownloadMode -->
     <array name="auto_download_plugin">
         <item>@string/disable</item>
@@ -126,6 +126,26 @@
         <item>30min</item>
     </array>
 
+    <string-array name="periodic_work_names">
+        <item>@string/none</item>
+        <item>3h</item>
+        <item>6h</item>
+        <item>12h</item>
+        <item>24h</item>
+        <item>3d</item>
+        <item>7d</item>
+    </string-array>
+    <!-- Values in hours -->
+    <integer-array name="periodic_work_values">
+        <item>0</item>
+        <item>3</item>
+        <item>6</item>
+        <item>12</item>
+        <item>24</item>
+        <item>72</item>
+        <item>168</item>
+    </integer-array>
+
     <array name="video_buffer_length_values">
         <item>0</item>
         <item>60</item>
@@ -246,12 +266,15 @@
 
     <string-array name="themes_overlay_names">
         <item>Normal</item>
+        <item>Dandelion Yellow</item>
         <item>Carnation Pink</item>
+        <item>Orange</item>
         <item>Dark Green</item>
         <item>Maroon</item>
         <item>Navy Blue</item>
         <item>Grey</item>
         <item>White</item>
+        <item>Cool Blue</item>
         <item>Brown</item>
         <item>Cool</item>
         <item>Fire</item>
@@ -266,12 +289,15 @@
     </string-array>
     <string-array name="themes_overlay_names_values">
         <item>Normal</item>
+        <item>DandelionYellow</item>
         <item>CarnationPink</item>
+        <item>Orange</item>
         <item>DarkGreen</item>
         <item>Maroon</item>
         <item>NavyBlue</item>
         <item>Grey</item>
         <item>White</item>
+        <item>CoolBlue</item>
         <item>Brown</item>
         <item>Blue</item>
         <item>Red</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d9258c40..c2c84d0d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -81,6 +81,9 @@
     <color name="colorPrimaryGrey">#515151</color>
     <color name="colorPrimaryWhite">#FFFFFF</color>
     <color name="colorPrimaryBrown">#622C00</color>
+    <color name="colorPrimaryOrange">#CE8500</color>
+    <color name="colorPrimaryDandelionYellow">#F5BB00</color>
+    <color name="colorPrimaryCoolBlue">#408cac</color>
 
     <color name="colorTestPass">#48E484</color>
     <color name="colorTestFail">#ea596e</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b44706c1..b349aecc 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -19,5 +19,5 @@
     <dimen name="navbar_width">62dp</dimen>
 
     <dimen name="download_size">50dp</dimen>
-
+    <dimen name="video_frame_width">1dp</dimen>
 </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 13251c7c..c722f33f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -51,6 +51,7 @@
     <string name="primary_color_key" translatable="false">primary_color_key</string>
     <string name="restore_key" translatable="false">restore_key</string>
     <string name="backup_key" translatable="false">backup_key</string>
+    <string name="automatic_backup_key" translatable="false">automatic_backup_key</string>
     <string name="prefer_media_type_key" translatable="false">prefer_media_type_key_2</string>
     <string name="app_theme_key" translatable="false">app_theme_key</string>
     <string name="episode_sync_enabled_key" translatable="false">episode_sync_enabled_key</string>
@@ -229,6 +230,7 @@
     <string name="episode_sync_settings_des">Automatically sync your current episode progress</string>
     <string name="restore_settings">Restore data from backup</string>
     <string name="backup_settings">Back up data</string>
+    <string name="backup_frequency">Backup frequency</string>
     <string name="restore_success">Loaded backup file</string>
     <string name="restore_failed_format" formatted="true">Failed to restore data from file %s</string>
     <string name="backup_success">Data stored</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e2f11221..2fa4eb41 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -86,8 +86,8 @@
 
     <style name="ChipFilled" parent="@style/Widget.Material3.Chip.Filter">
         <item name="chipBackgroundColor">@color/chip_color</item>
-       <!-- <item name="chipStrokeColor">@color/white_transparent_toggle</item>-->
-        <item name="chipStrokeColor">@color/transparent</item>
+        <item name="chipStrokeColor">@color/white_transparent_toggle</item>
+        <!--        <item name="chipStrokeColor">@color/transparent</item>-->
         <item name="chipStrokeWidth">2dp</item>
         <item name="textColor">@color/chip_color_text</item>
         <item name="android:textColor">@color/chip_color_text</item>
@@ -95,6 +95,7 @@
         <item name="fontFamily">@font/google_sans</item>
         <item name="chipIconTint">@color/chip_color_text</item>
         <item name="android:fontFamily">@font/google_sans</item>
+        <item name="android:tag">@string/tv_no_focus_tag</item>
         <item name="chipMinTouchTargetSize">0dp</item>
     </style>
 
@@ -352,6 +353,36 @@
         <item name="android:colorAccent">@color/colorPrimaryBrown</item>
     </style>
 
+    <style name="OverlayPrimaryColorOrange">
+        <item name="colorPrimary">@color/colorPrimaryOrange</item>
+        <item name="android:colorPrimary">@color/colorPrimaryOrange</item>
+        <item name="colorPrimaryDark">#A66B00</item>
+        <item name="colorAccent">#CE8500</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
+        <!--    Needed for leanback fuckery    -->
+        <item name="android:colorAccent">@color/colorPrimaryOrange</item>
+    </style>
+
+    <style name="OverlayPrimaryColorDandelionYellow">
+        <item name="colorPrimary">@color/colorPrimaryDandelionYellow</item>
+        <item name="android:colorPrimary">@color/colorPrimaryDandelionYellow</item>
+        <item name="colorPrimaryDark">#C49600</item>
+        <item name="colorAccent">#F5BB00</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
+        <!--    Needed for leanback fuckery    -->
+        <item name="android:colorAccent">@color/colorPrimaryDandelionYellow</item>
+    </style>
+
+    <style name="OverlayPrimaryColorCoolBlue">
+        <item name="colorPrimary">@color/colorPrimaryCoolBlue</item>
+        <item name="android:colorPrimary">@color/colorPrimaryCoolBlue</item>
+        <item name="colorPrimaryDark">#306981</item>
+        <item name="colorAccent">#51b0d7</item>
+        <item name="colorOnPrimary">@color/whiteText</item>
+        <!--    Needed for leanback fuckery    -->
+        <item name="android:colorAccent">@color/colorPrimaryCoolBlue</item>
+    </style>
+
     <style name="customRatingBar" parent="@style/Widget.AppCompat.RatingBar">
 
         <item name="android:progressDrawable">@drawable/abc_ratingbar_indicator_material</item>
@@ -388,7 +419,7 @@
         <item name="behavior_skipCollapsed">true</item>
         <item name="shapeAppearance">@null</item>
         <item name="shapeAppearanceOverlay">@null</item>
-        <item name="backgroundTint">@color/transparent</item>
+        <item name="backgroundTint">?attr/primaryBlackBackground</item>
         <item name="android:background">@drawable/rounded_dialog</item>
         <item name="behavior_peekHeight">512dp</item>
     </style>
@@ -500,9 +531,8 @@
         <item name="android:paddingStart">20dp</item>
         <item name="android:paddingEnd">20dp</item>
         <item name="android:selectAllOnFocus">true</item>
-       <!-- <item name="android:background">@drawable/outline_drawable_less</item>
-               <item name="android:foreground">?attr/selectableItemBackgroundBorderless</item>
-       -->
+        <item name="android:background">@drawable/outline_drawable_less</item>
+        <item name="android:foreground">?attr/selectableItemBackgroundBorderless</item>
         <item name="android:textColor">?attr/textColor</item>
         <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>
         <item name="drawableEndCompat">@drawable/ic_baseline_keyboard_arrow_right_24</item>
diff --git a/app/src/main/res/xml/settings_updates.xml b/app/src/main/res/xml/settings_updates.xml
index 9989e47b..e3b36648 100644
--- a/app/src/main/res/xml/settings_updates.xml
+++ b/app/src/main/res/xml/settings_updates.xml
@@ -9,7 +9,7 @@
         android:summaryOn="@string/bug_report_settings_on"
         android:title="@string/pref_disable_acra" />
 
-    <PreferenceCategory 
+    <PreferenceCategory
         android:title="@string/pref_category_app_updates">
         <Preference
             android:title="@string/check_for_update"
@@ -37,27 +37,32 @@
             app:key="@string/auto_update_key" />
     </PreferenceCategory>
 
-    <PreferenceCategory 
+    <PreferenceCategory
         android:title="@string/pref_category_backup">
         <Preference
             android:icon="@drawable/baseline_save_as_24"
             android:key="@string/backup_key"
             android:title="@string/backup_settings" />
 
+        <Preference
+            android:icon="@drawable/baseline_save_as_24"
+            android:key="@string/automatic_backup_key"
+            android:title="@string/backup_frequency" />
+
         <Preference
             android:icon="@drawable/baseline_restore_page_24"
             android:key="@string/restore_key"
             android:title="@string/restore_settings" />
     </PreferenceCategory>
 
-    <PreferenceCategory 
+    <PreferenceCategory
         android:title="@string/pref_category_extensions">
         <SwitchPreference
             android:defaultValue="true"
             android:icon="@drawable/ic_baseline_extension_24"
             android:key="@string/auto_update_plugins_key"
             android:title="@string/automatic_plugin_updates" />
-        
+
         <Preference
             android:icon="@drawable/ic_baseline_extension_24"
             android:key="@string/auto_download_plugins_key"
@@ -65,7 +70,7 @@
             android:summary="@string/automatic_plugin_download_summary" />
     </PreferenceCategory>
 
-    <PreferenceCategory 
+    <PreferenceCategory
         android:title="@string/pref_category_actions">
         <Preference
             android:icon="@drawable/baseline_description_24"
diff --git a/fastlane/metadata/android/am/changelogs/2.txt b/fastlane/metadata/android/am/changelogs/2.txt
new file mode 100644
index 00000000..0a614466
--- /dev/null
+++ b/fastlane/metadata/android/am/changelogs/2.txt
@@ -0,0 +1 @@
+- Changelog ታክሏል!
diff --git a/fastlane/metadata/android/am/full_description.txt b/fastlane/metadata/android/am/full_description.txt
new file mode 100644
index 00000000..4c4312ce
--- /dev/null
+++ b/fastlane/metadata/android/am/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 ፊልሞችን፣ ተከታታይ ቲቪ እና አኒሜ በዥረት እንዲመለከቱ እና እንዲያወርዱ ያስችልዎታል።
+
+መተግበሪያው ያለ ምንም ማስታወቂያዎች እና ትንታኔዎች እና
+በርካታ የፊልም ማስታወቂያ እና ሳይቶችን ይደግፋል፣ እና ሌሎችም፣ ለምሳሌ
+
+ዕልባቶች
+
+የግርጌ ጽሑፍ ውርዶች
+
+Chromecast ድጋፍ
diff --git a/fastlane/metadata/android/am/short_description.txt b/fastlane/metadata/android/am/short_description.txt
new file mode 100644
index 00000000..736a2e09
--- /dev/null
+++ b/fastlane/metadata/android/am/short_description.txt
@@ -0,0 +1 @@
+ፊልሞችን፣ ተከታታይ ቲቪዎችን እና አኒሜ በዥረት ይመልከቱ እና ያውርዱ።
diff --git a/fastlane/metadata/android/am/title.txt b/fastlane/metadata/android/am/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/am/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/bg/full_description.txt b/fastlane/metadata/android/bg/full_description.txt
new file mode 100644
index 00000000..f86e4797
--- /dev/null
+++ b/fastlane/metadata/android/bg/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 Ви позволява да стриймвате и изтегляте филми, сериали и аниме.
+
+Приложението не съдържа реклами и аналитики и
+поддържа няколко сайтове за трейлъри и филми и още, например:
+
+Отметки
+
+Изтегляне на субтитри
+
+Поддръжка на Chromecast
diff --git a/fastlane/metadata/android/bg/short_description.txt b/fastlane/metadata/android/bg/short_description.txt
new file mode 100644
index 00000000..8fda29de
--- /dev/null
+++ b/fastlane/metadata/android/bg/short_description.txt
@@ -0,0 +1 @@
+Стриймване и изтегляне филми, сериали и аниме.
diff --git a/fastlane/metadata/android/bg/title.txt b/fastlane/metadata/android/bg/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/bg/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/fr-FR/changelogs/2.txt b/fastlane/metadata/android/fr-FR/changelogs/2.txt
new file mode 100644
index 00000000..d70dc5d3
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/2.txt
@@ -0,0 +1 @@
+- Ajout du journal des modifications !
diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt
new file mode 100644
index 00000000..81647bbf
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 vous permet de regarder et de télécharger des Films, des Séries TV et des Animes.
+
+L'application n'a aucune publicité, aucun traçage et
+la prise en charge de différentes bandes-annonces & sites, et plus, par exemple
+
+Signets
+
+Téléchargement des sous-titres
+
+Prise en charge de Chromecast
diff --git a/fastlane/metadata/android/fr-FR/short_description.txt b/fastlane/metadata/android/fr-FR/short_description.txt
new file mode 100644
index 00000000..76c136a0
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/short_description.txt
@@ -0,0 +1 @@
+Regarder et télécharger des films, des séries TV et des animes.
diff --git a/fastlane/metadata/android/fr-FR/title.txt b/fastlane/metadata/android/fr-FR/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/hi-IN/changelogs/2.txt b/fastlane/metadata/android/hi-IN/changelogs/2.txt
new file mode 100644
index 00000000..a920a5d6
--- /dev/null
+++ b/fastlane/metadata/android/hi-IN/changelogs/2.txt
@@ -0,0 +1 @@
+- चेंजलॉग जोड़ा गया!
diff --git a/fastlane/metadata/android/hi-IN/full_description.txt b/fastlane/metadata/android/hi-IN/full_description.txt
new file mode 100644
index 00000000..89927810
--- /dev/null
+++ b/fastlane/metadata/android/hi-IN/full_description.txt
@@ -0,0 +1,10 @@
+क्लाउडस्ट्रीम-3 आपको मूवी, टीवी-सीरीज़ और एनीमे स्ट्रीम और डाउनलोड करने की सुविधा देता है।
+
+ऐप बिना किसी विज्ञापन और एनालिटिक्स के आता है और
+कई ट्रेलर और मूवी साइटों और अन्य का समर्थन करता है जैसे कि-
+
+बुकमार्क
+
+उपशीर्षक डाउनलोड
+
+क्रोमकास्ट का समर्थन
diff --git a/fastlane/metadata/android/hi-IN/short_description.txt b/fastlane/metadata/android/hi-IN/short_description.txt
new file mode 100644
index 00000000..a8a1eb4d
--- /dev/null
+++ b/fastlane/metadata/android/hi-IN/short_description.txt
@@ -0,0 +1 @@
+फिल्में, टीवी-सीरीज़ और एनीमे स्ट्रीम करें और डाउनलोड करें।
diff --git a/fastlane/metadata/android/hi-IN/title.txt b/fastlane/metadata/android/hi-IN/title.txt
new file mode 100644
index 00000000..a2134c16
--- /dev/null
+++ b/fastlane/metadata/android/hi-IN/title.txt
@@ -0,0 +1 @@
+क्लाउडस्ट्रीम
diff --git a/fastlane/metadata/android/lt/changelogs/2.txt b/fastlane/metadata/android/lt/changelogs/2.txt
new file mode 100644
index 00000000..a3139a05
--- /dev/null
+++ b/fastlane/metadata/android/lt/changelogs/2.txt
@@ -0,0 +1 @@
+-Pridėtas pokyčių žurnalas!
diff --git a/fastlane/metadata/android/lt/full_description.txt b/fastlane/metadata/android/lt/full_description.txt
new file mode 100644
index 00000000..4e8772d7
--- /dev/null
+++ b/fastlane/metadata/android/lt/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 leidžia transliuoti ir atsisiųsti filmus, TV serialus ir anime.
+
+Programa pateikiama be jokių reklamų ir analitikų ir
+palaiko daugybę anonsų ir filmų svetainių ir dar daugiau, pvz.
+
+Žymės
+
+Subtitrų atsisiuntimai
+
+Chromecast palaikymas
diff --git a/fastlane/metadata/android/lt/short_description.txt b/fastlane/metadata/android/lt/short_description.txt
new file mode 100644
index 00000000..86bf68bb
--- /dev/null
+++ b/fastlane/metadata/android/lt/short_description.txt
@@ -0,0 +1 @@
+Transliuokite ir atsisiųskite filmus, TV serialus ir anime.
diff --git a/fastlane/metadata/android/lt/title.txt b/fastlane/metadata/android/lt/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/lt/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/pa/changelogs/2.txt b/fastlane/metadata/android/pa/changelogs/2.txt
new file mode 100644
index 00000000..a7293fb4
--- /dev/null
+++ b/fastlane/metadata/android/pa/changelogs/2.txt
@@ -0,0 +1 @@
+- ਚੇਂਜਲੌਗ ਜੋੜਿਆ ਗਿਆ!
diff --git a/fastlane/metadata/android/pa/full_description.txt b/fastlane/metadata/android/pa/full_description.txt
new file mode 100644
index 00000000..99233f70
--- /dev/null
+++ b/fastlane/metadata/android/pa/full_description.txt
@@ -0,0 +1,10 @@
+ਕਲਾਊਡਸਟ੍ਰੀਮ-3 ਤੁਹਾਨੂੰ ਮੂਵੀਜ਼, ਟੀਵੀ-ਸੀਰੀਜ਼ ਅਤੇ ਐਨੀਮੇ ਨੂੰ ਸਟ੍ਰੀਮ ਅਤੇ ਡਾਊਨਲੋਡ ਕਰਨ ਦਿੰਦਾ ਹੈ।
+
+ਐਪ ਬਿਨਾਂ ਕਿਸੇ ਵਿਗਿਆਪਨ ਅਤੇ ਵਿਸ਼ਲੇਸ਼ਣ ਦੇ ਆਉਂਦੀ ਹੈ ਅਤੇ
+ਮਲਟੀਪਲ ਟ੍ਰੇਲਰ ਅਤੇ ਮੂਵੀ ਸਾਈਟਾਂ ਦਾ ਸਮਰਥਨ ਕਰਦਾ ਹੈ ਅਤੇ ਹੋਰ, ਜਿਵੇਂ ਕਿ
+
+ਬੁੱਕਮਾਰਕਸ
+
+ਉਪਸਿਰਲੇਖ ਡਾਊਨਲੋਡ
+
+ਕਰੋਮਕਾਸਟ ਦਾ ਸਮਰਥਨ
diff --git a/fastlane/metadata/android/pa/short_description.txt b/fastlane/metadata/android/pa/short_description.txt
new file mode 100644
index 00000000..1c4e5a21
--- /dev/null
+++ b/fastlane/metadata/android/pa/short_description.txt
@@ -0,0 +1 @@
+ਫਿਲਮਾਂ, ਟੀਵੀ-ਸੀਰੀਜ਼ ਅਤੇ ਐਨੀਮੇ ਨੂੰ ਸਟ੍ਰੀਮ ਅਤੇ ਡਾਊਨਲੋਡ ਕਰੋ।
diff --git a/fastlane/metadata/android/pa/title.txt b/fastlane/metadata/android/pa/title.txt
new file mode 100644
index 00000000..c1189a0f
--- /dev/null
+++ b/fastlane/metadata/android/pa/title.txt
@@ -0,0 +1 @@
+ਕਲਾਊਡਸਟ੍ਰੀਮ
diff --git a/fastlane/metadata/android/ta-IN/changelogs/2.txt b/fastlane/metadata/android/ta-IN/changelogs/2.txt
new file mode 100644
index 00000000..3d870199
--- /dev/null
+++ b/fastlane/metadata/android/ta-IN/changelogs/2.txt
@@ -0,0 +1 @@
+- சேஞ்ச்லாக் சேர்க்கப்பட்டது!
diff --git a/fastlane/metadata/android/ta-IN/full_description.txt b/fastlane/metadata/android/ta-IN/full_description.txt
new file mode 100644
index 00000000..c178275d
--- /dev/null
+++ b/fastlane/metadata/android/ta-IN/full_description.txt
@@ -0,0 +1,10 @@
+Cloudstream-3 உங்களை திரைப்படங்கள், தொலைக்காட்சி தொடர்கள் மற்றும் அனிம்களை ஸ்ட்ரீம் செய்யவும் பதிவிறக்கவும் அனுமதிக்கிறது.
+
+இந்த பயன்பாட்டில் எந்தவித விளம்பரங்களும் பகுப்பாய்வுகளும் இல்லாமல் வருகிறது மற்றும்
+பல டிரெய்லர் & திரைப்படத் தளங்கள் மற்றும் பலவற்றை ஆதரிக்கிறது, உதாரணத்திற்கு
+
+புக்மார்க்குகள்
+
+வசன பதிவிறக்கங்கள்
+
+Chromecast-இன் ஆதரவு
diff --git a/fastlane/metadata/android/ta-IN/short_description.txt b/fastlane/metadata/android/ta-IN/short_description.txt
new file mode 100644
index 00000000..45a49619
--- /dev/null
+++ b/fastlane/metadata/android/ta-IN/short_description.txt
@@ -0,0 +1 @@
+திரைப்படங்கள், டிவி தொடர்கள் மற்றும் அனிமே ஸ்ட்ரீம் செய்து பதிவிறக்கவும்.
diff --git a/fastlane/metadata/android/ta-IN/title.txt b/fastlane/metadata/android/ta-IN/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/ta-IN/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/ur/changelogs/2.txt b/fastlane/metadata/android/ur/changelogs/2.txt
new file mode 100644
index 00000000..3ac89c8b
--- /dev/null
+++ b/fastlane/metadata/android/ur/changelogs/2.txt
@@ -0,0 +1 @@
+تبادلہ کی لسٹ شامل کی گئی ہے!
diff --git a/fastlane/metadata/android/ur/full_description.txt b/fastlane/metadata/android/ur/full_description.txt
new file mode 100644
index 00000000..100573aa
--- /dev/null
+++ b/fastlane/metadata/android/ur/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 آپ کو موویز، ٹی وی سیریز اور اینمی کو سٹریم اور ڈاؤن لوڈ کرنے کی اجازت دیتا ہے۔
+
+اس ایپ کے ساتھ کوئی اشتہارات اور احصائیہ نہیں ہیں، اور
+متعدد ٹریلر اور مووی سائٹس کی حمایت کرتا ہے، اور اس کے علاوہ بھی، مثلاً:
+
+بکمارکس
+
+سب ٹائٹل ڈاؤن لوڈ کریں
+
+کروم کاسٹ کی حمایت
diff --git a/fastlane/metadata/android/ur/short_description.txt b/fastlane/metadata/android/ur/short_description.txt
new file mode 100644
index 00000000..1dbf1981
--- /dev/null
+++ b/fastlane/metadata/android/ur/short_description.txt
@@ -0,0 +1 @@
+فلمیں، ٹی وی سیریز، اور اینمی کو سٹریم اور ڈاؤن لوڈ کریں۔
diff --git a/fastlane/metadata/android/ur/title.txt b/fastlane/metadata/android/ur/title.txt
new file mode 100644
index 00000000..c3ee7b8d
--- /dev/null
+++ b/fastlane/metadata/android/ur/title.txt
@@ -0,0 +1 @@
+کلاؤڈسٹریم