diff --git a/.github/workflows/build_to_archive.yml b/.github/workflows/build_to_archive.yml
index 83430766..3b7aa9ae 100644
--- a/.github/workflows/build_to_archive.yml
+++ b/.github/workflows/build_to_archive.yml
@@ -32,10 +32,10 @@ jobs:
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/cloudstream-archive"
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
@@ -56,6 +56,8 @@ jobs:
         SIGNING_KEY_ALIAS: "key0"
         SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
+        SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
+        SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
     - uses: actions/checkout@v3
       with:
         repository: "recloudstream/cloudstream-archive"
diff --git a/.github/workflows/generate_dokka.yml b/.github/workflows/generate_dokka.yml
index 3c5caad7..abeee0b2 100644
--- a/.github/workflows/generate_dokka.yml
+++ b/.github/workflows/generate_dokka.yml
@@ -42,10 +42,10 @@ jobs:
           cd $GITHUB_WORKSPACE/dokka/
           rm -rf "./-cloudstream"
 
-      - name: Setup JDK 11
+      - name: Setup JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 4ce7dba1..58009a7a 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -24,10 +24,10 @@ jobs:
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/secrets"
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
@@ -48,6 +48,8 @@ jobs:
         SIGNING_KEY_ALIAS: "key0"
         SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
+        SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
+        SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
     - name: Create pre-release
       uses: "marvinpinto/action-automatic-releases@latest"
       with:
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 36199cd6..b6177710 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5421743a..b589d56e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 10c26704..a8a2961a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,7 +8,6 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/README.md b/README.md
index e3d033ba..8949304e 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,9 @@
 + **AdFree**, No ads whatsoever
 + No tracking/analytics
 + Bookmarks
-+ Download and stream movies, tv-shows and anime
++ Phone and TV support
 + Chromecast
++ Extension system for personal customization
 
 ### Supported languages:
 <a href="https://hosted.weblate.org/engage/cloudstream/">
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
new file mode 100644
index 00000000..7f7fd14c
--- /dev/null
+++ b/app/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Set this to the minimum version your project supports.
+cmake_minimum_required(VERSION 3.18)
+project(CrashHandler)
+find_library(log-lib log)
+add_library(native-lib SHARED src/main/cpp/native-lib.cpp)
+target_link_libraries(native-lib ${log-lib})
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 571e133f..89aa93c4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,4 +1,4 @@
-import com.android.build.gradle.api.BaseVariantOutput
+import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import org.jetbrains.dokka.gradle.DokkaTask
 import java.io.ByteArrayOutputStream
 import java.net.URL
@@ -9,7 +9,6 @@ plugins {
     id("com.android.application")
     id("kotlin-android")
     id("kotlin-kapt")
-    id("kotlin-android-extensions")
     id("org.jetbrains.dokka")
 }
 
@@ -39,6 +38,18 @@ android {
     testOptions {
         unitTests.isReturnDefaultValues = true
     }
+
+    viewBinding {
+        enable = true
+    }
+
+    // disable this for now
+    //externalNativeBuild {
+    //    cmake {
+    //        path("CMakeLists.txt")
+    //    }
+    //}
+
     signingConfigs {
         create("prerelease") {
             if (prereleaseStoreFile != null) {
@@ -51,28 +62,38 @@ android {
     }
 
     compileSdk = 33
-    buildToolsVersion = "30.0.3"
+    buildToolsVersion = "34.0.0"
 
     defaultConfig {
         applicationId = "com.lagradost.cloudstream3"
         minSdk = 21
         targetSdk = 33
 
-        versionCode = 59
-        versionName = "4.0.1"
+        versionCode = 62
+        versionName = "4.2.0"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
-
         resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "")
-
         resValue("bool", "is_prerelease", "false")
 
+        // Reads local.properties
+        val localProperties = gradleLocalProperties(rootDir)
+
         buildConfigField(
             "String",
             "BUILDDATE",
             "new java.text.SimpleDateFormat(\"yyyy-MM-dd HH:mm\").format(new java.util.Date(" + System.currentTimeMillis() + "L));"
         )
-
+        buildConfigField(
+            "String",
+            "SIMKL_CLIENT_ID",
+            "\"" + (System.getenv("SIMKL_CLIENT_ID") ?: localProperties["simkl.id"]) + "\""
+        )
+        buildConfigField(
+            "String",
+            "SIMKL_CLIENT_SECRET",
+            "\"" + (System.getenv("SIMKL_CLIENT_SECRET") ?: localProperties["simkl.secret"]) + "\""
+        )
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         kapt {
@@ -85,7 +106,10 @@ android {
             isDebuggable = false
             isMinifyEnabled = false
             isShrinkResources = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
         debug {
             isDebuggable = true
@@ -94,7 +118,6 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-
             resValue(
                 "string",
                 "debug_gdrive_secret",
@@ -123,6 +146,11 @@ android {
             versionCode = (System.currentTimeMillis() / 60000).toInt()
         }
     }
+    //toolchain {
+    //     languageVersion.set(JavaLanguageVersion.of(17))
+    // }
+    // jvmToolchain(17)
+
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
 
@@ -146,25 +174,26 @@ repositories {
 
 dependencies {
     implementation("com.google.android.mediahome:video:1.0.0")
-    implementation("androidx.test.ext:junit-ktx:1.1.3")
+    implementation("androidx.test.ext:junit-ktx:1.1.5")
     testImplementation("org.json:json:20180813")
 
-    implementation("androidx.core:core-ktx:1.8.0")
-    implementation("androidx.appcompat:appcompat:1.4.2") // need target 32 for 1.5.0
+    implementation("androidx.core:core-ktx:1.10.1")
+    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")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.5.1")
-    implementation("androidx.navigation:navigation-ui-ktx:2.5.1")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
+    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.3")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+    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("org.jsoup:jsoup:1.13.1")
+    // implementation("org.jsoup:jsoup:1.13.1")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1")
 
     implementation("androidx.preference:preference-ktx:1.2.0")
@@ -179,19 +208,23 @@ dependencies {
 
     // implementation("androidx.leanback:leanback-paging:1.1.0-alpha09")
 
-    // Exoplayer
-    implementation("com.google.android.exoplayer:exoplayer:2.18.2")
-    implementation("com.google.android.exoplayer:extension-cast:2.18.2")
-    implementation("com.google.android.exoplayer:extension-mediasession:2.18.2")
-    implementation("com.google.android.exoplayer:extension-okhttp:2.18.2")
-    // Use the Jellyfin ffmpeg extension for easy ffmpeg audio decoding in exoplayer. Thank you Jellyfin <3
-//    implementation("org.jellyfin.exoplayer:exoplayer-ffmpeg-extension:2.18.2+1")
+    // Media 3
+    implementation("androidx.media3:media3-common:1.1.1")
+    implementation("androidx.media3:media3-exoplayer:1.1.1")
+    implementation("androidx.media3:media3-datasource-okhttp:1.1.1")
+    implementation("androidx.media3:media3-ui:1.1.1")
+    implementation("androidx.media3:media3-session:1.1.1")
+    implementation("androidx.media3:media3-cast:1.1.1")
+    implementation("androidx.media3:media3-exoplayer-hls:1.1.1")
+    implementation("androidx.media3:media3-exoplayer-dash:1.1.1")
+    // 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.8.4")
-    implementation("ch.acra:acra-toast:5.8.4")
+    implementation("ch.acra:acra-core:5.11.0")
+    implementation("ch.acra:acra-toast:5.11.0")
 
     compileOnly("com.google.auto.service:auto-service-annotations:1.0")
     //either for java sources:
@@ -211,24 +244,24 @@ dependencies {
     //implementation("com.github.TorrentStream:TorrentStream-Android:2.7.0")
 
     // Downloading
-    implementation("androidx.work:work-runtime:2.8.0")
-    implementation("androidx.work:work-runtime-ktx:2.8.0")
+    implementation("androidx.work:work-runtime:2.8.1")
+    implementation("androidx.work:work-runtime-ktx:2.8.1")
 
     // Networking
-//    implementation("com.squareup.okhttp3:okhttp:4.9.2")
-//    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1")
-    implementation("com.github.Blatzar:NiceHttp:0.4.2")
+    // implementation("com.squareup.okhttp3:okhttp:4.9.2")
+    // 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")
     // Util to skip the URI file fuckery 🙏
-    implementation("com.github.tachiyomiorg:unifile:17bec43")
+    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.github.discord:OverlappingPanels:0.1.3")
+    implementation("com.github.discord:OverlappingPanels:0.1.5")
     // debugImplementation because LeakCanary should only run in debug builds.
-    // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
+    //debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
 
     // for shimmer when loading
     implementation("com.facebook.shimmer:shimmer:0.5.0")
@@ -238,17 +271,15 @@ dependencies {
     // used for subtitle decoding https://github.com/albfernandez/juniversalchardet
     implementation("com.github.albfernandez:juniversalchardet:2.4.0")
 
-    // slow af yt
-    //implementation("com.github.HaarigerHarald:android-youtubeExtractor:master-SNAPSHOT")
-
-    // newpipe yt taken from https://github.com/TeamNewPipe/NewPipe/blob/dev/app/build.gradle#L204
-    implementation("com.github.TeamNewPipe:NewPipeExtractor:master-SNAPSHOT")
+    // 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")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.6")
 
     // Library/extensions searching with Levenshtein distance
     implementation("me.xdrop:fuzzywuzzy:1.4.0")
 
-    // color pallette for images -> colors
+    // color palette for images -> colors
     implementation("androidx.palette:palette-ktx:1.0.0")
 
     implementation("org.skyscreamer:jsonassert:1.2.3")
diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
index 92042d60..df41ef91 100644
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
@@ -1,6 +1,30 @@
 package com.lagradost.cloudstream3
 
+import android.app.Activity
+import android.os.Bundle
+import android.os.PersistableBundle
+import android.view.LayoutInflater
+import androidx.test.core.app.ActivityScenario
 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.FragmentPlayerBinding
+import com.lagradost.cloudstream3.databinding.FragmentPlayerTvBinding
+import com.lagradost.cloudstream3.databinding.FragmentResultBinding
+import com.lagradost.cloudstream3.databinding.FragmentResultTvBinding
+import com.lagradost.cloudstream3.databinding.FragmentSearchBinding
+import com.lagradost.cloudstream3.databinding.FragmentSearchTvBinding
+import com.lagradost.cloudstream3.databinding.HomeResultGridBinding
+import com.lagradost.cloudstream3.databinding.HomepageParentBinding
+import com.lagradost.cloudstream3.databinding.HomepageParentTvBinding
+import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutBinding
+import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutTvBinding
+import com.lagradost.cloudstream3.databinding.RepositoryItemBinding
+import com.lagradost.cloudstream3.databinding.RepositoryItemTvBinding
+import com.lagradost.cloudstream3.databinding.SearchResultGridBinding
+import com.lagradost.cloudstream3.databinding.SearchResultGridExpandedBinding
+import com.lagradost.cloudstream3.databinding.TrailerCustomLayoutBinding
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.TestingUtils
 import kotlinx.coroutines.runBlocking
@@ -8,16 +32,23 @@ import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 
+
 /**
  * Instrumented test, which will execute on an Android device.
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
+class TestApplication : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
+        super.onCreate(savedInstanceState, persistentState)
+    }
+}
+
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
-    private fun getAllProviders(): List<MainAPI> {
+    private fun getAllProviders(): Array<MainAPI> {
         println("Providers: ${APIHolder.allProviders.size}")
-        return APIHolder.allProviders //.filter { !it.usesWebView }
+        return APIHolder.allProviders.toTypedArray() //.filter { !it.usesWebView }
     }
 
     @Test
@@ -26,6 +57,73 @@ class ExampleInstrumentedTest {
         println("Done providersExist")
     }
 
+    @Throws
+    private inline fun <reified T : ViewBinding> testAllLayouts(
+        activity: Activity,
+       vararg layouts: Int
+    ) {
+
+        val bind = T::class.java.methods.first { it.name == "bind" }
+        val inflater = LayoutInflater.from(activity)
+        for (layout in layouts) {
+            val root = inflater.inflate(layout, null, false)
+            bind.invoke(null, root)
+        }
+    }
+
+    @Test
+    @Throws
+    fun layoutTest() {
+        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+            scenario.onActivity { activity: MainActivity ->
+                // FragmentHomeHeadBinding and FragmentHomeHeadTvBinding CANT be the same
+                //testAllLayouts<FragmentHomeHeadBinding>(activity, R.layout.fragment_home_head, R.layout.fragment_home_head_tv)
+                //testAllLayouts<FragmentHomeHeadTvBinding>(activity, R.layout.fragment_home_head, R.layout.fragment_home_head_tv)
+
+                // main cant be tested
+               // testAllLayouts<ActivityMainTvBinding>(activity,R.layout.activity_main, R.layout.activity_main_tv)
+               // testAllLayouts<ActivityMainBinding>(activity,R.layout.activity_main, R.layout.activity_main_tv)
+                //testAllLayouts<ActivityMainBinding>(activity, R.layout.activity_main_tv)
+
+                testAllLayouts<FragmentPlayerBinding>(activity, R.layout.fragment_player,R.layout.fragment_player_tv)
+                testAllLayouts<FragmentPlayerTvBinding>(activity, R.layout.fragment_player,R.layout.fragment_player_tv)
+
+               // testAllLayouts<FragmentResultBinding>(activity, R.layout.fragment_result,R.layout.fragment_result_tv)
+               // testAllLayouts<FragmentResultTvBinding>(activity, R.layout.fragment_result,R.layout.fragment_result_tv)
+
+                testAllLayouts<PlayerCustomLayoutBinding>(activity, R.layout.player_custom_layout,R.layout.player_custom_layout_tv, R.layout.trailer_custom_layout)
+                testAllLayouts<PlayerCustomLayoutTvBinding>(activity, R.layout.player_custom_layout,R.layout.player_custom_layout_tv, R.layout.trailer_custom_layout)
+                testAllLayouts<TrailerCustomLayoutBinding>(activity, R.layout.player_custom_layout,R.layout.player_custom_layout_tv, R.layout.trailer_custom_layout)
+
+                testAllLayouts<RepositoryItemBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
+                testAllLayouts<RepositoryItemTvBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
+
+                testAllLayouts<RepositoryItemBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
+                testAllLayouts<RepositoryItemTvBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
+
+                testAllLayouts<FragmentHomeBinding>(activity, R.layout.fragment_home_tv, R.layout.fragment_home)
+                testAllLayouts<FragmentHomeTvBinding>(activity, R.layout.fragment_home_tv, R.layout.fragment_home)
+
+                testAllLayouts<FragmentSearchBinding>(activity, R.layout.fragment_search_tv, R.layout.fragment_search)
+                testAllLayouts<FragmentSearchTvBinding>(activity, R.layout.fragment_search_tv, R.layout.fragment_search)
+
+                testAllLayouts<HomeResultGridBinding>(activity, R.layout.home_result_grid_expanded, R.layout.home_result_grid)
+                //testAllLayouts<HomeResultGridExpandedBinding>(activity, R.layout.home_result_grid_expanded, R.layout.home_result_grid) ??? fails ???
+
+                testAllLayouts<SearchResultGridExpandedBinding>(activity, R.layout.search_result_grid, R.layout.search_result_grid_expanded)
+                testAllLayouts<SearchResultGridBinding>(activity, R.layout.search_result_grid, R.layout.search_result_grid_expanded)
+
+
+               // testAllLayouts<HomeScrollViewBinding>(activity, R.layout.home_scroll_view, R.layout.home_scroll_view_tv)
+               // testAllLayouts<HomeScrollViewTvBinding>(activity, R.layout.home_scroll_view, R.layout.home_scroll_view_tv)
+
+                testAllLayouts<HomepageParentTvBinding>(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent)
+                testAllLayouts<HomepageParentBinding>(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent)
+
+            }
+        }
+    }
+
     @Test
     @Throws(AssertionError::class)
     fun providerCorrectData() {
@@ -49,7 +147,7 @@ class ExampleInstrumentedTest {
     @Test
     fun providerCorrectHomepage() {
         runBlocking {
-            getAllProviders().amap { api ->
+            getAllProviders().toList().amap { api ->
                 TestingUtils.testHomepage(api, ::println)
             }
         }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a75b9069..088e16db 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
     <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 -->
 
-    <!-- <permission android:name="android.permission.QUERY_ALL_PACKAGES" /> &lt;!&ndash; Used for getting if vlc is installed &ndash;&gt; -->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /> <!-- Required for getting arbitrary Aniyomi packages  -->
     <!-- Fixes android tv fuckery -->
     <uses-feature
         android:name="android.hardware.touchscreen"
diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp
new file mode 100644
index 00000000..f4cb531f
--- /dev/null
+++ b/app/src/main/cpp/native-lib.cpp
@@ -0,0 +1,28 @@
+#include <jni.h>
+#include <csignal>
+#include <android/log.h>
+
+#define TAG "CloudStream Crash Handler"
+volatile sig_atomic_t gSignalStatus = 0;
+void handleNativeCrash(int signal) {
+    gSignalStatus = signal;
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_com_lagradost_cloudstream3_NativeCrashHandler_initNativeCrashHandler(JNIEnv *env, jobject) {
+    #define REGISTER_SIGNAL(X) signal(X, handleNativeCrash);
+    REGISTER_SIGNAL(SIGSEGV)
+    #undef REGISTER_SIGNAL
+}
+
+//extern "C" JNIEXPORT void JNICALL
+//Java_com_lagradost_cloudstream3_NativeCrashHandler_triggerNativeCrash(JNIEnv *env, jobject thiz) {
+//    int *p = nullptr;
+//    *p = 0;
+//}
+
+extern "C" JNIEXPORT int JNICALL
+Java_com_lagradost_cloudstream3_NativeCrashHandler_getSignalStatus(JNIEnv *env, jobject) {
+    //__android_log_print(ANDROID_LOG_INFO, TAG, "Got signal status %d", gSignalStatus);
+    return gSignalStatus;
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
index 0351b1ff..5f3162b4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
@@ -43,16 +43,16 @@ class CustomReportSender : ReportSender {
     override fun send(context: Context, errorContent: CrashReportData) {
         println("Sending report")
         val url =
-            "https://docs.google.com/forms/d/e/1FAIpQLSdOlbgCx7NeaxjvEGyEQlqdh2nCvwjm2vwpP1VwW7REj9Ri3Q/formResponse"
+            "https://docs.google.com/forms/d/e/1FAIpQLSfO4r353BJ79TTY_-t5KWSIJT2xfqcQWY81xjAA1-1N0U2eSg/formResponse"
         val data = mapOf(
-            "entry.753293084" to errorContent.toJSON()
+            "entry.1993829403" to errorContent.toJSON()
         )
 
         thread { // to not run it on main thread
             runBlocking {
                 suspendSafeApiCall {
-                    val post = app.post(url, data = data)
-                    println("Report response: $post")
+                    app.post(url, data = data)
+                    //println("Report response: $post")
                 }
             }
         }
@@ -104,12 +104,17 @@ class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)) :
 }
 
 class AcraApplication : Application() {
+
     override fun onCreate() {
         super.onCreate()
-        Thread.setDefaultUncaughtExceptionHandler(ExceptionHandler(filesDir.resolve("last_error")) {
+        //NativeCrashHandler.initCrashHandler()
+        ExceptionHandler(filesDir.resolve("last_error")) {
             val intent = context!!.packageManager.getLaunchIntentForPackage(context!!.packageName)
             startActivity(Intent.makeRestartActivityTask(intent!!.component))
-        })
+        }.also {
+            exceptionHandler = it
+            Thread.setDefaultUncaughtExceptionHandler(it)
+        }
     }
 
     override fun attachBaseContext(base: Context?) {
@@ -121,10 +126,10 @@ class AcraApplication : Application() {
             buildConfigClass = BuildConfig::class.java
             reportFormat = StringFormat.JSON
 
-            reportContent = arrayOf(
+            reportContent = listOf(
                 ReportField.BUILD_CONFIG, ReportField.USER_CRASH_DATE,
                 ReportField.ANDROID_VERSION, ReportField.PHONE_MODEL,
-                ReportField.STACK_TRACE
+                ReportField.STACK_TRACE,
             )
 
             // removed this due to bug when starting the app, moved it to when it actually crashes
@@ -137,6 +142,8 @@ class AcraApplication : Application() {
     }
 
     companion object {
+        var exceptionHandler: ExceptionHandler? = null
+
         /** Use to get activity from Context */
         tailrec fun Context.getActivity(): Activity? = this as? Activity
             ?: (this as? ContextWrapper)?.baseContext?.getActivity()
@@ -148,6 +155,14 @@ class AcraApplication : Application() {
                 _context = WeakReference(value)
             }
 
+        fun <T : Any> getKeyClass(path: String, valueType: Class<T>): T? {
+            return context?.getKey(path, valueType)
+        }
+
+        fun <T : Any> setKeyClass(path: String, value: T) {
+            context?.setKey(path, value)
+        }
+
         fun removeKeys(folder: String): Int? {
             return context?.removeKeys(folder)
         }
@@ -203,6 +218,5 @@ class AcraApplication : Application() {
                 activity?.supportFragmentManager?.fragments?.lastOrNull()
             )
         }
-
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index 89f0ae51..a7d899b6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -7,8 +7,14 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.content.res.Resources
 import android.os.Build
+import android.util.DisplayMetrics
 import android.util.Log
-import android.view.*
+import android.view.Gravity
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.View.NO_ID
+import android.view.ViewGroup
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -18,8 +24,11 @@ import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
+import androidx.core.view.children
 import androidx.preference.PreferenceManager
 import com.google.android.gms.cast.framework.CastSession
+import com.google.android.material.chip.ChipGroup
+import com.google.android.material.navigationrail.NavigationRailView
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 import com.lagradost.cloudstream3.mvvm.logError
@@ -27,6 +36,7 @@ import com.lagradost.cloudstream3.ui.player.PlayerEventType
 import com.lagradost.cloudstream3.ui.result.ResultFragment
 import com.lagradost.cloudstream3.ui.result.UiText
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.updateTv
+import com.lagradost.cloudstream3.utils.AppUtils.isRtl
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.UIHelper
@@ -34,14 +44,45 @@ import com.lagradost.cloudstream3.utils.UIHelper.hasPIPPermission
 import com.lagradost.cloudstream3.utils.UIHelper.shouldShowPIPMode
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import org.schabi.newpipe.extractor.NewPipe
-import java.util.*
+import java.lang.ref.WeakReference
+import java.util.Locale
+import kotlin.math.max
+import kotlin.math.min
+
+enum class FocusDirection {
+    Start,
+    End,
+    Up,
+    Down,
+}
 
 object CommonActivity {
+
+    private var _activity: WeakReference<Activity>? = null
+    var activity
+        get() = _activity?.get()
+        private set(value) {
+            _activity = WeakReference(value)
+        }
+
     @MainThread
     fun Activity?.getCastSession(): CastSession? {
         return (this as MainActivity?)?.mSessionManager?.currentCastSession
     }
 
+    val displayMetrics: DisplayMetrics = Resources.getSystem().displayMetrics
+
+    // screenWidth and screenHeight does always
+    // refer to the screen while in landscape mode
+    val screenWidth: Int
+        get() {
+            return max(displayMetrics.widthPixels, displayMetrics.heightPixels)
+        }
+    val screenHeight: Int
+        get() {
+            return min(displayMetrics.widthPixels, displayMetrics.heightPixels)
+        }
+
 
     var canEnterPipMode: Boolean = false
     var canShowPipMode: Boolean = false
@@ -56,6 +97,30 @@ object CommonActivity {
 
     var currentToast: Toast? = null
 
+    fun showToast(@StringRes message: Int, duration: Int? = null) {
+        val act = activity ?: return
+        act.runOnUiThread {
+            showToast(act, act.getString(message), duration)
+        }
+    }
+
+    fun showToast(message: String?, duration: Int? = null) {
+        val act = activity ?: return
+        act.runOnUiThread {
+            showToast(act, message, duration)
+        }
+    }
+
+    fun showToast(message: UiText?, duration: Int? = null) {
+        val act = activity ?: return
+        if (message == null) return
+        act.runOnUiThread {
+            showToast(act, message.asString(act), duration)
+        }
+    }
+
+
+    @MainThread
     fun showToast(act: Activity?, text: UiText, duration: Int) {
         if (act == null) return
         text.asStringNull(act)?.let {
@@ -140,6 +205,7 @@ object CommonActivity {
 
     fun init(act: ComponentActivity?) {
         if (act == null) return
+        activity = act
         //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 =
@@ -222,6 +288,7 @@ object CommonActivity {
                 "AmoledLight" -> R.style.AmoledModeLight
                 "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                     R.style.MonetMode else R.style.AppTheme
+
                 else -> R.style.AppTheme
             }
 
@@ -244,8 +311,10 @@ object CommonActivity {
                 "Pink" -> R.style.OverlayPrimaryColorPink
                 "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                     R.style.OverlayPrimaryColorMonet else R.style.OverlayPrimaryColorNormal
+
                 "Monet2" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                     R.style.OverlayPrimaryColorMonetTwo else R.style.OverlayPrimaryColorNormal
+
                 else -> R.style.OverlayPrimaryColorNormal
             }
         act.theme.applyStyle(currentTheme, true)
@@ -257,55 +326,138 @@ object CommonActivity {
         ) // THEME IS SET BEFORE VIEW IS CREATED TO APPLY THE THEME TO THE MAIN VIEW
     }
 
-    private fun getNextFocus(
-        act: Activity?,
+    /** because we want closes find, aka when multiple have the same id, we go to parent
+    until the correct one is found */
+    private fun localLook(from: View, id: Int): View? {
+        if (id == NO_ID) return null
+        var currentLook: View = from
+        // limit to 15 look depth
+        for (i in 0..15) {
+            currentLook.findViewById<View?>(id)?.let { return it }
+            currentLook = (currentLook.parent as? View) ?: break
+        }
+        return null
+    }
+    /*var currentLook: View = view
+    while (true) {
+        val tmpNext = currentLook.findViewById<View?>(nextId)
+        if (tmpNext != null) {
+            next = tmpNext
+            break
+        }
+        currentLook = currentLook.parent as? View ?: break
+    }*/
+
+    private fun View.hasContent() : Boolean {
+        return isShown && when(this) {
+            //is RecyclerView -> this.childCount > 0
+            is ViewGroup -> this.childCount > 0
+            else -> true
+        }
+    }
+
+    /** skips the initial stage of searching for an id using the view, see getNextFocus for specification */
+    fun continueGetNextFocus(
+        root: Any?,
+        view: View,
+        direction: FocusDirection,
+        nextId: Int,
+        depth: Int = 0
+    ): View? {
+        if (nextId == NO_ID) return null
+
+        // do an initial search for the view, in case the localLook is too deep we can use this as
+        // an early break and backup view
+        var next =
+            when (root) {
+                is Activity -> root.findViewById(nextId)
+                is View -> root.rootView.findViewById<View?>(nextId)
+                else -> null
+            } ?: return null
+
+        next = localLook(view, nextId) ?: next
+        val shown = next.hasContent()
+
+        // if cant focus but visible then break and let android decide
+        // the exception if is the view is a parent and has children that wants focus
+        val hasChildrenThatWantsFocus = (next as? ViewGroup)?.let { parent ->
+            parent.descendantFocusability == ViewGroup.FOCUS_AFTER_DESCENDANTS && parent.childCount > 0
+        } ?: false
+        if (!next.isFocusable && shown && !hasChildrenThatWantsFocus) return null
+
+        // if not shown then continue because we will "skip" over views to get to a replacement
+        if (!shown) {
+            // we don't want a while true loop, so we let android decide if we find a recursive view
+            if (next == view) return null
+            return getNextFocus(root, next, direction, depth + 1)
+        }
+
+        (when (next) {
+            is ChipGroup -> {
+                next.children.firstOrNull { it.isFocusable && it.isShown }
+            }
+
+            is NavigationRailView -> {
+                next.findViewById(next.selectedItemId) ?: next.findViewById(R.id.navigation_home)
+            }
+
+            else -> null
+        })?.let {
+            return it
+        }
+
+        // nothing wrong with the view found, return it
+        return next
+    }
+
+    /** recursively looks for a next focus up to a depth of 10,
+     * this is used to override the normal shit focus system
+     * because this application has a lot of invisible views that messes with some tv devices*/
+    fun getNextFocus(
+        root: Any?,
         view: View?,
         direction: FocusDirection,
         depth: Int = 0
-    ): Int? {
-        if (view == null || depth >= 10 || act == null) {
+    ): View? {
+        // if input is invalid let android decide + depth test to not crash if loop is found
+        if (view == null || depth >= 10 || root == null) {
             return null
         }
 
-        val nextId = when (direction) {
-            FocusDirection.Left -> {
-                view.nextFocusLeftId
+        var nextId = when (direction) {
+            FocusDirection.Start -> {
+                if (view.isRtl())
+                    view.nextFocusRightId
+                else
+                    view.nextFocusLeftId
             }
+
             FocusDirection.Up -> {
                 view.nextFocusUpId
             }
-            FocusDirection.Right -> {
-                view.nextFocusRightId
+
+            FocusDirection.End -> {
+                if (view.isRtl())
+                    view.nextFocusLeftId
+                else
+                    view.nextFocusRightId
             }
+
             FocusDirection.Down -> {
                 view.nextFocusDownId
             }
         }
 
-        return if (nextId != -1) {
-            val next = act.findViewById<View?>(nextId)
-            //println("NAME: ${next.accessibilityClassName} | ${next?.isShown}" )
-
-            if (next?.isShown == false) {
-                getNextFocus(act, next, direction, depth + 1)
-            } else {
-                if (depth == 0) {
-                    null
-                } else {
-                    nextId
-                }
-            }
-        } else {
-            null
+        if (nextId == NO_ID) {
+            // if not specified then use forward id
+            nextId = view.nextFocusForwardId
+            // if view is still not found to next focus then return and let android decide
+            if (nextId == NO_ID)
+                return null
         }
+        return continueGetNextFocus(root, view, direction, nextId, depth)
     }
 
-    enum class FocusDirection {
-        Left,
-        Right,
-        Up,
-        Down,
-    }
 
     fun onKeyDown(act: Activity?, keyCode: Int, event: KeyEvent?) {
         //println("Keycode: $keyCode")
@@ -328,30 +480,39 @@ object CommonActivity {
             KeyEvent.KEYCODE_FORWARD, KeyEvent.KEYCODE_D, KeyEvent.KEYCODE_MEDIA_SKIP_FORWARD, KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> {
                 PlayerEventType.SeekForward
             }
+
             KeyEvent.KEYCODE_A, KeyEvent.KEYCODE_MEDIA_SKIP_BACKWARD, KeyEvent.KEYCODE_MEDIA_REWIND -> {
                 PlayerEventType.SeekBack
             }
+
             KeyEvent.KEYCODE_MEDIA_NEXT, KeyEvent.KEYCODE_BUTTON_R1, KeyEvent.KEYCODE_N -> {
                 PlayerEventType.NextEpisode
             }
+
             KeyEvent.KEYCODE_MEDIA_PREVIOUS, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.KEYCODE_B -> {
                 PlayerEventType.PrevEpisode
             }
+
             KeyEvent.KEYCODE_MEDIA_PAUSE -> {
                 PlayerEventType.Pause
             }
+
             KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_BUTTON_START -> {
                 PlayerEventType.Play
             }
+
             KeyEvent.KEYCODE_L, KeyEvent.KEYCODE_NUMPAD_7, KeyEvent.KEYCODE_7 -> {
                 PlayerEventType.Lock
             }
+
             KeyEvent.KEYCODE_H, KeyEvent.KEYCODE_MENU -> {
                 PlayerEventType.ToggleHide
             }
+
             KeyEvent.KEYCODE_M, KeyEvent.KEYCODE_VOLUME_MUTE -> {
                 PlayerEventType.ToggleMute
             }
+
             KeyEvent.KEYCODE_S, KeyEvent.KEYCODE_NUMPAD_9, KeyEvent.KEYCODE_9 -> {
                 PlayerEventType.ShowMirrors
             }
@@ -359,21 +520,27 @@ object CommonActivity {
             KeyEvent.KEYCODE_O, KeyEvent.KEYCODE_NUMPAD_8, KeyEvent.KEYCODE_8 -> {
                 PlayerEventType.SearchSubtitlesOnline
             }
+
             KeyEvent.KEYCODE_E, KeyEvent.KEYCODE_NUMPAD_3, KeyEvent.KEYCODE_3 -> {
                 PlayerEventType.ShowSpeed
             }
+
             KeyEvent.KEYCODE_R, KeyEvent.KEYCODE_NUMPAD_0, KeyEvent.KEYCODE_0 -> {
                 PlayerEventType.Resize
             }
+
             KeyEvent.KEYCODE_C, KeyEvent.KEYCODE_NUMPAD_4, KeyEvent.KEYCODE_4 -> {
                 PlayerEventType.SkipOp
             }
+
             KeyEvent.KEYCODE_V, KeyEvent.KEYCODE_NUMPAD_5, KeyEvent.KEYCODE_5 -> {
                 PlayerEventType.SkipCurrentChapter
             }
+
             KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_ENTER -> { // space is not captured due to navigation
                 PlayerEventType.PlayPauseToggle
             }
+
             else -> null
         }?.let { playerEvent ->
             playerEventListener?.invoke(playerEvent)
@@ -386,64 +553,64 @@ object CommonActivity {
         //}
     }
 
+    /** overrides focus and custom key events */
     fun dispatchKeyEvent(act: Activity?, event: KeyEvent?): Boolean? {
         if (act == null) return null
+        val currentFocus = act.currentFocus
+
         event?.keyCode?.let { keyCode ->
-            when (event.action) {
-                KeyEvent.ACTION_DOWN -> {
-                    if (act.currentFocus != null) {
-                        val next = when (keyCode) {
-                            KeyEvent.KEYCODE_DPAD_LEFT -> getNextFocus(
-                                act,
-                                act.currentFocus,
-                                FocusDirection.Left
-                            )
-                            KeyEvent.KEYCODE_DPAD_RIGHT -> getNextFocus(
-                                act,
-                                act.currentFocus,
-                                FocusDirection.Right
-                            )
-                            KeyEvent.KEYCODE_DPAD_UP -> getNextFocus(
-                                act,
-                                act.currentFocus,
-                                FocusDirection.Up
-                            )
-                            KeyEvent.KEYCODE_DPAD_DOWN -> getNextFocus(
-                                act,
-                                act.currentFocus,
-                                FocusDirection.Down
-                            )
+            if (currentFocus == null || event.action != KeyEvent.ACTION_DOWN) return@let
+            val nextView = when (keyCode) {
+                KeyEvent.KEYCODE_DPAD_LEFT -> getNextFocus(
+                    act,
+                    currentFocus,
+                    FocusDirection.Start
+                )
 
-                            else -> null
-                        }
+                KeyEvent.KEYCODE_DPAD_RIGHT -> getNextFocus(
+                    act,
+                    currentFocus,
+                    FocusDirection.End
+                )
 
-                        if (next != null && next != -1) {
-                            val nextView = act.findViewById<View?>(next)
-                            if (nextView != null) {
-                                nextView.requestFocus()
-                                keyEventListener?.invoke(Pair(event, true))
-                                return true
-                            }
-                        }
+                KeyEvent.KEYCODE_DPAD_UP -> getNextFocus(
+                    act,
+                    currentFocus,
+                    FocusDirection.Up
+                )
 
-                        when (keyCode) {
-                            KeyEvent.KEYCODE_DPAD_CENTER -> {
-                                if (act.currentFocus is SearchView || act.currentFocus is SearchView.SearchAutoComplete) {
-                                    UIHelper.showInputMethod(act.currentFocus?.findFocus())
-                                }
-                            }
-                        }
-                    }
-                    //println("Keycode: $keyCode")
-                    //showToast(
-                    //    this,
-                    //    "Got Keycode $keyCode | ${KeyEvent.keyCodeToString(keyCode)} \n ${event?.action}",
-                    //    Toast.LENGTH_LONG
-                    //)
-                }
+                KeyEvent.KEYCODE_DPAD_DOWN -> getNextFocus(
+                    act,
+                    currentFocus,
+                    FocusDirection.Down
+                )
+
+                else -> null
             }
+            // println("NEXT FOCUS : $nextView")
+            if (nextView != null) {
+                nextView.requestFocus()
+                keyEventListener?.invoke(Pair(event, true))
+                return true
+            }
+
+            if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER &&
+                (act.currentFocus is SearchView || act.currentFocus is SearchView.SearchAutoComplete)
+            ) {
+                UIHelper.showInputMethod(act.currentFocus?.findFocus())
+            }
+
+            //println("Keycode: $keyCode")
+            //showToast(
+            //    this,
+            //    "Got Keycode $keyCode | ${KeyEvent.keyCodeToString(keyCode)} \n ${event?.action}",
+            //    Toast.LENGTH_LONG
+            //)
+
         }
 
+        // if someone else want to override the focus then don't handle the event as it is already
+        // consumed. used in video player
         if (keyEventListener?.invoke(Pair(event, false)) == true) {
             return true
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt b/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt
index 379a91e4..0a2db2bd 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt
@@ -50,7 +50,7 @@ class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Do
 
     companion object {
         private const val USER_AGENT =
-            "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
         private var instance: DownloaderTestImpl? = null
 
         /**
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index c20786c3..5b674c4c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -11,22 +11,27 @@ import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.json.JsonMapper
 import com.fasterxml.jackson.module.kotlin.KotlinModule
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
+import com.lagradost.cloudstream3.syncproviders.providers.SimklApi
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.Coroutines.mainWork
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
+import com.lagradost.nicehttp.RequestBodyTypes
 import okhttp3.Interceptor
-import org.mozilla.javascript.Scriptable
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody.Companion.toRequestBody
 import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.math.absoluteValue
 
 const val USER_AGENT =
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
 
 //val baseHeader = mapOf("User-Agent" to USER_AGENT)
 val mapper = JsonMapper.builder().addModule(KotlinModule())
@@ -50,8 +55,10 @@ object APIHolder {
     val allProviders = threadSafeListOf<MainAPI>()
 
     fun initAll() {
-        for (api in allProviders) {
-            api.init()
+        synchronized(allProviders) {
+            for (api in allProviders) {
+                api.init()
+            }
         }
         apiMap = null
     }
@@ -64,27 +71,35 @@ object APIHolder {
     var apiMap: Map<String, Int>? = null
 
     fun addPluginMapping(plugin: MainAPI) {
-        apis = apis + plugin
+        synchronized(apis) {
+            apis = apis + plugin
+        }
         initMap(true)
     }
 
     fun removePluginMapping(plugin: MainAPI) {
-        apis = apis.filter { it != plugin }
+        synchronized(apis) {
+            apis = apis.filter { it != plugin }
+        }
         initMap(true)
     }
 
     private fun initMap(forcedUpdate: Boolean = false) {
-        if (apiMap == null || forcedUpdate)
-            apiMap = apis.mapIndexed { index, api -> api.name to index }.toMap()
+        synchronized(apis) {
+            if (apiMap == null || forcedUpdate)
+                apiMap = apis.mapIndexed { index, api -> api.name to index }.toMap()
+        }
     }
 
     fun getApiFromNameNull(apiName: String?): MainAPI? {
         if (apiName == null) return null
         synchronized(allProviders) {
             initMap()
-            return apiMap?.get(apiName)?.let { apis.getOrNull(it) }
-            // Leave the ?. null check, it can crash regardless
-                ?: allProviders.firstOrNull { it.name == apiName }
+            synchronized(apis) {
+                return apiMap?.get(apiName)?.let { apis.getOrNull(it) }
+                // Leave the ?. null check, it can crash regardless
+                    ?: allProviders.firstOrNull { it.name == apiName }
+            }
         }
     }
 
@@ -164,10 +179,17 @@ 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.
-     * Uses the consumet api.
+     * Uses the anilist api.
      *
      * @param titles uses first index to search, but if you have multiple titles and want extra guarantee to match you can also have that
      * @param types Optional parameter to narrow down the scope to Movies, TV, etc. See TrackerType.getTypes()
@@ -176,7 +198,8 @@ object APIHolder {
     suspend fun getTracker(
         titles: List<String>,
         types: Set<TrackerType>?,
-        year: Int?
+        year: Int?,
+        lessAccurate: Boolean
     ): Tracker? {
         return try {
             require(titles.isNotEmpty()) { "titles must no be empty when calling getTracker" }
@@ -184,30 +207,70 @@ object APIHolder {
             val mainTitle = titles[0]
             val search =
                 trackerCache[mainTitle]
-                    ?: app.get("https://api.consumet.org/meta/anilist/$mainTitle")
-                        .parsedSafe<AniSearch>()?.also {
-                            trackerCache[mainTitle] = it
-                        } ?: return null
+                    ?: searchAnilist(mainTitle)?.also {
+                        trackerCache[mainTitle] = it
+                    } ?: return null
 
-            val res = search.results?.find { media ->
-                val matchingYears = year == null || media.releaseDate == year
+            val res = search.data?.page?.media?.find { media ->
+                val matchingYears = year == null || media.seasonYear == year
                 val matchingTitles = media.title?.let { title ->
                     titles.any { userTitle ->
                         title.isMatchingTitles(userTitle)
                     }
                 } ?: false
 
-                val matchingTypes = types?.any { it.name.equals(media.type, true) } == true
-                matchingTitles && matchingTypes && matchingYears
+                val matchingTypes = types?.any { it.name.equals(media.format, true) } == true
+                if(lessAccurate) matchingTitles || matchingTypes && matchingYears else matchingTitles && matchingTypes && matchingYears
             } ?: return null
 
-            Tracker(res.malId, res.aniId, res.image, res.cover)
+            Tracker(res.idMal, res.id.toString(), res.coverImage?.extraLarge ?: res.coverImage?.large, res.bannerImage)
         } catch (t: Throwable) {
             logError(t)
             null
         }
     }
 
+    private suspend fun searchAnilist(
+        title: String?,
+    ): AniSearch? {
+        val query = """
+        query (
+          ${'$'}page: Int = 1
+          ${'$'}search: String
+          ${'$'}sort: [MediaSort] = [POPULARITY_DESC, SCORE_DESC]
+          ${'$'}type: MediaType
+        ) {
+          Page(page: ${'$'}page, perPage: 20) {
+            media(
+              search: ${'$'}search
+              sort: ${'$'}sort
+              type: ${'$'}type
+            ) {
+              id
+              idMal
+              title { romaji english }
+              coverImage { extraLarge large }
+              bannerImage
+              seasonYear
+              format
+            }
+          }
+        }
+    """.trimIndent().trim()
+
+        val data = mapOf(
+            "query" to query,
+            "variables" to mapOf(
+                "search" to title,
+                "sort" to "SEARCH_MATCH",
+                "type" to "ANIME",
+            )
+        ).toJson().toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
+
+        return app.post("https://graphql.anilist.co", requestBody = data)
+            .parsedSafe()
+    }
+
 
     fun Context.getApiSettings(): HashSet<String> {
         //val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
@@ -215,7 +278,7 @@ object APIHolder {
         val hashSet = HashSet<String>()
         val activeLangs = getApiProviderLangSettings()
         val hasUniversal = activeLangs.contains(AllLanguagesName)
-        hashSet.addAll(apis.filter { hasUniversal || activeLangs.contains(it.lang) }
+        hashSet.addAll(synchronized(apis) { apis.filter { hasUniversal || activeLangs.contains(it.lang) } }
             .map { it.name })
 
         /*val set = settingsManager.getStringSet(
@@ -314,8 +377,9 @@ object APIHolder {
         } ?: default
         val langs = this.getApiProviderLangSettings()
         val hasUniversal = langs.contains(AllLanguagesName)
-        val allApis = apis.filter { hasUniversal || langs.contains(it.lang) }
-            .filter { api -> api.hasMainPage || !hasHomePageIsRequired }
+        val allApis = synchronized(apis) {
+            apis.filter { api -> (hasUniversal || langs.contains(api.lang)) && (api.hasMainPage || !hasHomePageIsRequired) }
+        }
         return if (currentPrefMedia.isEmpty()) {
             allApis
         } else {
@@ -736,6 +800,7 @@ fun fixTitle(str: String): String {
             .replaceFirstChar { char -> if (char.isLowerCase()) char.titlecase(Locale.getDefault()) else it }
     }
 }
+
 /**
  * Get rhino context in a safe way as it needs to be initialized on the main thread.
  * Make sure you get the scope using: val scope: Scriptable = rhino.initSafeStandardObjects()
@@ -801,6 +866,19 @@ enum class TvType(value: Int?) {
     Others(12)
 }
 
+public enum class AutoDownloadMode(val value: Int) {
+    Disable(0),
+    FilterByLang(1),
+    All(2),
+    NsfwOnly(3)
+    ;
+
+    companion object {
+        infix fun getEnum(value: Int): AutoDownloadMode? =
+            AutoDownloadMode.values().firstOrNull { it.value == value }
+    }
+}
+
 // IN CASE OF FUTURE ANIME MOVIE OR SMTH
 fun TvType.isMovieType(): Boolean {
     return this == TvType.Movie || this == TvType.AnimeMovie || this == TvType.Torrent || this == TvType.Live
@@ -1119,10 +1197,11 @@ interface LoadResponse {
     companion object {
         private val malIdPrefix = malApi.idPrefix
         private val aniListIdPrefix = aniListApi.idPrefix
+        private val simklIdPrefix = simklApi.idPrefix
         var isTrailersEnabled = true
 
         fun LoadResponse.isMovie(): Boolean {
-            return this.type.isMovieType()
+            return this.type.isMovieType() || this is MovieLoadResponse
         }
 
         @JvmName("addActorNames")
@@ -1140,6 +1219,20 @@ interface LoadResponse {
             this.actors = actors?.map { (actor, role) -> ActorData(actor, role = role) }
         }
 
+        /**
+         * Internal helper function to add simkl ids from other databases.
+         */
+        private fun LoadResponse.addSimklId(
+            database: SimklApi.Companion.SyncServices,
+            id: String?
+        ) {
+            normalSafeApiCall {
+                this.syncData[simklIdPrefix] =
+                    SimklApi.addIdToString(this.syncData[simklIdPrefix], database, id.toString())
+                        ?: return@normalSafeApiCall
+            }
+        }
+
         @JvmName("addActorsOnly")
         fun LoadResponse.addActors(actors: List<Actor>?) {
             this.actors = actors?.map { actor -> ActorData(actor) }
@@ -1155,10 +1248,16 @@ interface LoadResponse {
 
         fun LoadResponse.addMalId(id: Int?) {
             this.syncData[malIdPrefix] = (id ?: return).toString()
+            this.addSimklId(SimklApi.Companion.SyncServices.Mal, id.toString())
         }
 
         fun LoadResponse.addAniListId(id: Int?) {
             this.syncData[aniListIdPrefix] = (id ?: return).toString()
+            this.addSimklId(SimklApi.Companion.SyncServices.AniList, id.toString())
+        }
+
+        fun LoadResponse.addSimklId(id: Int?) {
+            this.addSimklId(SimklApi.Companion.SyncServices.Simkl, id.toString())
         }
 
         fun LoadResponse.addImdbUrl(url: String?) {
@@ -1240,6 +1339,7 @@ interface LoadResponse {
 
         fun LoadResponse.addImdbId(id: String?) {
             // TODO add imdb sync
+            this.addSimklId(SimklApi.Companion.SyncServices.Imdb, id)
         }
 
         fun LoadResponse.addTrackId(id: String?) {
@@ -1252,6 +1352,7 @@ interface LoadResponse {
 
         fun LoadResponse.addTMDbId(id: String?) {
             // TODO add TMDb sync
+            this.addSimklId(SimklApi.Companion.SyncServices.Tmdb, id)
         }
 
         fun LoadResponse.addRating(text: String?) {
@@ -1679,30 +1780,42 @@ data class Tracker(
     val cover: String? = null,
 )
 
-data class Title(
-    @JsonProperty("romaji") val romaji: String? = null,
-    @JsonProperty("english") val english: String? = null,
+data class AniSearch(
+    @JsonProperty("data") var data: Data? = Data()
 ) {
-    fun isMatchingTitles(title: String?): Boolean {
-        if (title == null) return false
-        return english.equals(title, true) || romaji.equals(title, true)
+    data class Data(
+        @JsonProperty("Page") var page: Page? = Page()
+    ) {
+        data class Page(
+            @JsonProperty("media") var media: ArrayList<Media> = arrayListOf()
+        ) {
+            data class Media(
+                @JsonProperty("title") var title: Title? = null,
+                @JsonProperty("id") var id: Int? = null,
+                @JsonProperty("idMal") var idMal: Int? = null,
+                @JsonProperty("seasonYear") var seasonYear: Int? = null,
+                @JsonProperty("format") var format: String? = null,
+                @JsonProperty("coverImage") var coverImage: CoverImage? = null,
+                @JsonProperty("bannerImage") var bannerImage: String? = null,
+            ) {
+                data class CoverImage(
+                    @JsonProperty("extraLarge") var extraLarge: String? = null,
+                    @JsonProperty("large") var large: String? = null,
+                )
+                data class Title(
+                    @JsonProperty("romaji") var romaji: String? = null,
+                    @JsonProperty("english") var english: String? = null,
+                ) {
+                    fun isMatchingTitles(title: String?): Boolean {
+                        if (title == null) return false
+                        return english.equals(title, true) || romaji.equals(title, true)
+                    }
+                }
+            }
+        }
     }
 }
 
-data class Results(
-    @JsonProperty("id") val aniId: String? = null,
-    @JsonProperty("malId") val malId: Int? = null,
-    @JsonProperty("title") val title: Title? = null,
-    @JsonProperty("releaseDate") val releaseDate: Int? = null,
-    @JsonProperty("type") val type: String? = null,
-    @JsonProperty("image") val image: String? = null,
-    @JsonProperty("cover") val cover: String? = null,
-)
-
-data class AniSearch(
-    @JsonProperty("results") val results: ArrayList<Results>? = arrayListOf()
-)
-
 /**
  * used for the getTracker() method
  **/
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 2bf843f1..ca5129aa 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -1,23 +1,34 @@
 package com.lagradost.cloudstream3
 
+import android.animation.ValueAnimator
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.Configuration
+import android.graphics.Rect
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.util.AttributeSet
 import android.util.Log
-import android.view.*
+import android.view.KeyEvent
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IdRes
+import androidx.annotation.MainThread
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.children
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.core.view.marginStart
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.NavController
@@ -28,13 +39,21 @@ import androidx.navigation.NavOptions
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.setupWithNavController
 import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.LinearSnapHelper
+import androidx.recyclerview.widget.RecyclerView
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.google.android.gms.cast.framework.*
+import com.google.android.gms.cast.framework.CastContext
+import com.google.android.gms.cast.framework.Session
+import com.google.android.gms.cast.framework.SessionManager
+import com.google.android.gms.cast.framework.SessionManagerListener
+import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.navigationrail.NavigationRailView
 import com.google.android.material.snackbar.Snackbar
+import com.google.common.collect.Comparators.min
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
 import com.lagradost.cloudstream3.APIHolder.allProviders
 import com.lagradost.cloudstream3.APIHolder.apis
@@ -47,9 +66,16 @@ import com.lagradost.cloudstream3.CommonActivity.loadThemes
 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.showToast
 import com.lagradost.cloudstream3.CommonActivity.updateLocale
-import com.lagradost.cloudstream3.mvvm.*
+import com.lagradost.cloudstream3.databinding.ActivityMainBinding
+import com.lagradost.cloudstream3.databinding.ActivityMainTvBinding
+import com.lagradost.cloudstream3.databinding.BottomResultviewPreviewBinding
+import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.network.initClient
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.PluginManager.loadAllOnlinePlugins
@@ -71,10 +97,12 @@ import com.lagradost.cloudstream3.ui.home.HomeViewModel
 import com.lagradost.cloudstream3.ui.player.BasicLink
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
 import com.lagradost.cloudstream3.ui.player.LinkGenerator
+import com.lagradost.cloudstream3.ui.result.LinearListLayout
 import com.lagradost.cloudstream3.ui.result.ResultViewModel2
 import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
 import com.lagradost.cloudstream3.ui.result.setImage
 import com.lagradost.cloudstream3.ui.result.setText
+import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.ui.search.SearchFragment
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isEmulatorSettings
@@ -84,21 +112,27 @@ import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.updateT
 import com.lagradost.cloudstream3.ui.settings.SettingsGeneral
 import com.lagradost.cloudstream3.ui.setup.HAS_DONE_SETUP_KEY
 import com.lagradost.cloudstream3.ui.setup.SetupFragmentExtensions
-import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.ApkInstaller
 import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
+import com.lagradost.cloudstream3.utils.AppUtils.isLtr
 import com.lagradost.cloudstream3.utils.AppUtils.isNetworkAvailable
+import com.lagradost.cloudstream3.utils.AppUtils.isRtl
 import com.lagradost.cloudstream3.utils.AppUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppUtils.loadRepository
 import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
+import com.lagradost.cloudstream3.utils.BackupUtils.backup
 import com.lagradost.cloudstream3.utils.BackupUtils.setUpBackup
 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
 import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.changeStatusBarState
@@ -109,17 +143,21 @@ import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
+import com.lagradost.cloudstream3.utils.UIHelper.toPx
+import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
+import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
 import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.ResponseParser
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.bottom_resultview_preview.*
-import kotlinx.android.synthetic.main.fragment_result_swipe.*
+import com.lagradost.safefile.SafeFile
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import java.io.File
+import java.lang.ref.WeakReference
 import java.net.URI
 import java.net.URLDecoder
 import java.nio.charset.Charset
+import kotlin.math.abs
+import kotlin.math.absoluteValue
 import kotlin.reflect.KClass
 import kotlin.system.exitProcess
 
@@ -245,6 +283,7 @@ var app = Requests(responseParser = object : ResponseParser {
 class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
     companion object {
         const val TAG = "MAINACT"
+        var lastError: String? = null
 
         /**
          * Setting this will automatically enter the query in the search
@@ -253,7 +292,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
          *
          * This is a very bad solution but I was unable to find a better one.
          **/
-        private var nextSearchQuery: String? = null
+        var nextSearchQuery: String? = null
 
         /**
          * Fires every time a new batch of plugins have been loaded, no guarantee about how often this is run and on which thread
@@ -269,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>()
 
 
         /**
@@ -308,7 +351,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                                     this@with.runOnUiThread {
                                         try {
                                             showToast(
-                                                this@with,
                                                 getString(if (isSuccessful) R.string.authenticated_user else R.string.authenticated_user_fail).format(
                                                     api.name
                                                 )
@@ -331,13 +373,20 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                         loadRepository(url)
                         return true
                     } else if (safeURI(str)?.scheme == appStringSearch) {
+                        val query = str.substringAfter("$appStringSearch://")
                         nextSearchQuery =
-                            URLDecoder.decode(str.substringAfter("$appStringSearch://"), "UTF-8")
-
+                            try {
+                                URLDecoder.decode(query, "UTF-8")
+                            } catch (t: Throwable) {
+                                logError(t)
+                                query
+                            }
                         // Use both navigation views to support both layouts.
                         // It might be better to use the QuickSearch.
-                        nav_view?.selectedItemId = R.id.navigation_search
-                        nav_rail_view?.selectedItemId = R.id.navigation_search
+                        activity?.findViewById<BottomNavigationView>(R.id.nav_view)?.selectedItemId =
+                            R.id.navigation_search
+                        activity?.findViewById<NavigationRailView>(R.id.nav_rail_view)?.selectedItemId =
+                            R.id.navigation_search
                     } else if (safeURI(str)?.scheme == appStringPlayer) {
                         val uri = Uri.parse(str)
                         val name = uri.getQueryParameter("name")
@@ -370,10 +419,12 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                             this.navigate(R.id.navigation_downloads)
                             return true
                         } else {
-                            for (api in apis) {
-                                if (str.startsWith(api.mainUrl)) {
-                                    loadResult(str, api.name)
-                                    return true
+                            synchronized(apis) {
+                                for (api in apis) {
+                                    if (str.startsWith(api.mainUrl)) {
+                                        loadResult(str, api.name)
+                                        return true
+                                    }
                                 }
                             }
                         }
@@ -414,7 +465,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         this.hideKeyboard()
 
         // Fucks up anime info layout since that has its own layout
-        cast_mini_controller_holder?.isVisible =
+        binding?.castMiniControllerHolder?.isVisible =
             !listOf(
                 R.id.navigation_results_phone,
                 R.id.navigation_results_tv,
@@ -448,17 +499,30 @@ 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)
 
-        nav_host_fragment?.apply {
+        binding?.navHostFragment?.apply {
             val params = layoutParams as ConstraintLayout.LayoutParams
+            val push =
+                if (!dontPush && isTvSettings()) resources.getDimensionPixelSize(R.dimen.navbar_width) else 0
+
+            if (!this.isLtr()) {
+                params.setMargins(
+                    params.leftMargin,
+                    params.topMargin,
+                    push,
+                    params.bottomMargin
+                )
+            } else {
+                params.setMargins(
+                    push,
+                    params.topMargin,
+                    params.rightMargin,
+                    params.bottomMargin
+                )
+            }
 
-            params.setMargins(
-                if (!dontPush && isTvSettings()) resources.getDimensionPixelSize(R.dimen.navbar_width) else 0,
-                params.topMargin,
-                params.rightMargin,
-                params.bottomMargin
-            )
             layoutParams = params
         }
 
@@ -466,21 +530,28 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             Configuration.ORIENTATION_LANDSCAPE -> {
                 true
             }
+
             Configuration.ORIENTATION_PORTRAIT -> {
-                false
+                isTvSettings()
             }
+
             else -> {
                 false
             }
         }
+        binding?.apply {
+            navView.isVisible = isNavVisible && !landscape
+            navRailView.isVisible = isNavVisible && landscape
 
-        nav_view?.isVisible = isNavVisible && !landscape
-        nav_rail_view?.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
 
-        // Hide library on TV since it is not supported yet :(
-        val isTrueTv = isTrueTvSettings()
-        nav_view?.menu?.findItem(R.id.navigation_library)?.isVisible = !isTrueTv
-        nav_rail_view?.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
+        }
     }
 
     //private var mCastSession: CastSession? = null
@@ -548,11 +619,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         }
     }
 
-
     override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
-        CommonActivity.dispatchKeyEvent(this, event)?.let {
-            return it
-        }
+        val response = CommonActivity.dispatchKeyEvent(this, event)
+        if (response != null)
+            return response
         return super.dispatchKeyEvent(event)
     }
 
@@ -659,27 +729,29 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
     private fun onAllPluginsLoaded(success: Boolean = false) {
         ioSafe {
             pluginsLock.withLock {
-                // Load cloned sites after plugins have been loaded since clones depend on plugins.
-                try {
-                    getKey<Array<SettingsGeneral.CustomSite>>(USER_PROVIDER_API)?.let { list ->
-                        list.forEach { custom ->
-                            allProviders.firstOrNull { it.javaClass.simpleName == custom.parentJavaClass }
-                                ?.let {
-                                    allProviders.add(it.javaClass.newInstance().apply {
-                                        name = custom.name
-                                        lang = custom.lang
-                                        mainUrl = custom.url.trimEnd('/')
-                                        canBeOverridden = false
-                                    })
-                                }
+                synchronized(allProviders) {
+                    // Load cloned sites after plugins have been loaded since clones depend on plugins.
+                    try {
+                        getKey<Array<SettingsGeneral.CustomSite>>(USER_PROVIDER_API)?.let { list ->
+                            list.forEach { custom ->
+                                allProviders.firstOrNull { it.javaClass.simpleName == custom.parentJavaClass }
+                                    ?.let {
+                                        allProviders.add(it.javaClass.newInstance().apply {
+                                            name = custom.name
+                                            lang = custom.lang
+                                            mainUrl = custom.url.trimEnd('/')
+                                            canBeOverridden = false
+                                        })
+                                    }
+                            }
                         }
+                        // it.hashCode() is not enough to make sure they are distinct
+                        apis =
+                            allProviders.distinctBy { it.lang + it.name + it.mainUrl + it.javaClass.name }
+                        APIHolder.apiMap = null
+                    } catch (e: Exception) {
+                        logError(e)
                     }
-                    // it.hashCode() is not enough to make sure they are distinct
-                    apis =
-                        allProviders.distinctBy { it.lang + it.name + it.mainUrl + it.javaClass.name }
-                    APIHolder.apiMap = null
-                } catch (e: Exception) {
-                    logError(e)
                 }
             }
         }
@@ -695,37 +767,322 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
     }
 
     private fun hidePreviewPopupDialog() {
-        viewModel.clear()
         bottomPreviewPopup.dismissSafe(this)
+        bottomPreviewPopup = null
+        bottomPreviewBinding = null
     }
 
-    var bottomPreviewPopup: BottomSheetDialog? = null
-    private fun showPreviewPopupDialog(): BottomSheetDialog {
-        val ret = (bottomPreviewPopup ?: run {
+    private var bottomPreviewPopup: BottomSheetDialog? = null
+    private var bottomPreviewBinding: BottomResultviewPreviewBinding? = null
+    private fun showPreviewPopupDialog(): BottomResultviewPreviewBinding {
+        val ret = (bottomPreviewBinding ?: run {
             val builder =
                 BottomSheetDialog(this)
-            builder.setContentView(R.layout.bottom_resultview_preview)
+            val binding: BottomResultviewPreviewBinding =
+                BottomResultviewPreviewBinding.inflate(builder.layoutInflater, null, false)
+            bottomPreviewBinding = binding
+            builder.setContentView(binding.root)
             builder.setOnDismissListener {
                 bottomPreviewPopup = null
+                bottomPreviewBinding = null
                 viewModel.clear()
             }
             builder.setCanceledOnTouchOutside(true)
             builder.show()
-            builder
+            bottomPreviewPopup = builder
+            binding
         })
-        bottomPreviewPopup = ret
+
         return ret
     }
 
+    var binding: ActivityMainBinding? = null
+
+    object TvFocus {
+        data class FocusTarget(
+            val width: Int,
+            val height: Int,
+            val x: Float,
+            val y: Float,
+        ) {
+            companion object {
+                fun lerp(a: FocusTarget, b: FocusTarget, lerp: Float): FocusTarget {
+                    val ilerp = 1 - lerp
+                    return FocusTarget(
+                        width = (a.width * ilerp + b.width * lerp).toInt(),
+                        height = (a.height * ilerp + b.height * lerp).toInt(),
+                        x = a.x * ilerp + b.x * lerp,
+                        y = a.y * ilerp + b.y * lerp
+                    )
+                }
+            }
+        }
+
+        var last: FocusTarget = FocusTarget(0, 0, 0.0f, 0.0f)
+        var current: FocusTarget = FocusTarget(0, 0, 0.0f, 0.0f)
+
+        var focusOutline: WeakReference<View> = WeakReference(null)
+        var lastFocus: WeakReference<View> = WeakReference(null)
+        private val layoutListener: View.OnLayoutChangeListener =
+            View.OnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+                // shitty fix for layouts
+                lastFocus.get()?.apply {
+                    updateFocusView(
+                        this, same = true
+                    )
+                    postDelayed({
+                        updateFocusView(
+                            lastFocus.get(), same = false
+                        )
+                    }, 300)
+                }
+            }
+        private val attachListener: View.OnAttachStateChangeListener =
+            object : View.OnAttachStateChangeListener {
+                override fun onViewAttachedToWindow(v: View) {
+                    updateFocusView(v)
+                }
+
+                override fun onViewDetachedFromWindow(v: View) {
+                    // removes the focus view but not the listener as updateFocusView(null) will remove the listener
+                    focusOutline.get()?.isVisible = false
+                }
+            }
+        /*private val scrollListener = object : RecyclerView.OnScrollListener() {
+            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                super.onScrolled(recyclerView, dx, dy)
+                current = current.copy(x = current.x + dx, y = current.y + dy)
+                setTargetPosition(current)
+            }
+        }*/
+
+        private fun setTargetPosition(target: FocusTarget) {
+            focusOutline.get()?.apply {
+                layoutParams = layoutParams?.apply {
+                    width = target.width
+                    height = target.height
+                }
+
+                translationX = target.x
+                translationY = target.y
+                bringToFront()
+            }
+        }
+
+        private var animator: ValueAnimator? = null
+
+        /** if this is enabled it will keep the focus unmoving
+         *  during listview move */
+        private const val NO_MOVE_LIST: Boolean = false
+
+        /** If this is enabled then it will try to move the
+         * listview focus to the left instead of center */
+        private const val LEFTMOST_MOVE_LIST: Boolean = true
+
+        private val reflectedScroll by lazy {
+            try {
+                RecyclerView::class.java.declaredMethods.firstOrNull {
+                    it.name == "scrollStep"
+                }?.also { it.isAccessible = true }
+            } catch (t: Throwable) {
+                null
+            }
+        }
+
+        @MainThread
+        fun updateFocusView(newFocus: View?, same: Boolean = false) {
+            val focusOutline = focusOutline.get() ?: return
+            val lastView = lastFocus.get()
+            val exactlyTheSame = lastView == newFocus && newFocus != null
+            if (!exactlyTheSame) {
+                lastView?.removeOnLayoutChangeListener(layoutListener)
+                lastView?.removeOnAttachStateChangeListener(attachListener)
+                (lastView?.parent as? RecyclerView)?.apply {
+                    removeOnLayoutChangeListener(layoutListener)
+                    //removeOnScrollListener(scrollListener)
+                }
+            }
+
+            val wasGone = focusOutline.isGone
+
+            val visible =
+                newFocus != null && newFocus.measuredHeight > 0 && newFocus.measuredWidth > 0 && newFocus.isShown && newFocus.tag != "tv_no_focus_tag"
+            focusOutline.isVisible = visible
+
+            if (newFocus != null) {
+                lastFocus = WeakReference(newFocus)
+                val parent = newFocus.parent
+                var targetDx = 0
+                if (parent is RecyclerView) {
+                    val layoutManager = parent.layoutManager
+                    if (layoutManager is LinearListLayout && layoutManager.orientation == LinearLayoutManager.HORIZONTAL) {
+                        val dx =
+                            LinearSnapHelper().calculateDistanceToFinalSnap(layoutManager, newFocus)
+                                ?.get(0)
+
+                        if (dx != null) {
+                            val rdx = if (LEFTMOST_MOVE_LIST) {
+                                // this makes the item the leftmost in ltr, instead of center
+                                val diff =
+                                    ((layoutManager.width - layoutManager.paddingStart - newFocus.measuredWidth) / 2) - newFocus.marginStart
+                                dx + if (parent.isRtl()) {
+                                    -diff
+                                } else {
+                                    diff
+                                }
+                            } else {
+                                if (dx > 0) dx else 0
+                            }
+
+                            if (!NO_MOVE_LIST) {
+                                parent.smoothScrollBy(rdx, 0)
+                            } else {
+                                val smoothScroll = reflectedScroll
+                                if (smoothScroll == null) {
+                                    parent.smoothScrollBy(rdx, 0)
+                                } else {
+                                    try {
+                                        // this is very fucked but because it is a protected method to
+                                        // be able to compute the scroll I use reflection, scroll, then
+                                        // scroll back, then smooth scroll and set the no move
+                                        val out = IntArray(2)
+                                        smoothScroll.invoke(parent, rdx, 0, out)
+                                        val scrolledX = out[0]
+                                        if (abs(scrolledX) <= 0) { // newFocus.measuredWidth*2
+                                            smoothScroll.invoke(parent, -rdx, 0, out)
+                                            parent.smoothScrollBy(scrolledX, 0)
+                                            if (NO_MOVE_LIST) targetDx = scrolledX
+                                        }
+                                    } catch (t: Throwable) {
+                                        parent.smoothScrollBy(rdx, 0)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                val out = IntArray(2)
+                newFocus.getLocationInWindow(out)
+                val (screenX, screenY) = out
+                var (x, y) = screenX.toFloat() to screenY.toFloat()
+                val (currentX, currentY) = focusOutline.translationX to focusOutline.translationY
+
+                if (!newFocus.isLtr()) {
+                    x = x - focusOutline.rootView.width + newFocus.measuredWidth
+                }
+                x -= targetDx
+
+                // out of bounds = 0,0
+                if (screenX == 0 && screenY == 0) {
+                    focusOutline.isVisible = false
+                }
+                if (!exactlyTheSame) {
+                    (newFocus.parent as? RecyclerView)?.apply {
+                        addOnLayoutChangeListener(layoutListener)
+                        //addOnScrollListener(scrollListener)
+                    }
+                    newFocus.addOnLayoutChangeListener(layoutListener)
+                    newFocus.addOnAttachStateChangeListener(attachListener)
+                }
+                val start = FocusTarget(
+                    x = currentX,
+                    y = currentY,
+                    width = focusOutline.measuredWidth,
+                    height = focusOutline.measuredHeight
+                )
+                val end = FocusTarget(
+                    x = x,
+                    y = y,
+                    width = newFocus.measuredWidth,
+                    height = newFocus.measuredHeight
+                )
+
+                // if they are the same within then snap, aka scrolling
+                val deltaMinX = min(end.width / 2, 60.toPx)
+                val deltaMinY = min(end.height / 2, 60.toPx)
+                if (start.width == end.width && start.height == end.height && (start.x - end.x).absoluteValue < deltaMinX && (start.y - end.y).absoluteValue < deltaMinY) {
+                    animator?.cancel()
+                    last = start
+                    current = end
+                    setTargetPosition(end)
+                    return
+                }
+
+                // if running then "reuse"
+                if (animator?.isRunning == true) {
+                    current = end
+                    return
+                } else {
+                    animator?.cancel()
+                }
+
+
+                last = start
+                current = end
+
+                // if previously gone, then tp
+                if (wasGone) {
+                    setTargetPosition(current)
+                    return
+                }
+
+                // animate between a and b
+                animator = ValueAnimator.ofFloat(0.0f, 1.0f).apply {
+                    startDelay = 0
+                    duration = 200
+                    addUpdateListener { animation ->
+                        val animatedValue = animation.animatedValue as Float
+                        val target = FocusTarget.lerp(last, current, minOf(animatedValue, 1.0f))
+                        setTargetPosition(target)
+                    }
+                    start()
+                }
+
+                // post check
+                if (!same) {
+                    newFocus.postDelayed({
+                        updateFocusView(lastFocus.get(), same = true)
+                    }, 200)
+                }
+
+                /*
+
+                the following is working, but somewhat bad code code
+
+                if (!wasGone) {
+                    (focusOutline.parent as? ViewGroup)?.let {
+                        TransitionManager.endTransitions(it)
+                        TransitionManager.beginDelayedTransition(
+                            it,
+                            TransitionSet().addTransition(ChangeBounds())
+                                .addTransition(ChangeTransform())
+                                .setDuration(100)
+                        )
+                    }
+                }
+
+                focusOutline.layoutParams = focusOutline.layoutParams?.apply {
+                    width = newFocus.measuredWidth
+                    height = newFocus.measuredHeight
+                }
+                focusOutline.translationX = x.toFloat()
+                focusOutline.translationY = y.toFloat()*/
+            }
+        }
+    }
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         app.initClient(this)
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
 
         val errorFile = filesDir.resolve("last_error")
-        var lastError: String? = null
         if (errorFile.exists() && errorFile.isFile) {
             lastError = errorFile.readText(Charset.defaultCharset())
             errorFile.delete()
+        } else {
+            lastError = null
         }
 
         val settingsForProvider = SettingsJson()
@@ -741,16 +1098,75 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             if (isCastApiAvailable()) {
                 mSessionManager = CastContext.getSharedInstance(this).sessionManager
             }
-        } catch (e: Exception) {
-            logError(e)
+        } catch (t: Throwable) {
+            logError(t)
         }
 
         window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
         updateTv()
-        if (isTvSettings()) {
-            setContentView(R.layout.activity_main_tv)
-        } else {
-            setContentView(R.layout.activity_main)
+
+        // backup when we update the app, I don't trust myself to not boot lock users, might want to make this a setting?
+        normalSafeApiCall {
+            val appVer = BuildConfig.VERSION_NAME
+            val lastAppAutoBackup: String = getKey("VERSION_NAME") ?: ""
+            if (appVer != lastAppAutoBackup) {
+                setKey("VERSION_NAME", BuildConfig.VERSION_NAME)
+                normalSafeApiCall {
+                    backup()
+                }
+                normalSafeApiCall {
+                    // Recompile oat on new version
+                    PluginManager.deleteAllOatFiles(this)
+                }
+            }
+        }
+
+        // just in case, MAIN SHOULD *NEVER* BOOT LOOP CRASH
+        binding = try {
+            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
+                        }
+                    }*/
+                }
+                newLocalBinding.root.viewTreeObserver.addOnScrollChangedListener {
+                    TvFocus.updateFocusView(TvFocus.lastFocus.get(), same = true)
+                }
+
+                ActivityMainBinding.bind(newLocalBinding.root) // this may crash
+            } else {
+                val newLocalBinding = ActivityMainBinding.inflate(layoutInflater, null, false)
+                setContentView(newLocalBinding.root)
+                newLocalBinding
+            }
+        } catch (t: Throwable) {
+            showToast(txt(R.string.unable_to_inflate, t.message ?: ""), Toast.LENGTH_LONG)
+            null
         }
 
         changeStatusBarState(isEmulatorSettings())
@@ -774,18 +1190,18 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                             snackbar.show()
                         }
                 }
-
             }
         }
 
+        ioSafe { SafeFile.check(this@MainActivity) }
 
         if (PluginManager.checkSafeModeFile()) {
             normalSafeApiCall {
-                showToast(this, R.string.safe_mode_file, Toast.LENGTH_LONG)
+                showToast(R.string.safe_mode_file, Toast.LENGTH_LONG)
             }
         } 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)
@@ -802,13 +1218,18 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                         loadAllOnlinePlugins(this@MainActivity)
                     }
 
-                    //Automatically download not existing plugins
-                    if (settingsManager.getBoolean(
+                    //Automatically download not existing plugins, using mode specified.
+                    val autoDownloadPlugin = AutoDownloadMode.getEnum(
+                        settingsManager.getInt(
                             getString(R.string.auto_download_plugins_key),
-                            false
+                            0
+                        )
+                    ) ?: AutoDownloadMode.Disable
+                    if (autoDownloadPlugin != AutoDownloadMode.Disable) {
+                        PluginManager.downloadNotExistingPluginsAndLoad(
+                            this@MainActivity,
+                            autoDownloadPlugin
                         )
-                    ) {
-                        PluginManager.downloadNotExistingPluginsAndLoad(this@MainActivity)
                     }
                 }
 
@@ -835,41 +1256,44 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
         observeNullable(viewModel.page) { resource ->
             if (resource == null) {
-                bottomPreviewPopup.dismissSafe(this)
+                hidePreviewPopupDialog()
                 return@observeNullable
             }
             when (resource) {
                 is Resource.Failure -> {
-                    showToast(this, R.string.error)
+                    showToast(R.string.error)
+                    viewModel.clear()
                     hidePreviewPopupDialog()
                 }
+
                 is Resource.Loading -> {
                     showPreviewPopupDialog().apply {
-                        resultview_preview_loading?.isVisible = true
-                        resultview_preview_result?.isVisible = false
-                        resultview_preview_loading_shimmer?.startShimmer()
+                        resultviewPreviewLoading.isVisible = true
+                        resultviewPreviewResult.isVisible = false
+                        resultviewPreviewLoadingShimmer.startShimmer()
                     }
                 }
+
                 is Resource.Success -> {
                     val d = resource.value
                     showPreviewPopupDialog().apply {
-                        resultview_preview_loading?.isVisible = false
-                        resultview_preview_result?.isVisible = true
-                        resultview_preview_loading_shimmer?.stopShimmer()
+                        resultviewPreviewLoading.isVisible = false
+                        resultviewPreviewResult.isVisible = true
+                        resultviewPreviewLoadingShimmer.stopShimmer()
 
-                        resultview_preview_title?.text = d.title
+                        resultviewPreviewTitle.text = d.title
 
-                        resultview_preview_meta_type.setText(d.typeText)
-                        resultview_preview_meta_year.setText(d.yearText)
-                        resultview_preview_meta_duration.setText(d.durationText)
-                        resultview_preview_meta_rating.setText(d.ratingText)
+                        resultviewPreviewMetaType.setText(d.typeText)
+                        resultviewPreviewMetaYear.setText(d.yearText)
+                        resultviewPreviewMetaDuration.setText(d.durationText)
+                        resultviewPreviewMetaRating.setText(d.ratingText)
 
-                        resultview_preview_description?.setText(d.plotText)
-                        resultview_preview_poster?.setImage(
+                        resultviewPreviewDescription.setText(d.plotText)
+                        resultviewPreviewPoster.setImage(
                             d.posterImage ?: d.posterBackgroundImage
                         )
 
-                        resultview_preview_poster?.setOnClickListener {
+                        resultviewPreviewPoster.setOnClickListener {
                             //viewModel.updateWatchStatus(WatchType.PLANTOWATCH)
                             val value = viewModel.watchStatus.value ?: WatchType.NONE
 
@@ -880,12 +1304,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                                 showApply = false,
                                 {}) {
                                 viewModel.updateWatchStatus(WatchType.values()[it])
-                                bookmarksUpdatedEvent(true)
                             }
                         }
 
                         if (!isTvSettings()) // dont want this clickable on tv layout
-                            resultview_preview_description?.setOnClickListener { view ->
+                            resultviewPreviewDescription.setOnClickListener { view ->
                                 view.context?.let { ctx ->
                                     val builder: AlertDialog.Builder =
                                         AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
@@ -895,7 +1318,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
                                 }
                             }
 
-                        resultview_preview_more_info?.setOnClickListener {
+                        resultviewPreviewMoreInfo.setOnClickListener {
+                            viewModel.clear()
                             hidePreviewPopupDialog()
                             lastPopup?.let {
                                 loadSearchResult(it)
@@ -936,7 +1360,9 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
         ioSafe {
             initAll()
             // No duplicates (which can happen by registerMainAPI)
-            apis = allProviders.distinctBy { it }
+            apis = synchronized(allProviders) {
+                allProviders.distinctBy { it }
+            }
         }
 
         //  val navView: BottomNavigationView = findViewById(R.id.nav_view)
@@ -949,10 +1375,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
         navController.addOnDestinationChangedListener { _: NavController, navDestination: NavDestination, bundle: Bundle? ->
             // Intercept search and add a query
+            updateNavBar(navDestination)
             if (navDestination.matchDestination(R.id.navigation_search) && !nextSearchQuery.isNullOrBlank()) {
                 bundle?.apply {
                     this.putString(SearchFragment.SEARCH_QUERY, nextSearchQuery)
-                    nextSearchQuery = null
                 }
             }
         }
@@ -967,29 +1393,47 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             .setPopExitAnim(R.anim.nav_pop_exit)
             .setPopUpTo(navController.graph.startDestination, false)
             .build()*/
-        nav_view?.setupWithNavController(navController)
-        val nav_rail = findViewById<NavigationRailView?>(R.id.nav_rail_view)
-        nav_rail?.setupWithNavController(navController)
-        if (isTvSettings()) {
-            nav_rail?.background?.alpha = 200
-        } else {
-            nav_rail?.background?.alpha = 255
 
+        val rippleColor = ColorStateList.valueOf(getResourceColor(R.attr.colorPrimary, 0.1f))
+
+        binding?.navView?.apply {
+            itemRippleColor = rippleColor
+            itemActiveIndicatorColor = rippleColor
+            setupWithNavController(navController)
+            setOnItemSelectedListener { item ->
+                onNavDestinationSelected(
+                    item,
+                    navController
+                )
+            }
         }
-        nav_rail?.setOnItemSelectedListener { item ->
-            onNavDestinationSelected(
-                item,
-                navController
-            )
-        }
-        nav_view?.setOnItemSelectedListener { item ->
-            onNavDestinationSelected(
-                item,
-                navController
-            )
-        }
-        navController.addOnDestinationChangedListener { _, destination, _ ->
-            updateNavBar(destination)
+
+        binding?.navRailView?.apply {
+            itemRippleColor = rippleColor
+            itemActiveIndicatorColor = rippleColor
+            setupWithNavController(navController)
+            if (isTvSettings()) {
+                background?.alpha = 200
+            } else {
+                background?.alpha = 255
+            }
+
+            setOnItemSelectedListener { item ->
+                onNavDestinationSelected(
+                    item,
+                    navController
+                )
+            }
+
+            fun noFocus(view: View) {
+                view.tag = view.context.getString(R.string.tv_no_focus_tag)
+                (view as? ViewGroup)?.let {
+                    for (child in it.children) {
+                        noFocus(child)
+                    }
+                }
+            }
+            noFocus(this)
         }
 
         loadCache()
@@ -1012,17 +1456,12 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
             true
         }*/
 
-        val rippleColor = ColorStateList.valueOf(getResourceColor(R.attr.colorPrimary, 0.1f))
-        nav_view?.itemRippleColor = rippleColor
-        nav_rail?.itemRippleColor = rippleColor
-        nav_rail?.itemActiveIndicatorColor = rippleColor
-        nav_view?.itemActiveIndicatorColor = rippleColor
 
         if (!checkWrite()) {
             requestRW()
             if (checkWrite()) return
         }
-        CastButtonFactory.setUpMediaRouteButton(this, media_route_button)
+        //CastButtonFactory.setUpMediaRouteButton(this, media_route_button)
 
         // THIS IS CURRENTLY REMOVED BECAUSE HIGHER VERS OF ANDROID NEEDS A NOTIFICATION
         //if (!VideoDownloadManager.isMyServiceRunning(this, VideoDownloadKeepAliveService::class.java)) {
@@ -1089,14 +1528,15 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
 
         if (BuildConfig.DEBUG) {
             var providersAndroidManifestString = "Current androidmanifest should be:\n"
-            for (api in allProviders) {
-                providersAndroidManifestString += "<data android:scheme=\"https\" android:host=\"${
-                    api.mainUrl.removePrefix(
-                        "https://"
-                    )
-                }\" android:pathPrefix=\"/\"/>\n"
+            synchronized(allProviders) {
+                for (api in allProviders) {
+                    providersAndroidManifestString += "<data android:scheme=\"https\" android:host=\"${
+                        api.mainUrl.removePrefix(
+                            "https://"
+                        )
+                    }\" android:pathPrefix=\"/\"/>\n"
+                }
             }
-
             println(providersAndroidManifestString)
         }
 
@@ -1122,6 +1562,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/NativeCrashHandler.kt b/app/src/main/java/com/lagradost/cloudstream3/NativeCrashHandler.kt
new file mode 100644
index 00000000..7be90440
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/NativeCrashHandler.kt
@@ -0,0 +1,53 @@
+package com.lagradost.cloudstream3
+
+import com.lagradost.cloudstream3.MainActivity.Companion.lastError
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.plugins.PluginManager.checkSafeModeFile
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+object NativeCrashHandler {
+    // external fun triggerNativeCrash()
+    /*private external fun initNativeCrashHandler()
+    private external fun getSignalStatus(): Int
+
+    private fun initSignalPolling() = CoroutineScope(Dispatchers.IO).launch {
+
+        //launch {
+        //    delay(10000)
+        //    triggerNativeCrash()
+        //}
+
+        while (true) {
+            delay(10_000)
+            val signal = getSignalStatus()
+            // Signal is initialized to zero
+            if (signal == 0) continue
+
+            // Do not crash in safe mode!
+            if (lastError != null) continue
+            if (checkSafeModeFile()) continue
+
+            AcraApplication.exceptionHandler?.uncaughtException(
+                Thread.currentThread(),
+                RuntimeException("Native crash with code: $signal. Try uninstalling extensions.\n")
+            )
+        }
+    }
+
+    fun initCrashHandler() {
+        try {
+            System.loadLibrary("native-lib")
+            initNativeCrashHandler()
+        } catch (t: Throwable) {
+            // Make debug crash.
+            if (BuildConfig.DEBUG) throw t
+            logError(t)
+            return
+        }
+
+        initSignalPolling()
+    }*/
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt
index 7a62fb52..4bed3169 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt
@@ -9,7 +9,7 @@ import java.net.URI
 
 open class AsianLoad : ExtractorApi() {
     override var name = "AsianLoad"
-    override var mainUrl = "https://asianembed.io"
+    override var mainUrl = "https://asianhdplay.pro"
     override val requiresReferer = true
 
     private val sourceRegex = Regex("""sources:[\W\w]*?file:\s*?["'](.*?)["']""")
@@ -43,4 +43,4 @@ open class AsianLoad : ExtractorApi() {
             return extractedLinksList
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/ByteShare.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/ByteShare.kt
index 3e0a03c0..2d56fe1f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/ByteShare.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/ByteShare.kt
@@ -4,7 +4,7 @@ import com.lagradost.cloudstream3.utils.*
 
 open class ByteShare : ExtractorApi() {
     override val name = "ByteShare"
-    override val mainUrl = "https://byteshare.net"
+    override val mainUrl = "https://byteshare.to"
     override val requiresReferer = false
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
@@ -20,4 +20,4 @@ open class ByteShare : ExtractorApi() {
         )
         return sources
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Cda.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Cda.kt
index 6a2f399d..42f6eddb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Cda.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Cda.kt
@@ -1,13 +1,11 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import android.util.Log
+import com.lagradost.cloudstream3.utils.Qualities
 import java.net.URLDecoder
 
 open class Cda: ExtractorApi() {
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 1c548e74..bcf8848c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt
@@ -2,15 +2,17 @@ package com.lagradost.cloudstream3.extractors
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.extractors.helper.*
+import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
-import javax.crypto.Cipher
-import javax.crypto.SecretKeyFactory
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.PBEKeySpec
-import javax.crypto.spec.SecretKeySpec
+
+class Moviesapi : Chillx() {
+    override val name = "Moviesapi"
+    override val mainUrl = "https://w1.moviesapi.club"
+}
 
 class Bestx : Chillx() {
     override val name = "Bestx"
@@ -27,7 +29,7 @@ open class Chillx : ExtractorApi() {
     override val requiresReferer = true
 
     companion object {
-        private const val KEY = "4VqE3#N7zt&HEP^a"
+        private const val KEY = "m4H6D9%0\$N&F6rQ&"
     }
 
     override suspend fun getUrl(
@@ -42,10 +44,9 @@ open class Chillx : ExtractorApi() {
                 referer = referer
             ).text
         )?.groupValues?.get(1)
-        val encData = AppUtils.tryParseJson<AESData>(base64Decode(master ?: return))
-        val decrypt = cryptoAESHandler(encData ?: return, KEY, false)
+        val decrypt = cryptoAESHandler(master ?: return, KEY.toByteArray(), false)?.replace("\\", "") ?: throw ErrorLoadingException("failed to decrypt")
 
-        val source = Regex("""sources:\s*\[\{"file":"([^"]+)""").find(decrypt)?.groupValues?.get(1)
+        val source = Regex(""""?file"?:\s*"([^"]+)""").find(decrypt)?.groupValues?.get(1)
         val tracks = Regex("""tracks:\s*\[(.+)]""").find(decrypt)?.groupValues?.get(1)
 
         // required
@@ -81,52 +82,6 @@ open class Chillx : ExtractorApi() {
             }
     }
 
-    private fun cryptoAESHandler(
-        data: AESData,
-        pass: String,
-        encrypt: Boolean = true
-    ): String {
-        val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512")
-        val spec = PBEKeySpec(
-            pass.toCharArray(),
-            data.salt?.hexToByteArray(),
-            data.iterations?.toIntOrNull() ?: 1,
-            256
-        )
-        val key = factory.generateSecret(spec)
-        val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
-        return if (!encrypt) {
-            cipher.init(
-                Cipher.DECRYPT_MODE,
-                SecretKeySpec(key.encoded, "AES"),
-                IvParameterSpec(data.iv?.hexToByteArray())
-            )
-            String(cipher.doFinal(base64DecodeArray(data.ciphertext.toString())))
-        } else {
-            cipher.init(
-                Cipher.ENCRYPT_MODE,
-                SecretKeySpec(key.encoded, "AES"),
-                IvParameterSpec(data.iv?.hexToByteArray())
-            )
-            base64Encode(cipher.doFinal(data.ciphertext?.toByteArray()))
-        }
-    }
-
-    private fun String.hexToByteArray(): ByteArray {
-        check(length % 2 == 0) { "Must have an even length" }
-        return chunked(2)
-            .map { it.toInt(16).toByte() }
-
-            .toByteArray()
-    }
-
-    data class AESData(
-        @JsonProperty("ciphertext") val ciphertext: String? = null,
-        @JsonProperty("iv") val iv: String? = null,
-        @JsonProperty("salt") val salt: String? = null,
-        @JsonProperty("iterations") val iterations: String? = null,
-    )
-
     data class Tracks(
         @JsonProperty("file") val file: String? = null,
         @JsonProperty("label") val label: String? = null,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
index 24495a40..8dcfb859 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
@@ -7,6 +7,10 @@ import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import kotlinx.coroutines.delay
 
+class Dooood : DoodLaExtractor() {
+    override var mainUrl = "https://dooood.com"
+}
+
 class DoodWfExtractor : DoodLaExtractor() {
     override var mainUrl = "https://dood.wf"
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
index 4c1791a8..a1148bb8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt
@@ -5,6 +5,16 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
 
+class Guccihide : Filesim() {
+    override val name = "Guccihide"
+    override var mainUrl = "https://guccihide.com"
+}
+
+class Ahvsh : Filesim() {
+    override val name = "Ahvsh"
+    override var mainUrl = "https://ahvsh.com"
+}
+
 class Moviesm4u : Filesim() {
     override val mainUrl = "https://moviesm4u.com"
     override val name = "Moviesm4u"
@@ -15,6 +25,11 @@ class FileMoonIn : Filesim() {
     override val name = "FileMoon"
 }
 
+class StreamhideTo : Filesim() {
+    override val mainUrl = "https://streamhide.to"
+    override val name = "Streamhide"
+}
+
 class StreamhideCom : Filesim() {
     override var name: String = "Streamhide"
     override var mainUrl: String = "https://streamhide.com"
@@ -42,7 +57,7 @@ class FileMoonSx : Filesim() {
 open class Filesim : ExtractorApi() {
     override val name = "Filesim"
     override val mainUrl = "https://files.im"
-    override val requiresReferer = false
+    override val requiresReferer = true
 
     override suspend fun getUrl(
         url: String,
@@ -50,27 +65,19 @@ open class Filesim : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val response = app.get(url, referer = mainUrl).document
-        response.select("script[type=text/javascript]").map { script ->
-            if (script.data().contains(Regex("eval\\(function\\(p,a,c,k,e,[rd]"))) {
-                val unpackedscript = getAndUnpack(script.data())
-                val m3u8Regex = Regex("file.\"(.*?m3u8.*?)\"")
-                val m3u8 = m3u8Regex.find(unpackedscript)?.destructured?.component1() ?: ""
-                if (m3u8.isNotEmpty()) {
-                    generateM3u8(
-                        name,
-                        m3u8,
-                        mainUrl
-                    ).forEach(callback)
-                }
-            }
+        val response = app.get(url, referer = referer)
+        val script = if (!getPacked(response.text).isNullOrEmpty()) {
+            getAndUnpack(response.text)
+        } else {
+            response.document.selectFirst("script:containsData(sources:)")?.data()
         }
+        val m3u8 =
+            Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return)?.groupValues?.getOrNull(1)
+        generateM3u8(
+            name,
+            m3u8 ?: return,
+            mainUrl
+        ).forEach(callback)
     }
 
-   /* private data class ResponseSource(
-        @JsonProperty("file") val file: String,
-        @JsonProperty("type") val type: String?,
-        @JsonProperty("label") val label: String?
-    ) */
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
index df9c74a4..8d1a4d07 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
@@ -2,14 +2,10 @@ package com.lagradost.cloudstream3.extractors
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import org.jsoup.nodes.Element
-import java.security.DigestException
-import java.security.MessageDigest
-import javax.crypto.Cipher
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
 
 class DatabaseGdrive2 : Gdriveplayer() {
     override var mainUrl = "https://databasegdriveplayer.co"
@@ -65,78 +61,6 @@ open class Gdriveplayer : ExtractorApi() {
             ?.data()?.let { getAndUnpack(it) }
     }
 
-    private fun String.decodeHex(): ByteArray {
-        check(length % 2 == 0) { "Must have an even length" }
-        return chunked(2)
-            .map { it.toInt(16).toByte() }
-            .toByteArray()
-    }
-
-    // https://stackoverflow.com/a/41434590/8166854
-    private fun GenerateKeyAndIv(
-        password: ByteArray,
-        salt: ByteArray,
-        hashAlgorithm: String = "MD5",
-        keyLength: Int = 32,
-        ivLength: Int = 16,
-        iterations: Int = 1
-    ): List<ByteArray>? {
-
-        val md = MessageDigest.getInstance(hashAlgorithm)
-        val digestLength = md.digestLength
-        val targetKeySize = keyLength + ivLength
-        val requiredLength = (targetKeySize + digestLength - 1) / digestLength * digestLength
-        val generatedData = ByteArray(requiredLength)
-        var generatedLength = 0
-
-        try {
-            md.reset()
-
-            while (generatedLength < targetKeySize) {
-                if (generatedLength > 0)
-                    md.update(
-                        generatedData,
-                        generatedLength - digestLength,
-                        digestLength
-                    )
-
-                md.update(password)
-                md.update(salt, 0, 8)
-                md.digest(generatedData, generatedLength, digestLength)
-
-                for (i in 1 until iterations) {
-                    md.update(generatedData, generatedLength, digestLength)
-                    md.digest(generatedData, generatedLength, digestLength)
-                }
-
-                generatedLength += digestLength
-            }
-            return listOf(
-                generatedData.copyOfRange(0, keyLength),
-                generatedData.copyOfRange(keyLength, targetKeySize)
-            )
-        } catch (e: DigestException) {
-            return null
-        }
-    }
-
-    private fun cryptoAESHandler(
-        data: AesData,
-        pass: ByteArray,
-        encrypt: Boolean = true
-    ): String? {
-        val (key, iv) = GenerateKeyAndIv(pass, data.s.decodeHex()) ?: return null
-        val cipher = Cipher.getInstance("AES/CBC/NoPadding")
-        return if (!encrypt) {
-            cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(key, "AES"), IvParameterSpec(iv))
-            String(cipher.doFinal(base64DecodeArray(data.ct)))
-        } else {
-            cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(key, "AES"), IvParameterSpec(iv))
-            base64Encode(cipher.doFinal(data.ct.toByteArray()))
-
-        }
-    }
-
     private fun Regex.first(str: String): String? {
         return find(str)?.groupValues?.getOrNull(1)
     }
@@ -154,14 +78,14 @@ open class Gdriveplayer : ExtractorApi() {
         val document = app.get(url).document
 
         val eval = unpackJs(document)?.replace("\\", "") ?: return
-        val data = tryParseJson<AesData>(Regex("data='(\\S+?)'").first(eval)) ?: return
+        val data = Regex("data='(\\S+?)'").first(eval) ?: return
         val password = Regex("null,['|\"](\\w+)['|\"]").first(eval)
             ?.split(Regex("\\D+"))
             ?.joinToString("") {
                 Char(it.toInt()).toString()
             }.let { Regex("var pass = \"(\\S+?)\"").first(it ?: return)?.toByteArray() }
             ?: throw ErrorLoadingException("can't find password")
-        val decryptedData = cryptoAESHandler(data, password, false)?.let { getAndUnpack(it) }?.replace("\\", "")
+        val decryptedData = cryptoAESHandler(data, password, false, "AES/CBC/NoPadding")?.let { getAndUnpack(it) }?.replace("\\", "")
 
         val sourceData = decryptedData?.substringAfter("sources:[")?.substringBefore("],")
         val subData = decryptedData?.substringAfter("tracks:[")?.substringBefore("],")
@@ -194,12 +118,6 @@ open class Gdriveplayer : ExtractorApi() {
 
     }
 
-    data class AesData(
-        @JsonProperty("ct") val ct: String,
-        @JsonProperty("iv") val iv: String,
-        @JsonProperty("s") val s: String
-    )
-
     data class Tracks(
         @JsonProperty("file") val file: String,
         @JsonProperty("kind") val kind: String,
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 2ec185e0..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,9 +19,12 @@ 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")
-        app.get("$mainApi/getContent?contentId=$id&token=$token&websiteToken=12345")
+        val websiteToken = app.get("$mainUrl/dist/js/alljs.js").text.let {
+            Regex("websiteToken\\s*=\\s*\"([^\"]+)").find(it)?.groupValues?.get(1)
+        }
+        app.get("$mainApi/getContent?contentId=$id&token=$token&websiteToken=$websiteToken")
             .parsedSafe<Source>()?.data?.contents?.forEach {
                 callback.invoke(
                     ExtractorLink(
@@ -56,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/Hxfile.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Hxfile.kt
index f5dde774..bfd7cae5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Hxfile.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Hxfile.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 
 class Neonime7n : Hxfile() {
     override val name = "Neonime7n"
-    override val mainUrl = "https://7njctn.neonime.watch"
+    override val mainUrl = "https://neonime.fun"
     override val redirect = false
 }
 
@@ -19,7 +19,7 @@ class Neonime8n : Hxfile() {
 
 class KotakAnimeid : Hxfile() {
     override val name = "KotakAnimeid"
-    override val mainUrl = "https://kotakanimeid.com"
+    override val mainUrl = "https://nontonanimeid.bio"
     override val requiresReferer = true
 }
 
@@ -97,4 +97,4 @@ open class Hxfile : ExtractorApi() {
         @JsonProperty("label") val label: String?
     )
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt
index aaa33ca1..51939cc2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 
 class MoviehabNet : Moviehab() {
-    override var mainUrl = "https://play.moviehab.net"
+    override var mainUrl = "https://play.moviehab.asia"
 }
 
 open class Moviehab : ExtractorApi() {
@@ -41,4 +41,4 @@ open class Moviehab : ExtractorApi() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Mp4Upload.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Mp4Upload.kt
index 93a280ed..e746b286 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Mp4Upload.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Mp4Upload.kt
@@ -10,24 +10,39 @@ open class Mp4Upload : ExtractorApi() {
     override var name = "Mp4Upload"
     override var mainUrl = "https://www.mp4upload.com"
     private val srcRegex = Regex("""player\.src\("(.*?)"""")
-    override val requiresReferer = true
+    private val srcRegex2 = Regex("""player\.src\([\w\W]*src: "(.*?)"""")
 
+    override val requiresReferer = true
+    private val idMatch = Regex("""mp4upload\.com/(embed-|)([A-Za-z0-9]*)""")
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        with(app.get(url)) {
-            getAndUnpack(this.text).let { unpackedText ->
-                val quality = unpackedText.lowercase().substringAfter(" height=").substringBefore(" ").toIntOrNull()
-                srcRegex.find(unpackedText)?.groupValues?.get(1)?.let { link ->
-                    return listOf(
-                        ExtractorLink(
-                            name,
-                            name,
-                            link,
-                            url,
-                            quality ?: Qualities.Unknown.value,
-                        )
-                    )
-                }
-            }
+        val realUrl = idMatch.find(url)?.groupValues?.get(2)?.let { id ->
+            "$mainUrl/embed-$id.html"
+        } ?: url
+        val response = app.get(realUrl)
+        val unpackedText = getAndUnpack(response.text)
+        val quality =
+            unpackedText.lowercase().substringAfter(" height=").substringBefore(" ").toIntOrNull()
+        srcRegex.find(unpackedText)?.groupValues?.get(1)?.let { link ->
+            return listOf(
+                ExtractorLink(
+                    name,
+                    name,
+                    link,
+                    url,
+                    quality ?: Qualities.Unknown.value,
+                )
+            )
+        }
+        srcRegex2.find(unpackedText)?.groupValues?.get(1)?.let { link ->
+            return listOf(
+                ExtractorLink(
+                    name,
+                    name,
+                    link,
+                    url,
+                    quality ?: Qualities.Unknown.value,
+                )
+            )
         }
         return null
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt
index 44657196..c7f4ac76 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt
@@ -9,7 +9,7 @@ import java.net.URI
 
 open class MultiQuality : ExtractorApi() {
     override var name = "MultiQuality"
-    override var mainUrl = "https://gogo-play.net"
+    override var mainUrl = "https://anihdplay.com"
     private val sourceRegex = Regex("""file:\s*['"](.*?)['"],label:\s*['"](.*?)['"]""")
     private val m3u8Regex = Regex(""".*?(\d*).m3u8""")
     private val urlRegex = Regex("""(.*?)([^/]+$)""")
@@ -56,4 +56,4 @@ open class MultiQuality : ExtractorApi() {
             return extractedLinksList
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt
index 45ec4c2f..4163cd94 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt
@@ -5,6 +5,7 @@ import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.extractorApis
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.loadExtractor
@@ -66,7 +67,7 @@ open class Pelisplus(val mainUrl: String) {
                                 href,
                                 page.url,
                                 getQualityFromName(qual),
-                                element.attr("href").contains(".m3u8")
+                                type = INFER_TYPE
                             )
                         )
                     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Pixeldrain.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pixeldrain.kt
new file mode 100644
index 00000000..9b481240
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pixeldrain.kt
@@ -0,0 +1,30 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+
+open class Pixeldrain : ExtractorApi() {
+    override val name = "Pixeldrain"
+    override val mainUrl = "https://pixeldrain.com"
+    override val requiresReferer = false
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val mId = Regex("/([ul]/[\\da-zA-Z\\-]+)").find(url)?.groupValues?.get(1)?.split("/")
+        callback.invoke(
+            ExtractorLink(
+                this.name,
+                this.name,
+                "$mainUrl/api/file/${mId?.last() ?: return}?download",
+                url,
+                Qualities.Unknown.value,
+            )
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
new file mode 100644
index 00000000..0154b4e8
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
@@ -0,0 +1,170 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.base64DecodeArray
+import com.lagradost.cloudstream3.utils.AppUtils
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper
+import java.nio.charset.StandardCharsets
+import java.security.MessageDigest
+import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+// No License found in https://github.com/enimax-anime/key
+// special credits to @enimax for providing key
+class Megacloud : Rabbitstream() {
+    override val name = "Megacloud"
+    override val mainUrl = "https://megacloud.tv"
+    override val embed = "embed-2/ajax/e-1"
+    override val key = "https://raw.githubusercontent.com/enimax-anime/key/e6/key.txt"
+}
+
+class Dokicloud : Rabbitstream() {
+    override val name = "Dokicloud"
+    override val mainUrl = "https://dokicloud.one"
+}
+
+open class Rabbitstream : ExtractorApi() {
+    override val name = "Rabbitstream"
+    override val mainUrl = "https://rabbitstream.net"
+    override val requiresReferer = false
+    open val embed = "ajax/embed-4"
+    open val key = "https://raw.githubusercontent.com/enimax-anime/key/e4/key.txt"
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val id = url.substringAfterLast("/").substringBefore("?")
+
+        val response = app.get(
+            "$mainUrl/$embed/getSources?id=$id",
+            referer = mainUrl,
+            headers = mapOf("X-Requested-With" to "XMLHttpRequest")
+        )
+
+        val encryptedMap = response.parsedSafe<SourcesEncrypted>()
+        val sources = encryptedMap?.sources
+        val decryptedSources = if (sources == null || encryptedMap.encrypted == false) {
+            response.parsedSafe()
+        } else {
+            val (key, encData) = extractRealKey(sources, getRawKey())
+            val decrypted = decryptMapped<List<Sources>>(encData, key)
+            SourcesResponses(
+                sources = decrypted,
+                tracks = encryptedMap.tracks
+            )
+        }
+
+        decryptedSources?.sources?.map { source ->
+            M3u8Helper.generateM3u8(
+                name,
+                source?.file ?: return@map,
+                "$mainUrl/",
+            ).forEach(callback)
+        }
+
+        decryptedSources?.tracks?.map { track ->
+            subtitleCallback.invoke(
+                SubtitleFile(
+                    track?.label ?: "",
+                    track?.file ?: return@map
+                )
+            )
+        }
+
+
+    }
+
+    private suspend fun getRawKey(): String = app.get(key).text
+
+    private fun extractRealKey(originalString: String?, stops: String): Pair<String, String> {
+        val table = parseJson<List<List<Int>>>(stops)
+        val decryptedKey = StringBuilder()
+        var offset = 0
+        var encryptedString = originalString
+
+        table.forEach { (start, end) ->
+            decryptedKey.append(encryptedString?.substring(start - offset, end - offset))
+            encryptedString = encryptedString?.substring(
+                0,
+                start - offset
+            ) + encryptedString?.substring(end - offset)
+            offset += end - start
+        }
+        return decryptedKey.toString() to encryptedString.toString()
+    }
+
+    private inline fun <reified T> decryptMapped(input: String, key: String): T? {
+        val decrypt = decrypt(input, key)
+        return AppUtils.tryParseJson(decrypt)
+    }
+
+    private fun decrypt(input: String, key: String): String {
+        return decryptSourceUrl(
+            generateKey(
+                base64DecodeArray(input).copyOfRange(8, 16),
+                key.toByteArray()
+            ), input
+        )
+    }
+
+    private fun generateKey(salt: ByteArray, secret: ByteArray): ByteArray {
+        var key = md5(secret + salt)
+        var currentKey = key
+        while (currentKey.size < 48) {
+            key = md5(key + secret + salt)
+            currentKey += key
+        }
+        return currentKey
+    }
+
+    private fun md5(input: ByteArray): ByteArray {
+        return MessageDigest.getInstance("MD5").digest(input)
+    }
+
+    private fun decryptSourceUrl(decryptionKey: ByteArray, sourceUrl: String): String {
+        val cipherData = base64DecodeArray(sourceUrl)
+        val encrypted = cipherData.copyOfRange(16, cipherData.size)
+        val aesCBC = Cipher.getInstance("AES/CBC/PKCS5Padding")
+        aesCBC.init(
+            Cipher.DECRYPT_MODE,
+            SecretKeySpec(decryptionKey.copyOfRange(0, 32), "AES"),
+            IvParameterSpec(decryptionKey.copyOfRange(32, decryptionKey.size))
+        )
+        val decryptedData = aesCBC?.doFinal(encrypted) ?: throw ErrorLoadingException("Cipher not found")
+        return String(decryptedData, StandardCharsets.UTF_8)
+    }
+
+    data class Tracks(
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("kind") val kind: String? = null,
+    )
+
+    data class Sources(
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("label") val label: String? = null,
+    )
+
+    data class SourcesResponses(
+        @JsonProperty("sources") val sources: List<Sources?>? = emptyList(),
+        @JsonProperty("tracks") val tracks: List<Tracks?>? = emptyList(),
+    )
+
+    data class SourcesEncrypted(
+        @JsonProperty("sources") val sources: String? = null,
+        @JsonProperty("encrypted") val encrypted: Boolean? = null,
+        @JsonProperty("tracks") val tracks: List<Tracks?>? = emptyList(),
+    )
+
+}
\ 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/SpeedoStream.kt
index 8ef6c463..213ecdf3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt
@@ -7,15 +7,22 @@ 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"
+}
+
 class SpeedoStream1 : SpeedoStream() {
-    override val mainUrl = "https://speedostream.nl"
+    override val mainUrl = "https://speedostream.pm"
 }
 
 open class SpeedoStream : ExtractorApi() {
     override val name = "SpeedoStream"
-    override val mainUrl = "https://speedostream.com"
+    override val mainUrl = "https://speedostream.bond"
     override val requiresReferer = true
 
+    // .bond, .pm, .mom redirect to .bond
+    private val hostUrl = "https://speedostream.bond"
+
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
         val sources = mutableListOf<ExtractorLink>()
         app.get(url, referer = referer).document.select("script").map { script ->
@@ -26,7 +33,7 @@ open class SpeedoStream : ExtractorApi() {
                     M3u8Helper.generateM3u8(
                         name,
                         it.file,
-                        "$mainUrl/",
+                        "$hostUrl/",
                     ).forEach { m3uData -> sources.add(m3uData) }
                 }
             }
@@ -37,6 +44,4 @@ open class SpeedoStream : ExtractorApi() {
     private data class File(
         @JsonProperty("file") val file: String,
     )
-
-
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
index 3d2a81b7..df050cf3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt
@@ -8,6 +8,31 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 import kotlin.random.Random
 
+class Sblona : StreamSB() {
+    override var name = "Sblona"
+    override var mainUrl = "https://sblona.com"
+}
+
+class Lvturbo : StreamSB() {
+    override var name = "Lvturbo"
+    override var mainUrl = "https://lvturbo.com"
+}
+
+class Sbrapid : StreamSB() {
+    override var name = "Sbrapid"
+    override var mainUrl = "https://sbrapid.com"
+}
+
+class Sbface : StreamSB() {
+    override var name = "Sbface"
+    override var mainUrl = "https://sbface.com"
+}
+
+class Sbsonic : StreamSB() {
+    override var name = "Sbsonic"
+    override var mainUrl = "https://sbsonic.com"
+}
+
 class Vidgomunimesb : StreamSB() {
     override var mainUrl = "https://vidgomunimesb.xyz"
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamoUpload.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamoUpload.kt
new file mode 100644
index 00000000..7fafe05b
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamoUpload.kt
@@ -0,0 +1,42 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.getAndUnpack
+import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.M3u8Helper
+
+open class StreamoUpload : ExtractorApi() {
+    override val name = "StreamoUpload"
+    override val mainUrl = "https://streamoupload.xyz"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
+        val sources = mutableListOf<ExtractorLink>()
+        val response = app.get(url, referer = referer)
+        val scriptElements = response.document.select("script").map { script ->
+            if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
+                val data = getAndUnpack(script.data())
+                    .substringAfter("sources:[")
+                    .substringBefore("],")
+                    .replace("file", "\"file\"")
+                    .trim()
+                tryParseJson<File>(data)?.let {
+                    M3u8Helper.generateM3u8(
+                        name,
+                        it.file,
+                        "$mainUrl/",
+                    ).forEach { m3uData -> sources.add(m3uData) }
+                }
+            }
+        }
+        return sources
+    }
+
+    private data class File(
+        @JsonProperty("file") val file: String,
+    )
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Userscloud.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Userscloud.kt
new file mode 100644
index 00000000..e8bd6c57
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Userscloud.kt
@@ -0,0 +1,45 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+
+open class Userscloud : ExtractorApi() {
+    override val name = "Userscloud"
+    override val mainUrl = "https://userscloud.com"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val res = app.get(url).document
+        val video = res.selectFirst("video#vjsplayer source")?.attr("src")
+        val quality = res.selectFirst("div.innerTB h2 b")?.text()
+        callback.invoke(
+            ExtractorLink(
+                this.name,
+                this.name,
+                video ?: return,
+                "$mainUrl/",
+                getQuality(quality),
+                headers = mapOf(
+                    "Accept" to "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5",
+                    "Range" to "bytes=0-",
+                    "Sec-Fetch-Dest" to "video",
+                    "Sec-Fetch-Mode" to "no-cors",
+                )
+            )
+        )
+    }
+
+    private fun getQuality(str: String?): Int {
+        return Regex("(\\d{3,4})[pP]").find(str ?: "")?.groupValues?.getOrNull(1)?.toIntOrNull()
+            ?: Qualities.Unknown.value
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidstream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidstream.kt
index 7eb7fbac..c6493dbe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidstream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidstream.kt
@@ -5,6 +5,7 @@ import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.argamap
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.extractorApis
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.loadExtractor
@@ -70,7 +71,7 @@ class Vidstream(val mainUrl: String) {
                                 href,
                                 page.url,
                                 getQualityFromName(qual),
-                                element.attr("href").contains(".m3u8")
+                                type = INFER_TYPE
                             )
                         )
                     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt
index 6cc486cd..659d7804 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt
@@ -7,6 +7,7 @@ import com.lagradost.cloudstream3.extractors.helper.NineAnimeHelper.encrypt
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.Qualities
 
 class Vidstreamz : WcoStream() {
@@ -126,8 +127,7 @@ open class WcoStream : ExtractorApi() {
 
         if (!response.text.startsWith("{")) throw ErrorLoadingException("Seems like 9Anime kiddies changed stuff again, Go touch some grass for bout an hour Or use a different Server")
         return response.parsed<Response>().data.media.sources.map {
-            ExtractorLink(name, it.file,it.file,host,Qualities.Unknown.value,it.file.contains(".m3u8"))
+            ExtractorLink(name, it.file, it.file, host, Qualities.Unknown.value, type = INFER_TYPE)
         }
-
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Wibufile.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Wibufile.kt
new file mode 100644
index 00000000..c69f0938
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Wibufile.kt
@@ -0,0 +1,35 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.INFER_TYPE
+import com.lagradost.cloudstream3.utils.Qualities
+
+open class Wibufile : ExtractorApi() {
+    override val name: String = "Wibufile"
+    override val mainUrl: String = "https://wibufile.com"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val res = app.get(url).text
+        val video = Regex("src: ['\"](.*?)['\"]").find(res)?.groupValues?.get(1)
+
+        callback.invoke(
+            ExtractorLink(
+                name,
+                name,
+                video ?: return,
+                "$mainUrl/",
+                Qualities.Unknown.value,
+                type = INFER_TYPE
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/AesHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/AesHelper.kt
new file mode 100644
index 00000000..b41eae52
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/AesHelper.kt
@@ -0,0 +1,95 @@
+package com.lagradost.cloudstream3.extractors.helper
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.base64DecodeArray
+import com.lagradost.cloudstream3.base64Encode
+import com.lagradost.cloudstream3.utils.AppUtils
+import java.security.DigestException
+import java.security.MessageDigest
+import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+object AesHelper {
+
+    private const val HASH = "AES/CBC/PKCS5PADDING"
+    private const val KDF = "MD5"
+
+    fun cryptoAESHandler(
+        data: String,
+        pass: ByteArray,
+        encrypt: Boolean = true,
+        padding: String = HASH,
+    ): String? {
+        val parse = AppUtils.tryParseJson<AesData>(data) ?: return null
+        val (key, iv) = generateKeyAndIv(pass, parse.s.hexToByteArray()) ?: return null
+        val cipher = Cipher.getInstance(padding)
+        return if (!encrypt) {
+            cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(key, "AES"), IvParameterSpec(iv))
+            String(cipher.doFinal(base64DecodeArray(parse.ct)))
+        } else {
+            cipher.init(Cipher.ENCRYPT_MODE, SecretKeySpec(key, "AES"), IvParameterSpec(iv))
+            base64Encode(cipher.doFinal(parse.ct.toByteArray()))
+        }
+    }
+
+    // https://stackoverflow.com/a/41434590/8166854
+    fun generateKeyAndIv(
+        password: ByteArray,
+        salt: ByteArray,
+        hashAlgorithm: String = KDF,
+        keyLength: Int = 32,
+        ivLength: Int = 16,
+        iterations: Int = 1
+    ): Pair<ByteArray,ByteArray>? {
+
+        val md = MessageDigest.getInstance(hashAlgorithm)
+        val digestLength = md.digestLength
+        val targetKeySize = keyLength + ivLength
+        val requiredLength = (targetKeySize + digestLength - 1) / digestLength * digestLength
+        val generatedData = ByteArray(requiredLength)
+        var generatedLength = 0
+
+        try {
+            md.reset()
+
+            while (generatedLength < targetKeySize) {
+                if (generatedLength > 0)
+                    md.update(
+                        generatedData,
+                        generatedLength - digestLength,
+                        digestLength
+                    )
+
+                md.update(password)
+                md.update(salt, 0, 8)
+                md.digest(generatedData, generatedLength, digestLength)
+
+                for (i in 1 until iterations) {
+                    md.update(generatedData, generatedLength, digestLength)
+                    md.digest(generatedData, generatedLength, digestLength)
+                }
+
+                generatedLength += digestLength
+            }
+            return generatedData.copyOfRange(0, keyLength) to generatedData.copyOfRange(keyLength, targetKeySize)
+        } catch (e: DigestException) {
+            return null
+        }
+    }
+
+    fun String.hexToByteArray(): ByteArray {
+        check(length % 2 == 0) { "Must have an even length" }
+        return chunked(2)
+            .map { it.toInt(16).toByte() }
+            .toByteArray()
+    }
+
+    private data class AesData(
+        @JsonProperty("ct") val ct: String,
+        @JsonProperty("iv") val iv: String,
+        @JsonProperty("s") val s: String
+    )
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
index 07aa904e..5bbb4538 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
@@ -21,10 +21,11 @@ class CrossTmdbProvider : TmdbProvider() {
         return Regex("""[^a-zA-Z0-9-]""").replace(name, "")
     }
 
-    private val validApis by lazy {
-        apis.filter { it.lang == this.lang && it::class.java != this::class.java }
-            //.distinctBy { it.uniqueId }
-    }
+    private val validApis
+        get() =
+            synchronized(apis) { apis.filter { it.lang == this.lang && it::class.java != this::class.java } }
+    //.distinctBy { it.uniqueId }
+
 
     data class CrossMetaData(
         @JsonProperty("isSuccess") val isSuccess: Boolean,
@@ -60,7 +61,8 @@ class CrossTmdbProvider : TmdbProvider() {
 
     override suspend fun load(url: String): LoadResponse? {
         val base = super.load(url)?.apply {
-            this.recommendations = this.recommendations?.filterIsInstance<MovieSearchResponse>() // TODO REMOVE
+            this.recommendations =
+                this.recommendations?.filterIsInstance<MovieSearchResponse>() // TODO REMOVE
             val matchName = filterName(this.name)
             when (this) {
                 is MovieLoadResponse -> {
@@ -98,6 +100,7 @@ class CrossTmdbProvider : TmdbProvider() {
                     this.dataUrl =
                         CrossMetaData(true, data.map { it.apiName to it.dataUrl }).toJson()
                 }
+
                 else -> {
                     throw ErrorLoadingException("Nothing besides movies are implemented for this provider")
                 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt
index e8ac1876..8cfe1e9a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt
@@ -25,13 +25,16 @@ class MultiAnimeProvider : MainAPI() {
         }
     }
 
-    private val validApis by lazy {
-        APIHolder.apis.filter {
-            it.lang == this.lang && it::class.java != this::class.java && it.supportedTypes.contains(
-                TvType.Anime
-            )
-        }
-    }
+    private val validApis
+        get() =
+            synchronized(APIHolder.apis) {
+                APIHolder.apis.filter {
+                    it.lang == this.lang && it::class.java != this::class.java && it.supportedTypes.contains(
+                        TvType.Anime
+                    )
+                }
+            }
+
 
     private fun filterName(name: String): String {
         return Regex("""[^a-zA-Z0-9-]""").replace(name, "")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt b/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
index bb15bc85..eb575775 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
@@ -57,32 +57,6 @@ fun <T> LifecycleOwner.observeNullable(liveData: LiveData<T>, action: (t: T) ->
     liveData.observe(this) { action(it) }
 }
 
-inline fun <reified T : Any> some(value: T?): Some<T> {
-    return if (value == null) {
-        Some.None
-    } else {
-        Some.Success(value)
-    }
-}
-
-sealed class Some<out T> {
-    data class Success<out T>(val value: T) : Some<T>()
-    object None : Some<Nothing>()
-
-    override fun toString(): String {
-        return when (this) {
-            is None -> "None"
-            is Success -> "Some(${value.toString()})"
-        }
-    }
-}
-
-sealed class ResourceSome<out T> {
-    data class Success<out T>(val value: T) : ResourceSome<T>()
-    object None : ResourceSome<Nothing>()
-    data class Loading(val data: Any? = null) : ResourceSome<Nothing>()
-}
-
 sealed class Resource<out T> {
     data class Success<out T>(val value: T) : Resource<T>()
     data class Failure(
@@ -155,6 +129,70 @@ fun CoroutineScope.launchSafe(
     return this.launch(context, start, obj)
 }
 
+fun<T> throwAbleToResource(
+    throwable: Throwable
+): Resource<T> {
+    return when (throwable) {
+        is NullPointerException -> {
+            for (line in throwable.stackTrace) {
+                if (line?.fileName?.endsWith("provider.kt", ignoreCase = true) == true) {
+                    return Resource.Failure(
+                        false,
+                        null,
+                        null,
+                        "NullPointerException at ${line.fileName} ${line.lineNumber}\nSite might have updated or added Cloudflare/DDOS protection"
+                    )
+                }
+            }
+            safeFail(throwable)
+        }
+        is SocketTimeoutException, is InterruptedIOException -> {
+            Resource.Failure(
+                true,
+                null,
+                null,
+                "Connection Timeout\nPlease try again later."
+            )
+        }
+        is HttpException -> {
+            Resource.Failure(
+                false,
+                throwable.statusCode,
+                null,
+                throwable.message ?: "HttpException"
+            )
+        }
+        is UnknownHostException -> {
+            Resource.Failure(true, null, null, "Cannot connect to server, try again later.\n${throwable.message}")
+        }
+        is ErrorLoadingException -> {
+            Resource.Failure(
+                true,
+                null,
+                null,
+                throwable.message ?: "Error loading, try again later."
+            )
+        }
+        is NotImplementedError -> {
+            Resource.Failure(false, null, null, "This operation is not implemented.")
+        }
+        is SSLHandshakeException -> {
+            Resource.Failure(
+                true,
+                null,
+                null,
+                (throwable.message ?: "SSLHandshakeException") + "\nTry a VPN or DNS."
+            )
+        }
+        is CancellationException -> {
+            throwable.cause?.let {
+                throwAbleToResource(it)
+            } ?: safeFail(throwable)
+        }
+        else -> safeFail(throwable)
+    }
+}
+
 suspend fun <T> safeApiCall(
     apiCall: suspend () -> T,
 ): Resource<T> {
@@ -163,60 +201,7 @@ suspend fun <T> safeApiCall(
             Resource.Success(apiCall.invoke())
         } catch (throwable: Throwable) {
             logError(throwable)
-            when (throwable) {
-                is NullPointerException -> {
-                    for (line in throwable.stackTrace) {
-                        if (line?.fileName?.endsWith("provider.kt", ignoreCase = true) == true) {
-                            return@withContext Resource.Failure(
-                                false,
-                                null,
-                                null,
-                                "NullPointerException at ${line.fileName} ${line.lineNumber}\nSite might have updated or added Cloudflare/DDOS protection"
-                            )
-                        }
-                    }
-                    safeFail(throwable)
-                }
-                is SocketTimeoutException, is InterruptedIOException -> {
-                    Resource.Failure(
-                        true,
-                        null,
-                        null,
-                        "Connection Timeout\nPlease try again later."
-                    )
-                }
-                is HttpException -> {
-                    Resource.Failure(
-                        false,
-                        throwable.statusCode,
-                        null,
-                        throwable.message ?: "HttpException"
-                    )
-                }
-                is UnknownHostException -> {
-                    Resource.Failure(true, null, null, "Cannot connect to server, try again later.")
-                }
-                is ErrorLoadingException -> {
-                    Resource.Failure(
-                        true,
-                        null,
-                        null,
-                        throwable.message ?: "Error loading, try again later."
-                    )
-                }
-                is NotImplementedError -> {
-                    Resource.Failure(false, null, null, "This operation is not implemented.")
-                }
-                is SSLHandshakeException -> {
-                    Resource.Failure(
-                        true,
-                        null,
-                        null,
-                        (throwable.message ?: "SSLHandshakeException") + "\nTry a VPN or DNS."
-                    )
-                }
-                else -> safeFail(throwable)
-            }
+            throwAbleToResource(throwable)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
index 242baf59..6b7dc90b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
@@ -36,7 +36,9 @@ abstract class Plugin {
         Log.i(PLUGIN_TAG, "Adding ${element.name} (${element.mainUrl}) MainAPI")
         element.sourcePlugin = this.__filename
         // Race condition causing which would case duplicates if not for distinctBy
-        APIHolder.allProviders.add(element)
+        synchronized(APIHolder.allProviders) {
+            APIHolder.allProviders.add(element)
+        }
         APIHolder.addPluginMapping(element)
     }
 
@@ -51,10 +53,14 @@ abstract class Plugin {
     }
 
     class Manifest {
-        @JsonProperty("name") var name: String? = null
-        @JsonProperty("pluginClassName") var pluginClassName: String? = null
-        @JsonProperty("version") var version: Int? = null
-        @JsonProperty("requiresResources") var requiresResources: Boolean = false
+        @JsonProperty("name")
+        var name: String? = null
+        @JsonProperty("pluginClassName")
+        var pluginClassName: String? = null
+        @JsonProperty("version")
+        var version: Int? = null
+        @JsonProperty("requiresResources")
+        var requiresResources: Boolean = false
     }
 
     /**
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 0dee57eb..5bb96ed1 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()
     }
@@ -163,7 +177,11 @@ object PluginManager {
     private val classLoaders: MutableMap<PathClassLoader, Plugin> =
         HashMap<PathClassLoader, Plugin>()
 
-    private var loadedLocalPlugins = false
+    var loadedLocalPlugins = false
+        private set
+
+    var loadedOnlinePlugins = false
+        private set
     private val gson = Gson()
 
     private suspend fun maybeLoadPlugin(context: Context, file: File) {
@@ -277,6 +295,7 @@ object PluginManager {
         }
 
         // ioSafe {
+        loadedOnlinePlugins = true
         afterPluginsLoadedEvent.invoke(false)
         // }
 
@@ -289,7 +308,7 @@ object PluginManager {
      * 2. Fetch all not downloaded plugins
      * 3. Download them and reload plugins
      **/
-    fun downloadNotExistingPluginsAndLoad(activity: Activity) {
+    fun downloadNotExistingPluginsAndLoad(activity: Activity, mode: AutoDownloadMode) {
         val newDownloadPlugins = mutableListOf<String>()
         val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
             ?: emptyArray()) + PREBUILT_REPOSITORIES
@@ -303,6 +322,8 @@ object PluginManager {
         // Iterate online repos and returns not downloaded plugins
         val notDownloadedPlugins = onlinePlugins.mapNotNull { onlineData ->
             val sitePlugin = onlineData.second
+            val tvtypes = sitePlugin.tvTypes ?: listOf()
+
             //Don't include empty urls
             if (sitePlugin.url.isBlank()) {
                 return@mapNotNull null
@@ -317,22 +338,29 @@ object PluginManager {
                 return@mapNotNull null
             }
 
-            //Omit lang not selected on language setting
-            val lang = sitePlugin.language ?: return@mapNotNull null
-            //If set to 'universal', don't skip any language
-            if (!providerLang.contains(AllLanguagesName) && !providerLang.contains(lang)) {
-                return@mapNotNull null
-            }
-            //Log.i(TAG, "sitePlugin lang => $lang")
-
-            //Omit NSFW, if disabled
-            sitePlugin.tvTypes?.let { tvtypes ->
-                if (!settingsForProvider.enableAdult) {
-                    if (tvtypes.contains(TvType.NSFW.name)) {
-                        return@mapNotNull null
-                    }
+            //Omit non-NSFW if mode is set to NSFW only
+            if (mode == AutoDownloadMode.NsfwOnly) {
+                if (tvtypes.contains(TvType.NSFW.name) == false) {
+                    return@mapNotNull null
                 }
             }
+            //Omit NSFW, if disabled
+            if (!settingsForProvider.enableAdult) {
+                if (tvtypes.contains(TvType.NSFW.name)) {
+                    return@mapNotNull null
+                }
+            }
+
+            //Omit lang not selected on language setting
+            if (mode == AutoDownloadMode.FilterByLang) {
+                val lang = sitePlugin.language ?: return@mapNotNull null
+                //If set to 'universal', don't skip any language
+                if (!providerLang.contains(AllLanguagesName) && !providerLang.contains(lang)) {
+                    return@mapNotNull null
+                }
+                //Log.i(TAG, "sitePlugin lang => $lang")
+            }
+
             val savedData = PluginData(
                 url = sitePlugin.url,
                 internalName = sitePlugin.internalName,
@@ -531,10 +559,14 @@ object PluginManager {
         }
 
         // remove all registered apis
-        APIHolder.apis.filter { api -> api.sourcePlugin == plugin.__filename }.forEach {
-            removePluginMapping(it)
+        synchronized(APIHolder.apis) {
+            APIHolder.apis.filter { api -> api.sourcePlugin == plugin.__filename }.forEach {
+                removePluginMapping(it)
+            }
+        }
+        synchronized(APIHolder.allProviders) {
+            APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.__filename }
         }
-        APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.__filename }
         extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.__filename }
 
         classLoaders.values.removeIf { v -> v == plugin }
@@ -692,4 +724,4 @@ object PluginManager {
             return null
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt
index f099ad1a..a45ab5f0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt
@@ -8,22 +8,14 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.R
 import java.security.MessageDigest
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 
 object VotingApi { // please do not cheat the votes lol
     private const val LOGKEY = "VotingApi"
 
-    enum class VoteType(val value: Int) {
-        UPVOTE(1),
-        DOWNVOTE(-1),
-        NONE(0)
-    }
-
-    private val apiDomain = "https://api.countapi.xyz"
+    private const val apiDomain = "https://counterapi.com/api"
 
     private fun transformUrl(url: String): String = // dont touch or all votes get reset
         MessageDigest
@@ -35,12 +27,12 @@ object VotingApi { // please do not cheat the votes lol
         return getVotes(url)
     }
 
-    suspend fun SitePlugin.vote(requestType: VoteType): Int {
-        return vote(url, requestType)
+    fun SitePlugin.hasVoted(): Boolean {
+        return hasVoted(url)
     }
 
-    fun SitePlugin.getVoteType(): VoteType {
-        return getVoteType(url)
+    suspend fun SitePlugin.vote(): Int {
+        return vote(url)
     }
 
     fun SitePlugin.canVote(): Boolean {
@@ -50,28 +42,31 @@ object VotingApi { // please do not cheat the votes lol
     // Plugin url to Int
     private val votesCache = mutableMapOf<String, Int>()
 
-    suspend fun getVotes(pluginUrl: String): Int {
-        val url = "${apiDomain}/get/cs3-votes/${transformUrl(pluginUrl)}"
+    private fun getRepository(pluginUrl: String) = pluginUrl
+        .split("/")
+        .drop(2)
+        .take(3)
+        .joinToString("-")
+
+    private suspend fun readVote(pluginUrl: String): Int {
+        var url = "${apiDomain}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}?readOnly=true"
         Log.d(LOGKEY, "Requesting: $url")
-        return votesCache[pluginUrl] ?: app.get(url).parsedSafe<Result>()?.value?.also {
-            votesCache[pluginUrl] = it
-        } ?: (0.also {
-            ioSafe {
-                createBucket(pluginUrl)
+        return app.get(url).parsedSafe<Result>()?.value ?: 0
+    }
+
+    private suspend fun writeVote(pluginUrl: String): Boolean {
+        var url = "${apiDomain}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}"
+        Log.d(LOGKEY, "Requesting: $url")
+        return app.get(url).parsedSafe<Result>()?.value != null
+    }
+
+    suspend fun getVotes(pluginUrl: String): Int =
+            votesCache[pluginUrl] ?: readVote(pluginUrl).also {
+                votesCache[pluginUrl] = it
             }
-        })
-    }
 
-    fun getVoteType(pluginUrl: String): VoteType {
-        return getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: VoteType.NONE
-    }
-
-    private suspend fun createBucket(pluginUrl: String) {
-        val url =
-            "${apiDomain}/create?namespace=cs3-votes&key=${transformUrl(pluginUrl)}&value=0&update_lowerbound=-2&update_upperbound=2&enable_reset=0"
-        Log.d(LOGKEY, "Requesting: $url")
-        app.get(url)
-    }
+    fun hasVoted(pluginUrl: String) =
+        getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: false
 
     fun canVote(pluginUrl: String): Boolean {
         if (!PluginManager.urlPlugins.contains(pluginUrl)) return false
@@ -79,7 +74,7 @@ object VotingApi { // please do not cheat the votes lol
     }
 
     private val voteLock = Mutex()
-    suspend fun vote(pluginUrl: String, requestType: VoteType): Int {
+    suspend fun vote(pluginUrl: String): Int {
         // Prevent multiple requests at the same time.
         voteLock.withLock {
             if (!canVote(pluginUrl)) {
@@ -90,33 +85,21 @@ object VotingApi { // please do not cheat the votes lol
                 return getVotes(pluginUrl)
             }
 
-            val savedType: VoteType =
-                getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: VoteType.NONE
-
-            val newType = if (requestType == savedType) VoteType.NONE else requestType
-            val changeValue = if (requestType == savedType) {
-                -requestType.value
-            } else if (savedType == VoteType.NONE) {
-                requestType.value
-            } else if (savedType != requestType) {
-                -savedType.value + requestType.value
-            } else 0
-
-            // Pre-emptively set vote key
-            setKey("cs3-votes/${transformUrl(pluginUrl)}", newType)
-
-            val url =
-                "${apiDomain}/update/cs3-votes/${transformUrl(pluginUrl)}?amount=${changeValue}"
-            Log.d(LOGKEY, "Requesting: $url")
-            val res = app.get(url).parsedSafe<Result>()?.value
-
-            if (res == null) {
-                // "Refund" key if the response is invalid
-                setKey("cs3-votes/${transformUrl(pluginUrl)}", savedType)
-            } else {
-                votesCache[pluginUrl] = res
+            if (hasVoted(pluginUrl)) {
+                main {
+                    Toast.makeText(context, R.string.already_voted, Toast.LENGTH_SHORT)
+                        .show()
+                }
+                return getVotes(pluginUrl)
             }
-            return res ?: 0
+
+
+            if (writeVote(pluginUrl)) {
+                setKey("cs3-votes/${transformUrl(pluginUrl)}", true)
+                votesCache[pluginUrl] = votesCache[pluginUrl]?.plus(1) ?: 1
+            }
+
+            return getVotes(pluginUrl)
         }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
index 3dd1b96c..54128112 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
@@ -12,6 +12,7 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
         val malApi = MALApi(0)
         val aniListApi = AniListApi(0)
         val openSubtitlesApi = OpenSubtitlesApi(0)
+        val simklApi = SimklApi(0)
         val googleDriveApi = GoogleDriveApi(0)
         val indexSubtitlesApi = IndexSubtitleApi()
         val addic7ed = Addic7ed()
@@ -20,19 +21,19 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
         // used to login via app intent
         val OAuth2Apis
             get() = listOf<OAuth2API>(
-                malApi, aniListApi, googleDriveApi
+                malApi, aniListApi, simklApi, googleDriveApi
             )
 
         // this needs init with context and can be accessed in settings
         val accountManagers
             get() = listOf(
-                malApi, aniListApi, openSubtitlesApi, googleDriveApi //, nginxApi
+                malApi, aniListApi, openSubtitlesApi, simklApi, googleDriveApi //, nginxApi
             )
 
         // used for active syncing
         val SyncApis
             get() = listOf(
-                SyncRepo(malApi), SyncRepo(aniListApi), SyncRepo(localListApi)
+                SyncRepo(malApi), SyncRepo(aniListApi), SyncRepo(localListApi), SyncRepo(simklApi)
             )
 
         // used for active backup
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
index 8c76c5bf..ed496326 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
@@ -10,7 +10,8 @@ enum class SyncIdName {
     MyAnimeList,
     Trakt,
     Imdb,
-    LocalList
+    Simkl,
+    LocalList,
 }
 
 interface SyncAPI : OAuth2API {
@@ -35,9 +36,9 @@ interface SyncAPI : OAuth2API {
     4 -> PlanToWatch
     5 -> ReWatching
      */
-    suspend fun score(id: String, status: SyncStatus): Boolean
+    suspend fun score(id: String, status: AbstractSyncStatus): Boolean
 
-    suspend fun getStatus(id: String): SyncStatus?
+    suspend fun getStatus(id: String): AbstractSyncStatus?
 
     suspend fun getResult(id: String): SyncResult?
 
@@ -59,14 +60,24 @@ interface SyncAPI : OAuth2API {
         override var id: Int? = null,
     ) : SearchResponse
 
-    data class SyncStatus(
-        val status: Int,
+    abstract class AbstractSyncStatus {
+        abstract var status: Int
+
         /** 1-10 */
-        val score: Int?,
-        val watchedEpisodes: Int?,
-        var isFavorite: Boolean? = null,
-        var maxEpisodes: Int? = null,
-    )
+        abstract var score: Int?
+        abstract var watchedEpisodes: Int?
+        abstract var isFavorite: Boolean?
+        abstract var maxEpisodes: Int?
+    }
+
+    data class SyncStatus(
+        override var status: Int,
+        /** 1-10 */
+        override var score: Int?,
+        override var watchedEpisodes: Int?,
+        override var isFavorite: Boolean? = null,
+        override var maxEpisodes: Int? = null,
+    ) : AbstractSyncStatus()
 
     data class SyncResult(
         /**Used to verify*/
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncRepo.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncRepo.kt
index 85b877e0..9363cb6f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncRepo.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncRepo.kt
@@ -18,11 +18,11 @@ class SyncRepo(private val repo: SyncAPI) {
             repo.requireLibraryRefresh = value
         }
 
-    suspend fun score(id: String, status: SyncAPI.SyncStatus): Resource<Boolean> {
+    suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Resource<Boolean> {
         return safeApiCall { repo.score(id, status) }
     }
 
-    suspend fun getStatus(id: String): Resource<SyncAPI.SyncStatus> {
+    suspend fun getStatus(id: String): Resource<SyncAPI.AbstractSyncStatus> {
         return safeApiCall { repo.getStatus(id) ?: throw ErrorLoadingException("No data") }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
index 0010ce25..d0c88901 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
@@ -158,7 +158,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         )
     }
 
-    override suspend fun getStatus(id: String): SyncAPI.SyncStatus? {
+    override suspend fun getStatus(id: String): SyncAPI.AbstractSyncStatus? {
         val internalId = id.toIntOrNull() ?: return null
         val data = getDataAboutId(internalId) ?: return null
 
@@ -171,7 +171,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         )
     }
 
-    override suspend fun score(id: String, status: SyncAPI.SyncStatus): Boolean {
+    override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
         return postDataAboutId(
             id.toIntOrNull() ?: return false,
             fromIntToAnimeStatus(status.status),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt
index 7dd43fe7..e6ca9711 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt
@@ -45,11 +45,11 @@ class LocalList : SyncAPI {
 
     override val mainUrl = ""
     override val syncIdName = SyncIdName.LocalList
-    override suspend fun score(id: String, status: SyncAPI.SyncStatus): Boolean {
+    override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
         return true
     }
 
-    override suspend fun getStatus(id: String): SyncAPI.SyncStatus? {
+    override suspend fun getStatus(id: String): SyncAPI.AbstractSyncStatus? {
         return null
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt
index 5164b606..02826401 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt
@@ -91,7 +91,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         return Regex("""/anime/((.*)/|(.*))""").find(url)!!.groupValues.first()
     }
 
-    override suspend fun score(id: String, status: SyncAPI.SyncStatus): Boolean {
+    override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
         return setScoreRequest(
             id.toIntOrNull() ?: return false,
             fromIntToAnimeStatus(status.status),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
index 3e372c2d..4030649d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
@@ -2,12 +2,13 @@ package com.lagradost.cloudstream3.syncproviders.providers
 
 import android.util.Log
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.google.common.collect.BiMap
-import com.google.common.collect.HashBiMap
-import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.subtitles.AbstractSubApi
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
@@ -15,8 +16,8 @@ import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI
 import com.lagradost.cloudstream3.syncproviders.InAppAuthAPIManager
 import com.lagradost.cloudstream3.utils.AppUtils
-import java.net.URLEncoder
-import java.nio.charset.StandardCharsets
+import okhttp3.Interceptor
+import okhttp3.Response
 
 class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
     override val idPrefix = "opensubtitles"
@@ -36,6 +37,23 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         var currentSession: SubtitleOAuthEntity? = null
     }
 
+    private val headerInterceptor = OpenSubtitleInterceptor()
+
+    /** Automatically adds required api headers */
+    private class OpenSubtitleInterceptor : Interceptor {
+        /** Required user agent! */
+        private val userAgent = "Cloudstream3 v0.1"
+        override fun intercept(chain: Interceptor.Chain): Response {
+            return chain.proceed(
+                chain.request().newBuilder()
+                    .removeHeader("user-agent")
+                    .addHeader("user-agent", userAgent)
+                    .addHeader("Api-Key", apiKey)
+                    .build()
+            )
+        }
+    }
+
     private fun canDoRequest(): Boolean {
         return unixTimeMs > currentCoolDown
     }
@@ -98,13 +116,13 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         val response = app.post(
             url = "$host/login",
             headers = mapOf(
-                "Api-Key" to apiKey,
-                "Content-Type" to "application/json"
+                "Content-Type" to "application/json",
             ),
             data = mapOf(
                 "username" to username,
                 "password" to password
-            )
+            ),
+            interceptor = headerInterceptor
         )
         //Log.i(TAG, "Responsecode = ${response.code}")
         //Log.i(TAG, "Result => ${response.text}")
@@ -149,11 +167,13 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
 //        "pt" to "pt-PT",
 //        "pt" to "pt-BR"
     )
-    private fun fixLanguage(language: String?) : String? {
+
+    private fun fixLanguage(language: String?): String? {
         return languageExceptions[language] ?: language
     }
+
     // O(n) but good enough, BiMap did not want to work properly
-    private fun fixLanguageReverse(language: String?) : String? {
+    private fun fixLanguageReverse(language: String?): String? {
         return languageExceptions.entries.firstOrNull { it.value == language }?.key ?: language
     }
 
@@ -183,9 +203,9 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         val req = app.get(
             url = searchQueryUrl,
             headers = mapOf(
-                Pair("Api-Key", apiKey),
                 Pair("Content-Type", "application/json")
-            )
+            ),
+            interceptor = headerInterceptor
         )
         Log.i(TAG, "Search Req => ${req.text}")
         if (!req.isSuccessful) {
@@ -207,7 +227,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
                 //Use any valid name/title in hierarchy
                 val name = filename ?: featureDetails?.movieName ?: featureDetails?.title
                 ?: featureDetails?.parentTitle ?: attr.release ?: query.query
-                val lang = fixLanguageReverse(attr.language)?: ""
+                val lang = fixLanguageReverse(attr.language) ?: ""
                 val resEpNum = featureDetails?.episodeNumber ?: query.epNumber
                 val resSeasonNum = featureDetails?.seasonNumber ?: query.seasonNumber
                 val year = featureDetails?.year ?: query.year
@@ -251,13 +271,13 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
                     "Authorization",
                     "Bearer ${currentSession?.access_token ?: throw ErrorLoadingException("No access token active in current session")}"
                 ),
-                Pair("Api-Key", apiKey),
                 Pair("Content-Type", "application/json"),
                 Pair("Accept", "*/*")
             ),
             data = mapOf(
                 Pair("file_id", data.data)
-            )
+            ),
+            interceptor = headerInterceptor
         )
         Log.i(TAG, "Request result  => (${req.code}) ${req.text}")
         //Log.i(TAG, "Request headers => ${req.headers}")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
new file mode 100644
index 00000000..cd1df562
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
@@ -0,0 +1,1054 @@
+package com.lagradost.cloudstream3.syncproviders.providers
+
+import androidx.annotation.StringRes
+import androidx.core.net.toUri
+import androidx.fragment.app.FragmentActivity
+import com.fasterxml.jackson.annotation.JsonInclude
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.AcraApplication
+import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys
+import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
+import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.BuildConfig
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.mapper
+import com.lagradost.cloudstream3.mvvm.debugAssert
+import com.lagradost.cloudstream3.mvvm.debugPrint
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
+import com.lagradost.cloudstream3.syncproviders.AccountManager
+import com.lagradost.cloudstream3.syncproviders.AuthAPI
+import com.lagradost.cloudstream3.syncproviders.SyncAPI
+import com.lagradost.cloudstream3.syncproviders.SyncIdName
+import com.lagradost.cloudstream3.ui.library.ListSorting
+import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import okhttp3.Interceptor
+import okhttp3.Response
+import java.math.BigInteger
+import java.security.SecureRandom
+import java.text.SimpleDateFormat
+import java.time.Instant
+import java.util.Date
+import java.util.TimeZone
+import kotlin.time.Duration
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
+
+class SimklApi(index: Int) : AccountManager(index), SyncAPI {
+    override var name = "Simkl"
+    override val key = "simkl-key"
+    override val redirectUrl = "simkl"
+    override val idPrefix = "simkl"
+    override var requireLibraryRefresh = true
+    override var mainUrl = "https://api.simkl.com"
+    override val icon = R.drawable.simkl_logo
+    override val requiresLogin = false
+    override val createAccountUrl = "$mainUrl/signup"
+    override val syncIdName = SyncIdName.Simkl
+    private val token: String?
+        get() = getKey<String>(accountId, SIMKL_TOKEN_KEY).also {
+            debugAssert({ it == null }) { "No ${this.name} token!" }
+        }
+
+    /** Automatically adds simkl auth headers */
+    private val interceptor = HeaderInterceptor()
+
+    /**
+     * This is required to override the reported last activity as simkl activites
+     * may not always update based on testing.
+     */
+    private var lastScoreTime = -1L
+
+    private object SimklCache {
+        private const val SIMKL_CACHE_KEY = "SIMKL_API_CACHE"
+
+        enum class CacheTimes(val value: String) {
+            OneMonth("30d"),
+            ThirtyMinutes("30m")
+        }
+
+        private class SimklCacheWrapper<T>(
+            @JsonProperty("obj") val obj: T?,
+            @JsonProperty("validUntil") val validUntil: Long,
+            @JsonProperty("cacheTime") val cacheTime: Long = unixTime,
+        ) {
+            /** Returns true if cache is newer than cacheDays */
+            fun isFresh(): Boolean {
+                return validUntil > unixTime
+            }
+
+            fun remainingTime(): Duration {
+                val unixTime = unixTime
+                return if (validUntil > unixTime) {
+                    (validUntil - unixTime).toDuration(DurationUnit.SECONDS)
+                } else {
+                    Duration.ZERO
+                }
+            }
+        }
+
+        fun cleanOldCache() {
+            getKeys(SIMKL_CACHE_KEY)?.forEach {
+                val isOld = AcraApplication.getKey<SimklCacheWrapper<Any>>(it)?.isFresh() == false
+                if (isOld) {
+                    removeKey(it)
+                }
+            }
+        }
+
+        fun <T> setKey(path: String, value: T, cacheTime: Duration) {
+            debugPrint { "Set cache: $SIMKL_CACHE_KEY/$path for ${cacheTime.inWholeDays} days or ${cacheTime.inWholeSeconds} seconds." }
+            setKey(
+                SIMKL_CACHE_KEY,
+                path,
+                // Storing as plain sting is required to make generics work.
+                SimklCacheWrapper(value, unixTime + cacheTime.inWholeSeconds).toJson()
+            )
+        }
+
+        /**
+         * Gets cached object, if object is not fresh returns null and removes it from cache
+         */
+        inline fun <reified T : Any> getKey(path: String): T? {
+            // Required for generic otherwise "LinkedHashMap cannot be cast to MediaObject"
+            val type = mapper.typeFactory.constructParametricType(
+                SimklCacheWrapper::class.java,
+                T::class.java
+            )
+            val cache = getKey<String>(SIMKL_CACHE_KEY, path)?.let {
+                mapper.readValue<SimklCacheWrapper<T>>(it, type)
+            }
+
+            return if (cache?.isFresh() == true) {
+                debugPrint {
+                    "Cache hit at: $SIMKL_CACHE_KEY/$path. " +
+                            "Remains fresh for ${cache.remainingTime().inWholeDays} days or ${cache.remainingTime().inWholeSeconds} seconds."
+                }
+                cache.obj
+            } else {
+                debugPrint { "Cache miss at: $SIMKL_CACHE_KEY/$path" }
+                removeKey(SIMKL_CACHE_KEY, path)
+                null
+            }
+        }
+    }
+
+    companion object {
+        private const val clientId: String = BuildConfig.SIMKL_CLIENT_ID
+        private const val clientSecret: String = BuildConfig.SIMKL_CLIENT_SECRET
+        private var lastLoginState = ""
+
+        const val SIMKL_TOKEN_KEY: String = "simkl_token"
+        const val SIMKL_USER_KEY: String = "simkl_user"
+        const val SIMKL_CACHED_LIST: String = "simkl_cached_list"
+        const val SIMKL_CACHED_LIST_TIME: String = "simkl_cached_time"
+
+        /** 2014-09-01T09:10:11Z -> 1409562611 */
+        private const val simklDateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
+        fun getUnixTime(string: String?): Long? {
+            return try {
+                SimpleDateFormat(simklDateFormat).apply {
+                    this.timeZone = TimeZone.getTimeZone("UTC")
+                }.parse(
+                    string ?: return null
+                )?.toInstant()?.epochSecond
+            } catch (e: Exception) {
+                logError(e)
+                return null
+            }
+        }
+
+        /** 1409562611 -> 2014-09-01T09:10:11Z */
+        fun getDateTime(unixTime: Long?): String? {
+            return try {
+                SimpleDateFormat(simklDateFormat).apply {
+                    this.timeZone = TimeZone.getTimeZone("UTC")
+                }.format(
+                    Date.from(
+                        Instant.ofEpochSecond(
+                            unixTime ?: return null
+                        )
+                    )
+                )
+            } catch (e: Exception) {
+                null
+            }
+        }
+
+        /**
+         * Set of sync services simkl is compatible with.
+         * Add more as required: https://simkl.docs.apiary.io/#reference/search/id-lookup/get-items-by-id
+         */
+        enum class SyncServices(val originalName: String) {
+            Simkl("simkl"),
+            Imdb("imdb"),
+            Tmdb("tmdb"),
+            AniList("anilist"),
+            Mal("mal"),
+        }
+
+        /**
+         * The ID string is a way to keep a collection of services in one single ID using a map
+         * This adds a database service (like imdb) to the string and returns the new string.
+         */
+        fun addIdToString(idString: String?, database: SyncServices, id: String?): String? {
+            if (id == null) return idString
+            return (readIdFromString(idString) + mapOf(database to id)).toJson()
+        }
+
+        /** Read the id string to get all other ids */
+        private fun readIdFromString(idString: String?): Map<SyncServices, String> {
+            return tryParseJson(idString) ?: return emptyMap()
+        }
+
+        fun getPosterUrl(poster: String): String {
+            return "https://wsrv.nl/?url=https://simkl.in/posters/${poster}_m.webp"
+        }
+
+        private fun getUrlFromId(id: Int): String {
+            return "https://simkl.com/shows/$id"
+        }
+
+        enum class SimklListStatusType(
+            var value: Int,
+            @StringRes val stringRes: Int,
+            val originalName: String?
+        ) {
+            Watching(0, R.string.type_watching, "watching"),
+            Completed(1, R.string.type_completed, "completed"),
+            Paused(2, R.string.type_on_hold, "hold"),
+            Dropped(3, R.string.type_dropped, "dropped"),
+            Planning(4, R.string.type_plan_to_watch, "plantowatch"),
+            ReWatching(5, R.string.type_re_watching, "watching"),
+            None(-1, R.string.none, null);
+
+            companion object {
+                fun fromString(string: String): SimklListStatusType? {
+                    return SimklListStatusType.values().firstOrNull {
+                        it.originalName == string
+                    }
+                }
+            }
+        }
+
+        // -------------------
+        @JsonInclude(JsonInclude.Include.NON_EMPTY)
+        data class TokenRequest(
+            @JsonProperty("code") val code: String,
+            @JsonProperty("client_id") val client_id: String = clientId,
+            @JsonProperty("client_secret") val client_secret: String = clientSecret,
+            @JsonProperty("redirect_uri") val redirect_uri: String = "$appString://simkl",
+            @JsonProperty("grant_type") val grant_type: String = "authorization_code"
+        )
+
+        data class TokenResponse(
+            /** No expiration date */
+            val access_token: String,
+            val token_type: String,
+            val scope: String
+        )
+        // -------------------
+
+        /** https://simkl.docs.apiary.io/#reference/users/settings/receive-settings */
+        data class SettingsResponse(
+            val user: User
+        ) {
+            data class User(
+                val name: String,
+                /** Url */
+                val avatar: String
+            )
+        }
+
+        // -------------------
+        data class ActivitiesResponse(
+            val all: String?,
+            val tv_shows: UpdatedAt,
+            val anime: UpdatedAt,
+            val movies: UpdatedAt,
+        ) {
+            data class UpdatedAt(
+                val all: String?,
+                val removed_from_list: String?,
+                val rated_at: String?,
+            )
+        }
+
+        /** https://simkl.docs.apiary.io/#reference/tv/episodes/get-tv-show-episodes */
+        @JsonInclude(JsonInclude.Include.NON_EMPTY)
+        data class EpisodeMetadata(
+            @JsonProperty("title") val title: String?,
+            @JsonProperty("description") val description: String?,
+            @JsonProperty("season") val season: Int?,
+            @JsonProperty("episode") val episode: Int,
+            @JsonProperty("img") val img: String?
+        ) {
+            companion object {
+                fun convertToEpisodes(list: List<EpisodeMetadata>?): List<MediaObject.Season.Episode>? {
+                    return list?.map {
+                        MediaObject.Season.Episode(it.episode)
+                    }
+                }
+
+                fun convertToSeasons(list: List<EpisodeMetadata>?): List<MediaObject.Season>? {
+                    return list?.filter { it.season != null }?.groupBy {
+                        it.season
+                    }?.mapNotNull { (season, episodes) ->
+                        convertToEpisodes(episodes)?.let { MediaObject.Season(season!!, it) }
+                    }?.ifEmpty { null }
+                }
+            }
+        }
+
+        /**
+         * https://simkl.docs.apiary.io/#introduction/about-simkl-api/standard-media-objects
+         * Useful for finding shows from metadata
+         */
+        @JsonInclude(JsonInclude.Include.NON_EMPTY)
+        open class MediaObject(
+            @JsonProperty("title") val title: String?,
+            @JsonProperty("year") val year: Int?,
+            @JsonProperty("ids") val ids: Ids?,
+            @JsonProperty("total_episodes") val total_episodes: Int? = null,
+            @JsonProperty("status") val status: String? = null,
+            @JsonProperty("poster") val poster: String? = null,
+            @JsonProperty("type") val type: String? = null,
+            @JsonProperty("seasons") val seasons: List<Season>? = null,
+            @JsonProperty("episodes") val episodes: List<Season.Episode>? = null
+        ) {
+            fun hasEnded(): Boolean {
+                return status == "released" || status == "ended"
+            }
+
+            @JsonInclude(JsonInclude.Include.NON_EMPTY)
+            data class Season(
+                @JsonProperty("number") val number: Int,
+                @JsonProperty("episodes") val episodes: List<Episode>
+            ) {
+                data class Episode(@JsonProperty("number") val number: Int)
+            }
+
+            @JsonInclude(JsonInclude.Include.NON_EMPTY)
+            data class Ids(
+                @JsonProperty("simkl") val simkl: Int?,
+                @JsonProperty("imdb") val imdb: String? = null,
+                @JsonProperty("tmdb") val tmdb: String? = null,
+                @JsonProperty("mal") val mal: String? = null,
+                @JsonProperty("anilist") val anilist: String? = null,
+            ) {
+                companion object {
+                    fun fromMap(map: Map<SyncServices, String>): Ids {
+                        return Ids(
+                            simkl = map[SyncServices.Simkl]?.toIntOrNull(),
+                            imdb = map[SyncServices.Imdb],
+                            tmdb = map[SyncServices.Tmdb],
+                            mal = map[SyncServices.Mal],
+                            anilist = map[SyncServices.AniList]
+                        )
+                    }
+                }
+            }
+
+            fun toSyncSearchResult(): SyncAPI.SyncSearchResult? {
+                return SyncAPI.SyncSearchResult(
+                    this.title ?: return null,
+                    "Simkl",
+                    this.ids?.simkl?.toString() ?: return null,
+                    getUrlFromId(this.ids.simkl),
+                    this.poster?.let { getPosterUrl(it) },
+                    if (this.type == "movie") TvType.Movie else TvType.TvSeries
+                )
+            }
+        }
+
+        class SimklScoreBuilder private constructor() {
+            data class Builder(
+                private var url: String? = null,
+                private var interceptor: Interceptor? = null,
+                private var ids: MediaObject.Ids? = null,
+                private var score: Int? = null,
+                private var status: Int? = null,
+                private var addEpisodes: Pair<List<MediaObject.Season>?, List<MediaObject.Season.Episode>?>? = null,
+                private var removeEpisodes: Pair<List<MediaObject.Season>?, List<MediaObject.Season.Episode>?>? = null,
+            ) {
+                fun interceptor(interceptor: Interceptor) = apply { this.interceptor = interceptor }
+                fun apiUrl(url: String) = apply { this.url = url }
+                fun ids(ids: MediaObject.Ids) = apply { this.ids = ids }
+                fun score(score: Int?, oldScore: Int?) = apply {
+                    if (score != oldScore) {
+                        this.score = score
+                    }
+                }
+
+                fun status(newStatus: Int?, oldStatus: Int?) = apply {
+                    // Only set status if its new
+                    if (newStatus != oldStatus) {
+                        this.status = newStatus
+                    } else {
+                        this.status = null
+                    }
+                }
+
+                fun episodes(
+                    allEpisodes: List<EpisodeMetadata>?,
+                    newEpisodes: Int?,
+                    oldEpisodes: Int?,
+                ) = apply {
+                    if (allEpisodes == null || newEpisodes == null) return@apply
+
+                    fun getEpisodes(rawEpisodes: List<EpisodeMetadata>) =
+                        if (rawEpisodes.any { it.season != null }) {
+                            EpisodeMetadata.convertToSeasons(rawEpisodes) to null
+                        } else {
+                            null to EpisodeMetadata.convertToEpisodes(rawEpisodes)
+                        }
+
+                    // Do not add episodes if there is no change
+                    if (newEpisodes > (oldEpisodes ?: 0)) {
+                        this.addEpisodes = getEpisodes(allEpisodes.take(newEpisodes))
+                    }
+                    if ((oldEpisodes ?: 0) > newEpisodes) {
+                        this.removeEpisodes = getEpisodes(allEpisodes.drop(newEpisodes))
+                    }
+                }
+
+                suspend fun execute(): Boolean {
+                    val time = getDateTime(unixTime)
+
+                    return if (this.status == SimklListStatusType.None.value) {
+                        app.post(
+                            "$url/sync/history/remove",
+                            json = StatusRequest(
+                                shows = listOf(HistoryMediaObject(ids = ids)),
+                                movies = emptyList()
+                            ),
+                            interceptor = interceptor
+                        ).isSuccessful
+                    } else {
+                        val episodeRemovalResponse = removeEpisodes?.let { (seasons, episodes) ->
+                            app.post(
+                                "${this.url}/sync/history/remove",
+                                json = StatusRequest(
+                                    shows = listOf(
+                                        HistoryMediaObject(
+                                            ids = ids,
+                                            seasons = seasons,
+                                            episodes = episodes
+                                        )
+                                    ),
+                                    movies = emptyList()
+                                ),
+                                interceptor = interceptor
+                            ).isSuccessful
+                        } ?: true
+
+                        val historyResponse =
+                            // Only post if there are episodes or score to upload
+                            if (addEpisodes != null || score != null) {
+                                app.post(
+                                    "${this.url}/sync/history",
+                                    json = StatusRequest(
+                                        shows = listOf(
+                                            HistoryMediaObject(
+                                                null,
+                                                null,
+                                                ids,
+                                                addEpisodes?.first,
+                                                addEpisodes?.second,
+                                                score,
+                                                score?.let { time },
+                                            )
+                                        ), movies = emptyList()
+                                    ),
+                                    interceptor = interceptor
+                                ).isSuccessful
+                            } else {
+                                true
+                            }
+
+                        val statusResponse = status?.let { setStatus ->
+                            val newStatus =
+                                SimklListStatusType.values()
+                                    .firstOrNull { it.value == setStatus }?.originalName
+                                    ?: SimklListStatusType.Watching.originalName!!
+
+                            app.post(
+                                "${this.url}/sync/add-to-list",
+                                json = StatusRequest(
+                                    shows = listOf(
+                                        StatusMediaObject(
+                                            null,
+                                            null,
+                                            ids,
+                                            newStatus,
+                                        )
+                                    ), movies = emptyList()
+                                ),
+                                interceptor = interceptor
+                            ).isSuccessful
+                        } ?: true
+
+                        statusResponse && episodeRemovalResponse && historyResponse
+                    }
+                }
+            }
+        }
+
+        suspend fun getEpisodes(
+            simklId: Int?,
+            type: String?,
+            episodes: Int?,
+            hasEnded: Boolean?
+        ): Array<EpisodeMetadata>? {
+            if (simklId == null) return null
+
+            val cacheKey = "Episodes/$simklId"
+            val cache = SimklCache.getKey<Array<EpisodeMetadata>>(cacheKey)
+
+            // Return cached result if its higher or equal the amount of episodes.
+            if (cache != null && cache.size >= (episodes ?: 0)) {
+                return cache
+            }
+
+            // There is always one season in Anime -> no request necessary
+            if (type == "anime" && episodes != null) {
+                return episodes.takeIf { it > 0 }?.let {
+                    (1..it).map { episode ->
+                        EpisodeMetadata(
+                            null, null, null, episode, null
+                        )
+                    }.toTypedArray()
+                }
+            }
+            val url = when (type) {
+                "anime" -> "https://api.simkl.com/anime/episodes/$simklId"
+                "tv" -> "https://api.simkl.com/tv/episodes/$simklId"
+                "movie" -> return null
+                else -> return null
+            }
+
+            debugPrint { "Requesting episodes from $url" }
+            return app.get(url, params = mapOf("client_id" to clientId))
+                .parsedSafe<Array<EpisodeMetadata>>()?.also {
+                    val cacheTime =
+                        if (hasEnded == true) SimklCache.CacheTimes.OneMonth.value else SimklCache.CacheTimes.ThirtyMinutes.value
+
+                    // 1 Month cache
+                    SimklCache.setKey(cacheKey, it, Duration.parse(cacheTime))
+                }
+        }
+
+        @JsonInclude(JsonInclude.Include.NON_EMPTY)
+        class HistoryMediaObject(
+            @JsonProperty("title") title: String? = null,
+            @JsonProperty("year") year: Int? = null,
+            @JsonProperty("ids") ids: Ids? = null,
+            @JsonProperty("seasons") seasons: List<Season>? = null,
+            @JsonProperty("episodes") episodes: List<Season.Episode>? = null,
+            @JsonProperty("rating") val rating: Int? = null,
+            @JsonProperty("rated_at") val rated_at: String? = null,
+        ) : MediaObject(title, year, ids, seasons = seasons, episodes = episodes)
+
+        @JsonInclude(JsonInclude.Include.NON_EMPTY)
+        class RatingMediaObject(
+            @JsonProperty("title") title: String?,
+            @JsonProperty("year") year: Int?,
+            @JsonProperty("ids") ids: Ids?,
+            @JsonProperty("rating") val rating: Int,
+            @JsonProperty("rated_at") val rated_at: String? = getDateTime(unixTime)
+        ) : MediaObject(title, year, ids)
+
+        @JsonInclude(JsonInclude.Include.NON_EMPTY)
+        class StatusMediaObject(
+            @JsonProperty("title") title: String?,
+            @JsonProperty("year") year: Int?,
+            @JsonProperty("ids") ids: Ids?,
+            @JsonProperty("to") val to: String,
+            @JsonProperty("watched_at") val watched_at: String? = getDateTime(unixTime)
+        ) : MediaObject(title, year, ids)
+
+        @JsonInclude(JsonInclude.Include.NON_EMPTY)
+        data class StatusRequest(
+            @JsonProperty("movies") val movies: List<MediaObject>,
+            @JsonProperty("shows") val shows: List<MediaObject>
+        )
+
+        /** https://simkl.docs.apiary.io/#reference/sync/get-all-items/get-all-items-in-the-user's-watchlist */
+        data class AllItemsResponse(
+            @JsonProperty("shows")
+            val shows: List<ShowMetadata> = emptyList(),
+            @JsonProperty("anime")
+            val anime: List<ShowMetadata> = emptyList(),
+            @JsonProperty("movies")
+            val movies: List<MovieMetadata> = emptyList(),
+        ) {
+            companion object {
+                fun merge(first: AllItemsResponse?, second: AllItemsResponse?): AllItemsResponse {
+
+                    // Replace the first item with the same id, or add the new item
+                    fun <T> MutableList<T>.replaceOrAddItem(newItem: T, predicate: (T) -> Boolean) {
+                        for (i in this.indices) {
+                            if (predicate(this[i])) {
+                                this[i] = newItem
+                                return
+                            }
+                        }
+                        this.add(newItem)
+                    }
+
+                    //
+                    fun <T : Metadata> merge(
+                        first: List<T>?,
+                        second: List<T>?
+                    ): List<T> {
+                        return (first?.toMutableList() ?: mutableListOf()).apply {
+                            second?.forEach { secondShow ->
+                                this.replaceOrAddItem(secondShow) {
+                                    it.getIds().simkl == secondShow.getIds().simkl
+                                }
+                            }
+                        }
+                    }
+
+                    return AllItemsResponse(
+                        merge(first?.shows, second?.shows),
+                        merge(first?.anime, second?.anime),
+                        merge(first?.movies, second?.movies),
+                    )
+                }
+            }
+
+            interface Metadata {
+                val last_watched_at: String?
+                val status: String?
+                val user_rating: Int?
+                val last_watched: String?
+                val watched_episodes_count: Int?
+                val total_episodes_count: Int?
+
+                fun getIds(): ShowMetadata.Show.Ids
+                fun toLibraryItem(): SyncAPI.LibraryItem
+            }
+
+            data class MovieMetadata(
+                override val last_watched_at: String?,
+                override val status: String,
+                override val user_rating: Int?,
+                override val last_watched: String?,
+                override val watched_episodes_count: Int?,
+                override val total_episodes_count: Int?,
+                val movie: ShowMetadata.Show
+            ) : Metadata {
+                override fun getIds(): ShowMetadata.Show.Ids {
+                    return this.movie.ids
+                }
+
+                override fun toLibraryItem(): SyncAPI.LibraryItem {
+                    return SyncAPI.LibraryItem(
+                        this.movie.title,
+                        "https://simkl.com/tv/${movie.ids.simkl}",
+                        movie.ids.simkl.toString(),
+                        this.watched_episodes_count,
+                        this.total_episodes_count,
+                        this.user_rating?.times(10),
+                        getUnixTime(last_watched_at) ?: 0,
+                        "Simkl",
+                        TvType.Movie,
+                        this.movie.poster?.let { getPosterUrl(it) },
+                        null,
+                        null,
+                        movie.ids.simkl
+                    )
+                }
+            }
+
+            data class ShowMetadata(
+                @JsonProperty("last_watched_at") override val last_watched_at: String?,
+                @JsonProperty("status") override val status: String,
+                @JsonProperty("user_rating") override val user_rating: Int?,
+                @JsonProperty("last_watched") override val last_watched: String?,
+                @JsonProperty("watched_episodes_count") override val watched_episodes_count: Int?,
+                @JsonProperty("total_episodes_count") override val total_episodes_count: Int?,
+                @JsonProperty("show") val show: Show
+            ) : Metadata {
+                override fun getIds(): Show.Ids {
+                    return this.show.ids
+                }
+
+                override fun toLibraryItem(): SyncAPI.LibraryItem {
+                    return SyncAPI.LibraryItem(
+                        this.show.title,
+                        "https://simkl.com/tv/${show.ids.simkl}",
+                        show.ids.simkl.toString(),
+                        this.watched_episodes_count,
+                        this.total_episodes_count,
+                        this.user_rating?.times(10),
+                        getUnixTime(last_watched_at) ?: 0,
+                        "Simkl",
+                        TvType.Anime,
+                        this.show.poster?.let { getPosterUrl(it) },
+                        null,
+                        null,
+                        show.ids.simkl
+                    )
+                }
+
+                data class Show(
+                    @JsonProperty("title") val title: String,
+                    @JsonProperty("poster") val poster: String?,
+                    @JsonProperty("year") val year: Int?,
+                    @JsonProperty("ids") val ids: Ids,
+                ) {
+                    data class Ids(
+                        @JsonProperty("simkl") val simkl: Int,
+                        @JsonProperty("slug") val slug: String?,
+                        @JsonProperty("imdb") val imdb: String?,
+                        @JsonProperty("zap2it") val zap2it: String?,
+                        @JsonProperty("tmdb") val tmdb: String?,
+                        @JsonProperty("offen") val offen: String?,
+                        @JsonProperty("tvdb") val tvdb: String?,
+                        @JsonProperty("mal") val mal: String?,
+                        @JsonProperty("anidb") val anidb: String?,
+                        @JsonProperty("anilist") val anilist: String?,
+                        @JsonProperty("traktslug") val traktslug: String?
+                    ) {
+                        fun matchesId(database: SyncServices, id: String): Boolean {
+                            return when (database) {
+                                SyncServices.Simkl -> this.simkl == id.toIntOrNull()
+                                SyncServices.AniList -> this.anilist == id
+                                SyncServices.Mal -> this.mal == id
+                                SyncServices.Tmdb -> this.tmdb == id
+                                SyncServices.Imdb -> this.imdb == id
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Appends api keys to the requests
+     **/
+    private inner class HeaderInterceptor : Interceptor {
+        override fun intercept(chain: Interceptor.Chain): Response {
+            debugPrint { "${this@SimklApi.name} made request to ${chain.request().url}" }
+            return chain.proceed(
+                chain.request()
+                    .newBuilder()
+                    .addHeader("Authorization", "Bearer $token")
+                    .addHeader("simkl-api-key", clientId)
+                    .build()
+            )
+        }
+    }
+
+    private suspend fun getUser(): SettingsResponse.User? {
+        return suspendSafeApiCall {
+            app.post("$mainUrl/users/settings", interceptor = interceptor)
+                .parsedSafe<SettingsResponse>()?.user
+        }
+    }
+
+    /**
+     * Useful to get episodes on demand to prevent unnecessary requests.
+     */
+    class SimklEpisodeConstructor(
+        private val simklId: Int?,
+        private val type: String?,
+        private val totalEpisodeCount: Int?,
+        private val hasEnded: Boolean?
+    ) {
+        suspend fun getEpisodes(): Array<EpisodeMetadata>? {
+            return getEpisodes(simklId, type, totalEpisodeCount, hasEnded)
+        }
+    }
+
+    class SimklSyncStatus(
+        override var status: Int,
+        override var score: Int?,
+        val oldScore: Int?,
+        override var watchedEpisodes: Int?,
+        val episodeConstructor: SimklEpisodeConstructor,
+        override var isFavorite: Boolean? = null,
+        override var maxEpisodes: Int? = null,
+        /** Save seen episodes separately to know the change from old to new.
+         * Required to remove seen episodes if count decreases */
+        val oldEpisodes: Int,
+        val oldStatus: String?
+    ) : SyncAPI.AbstractSyncStatus()
+
+    override suspend fun getStatus(id: String): SyncAPI.AbstractSyncStatus? {
+        val realIds = readIdFromString(id)
+
+        // Key which assumes all ids are the same each time :/
+        // This could be some sort of reference system to make multiple IDs
+        // point to the same key.
+        val idKey =
+            realIds.toList().map { "${it.first.originalName}=${it.second}" }.sorted().joinToString()
+
+        val cachedObject = SimklCache.getKey<MediaObject>(idKey)
+        val searchResult: MediaObject = cachedObject
+            ?: (searchByIds(realIds)?.firstOrNull()?.also { result ->
+                val cacheTime =
+                    if (result.hasEnded()) SimklCache.CacheTimes.OneMonth.value else SimklCache.CacheTimes.ThirtyMinutes.value
+                SimklCache.setKey(idKey, result, Duration.parse(cacheTime))
+            }) ?: return null
+
+        val episodeConstructor = SimklEpisodeConstructor(
+            searchResult.ids?.simkl,
+            searchResult.type,
+            searchResult.total_episodes,
+            searchResult.hasEnded()
+        )
+
+        val foundItem = getSyncListSmart()?.let { list ->
+            listOf(list.shows, list.anime, list.movies).flatten().firstOrNull { show ->
+                realIds.any { (database, id) ->
+                    show.getIds().matchesId(database, id)
+                }
+            }
+        }
+
+        if (foundItem != null) {
+            return SimklSyncStatus(
+                status = foundItem.status?.let { SimklListStatusType.fromString(it)?.value }
+                    ?: return null,
+                score = foundItem.user_rating,
+                watchedEpisodes = foundItem.watched_episodes_count,
+                maxEpisodes = searchResult.total_episodes,
+                episodeConstructor = episodeConstructor,
+                oldEpisodes = foundItem.watched_episodes_count ?: 0,
+                oldScore = foundItem.user_rating,
+                oldStatus = foundItem.status
+            )
+        } else {
+            return SimklSyncStatus(
+                status = SimklListStatusType.None.value,
+                score = 0,
+                watchedEpisodes = 0,
+                maxEpisodes = if (searchResult.type == "movie") 0 else searchResult.total_episodes,
+                episodeConstructor = episodeConstructor,
+                oldEpisodes = 0,
+                oldStatus = null,
+                oldScore = null
+            )
+        }
+    }
+
+    override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
+        val parsedId = readIdFromString(id)
+        lastScoreTime = unixTime
+        val simklStatus = status as? SimklSyncStatus
+
+        val builder = SimklScoreBuilder.Builder()
+            .apiUrl(this.mainUrl)
+            .score(status.score, simklStatus?.oldScore)
+            .status(status.status, (status as? SimklSyncStatus)?.oldStatus?.let { oldStatus ->
+                SimklListStatusType.values().firstOrNull {
+                    it.originalName == oldStatus
+                }?.value
+            })
+            .interceptor(interceptor)
+            .ids(MediaObject.Ids.fromMap(parsedId))
+
+
+        // Get episodes only when required
+        val episodes = simklStatus?.episodeConstructor?.getEpisodes()
+
+        // All episodes if marked as completed
+        val watchedEpisodes = if (status.status == SimklListStatusType.Completed.value) {
+            episodes?.size
+        } else {
+            status.watchedEpisodes
+        }
+
+        builder.episodes(episodes?.toList(), watchedEpisodes, simklStatus?.oldEpisodes)
+
+        requireLibraryRefresh = true
+        return builder.execute()
+    }
+
+
+    /** See https://simkl.docs.apiary.io/#reference/search/id-lookup/get-items-by-id */
+    suspend fun searchByIds(serviceMap: Map<SyncServices, String>): Array<MediaObject>? {
+        if (serviceMap.isEmpty()) return emptyArray()
+
+        return app.get(
+            "$mainUrl/search/id",
+            params = mapOf("client_id" to clientId) + serviceMap.map { (service, id) ->
+                service.originalName to id
+            }
+        ).parsedSafe()
+    }
+
+    override suspend fun search(name: String): List<SyncAPI.SyncSearchResult>? {
+        return app.get(
+            "$mainUrl/search/", params = mapOf("client_id" to clientId, "q" to name)
+        ).parsedSafe<Array<MediaObject>>()?.mapNotNull { it.toSyncSearchResult() }
+    }
+
+    override fun authenticate(activity: FragmentActivity?) {
+        lastLoginState = BigInteger(130, SecureRandom()).toString(32)
+        val url =
+            "https://simkl.com/oauth/authorize?response_type=code&client_id=$clientId&redirect_uri=$appString://${redirectUrl}&state=$lastLoginState"
+        openBrowser(url, activity)
+    }
+
+    override fun loginInfo(): AuthAPI.LoginInfo? {
+        return getKey<SettingsResponse.User>(accountId, SIMKL_USER_KEY)?.let { user ->
+            AuthAPI.LoginInfo(
+                name = user.name,
+                profilePicture = user.avatar,
+                accountIndex = accountIndex
+            )
+        }
+    }
+
+    override fun logOut() {
+        requireLibraryRefresh = true
+        removeAccountKeys()
+    }
+
+    override suspend fun getResult(id: String): SyncAPI.SyncResult? {
+        return null
+    }
+
+    private suspend fun getSyncListSince(since: Long?): AllItemsResponse? {
+        val params = getDateTime(since)?.let {
+            mapOf("date_from" to it)
+        } ?: emptyMap()
+
+        // Can return null on no change.
+        return app.get(
+            "$mainUrl/sync/all-items/",
+            params = params,
+            interceptor = interceptor
+        ).parsedSafe()
+    }
+
+    private suspend fun getActivities(): ActivitiesResponse? {
+        return app.post("$mainUrl/sync/activities", interceptor = interceptor).parsedSafe()
+    }
+
+    private fun getSyncListCached(): AllItemsResponse? {
+        return getKey(accountId, SIMKL_CACHED_LIST)
+    }
+
+    private suspend fun getSyncListSmart(): AllItemsResponse? {
+        if (token == null) return null
+
+        val activities = getActivities()
+        val lastCacheUpdate = getKey<Long>(accountId, SIMKL_CACHED_LIST_TIME)
+        val lastRemoval = listOf(
+            activities?.tv_shows?.removed_from_list,
+            activities?.anime?.removed_from_list,
+            activities?.movies?.removed_from_list
+        ).maxOf {
+            getUnixTime(it) ?: -1
+        }
+        val lastRealUpdate =
+            listOf(
+                activities?.tv_shows?.all,
+                activities?.anime?.all,
+                activities?.movies?.all,
+            ).maxOf {
+                getUnixTime(it) ?: -1
+            }
+
+        debugPrint { "Cache times: lastCacheUpdate=$lastCacheUpdate, lastRemoval=$lastRemoval, lastRealUpdate=$lastRealUpdate" }
+        val list = if (lastCacheUpdate == null || lastCacheUpdate < lastRemoval) {
+            debugPrint { "Full list update in ${this.name}." }
+            setKey(accountId, SIMKL_CACHED_LIST_TIME, lastRemoval)
+            getSyncListSince(null)
+        } else if (lastCacheUpdate < lastRealUpdate || lastCacheUpdate < lastScoreTime) {
+            debugPrint { "Partial list update in ${this.name}." }
+            setKey(accountId, SIMKL_CACHED_LIST_TIME, lastCacheUpdate)
+            AllItemsResponse.merge(getSyncListCached(), getSyncListSince(lastCacheUpdate))
+        } else {
+            debugPrint { "Cached list update in ${this.name}." }
+            getSyncListCached()
+        }
+        debugPrint { "List sizes: movies=${list?.movies?.size}, shows=${list?.shows?.size}, anime=${list?.anime?.size}" }
+
+        setKey(accountId, SIMKL_CACHED_LIST, list)
+
+        return list
+    }
+
+
+    override suspend fun getPersonalLibrary(): SyncAPI.LibraryMetadata? {
+        val list = getSyncListSmart() ?: return null
+
+        val baseMap =
+            SimklListStatusType.values()
+                .filter { it.value >= 0 && it.value != SimklListStatusType.ReWatching.value }
+                .associate {
+                    it.stringRes to emptyList<SyncAPI.LibraryItem>()
+                }
+
+        val syncMap = listOf(list.anime, list.movies, list.shows)
+            .flatten()
+            .groupBy {
+                it.status
+            }
+            .mapNotNull { (status, list) ->
+                val stringRes =
+                    status?.let { SimklListStatusType.fromString(it)?.stringRes }
+                        ?: return@mapNotNull null
+                val libraryList = list.map { it.toLibraryItem() }
+                stringRes to libraryList
+            }.toMap()
+
+        return SyncAPI.LibraryMetadata(
+            (baseMap + syncMap).map { SyncAPI.LibraryList(txt(it.key), it.value) }, setOf(
+                ListSorting.AlphabeticalA,
+                ListSorting.AlphabeticalZ,
+                ListSorting.UpdatedNew,
+                ListSorting.UpdatedOld,
+                ListSorting.RatingHigh,
+                ListSorting.RatingLow,
+            )
+        )
+    }
+
+    override fun getIdFromUrl(url: String): String {
+        val simklUrlRegex = Regex("""https://simkl\.com/[^/]*/(\d+).*""")
+        return simklUrlRegex.find(url)?.groupValues?.get(1) ?: ""
+    }
+
+    override suspend fun handleRedirect(url: String): Boolean {
+        val uri = url.toUri()
+        val state = uri.getQueryParameter("state")
+        // Ensure consistent state
+        if (state != lastLoginState) return false
+        lastLoginState = ""
+
+        val code = uri.getQueryParameter("code") ?: return false
+        val token = app.post(
+            "$mainUrl/oauth/token", json = TokenRequest(code)
+        ).parsedSafe<TokenResponse>() ?: return false
+
+        switchToNewAccount()
+        setKey(accountId, SIMKL_TOKEN_KEY, token.access_token)
+
+        val user = getUser()
+        if (user == null) {
+            removeKey(accountId, SIMKL_TOKEN_KEY)
+            switchToOldAccount()
+            return false
+        }
+
+        setKey(accountId, SIMKL_USER_KEY, user)
+        registerAccount()
+        requireLibraryRefresh = true
+
+        return true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
index 4ab2e8e2..a075cc2e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -1,16 +1,24 @@
 package com.lagradost.cloudstream3.ui
 
-import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
+import com.lagradost.cloudstream3.DubStatus
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.HomePageResponse
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
+import com.lagradost.cloudstream3.MainPageRequest
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.fixUrl
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope.coroutineContext
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
@@ -174,7 +182,7 @@ class APIRepository(val api: MainAPI) {
         data: String,
         isCasting: Boolean,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ): Boolean {
         if (isInvalidData(data)) return false // this makes providers cleaner
         return try {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
index 46ddce09..6c0e7796 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
@@ -25,6 +25,7 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.sortSubs
 import com.lagradost.cloudstream3.sortUrls
+import com.lagradost.cloudstream3.ui.player.LoadType
 import com.lagradost.cloudstream3.ui.player.RepoLinkGenerator
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
@@ -294,7 +295,8 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                         val generator = RepoLinkGenerator(listOf(epData))
 
                         val isSuccessful = safeApiCall {
-                            generator.generateLinks(clearCache = false, isCasting = true,
+                            generator.generateLinks(
+                                clearCache = false, type = LoadType.Chromecast,
                                 callback = {
                                     it.first?.let { link ->
                                         currentLinks.add(link)
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 70%
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 b4c07792..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
@@ -24,7 +25,7 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) :
         }
     }
 
-    override fun onRequestChildFocus(
+    /*override fun onRequestChildFocus(
         parent: RecyclerView,
         state: RecyclerView.State,
         child: View,
@@ -32,13 +33,17 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) :
     ): Boolean {
         // android.widget.FrameLayout$LayoutParams cannot be cast to androidx.recyclerview.widget.RecyclerView$LayoutParams
         return try {
-            val pos = maxOf(0, getPosition(focused!!) - 2)
-            parent.scrollToPosition(pos)
+            if(focused != null) {
+              //  val pos = maxOf(0, getPosition(focused) - 2) // IDK WHY
+                val pos = getPosition(focused)
+                if(pos >= 0) parent.scrollToPosition(pos)
+            }
+
             super.onRequestChildFocus(parent, state, child, focused)
         } catch (e: Exception) {
             false
         }
-    }
+    }*/
 
     // Allows moving right and left with focus https://gist.github.com/vganin/8930b41f55820ec49e4d
     override fun onInterceptFocusSearch(focused: View, direction: Int): View? {
@@ -65,32 +70,47 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) :
         val spanCount = this.spanCount
         val orientation = this.orientation
 
-        if (orientation == VERTICAL) {
+        // fixes arabic by inverting left and right layout focus
+        val correctDirection = if (this.isLayoutRTL) {
             when (direction) {
+                View.FOCUS_RIGHT -> View.FOCUS_LEFT
+                View.FOCUS_LEFT -> View.FOCUS_RIGHT
+                else -> direction
+            }
+        } else direction
+
+        if (orientation == VERTICAL) {
+            when (correctDirection) {
                 View.FOCUS_DOWN -> {
                     return spanCount
                 }
+
                 View.FOCUS_UP -> {
                     return -spanCount
                 }
+
                 View.FOCUS_RIGHT -> {
                     return 1
                 }
+
                 View.FOCUS_LEFT -> {
                     return -1
                 }
             }
         } else if (orientation == HORIZONTAL) {
-            when (direction) {
+            when (correctDirection) {
                 View.FOCUS_DOWN -> {
                     return 1
                 }
+
                 View.FOCUS_UP -> {
                     return -1
                 }
+
                 View.FOCUS_RIGHT -> {
                     return spanCount
                 }
+
                 View.FOCUS_LEFT -> {
                     return -spanCount
                 }
@@ -142,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/EasterEggMonke.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt
index 556ebd34..c7041776 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt
@@ -16,14 +16,16 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.view.isVisible
 import com.lagradost.cloudstream3.R
-import kotlinx.android.synthetic.main.activity_easter_egg_monke.*
-import java.util.*
+import com.lagradost.cloudstream3.databinding.ActivityEasterEggMonkeBinding
 
 class EasterEggMonke : AppCompatActivity() {
 
+    lateinit var binding : ActivityEasterEggMonkeBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_easter_egg_monke)
+
+        binding = ActivityEasterEggMonkeBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         val handler = Handler(mainLooper)
         lateinit var runnable: Runnable
@@ -32,15 +34,14 @@ class EasterEggMonke : AppCompatActivity() {
             handler.postDelayed(runnable, 300)
         }
         handler.postDelayed(runnable, 1000)
-
     }
 
     private fun shower() {
 
-        val containerW = frame.width
-        val containerH = frame.height
-        var starW: Float = monke.width.toFloat()
-        var starH: Float = monke.height.toFloat()
+        val containerW = binding.frame.width
+        val containerH = binding.frame.height
+        var starW: Float = binding.monke.width.toFloat()
+        var starH: Float = binding.monke.height.toFloat()
 
         val newStar = AppCompatImageView(this)
         val idx = (monkeys.size * Math.random()).toInt()
@@ -48,7 +49,7 @@ class EasterEggMonke : AppCompatActivity() {
         newStar.isVisible = true
         newStar.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,
             FrameLayout.LayoutParams.WRAP_CONTENT)
-        frame.addView(newStar)
+        binding.frame.addView(newStar)
 
         newStar.scaleX = Math.random().toFloat() * 1.5f +  newStar.scaleX
         newStar.scaleY = newStar.scaleX
@@ -70,7 +71,7 @@ class EasterEggMonke : AppCompatActivity() {
 
         set.addListener(object : AnimatorListenerAdapter() {
             override fun onAnimationEnd(animation: Animator) {
-                frame.removeView(newStar)
+                binding.frame.removeView(newStar)
             }
         })
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt
index 19e24f74..9ed58e2c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt
@@ -12,20 +12,23 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.findNavController
 import com.lagradost.cloudstream3.MainActivity
-import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.databinding.FragmentWebviewBinding
 import com.lagradost.cloudstream3.network.WebViewResolver
 import com.lagradost.cloudstream3.utils.AppUtils.loadRepository
-import kotlinx.android.synthetic.main.fragment_webview.*
+
 
 class WebviewFragment : Fragment() {
+
+    var binding: FragmentWebviewBinding? = null
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val url = arguments?.getString(WEBVIEW_URL) ?: "".also {
             findNavController().popBackStack()
         }
 
-        web_view.webViewClient = object : WebViewClient() {
+        binding?.webView?.webViewClient = object : WebViewClient() {
             override fun shouldOverrideUrlLoading(
                 view: WebView?,
                 request: WebResourceRequest?
@@ -40,24 +43,28 @@ class WebviewFragment : Fragment() {
                 return super.shouldOverrideUrlLoading(view, request)
             }
         }
+        binding?.webView?.apply {
+            WebViewResolver.webViewUserAgent = settings.userAgentString
 
-        WebViewResolver.webViewUserAgent = web_view.settings.userAgentString
-
-        web_view.addJavascriptInterface(RepoApi(activity), "RepoApi")
-        web_view.settings.javaScriptEnabled = true
-        web_view.settings.userAgentString = USER_AGENT
-        web_view.settings.domStorageEnabled = true
+            addJavascriptInterface(RepoApi(activity), "RepoApi")
+            settings.javaScriptEnabled = true
+            settings.userAgentString = USER_AGENT
+            settings.domStorageEnabled = true
 //        WebView.setWebContentsDebuggingEnabled(true)
 
-        web_view.loadUrl(url)
+            loadUrl(url)
+        }
+
     }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
+        val localBinding = FragmentWebviewBinding.inflate(inflater, container, false)
+        binding = localBinding
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_webview, container, false)
+        return localBinding.root//inflater.inflate(R.layout.fragment_webview, container, false)
     }
 
     companion object {
@@ -70,7 +77,7 @@ class WebviewFragment : Fragment() {
 
     private class RepoApi(val activity: FragmentActivity?) {
         @JavascriptInterface
-         fun installRepo(repoUrl: String) {
+        fun installRepo(repoUrl: String) {
             activity?.loadRepository(repoUrl)
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WhoIsWatchingAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WhoIsWatchingAdapter.kt
new file mode 100644
index 00000000..6b3090a9
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WhoIsWatchingAdapter.kt
@@ -0,0 +1,106 @@
+package com.lagradost.cloudstream3.ui
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
+import com.lagradost.cloudstream3.databinding.WhoIsWatchingAccountAddBinding
+import com.lagradost.cloudstream3.databinding.WhoIsWatchingAccountBinding
+import com.lagradost.cloudstream3.ui.result.setImage
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+
+class WhoIsWatchingAdapter(
+    private val selectCallBack: (DataStoreHelper.Account) -> Unit = { },
+    private val editCallBack: (DataStoreHelper.Account) -> Unit = { },
+    private val addAccountCallback: () -> Unit = {}
+) :
+    ListAdapter<DataStoreHelper.Account, WhoIsWatchingAdapter.WhoIsWatchingHolder>(DiffCallback()) {
+
+    companion object {
+        const val FOOTER = 1
+        const val NORMAL = 0
+    }
+
+    override fun getItemCount(): Int {
+        return currentList.size + 1
+    }
+
+    override fun getItemViewType(position: Int): Int = when (position) {
+        currentList.size -> FOOTER
+        else -> NORMAL
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WhoIsWatchingHolder =
+        WhoIsWatchingHolder(
+            binding = when (viewType) {
+                NORMAL -> WhoIsWatchingAccountBinding.inflate(
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false
+                )
+
+                FOOTER -> WhoIsWatchingAccountAddBinding.inflate(
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false
+                )
+
+                else -> throw NotImplementedError()
+            },
+            selectCallBack = selectCallBack,
+            addAccountCallback = addAccountCallback,
+            editCallBack = editCallBack,
+        )
+
+
+    override fun onBindViewHolder(holder: WhoIsWatchingHolder, position: Int) =
+        holder.bind(currentList.getOrNull(position))
+
+    class WhoIsWatchingHolder(
+        val binding: ViewBinding,
+        val selectCallBack: (DataStoreHelper.Account) -> Unit,
+        val addAccountCallback: () -> Unit,
+        val editCallBack: (DataStoreHelper.Account) -> Unit
+    ) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(card: DataStoreHelper.Account?) {
+            when (binding) {
+                is WhoIsWatchingAccountBinding -> binding.apply {
+                    if(card == null) return@apply
+                    outline.isVisible = card.keyIndex == DataStoreHelper.selectedKeyIndex
+                    profileText.text = card.name
+                    profileImageBackground.setImage(card.image)
+                    root.setOnClickListener {
+                        selectCallBack(card)
+                    }
+                    root.setOnLongClickListener {
+                        editCallBack(card)
+                        return@setOnLongClickListener true
+                    }
+                }
+
+                is WhoIsWatchingAccountAddBinding -> binding.apply {
+                    root.setOnClickListener {
+                        addAccountCallback()
+                    }
+                }
+            }
+        }
+    }
+
+    class DiffCallback : DiffUtil.ItemCallback<DataStoreHelper.Account>() {
+        override fun areItemsTheSame(
+            oldItem: DataStoreHelper.Account,
+            newItem: DataStoreHelper.Account
+        ): Boolean = oldItem.keyIndex == newItem.keyIndex
+
+        override fun areContentsTheSame(
+            oldItem: DataStoreHelper.Account,
+            newItem: DataStoreHelper.Account
+        ): Boolean = oldItem == newItem
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt
index add36f1a..10ce67a7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt
@@ -5,6 +5,7 @@ import android.content.DialogInterface
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
@@ -19,7 +20,7 @@ import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
 
 object DownloadButtonSetup {
-    fun handleDownloadClick(activity: Activity?, click: DownloadClickEvent) {
+    fun handleDownloadClick(click: DownloadClickEvent) {
         val id = click.data.id
         if (click.data !is VideoDownloadHelper.DownloadEpisodeCached) return
         when (click.action) {
@@ -89,9 +90,9 @@ object DownloadButtonSetup {
                         )?.fileLength
                             ?: 0
                     if (length > 0) {
-                        showToast(act, R.string.delete, Toast.LENGTH_LONG)
+                        showToast(R.string.delete, Toast.LENGTH_LONG)
                     } else {
-                        showToast(act, R.string.download, Toast.LENGTH_LONG)
+                        showToast(R.string.download, Toast.LENGTH_LONG)
                     }
                 }
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonViewHolder.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonViewHolder.kt
deleted file mode 100644
index 0096ff42..00000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonViewHolder.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.lagradost.cloudstream3.ui.download
-
-interface DownloadButtonViewHolder {
-    var downloadButton : EasyDownloadButton
-    fun reattachDownloadButton()
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildAdapter.kt
index a541171b..1d7b5a83 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildAdapter.kt
@@ -3,18 +3,12 @@ package com.lagradost.cloudstream3.ui.download
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.cardview.widget.CardView
-import androidx.core.widget.ContentLoadingProgressBar
 import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.DownloadChildEpisodeBinding
 import com.lagradost.cloudstream3.utils.AppUtils.getNameFull
 import com.lagradost.cloudstream3.utils.DataStoreHelper.fixVisual
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
-import kotlinx.android.synthetic.main.download_child_episode.view.*
-import java.util.*
 
 const val DOWNLOAD_ACTION_PLAY_FILE = 0
 const val DOWNLOAD_ACTION_DELETE_FILE = 1
@@ -29,46 +23,16 @@ data class VisualDownloadChildCached(
     val data: VideoDownloadHelper.DownloadEpisodeCached,
 )
 
-data class DownloadClickEvent(val action: Int, val data: EasyDownloadButton.IMinimumData)
+data class DownloadClickEvent(val action: Int, val data: VideoDownloadHelper.DownloadEpisodeCached)
 
 class DownloadChildAdapter(
     var cardList: List<VisualDownloadChildCached>,
     private val clickCallback: (DownloadClickEvent) -> Unit,
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    private val mBoundViewHolders: HashSet<DownloadButtonViewHolder> = HashSet()
-    private fun getAllBoundViewHolders(): Set<DownloadButtonViewHolder?>? {
-        return Collections.unmodifiableSet(mBoundViewHolders)
-    }
-
-    fun killAdapter() {
-        getAllBoundViewHolders()?.forEach { view ->
-            view?.downloadButton?.dispose()
-        }
-    }
-
-    override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.downloadButton.dispose()
-        }
-    }
-
-    override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.downloadButton.dispose()
-            mBoundViewHolders.remove(holder)
-        }
-    }
-
-    override fun onViewAttachedToWindow(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.reattachDownloadButton()
-        }
-    }
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return DownloadChildViewHolder(
-            LayoutInflater.from(parent.context).inflate(R.layout.download_child_episode, parent, false),
+            DownloadChildEpisodeBinding.inflate(LayoutInflater.from(parent.context), parent, false),
             clickCallback
         )
     }
@@ -77,7 +41,6 @@ class DownloadChildAdapter(
         when (holder) {
             is DownloadChildViewHolder -> {
                 holder.bind(cardList[position])
-                mBoundViewHolders.add(holder)
             }
         }
     }
@@ -88,66 +51,44 @@ class DownloadChildAdapter(
 
     class DownloadChildViewHolder
     constructor(
-        itemView: View,
+        val binding: DownloadChildEpisodeBinding,
         private val clickCallback: (DownloadClickEvent) -> Unit,
-    ) : RecyclerView.ViewHolder(itemView), DownloadButtonViewHolder {
-        override var downloadButton = EasyDownloadButton()
+    ) : RecyclerView.ViewHolder(binding.root) {
 
-        private val title: TextView = itemView.download_child_episode_text
+        /*private val title: TextView = itemView.download_child_episode_text
         private val extraInfo: TextView = itemView.download_child_episode_text_extra
         private val holder: CardView = itemView.download_child_episode_holder
         private val progressBar: ContentLoadingProgressBar = itemView.download_child_episode_progress
         private val progressBarDownload: ContentLoadingProgressBar = itemView.download_child_episode_progress_downloaded
-        private val downloadImage: ImageView = itemView.download_child_episode_download
+        private val downloadImage: ImageView = itemView.download_child_episode_download*/
 
-        private var localCard: VisualDownloadChildCached? = null
 
         fun bind(card: VisualDownloadChildCached) {
-            localCard = card
             val d = card.data
 
             val posDur = getViewPos(d.id)
-            if (posDur != null) {
-                val visualPos = posDur.fixVisual()
-                progressBar.max = (visualPos.duration / 1000).toInt()
-                progressBar.progress = (visualPos.position / 1000).toInt()
-                progressBar.visibility = View.VISIBLE
-            } else {
-                progressBar.visibility = View.GONE
+            binding.downloadChildEpisodeProgress.apply {
+                if (posDur != null) {
+                    val visualPos = posDur.fixVisual()
+                    max = (visualPos.duration / 1000).toInt()
+                    progress = (visualPos.position / 1000).toInt()
+                    visibility = View.VISIBLE
+                } else {
+                    visibility = View.GONE
+                }
             }
 
-            title.text = title.context.getNameFull(d.name, d.episode, d.season)
-            title.isSelected = true // is needed for text repeating
+            binding.downloadButton.setDefaultClickListener(card.data, binding.downloadChildEpisodeTextExtra, clickCallback)
 
-            downloadButton.setUpButton(
-                card.currentBytes,
-                card.totalBytes,
-                progressBarDownload,
-                downloadImage,
-                extraInfo,
-                card.data,
-                clickCallback
-            )
+            binding.downloadChildEpisodeText.apply {
+                text = context.getNameFull(d.name, d.episode, d.season)
+                isSelected = true // is needed for text repeating
+            }
 
-            holder.setOnClickListener {
+
+            binding.downloadChildEpisodeHolder.setOnClickListener {
                 clickCallback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_PLAY_FILE, d))
             }
         }
-
-        override fun reattachDownloadButton() {
-            downloadButton.dispose()
-            val card = localCard
-            if (card != null) {
-                downloadButton.setUpButton(
-                    card.currentBytes,
-                    card.totalBytes,
-                    progressBarDownload,
-                    downloadImage,
-                    extraInfo,
-                    card.data,
-                    clickCallback
-                )
-            }
-        }
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt
index 477a18e0..f62482ed 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt
@@ -5,23 +5,24 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentChildDownloadsBinding
 import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick
+import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
+import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.getKeys
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
-import kotlinx.android.synthetic.main.fragment_child_downloads.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 class DownloadChildFragment : Fragment() {
     companion object {
-        fun newInstance(headerName: String, folder: String) : Bundle {
+        fun newInstance(headerName: String, folder: String): Bundle {
             return Bundle().apply {
                 putString("folder", folder)
                 putString("name", headerName)
@@ -30,13 +31,20 @@ class DownloadChildFragment : Fragment() {
     }
 
     override fun onDestroyView() {
-        (download_child_list?.adapter as DownloadChildAdapter?)?.killAdapter()
         downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent -= it }
+        binding = null
         super.onDestroyView()
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_child_downloads, container, false)
+    var binding: FragmentChildDownloadsBinding? = null
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        val localBinding = FragmentChildDownloadsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root//inflater.inflate(R.layout.fragment_child_downloads, container, false)
     }
 
     private fun updateList(folder: String) = main {
@@ -50,14 +58,15 @@ class DownloadChildFragment : Fragment() {
                         ?: return@mapNotNull null
                     VisualDownloadChildCached(info.fileLength, info.totalBytes, it)
                 }
-            }.sortedBy { it.data.episode + (it.data.season?: 0)*100000 }
+            }.sortedBy { it.data.episode + (it.data.season ?: 0) * 100000 }
             if (eps.isEmpty()) {
                 activity?.onBackPressed()
                 return@main
             }
 
-            (download_child_list?.adapter as DownloadChildAdapter? ?: return@main).cardList = eps
-            download_child_list?.adapter?.notifyDataSetChanged()
+            (binding?.downloadChildList?.adapter as DownloadChildAdapter? ?: return@main).cardList =
+                eps
+            binding?.downloadChildList?.adapter?.notifyDataSetChanged()
         }
     }
 
@@ -72,23 +81,26 @@ class DownloadChildFragment : Fragment() {
             activity?.onBackPressed() // TODO FIX
             return
         }
-        context?.fixPaddingStatusbar(download_child_root)
+        fixPaddingStatusbar(binding?.downloadChildRoot)
 
-        download_child_toolbar.title = name
-        download_child_toolbar.setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-        download_child_toolbar.setNavigationOnClickListener {
-            activity?.onBackPressed()
+        binding?.downloadChildToolbar?.apply {
+            title = name
+            setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
+            setNavigationOnClickListener {
+                activity?.onBackPressed()
+            }
         }
 
+
         val adapter: RecyclerView.Adapter<RecyclerView.ViewHolder> =
             DownloadChildAdapter(
                 ArrayList(),
             ) { click ->
-                handleDownloadClick(activity, click)
+                handleDownloadClick(click)
             }
 
         downloadDeleteEventListener = { id: Int ->
-            val list = (download_child_list?.adapter as DownloadChildAdapter?)?.cardList
+            val list = (binding?.downloadChildList?.adapter as DownloadChildAdapter?)?.cardList
             if (list != null) {
                 if (list.any { it.data.id == id }) {
                     updateList(folder)
@@ -98,8 +110,12 @@ class DownloadChildFragment : Fragment() {
 
         downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent += it }
 
-        download_child_list.adapter = adapter
-        download_child_list.layoutManager = GridLayoutManager(context, 1)
+        binding?.downloadChildList?.adapter = adapter
+        binding?.downloadChildList?.setLinearListLayout(
+            isHorizontal = false,
+            nextDown = FOCUS_SELF,
+            nextRight = FOCUS_SELF
+        )//layoutManager = GridLayoutManager(context, 1)
 
         updateList(folder)
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
index e80a8fa5..27c2e1a3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
@@ -34,12 +34,14 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
-import kotlinx.android.synthetic.main.fragment_downloads.*
-import kotlinx.android.synthetic.main.stream_input.*
 import android.text.format.Formatter.formatShortFileSize
 import androidx.core.widget.doOnTextChanged
+import com.lagradost.cloudstream3.databinding.FragmentDownloadsBinding
+import com.lagradost.cloudstream3.databinding.StreamInputBinding
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.ui.player.BasicLink
+import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
+import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import java.net.URI
 
@@ -60,8 +62,8 @@ class DownloadFragment : Fragment() {
 
     private fun setList(list: List<VisualDownloadHeaderCached>) {
         main {
-            (download_list?.adapter as DownloadHeaderAdapter?)?.cardList = list
-            download_list?.adapter?.notifyDataSetChanged()
+            (binding?.downloadList?.adapter as DownloadHeaderAdapter?)?.cardList = list
+            binding?.downloadList?.adapter?.notifyDataSetChanged()
         }
     }
 
@@ -70,10 +72,12 @@ class DownloadFragment : Fragment() {
             VideoDownloadManager.downloadDeleteEvent -= downloadDeleteEventListener!!
             downloadDeleteEventListener = null
         }
-        (download_list?.adapter as DownloadHeaderAdapter?)?.killAdapter()
+        binding = null
         super.onDestroyView()
     }
 
+    var binding: FragmentDownloadsBinding? = null
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -82,7 +86,9 @@ class DownloadFragment : Fragment() {
         downloadsViewModel =
             ViewModelProvider(this)[DownloadViewModel::class.java]
 
-        return inflater.inflate(R.layout.fragment_downloads, container, false)
+        val localBinding = FragmentDownloadsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root//inflater.inflate(R.layout.fragment_downloads, container, false)
     }
 
     private var downloadDeleteEventListener: ((Int) -> Unit)? = null
@@ -92,36 +98,40 @@ class DownloadFragment : Fragment() {
         hideKeyboard()
 
         observe(downloadsViewModel.noDownloadsText) {
-            text_no_downloads.text = it
+            binding?.textNoDownloads?.text = it
         }
         observe(downloadsViewModel.headerCards) {
             setList(it)
-            download_loading.isVisible = false
+            binding?.downloadLoading?.isVisible = false
         }
         observe(downloadsViewModel.availableBytes) {
-            download_free_txt?.text =
+            binding?.downloadFreeTxt?.text =
                 getString(R.string.storage_size_format).format(
                     getString(R.string.free_storage),
                     formatShortFileSize(view.context, it)
                 )
-            download_free?.setLayoutWidth(it)
+            binding?.downloadFree?.setLayoutWidth(it)
         }
         observe(downloadsViewModel.usedBytes) {
-            download_used_txt?.text =
-                getString(R.string.storage_size_format).format(
-                    getString(R.string.used_storage),
-                    formatShortFileSize(view.context, it)
-                )
-            download_used?.setLayoutWidth(it)
-            download_storage_appbar?.isVisible = it > 0
+            binding?.apply {
+                downloadUsedTxt.text =
+                    getString(R.string.storage_size_format).format(
+                        getString(R.string.used_storage),
+                        formatShortFileSize(view.context, it)
+                    )
+                downloadUsed.setLayoutWidth(it)
+                downloadStorageAppbar.isVisible = it > 0
+            }
         }
         observe(downloadsViewModel.downloadBytes) {
-            download_app_txt?.text =
-                getString(R.string.storage_size_format).format(
-                    getString(R.string.app_storage),
-                    formatShortFileSize(view.context, it)
-                )
-            download_app?.setLayoutWidth(it)
+            binding?.apply {
+                downloadAppTxt.text =
+                    getString(R.string.storage_size_format).format(
+                        getString(R.string.app_storage),
+                        formatShortFileSize(view.context, it)
+                    )
+                downloadApp.setLayoutWidth(it)
+            }
         }
 
         val adapter: RecyclerView.Adapter<RecyclerView.ViewHolder> =
@@ -143,6 +153,7 @@ class DownloadFragment : Fragment() {
                                 )
                             }
                         }
+
                         1 -> {
                             (activity as AppCompatActivity?)?.loadResult(
                                 click.data.url,
@@ -154,7 +165,7 @@ class DownloadFragment : Fragment() {
                 },
                 { downloadClickEvent ->
                     if (downloadClickEvent.data !is VideoDownloadHelper.DownloadEpisodeCached) return@DownloadHeaderAdapter
-                    handleDownloadClick(activity, downloadClickEvent)
+                    handleDownloadClick(downloadClickEvent)
                     if (downloadClickEvent.action == DOWNLOAD_ACTION_DELETE_FILE) {
                         context?.let { ctx ->
                             downloadsViewModel.updateList(ctx)
@@ -164,7 +175,7 @@ class DownloadFragment : Fragment() {
             )
 
         downloadDeleteEventListener = { id ->
-            val list = (download_list?.adapter as DownloadHeaderAdapter?)?.cardList
+            val list = (binding?.downloadList?.adapter as DownloadHeaderAdapter?)?.cardList
             if (list != null) {
                 if (list.any { it.data.id == id }) {
                     context?.let { ctx ->
@@ -177,31 +188,42 @@ class DownloadFragment : Fragment() {
 
         downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent += it }
 
-        download_list?.adapter = adapter
-        download_list?.layoutManager = GridLayoutManager(context, 1)
+        binding?.downloadList?.apply {
+            this.adapter = adapter
+            setLinearListLayout(
+                isHorizontal = false,
+                nextRight = FOCUS_SELF,
+                nextUp = FOCUS_SELF,
+                nextDown = FOCUS_SELF
+            )
+            //layoutManager = GridLayoutManager(context, 1)
+        }
 
         // Should be visible in emulator layout
-        download_stream_button?.isGone = isTrueTvSettings()
-        download_stream_button?.setOnClickListener {
+        binding?.downloadStreamButton?.isGone = isTrueTvSettings()
+        binding?.downloadStreamButton?.setOnClickListener {
             val dialog =
                 Dialog(it.context ?: return@setOnClickListener, R.style.AlertDialogCustom)
-            dialog.setContentView(R.layout.stream_input)
+
+            val binding = StreamInputBinding.inflate(dialog.layoutInflater)
+
+            dialog.setContentView(binding.root)
 
             dialog.show()
 
             // If user has clicked the switch do not interfere
             var preventAutoSwitching = false
-            dialog.hls_switch?.setOnClickListener {
+            binding.hlsSwitch.setOnClickListener {
                 preventAutoSwitching = true
             }
 
             fun activateSwitchOnHls(text: String?) {
-                dialog.hls_switch?.isChecked = normalSafeApiCall {
+                binding.hlsSwitch.isChecked = normalSafeApiCall {
                     URI(text).path?.substringAfterLast(".")?.contains("m3u")
                 } == true
             }
 
-            dialog.stream_referer?.doOnTextChanged { text, _, _, _ ->
+            binding.streamReferer.doOnTextChanged { text, _, _, _ ->
                 if (!preventAutoSwitching)
                     activateSwitchOnHls(text?.toString())
             }
@@ -210,16 +232,16 @@ class DownloadFragment : Fragment() {
                 0
             )?.text?.toString()?.let { copy ->
                 val fixedText = copy.trim()
-                dialog.stream_url?.setText(fixedText)
+                binding.streamUrl.setText(fixedText)
                 activateSwitchOnHls(fixedText)
             }
 
-            dialog.apply_btt?.setOnClickListener {
-                val url = dialog.stream_url.text?.toString()
+            binding.applyBtt.setOnClickListener {
+                val url = binding.streamUrl.text?.toString()
                 if (url.isNullOrEmpty()) {
-                    showToast(activity, R.string.error_invalid_url, Toast.LENGTH_SHORT)
+                    showToast(R.string.error_invalid_url, Toast.LENGTH_SHORT)
                 } else {
-                    val referer = dialog.stream_referer.text?.toString()
+                    val referer = binding.streamReferer.text?.toString()
 
                     activity?.navigate(
                         R.id.global_to_navigation_player,
@@ -228,7 +250,7 @@ class DownloadFragment : Fragment() {
                                 listOf(BasicLink(url)),
                                 extract = true,
                                 referer = referer,
-                                isM3u8 = dialog.hls_switch?.isChecked
+                                isM3u8 = binding.hlsSwitch.isChecked
                             )
                         )
                     )
@@ -237,22 +259,22 @@ class DownloadFragment : Fragment() {
                 }
             }
 
-            dialog.cancel_btt?.setOnClickListener {
+            binding.cancelBtt.setOnClickListener {
                 dialog.dismissSafe(activity)
             }
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            download_list?.setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+            binding?.downloadList?.setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                 val dy = scrollY - oldScrollY
                 if (dy > 0) { //check for scroll down
-                    download_stream_button?.shrink() // hide
+                    binding?.downloadStreamButton?.shrink() // hide
                 } else if (dy < -5) {
-                    download_stream_button?.extend() // show
+                    binding?.downloadStreamButton?.extend() // show
                 }
             }
         }
         downloadsViewModel.updateList(requireContext())
 
-        context?.fixPaddingStatusbar(download_root)
+        fixPaddingStatusbar(binding?.downloadRoot)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt
index 29bb303a..65a6441f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt
@@ -5,16 +5,13 @@ import android.text.format.Formatter.formatShortFileSize
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.cardview.widget.CardView
-import androidx.core.widget.ContentLoadingProgressBar
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.DownloadHeaderEpisodeBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
-import kotlinx.android.synthetic.main.download_header_episode.view.*
 import java.util.*
 
 data class VisualDownloadHeaderCached(
@@ -26,7 +23,10 @@ data class VisualDownloadHeaderCached(
     val child: VideoDownloadHelper.DownloadEpisodeCached?,
 )
 
-data class DownloadHeaderClickEvent(val action: Int, val data: VideoDownloadHelper.DownloadHeaderCached)
+data class DownloadHeaderClickEvent(
+    val action: Int,
+    val data: VideoDownloadHelper.DownloadHeaderCached
+)
 
 class DownloadHeaderAdapter(
     var cardList: List<VisualDownloadHeaderCached>,
@@ -34,39 +34,13 @@ class DownloadHeaderAdapter(
     private val movieClickCallback: (DownloadClickEvent) -> Unit,
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    private val mBoundViewHolders: HashSet<DownloadButtonViewHolder> = HashSet()
-    private fun getAllBoundViewHolders(): Set<DownloadButtonViewHolder?>? {
-        return Collections.unmodifiableSet(mBoundViewHolders)
-    }
-
-    fun killAdapter() {
-        getAllBoundViewHolders()?.forEach { view ->
-            view?.downloadButton?.dispose()
-        }
-    }
-
-    override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.downloadButton.dispose()
-        }
-    }
-
-    override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.downloadButton.dispose()
-            mBoundViewHolders.remove(holder)
-        }
-    }
-
-    override fun onViewAttachedToWindow(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.reattachDownloadButton()
-        }
-    }
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return DownloadHeaderViewHolder(
-            LayoutInflater.from(parent.context).inflate(R.layout.download_header_episode, parent, false),
+            DownloadHeaderEpisodeBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            ),
             clickCallback,
             movieClickCallback
         )
@@ -76,7 +50,6 @@ class DownloadHeaderAdapter(
         when (holder) {
             is DownloadHeaderViewHolder -> {
                 holder.bind(cardList[position])
-                mBoundViewHolders.add(holder)
             }
         }
     }
@@ -87,93 +60,89 @@ class DownloadHeaderAdapter(
 
     class DownloadHeaderViewHolder
     constructor(
-        itemView: View,
+        val binding: DownloadHeaderEpisodeBinding,
         private val clickCallback: (DownloadHeaderClickEvent) -> Unit,
         private val movieClickCallback: (DownloadClickEvent) -> Unit,
-    ) : RecyclerView.ViewHolder(itemView), DownloadButtonViewHolder {
-        override var downloadButton = EasyDownloadButton()
+    ) : RecyclerView.ViewHolder(binding.root) {
 
-        private val poster: ImageView? = itemView.download_header_poster
+        /*private val poster: ImageView? = itemView.download_header_poster
         private val title: TextView = itemView.download_header_title
         private val extraInfo: TextView = itemView.download_header_info
         private val holder: CardView = itemView.episode_holder
 
         private val downloadBar: ContentLoadingProgressBar = itemView.download_header_progress_downloaded
         private val downloadImage: ImageView = itemView.download_header_episode_download
-        private val normalImage: ImageView = itemView.download_header_goto_child
-        private var localCard: VisualDownloadHeaderCached? = null
+        private val normalImage: ImageView = itemView.download_header_goto_child*/
 
         @SuppressLint("SetTextI18n")
         fun bind(card: VisualDownloadHeaderCached) {
-            localCard = card
             val d = card.data
 
-            poster?.setImage(d.poster)
-            poster?.setOnClickListener {
-                clickCallback.invoke(DownloadHeaderClickEvent(1, d))
+            binding.downloadHeaderPoster.apply {
+                setImage(d.poster)
+                setOnClickListener {
+                    clickCallback.invoke(DownloadHeaderClickEvent(1, d))
+                }
             }
 
-            title.text = d.name
-            val mbString = formatShortFileSize(itemView.context, card.totalBytes)
+            binding.apply {
 
-            //val isMovie = d.type.isMovieType()
-            if (card.child != null) {
-                downloadBar.visibility = View.VISIBLE
-                downloadImage.visibility = View.VISIBLE
-                normalImage.visibility = View.GONE
-                /*setUpButton(
-                    card.currentBytes,
-                    card.totalBytes,
-                    downloadBar,
-                    downloadImage,
-                    extraInfo,
-                    card.child,
-                    movieClickCallback
-                )*/
+                binding.downloadHeaderTitle.text = d.name
+                val mbString = formatShortFileSize(itemView.context, card.totalBytes)
 
-                holder.setOnClickListener {
-                    movieClickCallback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_PLAY_FILE, card.child))
-                }
-            } else {
-                downloadBar.visibility = View.GONE
-                downloadImage.visibility = View.GONE
-                normalImage.visibility = View.VISIBLE
+                //val isMovie = d.type.isMovieType()
+                if (card.child != null) {
+                    //downloadHeaderProgressDownloaded.visibility = View.VISIBLE
 
-                try {
-                    extraInfo.text =
-                        extraInfo.context.getString(R.string.extra_info_format).format(
-                            card.totalDownloads,
-                            if (card.totalDownloads == 1) extraInfo.context.getString(R.string.episode) else extraInfo.context.getString(
-                                R.string.episodes
-                            ),
-                            mbString
+                   // downloadHeaderEpisodeDownload.visibility = View.VISIBLE
+                    binding.downloadHeaderGotoChild.visibility = View.GONE
+
+                    downloadButton.setDefaultClickListener(card.child, downloadHeaderInfo, movieClickCallback)
+                    downloadButton.isVisible = true
+                    /*setUpButton(
+                        card.currentBytes,
+                        card.totalBytes,
+                        downloadBar,
+                        downloadImage,
+                        extraInfo,
+                        card.child,
+                        movieClickCallback
+                    )*/
+
+                    episodeHolder.setOnClickListener {
+                        movieClickCallback.invoke(
+                            DownloadClickEvent(
+                                DOWNLOAD_ACTION_PLAY_FILE,
+                                card.child
+                            )
                         )
-                } catch (t : Throwable) {
-                    // you probably formatted incorrectly
-                    extraInfo.text = "Error"
-                    logError(t)
+                    }
+                } else {
+                    downloadButton.isVisible = false
+                   // downloadHeaderProgressDownloaded.visibility = View.GONE
+                   // downloadHeaderEpisodeDownload.visibility = View.GONE
+                    binding.downloadHeaderGotoChild.visibility = View.VISIBLE
+
+                    try {
+                        downloadHeaderInfo.text =
+                            downloadHeaderInfo.context.getString(R.string.extra_info_format).format(
+                                card.totalDownloads,
+                                if (card.totalDownloads == 1) downloadHeaderInfo.context.getString(R.string.episode) else downloadHeaderInfo.context.getString(
+                                    R.string.episodes
+                                ),
+                                mbString
+                            )
+                    } catch (t: Throwable) {
+                        // you probably formatted incorrectly
+                        downloadHeaderInfo.text = "Error"
+                        logError(t)
+                    }
+
+
+                    episodeHolder.setOnClickListener {
+                        clickCallback.invoke(DownloadHeaderClickEvent(0, d))
+                    }
                 }
-
-
-                holder.setOnClickListener {
-                    clickCallback.invoke(DownloadHeaderClickEvent(0, d))
-                }
-            }
-        }
-
-        override fun reattachDownloadButton() {
-            downloadButton.dispose()
-            val card = localCard
-            if (card?.child != null) {
-                downloadButton.setUpButton(
-                    card.currentBytes,
-                    card.totalBytes,
-                    downloadBar,
-                    downloadImage,
-                    extraInfo,
-                    card.child,
-                    movieClickCallback
-                )
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/EasyDownloadButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/EasyDownloadButton.kt
deleted file mode 100644
index 77878432..00000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/EasyDownloadButton.kt
+++ /dev/null
@@ -1,264 +0,0 @@
-package com.lagradost.cloudstream3.ui.download
-
-import android.animation.ObjectAnimator
-import android.text.format.Formatter.formatShortFileSize
-import android.view.View
-import android.view.animation.DecelerateInterpolator
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import androidx.core.widget.ContentLoadingProgressBar
-import com.google.android.material.button.MaterialButton
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.utils.Coroutines
-import com.lagradost.cloudstream3.utils.IDisposable
-import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIcons
-import com.lagradost.cloudstream3.utils.VideoDownloadManager
-
-class EasyDownloadButton : IDisposable {
-    interface IMinimumData {
-        val id: Int
-    }
-
-    private var _clickCallback: ((DownloadClickEvent) -> Unit)? = null
-    private var _imageChangeCallback: ((Pair<Int, String>) -> Unit)? = null
-
-    override fun dispose() {
-        try {
-            _clickCallback = null
-            _imageChangeCallback = null
-            downloadProgressEventListener?.let { VideoDownloadManager.downloadProgressEvent -= it }
-            downloadStatusEventListener?.let { VideoDownloadManager.downloadStatusEvent -= it }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private var downloadProgressEventListener: ((Triple<Int, Long, Long>) -> Unit)? = null
-    private var downloadStatusEventListener: ((Pair<Int, VideoDownloadManager.DownloadType>) -> Unit)? =
-        null
-
-    fun setUpMaterialButton(
-        setupCurrentBytes: Long?,
-        setupTotalBytes: Long?,
-        progressBar: ContentLoadingProgressBar,
-        downloadButton: MaterialButton,
-        textView: TextView?,
-        data: IMinimumData,
-        clickCallback: (DownloadClickEvent) -> Unit,
-    ) {
-        setUpDownloadButton(
-            setupCurrentBytes,
-            setupTotalBytes,
-            progressBar,
-            textView,
-            data,
-            downloadButton,
-            {
-                downloadButton.setIconResource(it.first)
-                downloadButton.text = it.second
-            },
-            clickCallback
-        )
-    }
-
-    fun setUpMoreButton(
-        setupCurrentBytes: Long?,
-        setupTotalBytes: Long?,
-        progressBar: ContentLoadingProgressBar,
-        downloadImage: ImageView,
-        textView: TextView?,
-        textViewProgress: TextView?,
-        clickableView: View,
-        isTextPercentage: Boolean,
-        data: IMinimumData,
-        clickCallback: (DownloadClickEvent) -> Unit,
-    ) {
-        setUpDownloadButton(
-            setupCurrentBytes,
-            setupTotalBytes,
-            progressBar,
-            textViewProgress,
-            data,
-            clickableView,
-            { (image, text) ->
-                downloadImage.isVisible = textViewProgress?.isGone ?: true
-                downloadImage.setImageResource(image)
-                textView?.text = text
-            },
-            clickCallback, isTextPercentage
-        )
-    }
-
-    fun setUpButton(
-        setupCurrentBytes: Long?,
-        setupTotalBytes: Long?,
-        progressBar: ContentLoadingProgressBar,
-        downloadImage: ImageView,
-        textView: TextView?,
-        data: IMinimumData,
-        clickCallback: (DownloadClickEvent) -> Unit,
-    ) {
-        setUpDownloadButton(
-            setupCurrentBytes,
-            setupTotalBytes,
-            progressBar,
-            textView,
-            data,
-            downloadImage,
-            {
-                downloadImage.setImageResource(it.first)
-            },
-            clickCallback
-        )
-    }
-
-    private fun setUpDownloadButton(
-        setupCurrentBytes: Long?,
-        setupTotalBytes: Long?,
-        progressBar: ContentLoadingProgressBar,
-        textView: TextView?,
-        data: IMinimumData,
-        downloadView: View,
-        downloadImageChangeCallback: (Pair<Int, String>) -> Unit,
-        clickCallback: (DownloadClickEvent) -> Unit,
-        isTextPercentage: Boolean = false
-    ) {
-        _clickCallback = clickCallback
-        _imageChangeCallback = downloadImageChangeCallback
-        var lastState: VideoDownloadManager.DownloadType? = null
-        var currentBytes = setupCurrentBytes ?: 0
-        var totalBytes = setupTotalBytes ?: 0
-        var needImageUpdate = true
-
-        fun changeDownloadImage(state: VideoDownloadManager.DownloadType) {
-            lastState = state
-            if (currentBytes <= 0) needImageUpdate = true
-            val img = if (currentBytes > 0) {
-                when (state) {
-                    VideoDownloadManager.DownloadType.IsPaused -> Pair(
-                        R.drawable.ic_baseline_play_arrow_24,
-                        R.string.download_paused
-                    )
-                    VideoDownloadManager.DownloadType.IsDownloading -> Pair(
-                        R.drawable.netflix_pause,
-                        R.string.downloading
-                    )
-                    else -> Pair(R.drawable.ic_baseline_delete_outline_24, R.string.downloaded)
-                }
-            } else {
-                Pair(R.drawable.netflix_download, R.string.download)
-            }
-            _imageChangeCallback?.invoke(
-                Pair(
-                    img.first,
-                    downloadView.context.getString(img.second)
-                )
-            )
-        }
-
-        fun fixDownloadedBytes(setCurrentBytes: Long, setTotalBytes: Long, animate: Boolean) {
-            currentBytes = setCurrentBytes
-            totalBytes = setTotalBytes
-
-            if (currentBytes == 0L) {
-                changeDownloadImage(VideoDownloadManager.DownloadType.IsStopped)
-                textView?.visibility = View.GONE
-                progressBar.visibility = View.GONE
-            } else {
-                if (lastState == VideoDownloadManager.DownloadType.IsStopped) {
-                    changeDownloadImage(VideoDownloadManager.getDownloadState(data.id))
-                }
-                textView?.visibility = View.VISIBLE
-                progressBar.visibility = View.VISIBLE
-                val currentMbString = formatShortFileSize(textView?.context, setCurrentBytes)
-                val totalMbString = formatShortFileSize(textView?.context, setTotalBytes)
-
-                textView?.text =
-                    if (isTextPercentage) "%d%%".format(setCurrentBytes * 100L / setTotalBytes) else
-                        textView?.context?.getString(R.string.download_size_format)
-                            ?.format(currentMbString, totalMbString)
-
-                progressBar.let { bar ->
-                    bar.max = (setTotalBytes / 1000).toInt()
-
-                    if (animate) {
-                        val animation: ObjectAnimator = ObjectAnimator.ofInt(
-                            bar,
-                            "progress",
-                            bar.progress,
-                            (setCurrentBytes / 1000).toInt()
-                        )
-                        animation.duration = 500
-                        animation.setAutoCancel(true)
-                        animation.interpolator = DecelerateInterpolator()
-                        animation.start()
-                    } else {
-                        bar.progress = (setCurrentBytes / 1000).toInt()
-                    }
-                }
-            }
-        }
-
-        fixDownloadedBytes(currentBytes, totalBytes, false)
-        changeDownloadImage(VideoDownloadManager.getDownloadState(data.id))
-
-        downloadProgressEventListener = { downloadData: Triple<Int, Long, Long> ->
-            if (data.id == downloadData.first) {
-                if (downloadData.second != currentBytes || downloadData.third != totalBytes) { // TO PREVENT WASTING UI TIME
-                    Coroutines.runOnMainThread {
-                        fixDownloadedBytes(downloadData.second, downloadData.third, true)
-                        changeDownloadImage(VideoDownloadManager.getDownloadState(data.id))
-                    }
-                }
-            }
-        }
-
-        downloadStatusEventListener =
-            { downloadData: Pair<Int, VideoDownloadManager.DownloadType> ->
-                if (data.id == downloadData.first) {
-                    if (lastState != downloadData.second || needImageUpdate) { // TO PREVENT WASTING UI TIME
-                        Coroutines.runOnMainThread {
-                            changeDownloadImage(downloadData.second)
-                        }
-                    }
-                }
-            }
-
-        downloadProgressEventListener?.let { VideoDownloadManager.downloadProgressEvent += it }
-        downloadStatusEventListener?.let { VideoDownloadManager.downloadStatusEvent += it }
-
-        downloadView.setOnClickListener {
-            if (currentBytes <= 0 || totalBytes <= 0) {
-                _clickCallback?.invoke(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, data))
-            } else {
-                val list = arrayListOf(
-                    Pair(DOWNLOAD_ACTION_PLAY_FILE, R.string.popup_play_file),
-                    Pair(DOWNLOAD_ACTION_DELETE_FILE, R.string.popup_delete_file),
-                )
-
-                // DON'T RESUME A DOWNLOADED FILE lastState != VideoDownloadManager.DownloadType.IsDone &&
-                if ((currentBytes * 100 / totalBytes) < 98) {
-                    list.add(
-                        if (lastState == VideoDownloadManager.DownloadType.IsDownloading)
-                            Pair(DOWNLOAD_ACTION_PAUSE_DOWNLOAD, R.string.popup_pause_download)
-                        else
-                            Pair(DOWNLOAD_ACTION_RESUME_DOWNLOAD, R.string.popup_resume_download)
-                    )
-                }
-
-                it.popupMenuNoIcons(
-                    list
-                ) {
-                    _clickCallback?.invoke(DownloadClickEvent(itemId, data))
-                }
-            }
-        }
-
-        downloadView.setOnLongClickListener {
-            clickCallback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_LONG_CLICK, data))
-            return@setOnLongClickListener true
-        }
-    }
-}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
new file mode 100644
index 00000000..b43f1aac
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
@@ -0,0 +1,202 @@
+package com.lagradost.cloudstream3.ui.download.button
+
+import android.content.Context
+import android.text.format.Formatter
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import android.widget.TextView
+import androidx.annotation.LayoutRes
+import androidx.core.view.isVisible
+import androidx.core.widget.ContentLoadingProgressBar
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.utils.VideoDownloadManager
+
+typealias DownloadStatusTell = VideoDownloadManager.DownloadType
+
+data class DownloadMetadata(
+    var id: Int,
+    var downloadedLength: Long,
+    var totalLength: Long,
+    var status: DownloadStatusTell? = null
+) {
+    val progressPercentage: Long
+        get() = if (downloadedLength < 1024) 0 else maxOf(
+            0,
+            minOf(100, (downloadedLength * 100L) / (totalLength + 1))
+        )
+}
+
+abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
+    FrameLayout(context, attributeSet) {
+
+    var persistentId: Int? = null // used to save sessions
+
+    lateinit var progressBar: ContentLoadingProgressBar
+    var progressText: TextView? = null
+
+    /*val gid: String? get() = sessionIdToGid[persistentId]
+
+    // used for resuming data
+    var _lastRequestOverride: UriRequest? = null
+    var lastRequest: UriRequest?
+        get() = _lastRequestOverride ?: sessionIdToLastRequest[persistentId]
+        set(value) {
+            _lastRequestOverride = value
+        }
+
+    var files: List<AbstractClient.JsonFile> = emptyList()*/
+    protected var isZeroBytes: Boolean = true
+
+    fun inflate(@LayoutRes layout: Int) {
+        inflate(context, layout, this)
+    }
+
+    init {
+        resetViewData()
+    }
+
+    open fun resetViewData() {
+        // lastRequest = null
+        isZeroBytes = true
+        persistentId = null
+    }
+
+    var currentMetaData: DownloadMetadata =
+        DownloadMetadata(0, 0, 0, null)
+
+    fun setPersistentId(id: Int) {
+        persistentId = id
+        currentMetaData.id = id
+
+        VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(context, id)?.let { savedData ->
+            val downloadedBytes = savedData.fileLength
+            val totalBytes = savedData.totalBytes
+
+            /*lastRequest = savedData.uriRequest
+            files = savedData.files
+
+            var totalBytes: Long = 0
+            var downloadedBytes: Long = 0
+            for (file in savedData.files) {
+                downloadedBytes += file.completedLength
+                totalBytes += file.length
+            }*/
+            setProgress(downloadedBytes, totalBytes)
+            // some extra padding for just in case
+            val status = VideoDownloadManager.downloadStatus[id]
+                ?: if (downloadedBytes > 1024L && downloadedBytes + 1024L >= totalBytes) DownloadStatusTell.IsDone else DownloadStatusTell.IsPaused
+            currentMetaData.apply {
+                this.id = id
+                this.downloadedLength = downloadedBytes
+                this.totalLength = totalBytes
+                this.status = status
+            }
+            setStatus(status)
+        } ?: run {
+            resetView()
+        }
+    }
+
+    abstract fun setStatus(status: VideoDownloadManager.DownloadType?)
+
+    open fun setProgress(downloadedBytes: Long, totalBytes: Long) {
+        isZeroBytes = downloadedBytes == 0L
+        progressBar.post {
+            val steps = 10000L
+            progressBar.max = steps.toInt()
+            // div by zero error and 1 byte off is ok impo
+
+            val progress = (downloadedBytes * steps / (totalBytes + 1L)).toInt()
+
+            val animation = ProgressBarAnimation(
+                progressBar,
+                progressBar.progress.toFloat(),
+                progress.toFloat()
+            ).apply {
+                fillAfter = true
+                duration =
+                    if (progress > progressBar.progress) // we don't want to animate backward changes in progress
+                        100
+                    else
+                        0L
+            }
+
+            if (isZeroBytes) {
+                progressText?.isVisible = false
+            } else {
+                progressText?.apply {
+                    val currentMbString = Formatter.formatShortFileSize(context, downloadedBytes)
+                    val totalMbString = Formatter.formatShortFileSize(context, totalBytes)
+                    text =
+                            //if (isTextPercentage) "%d%%".format(setCurrentBytes * 100L / setTotalBytes) else
+                        context?.getString(R.string.download_size_format)
+                            ?.format(currentMbString, totalMbString)
+                }
+            }
+
+            progressBar.startAnimation(animation)
+        }
+    }
+
+    fun downloadStatusEvent(data: Pair<Int, VideoDownloadManager.DownloadType>) {
+        val (id, status) = data
+        if (id == persistentId) {
+            currentMetaData.status = status
+            setStatus(status)
+        }
+    }
+
+    /*fun downloadDeleteEvent(data: Int) {
+
+    }*/
+
+    /*fun downloadEvent(data: Pair<Int, VideoDownloadManager.DownloadActionType>) {
+        val (id, action) = data
+
+    }*/
+
+    fun downloadProgressEvent(data: Triple<Int, Long, Long>) {
+        val (id, bytesDownloaded, bytesTotal) = data
+        if (id == persistentId) {
+            currentMetaData.downloadedLength = bytesDownloaded
+            currentMetaData.totalLength = bytesTotal
+
+            setProgress(bytesDownloaded, bytesTotal)
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        VideoDownloadManager.downloadStatusEvent += ::downloadStatusEvent
+        //VideoDownloadManager.downloadDeleteEvent += ::downloadDeleteEvent
+        //VideoDownloadManager.downloadEvent += ::downloadEvent
+        VideoDownloadManager.downloadProgressEvent += ::downloadProgressEvent
+
+        val pid = persistentId
+        if (pid != null) {
+            // refresh in case of onDetachedFromWindow -> onAttachedToWindow while still being ???????
+            setPersistentId(pid)
+        }
+
+        super.onAttachedToWindow()
+    }
+
+    override fun onDetachedFromWindow() {
+        VideoDownloadManager.downloadStatusEvent -= ::downloadStatusEvent
+        //VideoDownloadManager.downloadDeleteEvent -= ::downloadDeleteEvent
+        //VideoDownloadManager.downloadEvent -= ::downloadEvent
+        VideoDownloadManager.downloadProgressEvent -= ::downloadProgressEvent
+
+        super.onDetachedFromWindow()
+    }
+
+    /**
+     * No checks required. Arg will always include a download with current id
+     * */
+    abstract fun updateViewOnDownload(metadata: DownloadMetadata)
+
+    /**
+     * Get a clean slate again, might be useful in recyclerview?
+     * */
+    abstract fun resetView()
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/DownloadButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/DownloadButton.kt
new file mode 100644
index 00000000..d97a4b88
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/DownloadButton.kt
@@ -0,0 +1,59 @@
+package com.lagradost.cloudstream3.ui.download.button
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.TextView
+import androidx.core.view.isVisible
+import com.google.android.material.button.MaterialButton
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+
+class DownloadButton(context: Context, attributeSet: AttributeSet) :
+    PieFetchButton(context, attributeSet) {
+
+    var mainText: TextView? = null
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        progressText = findViewById(R.id.result_movie_download_text_precentage)
+        mainText = findViewById(R.id.result_movie_download_text)
+    }
+
+    override fun setStatus(status: DownloadStatusTell?) {
+        mainText?.post {
+            val txt = when (status) {
+                DownloadStatusTell.IsPaused -> R.string.download_paused
+                DownloadStatusTell.IsDownloading -> R.string.downloading
+                DownloadStatusTell.IsDone -> R.string.downloaded
+                else -> R.string.download
+            }
+            mainText?.setText(txt)
+        }
+        super.setStatus(status)
+
+    }
+
+    override fun setDefaultClickListener(
+        card: VideoDownloadHelper.DownloadEpisodeCached,
+        textView: TextView?,
+        callback: (DownloadClickEvent) -> Unit
+    ) {
+        this.setDefaultClickListener(
+            this.findViewById<MaterialButton>(R.id.download_movie_button),
+            textView,
+            card,
+            callback
+        )
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun updateViewOnDownload(metadata: DownloadMetadata) {
+        super.updateViewOnDownload(metadata)
+
+        val isVis = metadata.progressPercentage > 0
+        progressText?.isVisible = isVis
+        if (isVis)
+            progressText?.text = "${metadata.progressPercentage}%"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt
new file mode 100644
index 00000000..d20fcf93
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt
@@ -0,0 +1,323 @@
+package com.lagradost.cloudstream3.ui.download.button
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.util.Log
+import android.view.View
+import android.view.animation.AnimationUtils
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DELETE_FILE
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_PAUSE_DOWNLOAD
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_PLAY_FILE
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_RESUME_DOWNLOAD
+import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
+import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIcons
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+import com.lagradost.cloudstream3.utils.VideoDownloadManager
+
+
+open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
+    BaseFetchButton(context, attributeSet) {
+
+    private var waitingAnimation: Int = 0
+    private var animateWaiting: Boolean = false
+    private var activeOutline: Int = 0
+    private var nonActiveOutline: Int = 0
+
+    private var iconInit: Int = 0
+    private var iconError: Int = 0
+    private var iconComplete: Int = 0
+    private var iconActive: Int = 0
+    private var iconWaiting: Int = 0
+    private var iconRemoved: Int = 0
+    private var iconPaused: Int = 0
+    private var hideWhenIcon: Boolean = true
+
+    var overrideLayout: Int? = null
+
+    companion object {
+        val fillArray = arrayOf(
+            R.drawable.circular_progress_bar_clockwise,
+            R.drawable.circular_progress_bar_counter_clockwise,
+            R.drawable.circular_progress_bar_small_to_large,
+            R.drawable.circular_progress_bar_top_to_bottom,
+        )
+    }
+
+    private var progressBarBackground: View
+    private var statusView: ImageView
+
+    open fun onInflate() {}
+
+    init {
+        context.obtainStyledAttributes(attributeSet, R.styleable.PieFetchButton, 0, 0).apply {
+            try {
+                inflate(
+                    overrideLayout ?: getResourceId(
+                        R.styleable.PieFetchButton_download_layout,
+                        R.layout.download_button_view
+                    )
+                )
+            } catch (e: Exception) {
+                Log.e(
+                    "PieFetchButton", "Error inflating PieFetchButton, " +
+                            "check that you have declared the required aria2c attrs: aria2c_icon_scale aria2c_icon_color aria2c_outline_color aria2c_fill_color"
+                )
+                throw e
+            }
+
+
+            progressBar = findViewById(R.id.progress_downloaded)
+            progressBarBackground = findViewById(R.id.progress_downloaded_background)
+            statusView = findViewById(R.id.image_download_status)
+
+            animateWaiting = getBoolean(
+                R.styleable.PieFetchButton_download_animate_waiting,
+                true
+            )
+            hideWhenIcon = getBoolean(
+                R.styleable.PieFetchButton_download_hide_when_icon,
+                true
+            )
+
+            waitingAnimation = getResourceId(
+                R.styleable.PieFetchButton_download_waiting_animation,
+                R.anim.rotate_around_center_point
+            )
+
+            activeOutline = getResourceId(
+                R.styleable.PieFetchButton_download_outline_active, R.drawable.circle_shape
+            )
+
+            nonActiveOutline = getResourceId(
+                R.styleable.PieFetchButton_download_outline_non_active,
+                R.drawable.circle_shape_dotted
+            )
+            iconInit = getResourceId(
+                R.styleable.PieFetchButton_download_icon_init, R.drawable.netflix_download
+            )
+            iconError = getResourceId(
+                R.styleable.PieFetchButton_download_icon_paused, R.drawable.download_icon_error
+            )
+            iconComplete = getResourceId(
+                R.styleable.PieFetchButton_download_icon_complete, R.drawable.download_icon_done
+            )
+            iconPaused = getResourceId(
+                R.styleable.PieFetchButton_download_icon_paused, 0//R.drawable.download_icon_pause
+            )
+            iconActive = getResourceId(
+                R.styleable.PieFetchButton_download_icon_active, 0 //R.drawable.download_icon_load
+            )
+            iconWaiting = getResourceId(
+                R.styleable.PieFetchButton_download_icon_waiting, 0
+            )
+            iconRemoved = getResourceId(
+                R.styleable.PieFetchButton_download_icon_removed, R.drawable.netflix_download
+            )
+
+            val fillIndex = getInt(R.styleable.PieFetchButton_download_fill, 0)
+
+            val progressDrawable = getResourceId(
+                R.styleable.PieFetchButton_download_fill_override, fillArray[fillIndex]
+            )
+
+            progressBar.progressDrawable = ContextCompat.getDrawable(context, progressDrawable)
+
+            recycle()
+        }
+        resetView()
+        onInflate()
+    }
+
+    private var currentStatus: DownloadStatusTell? = null
+    /*private fun getActivity(): Activity? {
+        var context = context
+        while (context is ContextWrapper) {
+            if (context is Activity) {
+                return context
+            }
+            context = context.baseContext
+        }
+        return null
+    }
+
+    fun callback(event : DownloadClickEvent) {
+        handleDownloadClick(
+            getActivity(),
+            event
+        )
+    }*/
+
+    protected fun setDefaultClickListener(
+        view: View, textView: TextView?, card: VideoDownloadHelper.DownloadEpisodeCached,
+        callback: (DownloadClickEvent) -> Unit
+    ) {
+        this.progressText = textView
+        this.setPersistentId(card.id)
+        view.setOnClickListener {
+            if (isZeroBytes) {
+                callback(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, card))
+                //callback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, data))
+            } else {
+                val list = arrayListOf(
+                    Pair(DOWNLOAD_ACTION_PLAY_FILE, R.string.popup_play_file),
+                    Pair(DOWNLOAD_ACTION_DELETE_FILE, R.string.popup_delete_file),
+                )
+
+                currentMetaData.apply {
+                    // DON'T RESUME A DOWNLOADED FILE lastState != VideoDownloadManager.DownloadType.IsDone &&
+                    if (progressPercentage < 98) {
+                        list.add(
+                            if (status == VideoDownloadManager.DownloadType.IsDownloading)
+                                Pair(DOWNLOAD_ACTION_PAUSE_DOWNLOAD, R.string.popup_pause_download)
+                            else
+                                Pair(
+                                    DOWNLOAD_ACTION_RESUME_DOWNLOAD,
+                                    R.string.popup_resume_download
+                                )
+                        )
+                    }
+                }
+
+
+                it.popupMenuNoIcons(
+                    list
+                ) {
+                    callback(DownloadClickEvent(itemId, card))
+                    //callback.invoke(DownloadClickEvent(itemId, data))
+                }
+            }
+        }
+
+        view.setOnLongClickListener {
+            callback(DownloadClickEvent(DOWNLOAD_ACTION_LONG_CLICK, card))
+
+            //clickCallback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_LONG_CLICK, data))
+            return@setOnLongClickListener true
+        }
+    }
+
+    open fun setDefaultClickListener(
+        card: VideoDownloadHelper.DownloadEpisodeCached,
+        textView: TextView?,
+        callback: (DownloadClickEvent) -> Unit
+    ) {
+        setDefaultClickListener(this, textView, card, callback)
+    }
+
+    /*open fun setDefaultClickListener(requestGetter: suspend BaseFetchButton.() -> List<UriRequest>) {
+        this.setOnClickListener {
+            when (this.currentStatus) {
+                null -> {
+                    setStatus(DownloadStatusTell.IsPending)
+                    ioThread {
+                        val request = requestGetter.invoke(this)
+                        if (request.size == 1) {
+                            performDownload(request.first())
+                        } else if (request.isNotEmpty()) {
+                            performFailQueueDownload(request)
+                        }
+                    }
+                }
+                DownloadStatusTell.Paused -> {
+                    resumeDownload()
+                }
+                DownloadStatusTell.Active -> {
+                    pauseDownload()
+                }
+                DownloadStatusTell.Error -> {
+                    redownload()
+                }
+                else -> {}
+            }
+        }
+    }*/
+
+    /** Also sets currentStatus */
+    override fun setStatus(status: DownloadStatusTell?) {
+        currentStatus = status
+
+        //progressBar.isVisible =
+        //    status != null && status != DownloadStatusTell.Complete && status != DownloadStatusTell.Error
+        //progressBarBackground.isVisible = status != null && status != DownloadStatusTell.Complete
+        progressBarBackground.post {
+            val isPreActive = isZeroBytes && status == DownloadStatusTell.IsDownloading
+            if (animateWaiting && (status == DownloadStatusTell.IsPending || isPreActive)) {
+                val animation = AnimationUtils.loadAnimation(context, waitingAnimation)
+                progressBarBackground.startAnimation(animation)
+            } else {
+                progressBarBackground.clearAnimation()
+            }
+
+            val progressDrawable =
+                if (status == DownloadStatusTell.IsDownloading && !isPreActive) activeOutline else nonActiveOutline
+
+            progressBarBackground.background =
+                ContextCompat.getDrawable(context, progressDrawable)
+
+            val drawable = getDrawableFromStatus(status)
+            statusView.setImageDrawable(drawable)
+            val isDrawable = drawable != null
+
+            statusView.isVisible = isDrawable
+            val hide = hideWhenIcon && isDrawable
+            if (hide) {
+                progressBar.clearAnimation()
+                progressBarBackground.clearAnimation()
+            }
+            progressBarBackground.isGone = hide
+            progressBar.isGone = hide
+        }
+    }
+
+    override fun resetView() {
+        setStatus(null)
+        currentMetaData = DownloadMetadata(0, 0, 0, null)
+        isZeroBytes = true
+        progressBar.progress = 0
+    }
+
+    override fun updateViewOnDownload(metadata: DownloadMetadata) {
+
+        val newStatus = metadata.status
+
+        if (newStatus == null) {
+            resetView()
+            return
+        }
+
+        val isDone =
+            newStatus == DownloadStatusTell.IsDone || (metadata.downloadedLength > 1024 && metadata.downloadedLength + 1024 >= metadata.totalLength)
+
+        if (isDone)
+            setStatus(DownloadStatusTell.IsDone)
+        else {
+            setProgress(metadata.downloadedLength, metadata.totalLength)
+            setStatus(newStatus)
+        }
+    }
+
+    open fun getDrawableFromStatus(status: DownloadStatusTell?): Drawable? {
+        val drawableInt = when (status) {
+            DownloadStatusTell.IsPaused -> iconPaused
+            DownloadStatusTell.IsPending -> iconWaiting
+            DownloadStatusTell.IsDownloading -> iconActive
+            DownloadStatusTell.IsFailed -> iconError
+            DownloadStatusTell.IsDone -> iconComplete
+            DownloadStatusTell.IsStopped -> iconRemoved
+            null -> iconInit
+        }
+        if (drawableInt == 0) {
+            return null
+        }
+        return ContextCompat.getDrawable(this.context, drawableInt)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/ProgressBarAnimation.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/ProgressBarAnimation.kt
new file mode 100644
index 00000000..11818a7e
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/ProgressBarAnimation.kt
@@ -0,0 +1,18 @@
+package com.lagradost.cloudstream3.ui.download.button
+
+import android.view.animation.Animation
+import android.view.animation.Transformation
+import android.widget.ProgressBar
+
+class ProgressBarAnimation(
+    private val progressBar: ProgressBar,
+    private val from: Float,
+    private val to: Float
+) :
+    Animation() {
+    override fun applyTransformation(interpolatedTime: Float, t: Transformation?) {
+        super.applyTransformation(interpolatedTime, t)
+        val value = from + (to - from) * interpolatedTime
+        progressBar.progress = value.toInt()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
index b90a4e43..f84966eb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
@@ -1,22 +1,23 @@
 package com.lagradost.cloudstream3.ui.home
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.databinding.HomeResultGridBinding
+import com.lagradost.cloudstream3.databinding.HomeResultGridExpandedBinding
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
+import com.lagradost.cloudstream3.utils.AppUtils.isRtl
 import com.lagradost.cloudstream3.utils.UIHelper.IsBottomLayout
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.home_result_grid.view.background_card
-import kotlinx.android.synthetic.main.home_result_grid_expanded.view.*
 
 class HomeChildItemAdapter(
     val cardList: MutableList<SearchResponse>,
-    private val overrideLayout: Int? = null,
+
     private val nextFocusUp: Int? = null,
     private val nextFocusDown: Int? = null,
     private val clickCallback: (SearchClickCallback) -> Unit,
@@ -26,16 +27,28 @@ class HomeChildItemAdapter(
     var hasNext: Boolean = false
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val layout = overrideLayout
-            ?: if (parent.context.IsBottomLayout()) R.layout.home_result_grid_expanded else R.layout.home_result_grid
+        val expanded = parent.context.IsBottomLayout()
+        /* val layout = if (bottom) R.layout.home_result_grid_expanded else R.layout.home_result_grid
+
+         val root = LayoutInflater.from(parent.context).inflate(layout, parent, false)
+         val binding = HomeResultGridBinding.bind(root)*/
+
+        val inflater = LayoutInflater.from(parent.context)
+        val binding = if (expanded) HomeResultGridExpandedBinding.inflate(
+            inflater,
+            parent,
+            false
+        ) else HomeResultGridBinding.inflate(inflater, parent, false)
+
 
         return CardViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false),
+            binding,
             clickCallback,
             itemCount,
             nextFocusUp,
             nextFocusDown,
-            isHorizontal
+            isHorizontal,
+            parent.isRtl()
         )
     }
 
@@ -69,58 +82,101 @@ class HomeChildItemAdapter(
 
     class CardViewHolder
     constructor(
-        itemView: View,
+        val binding: ViewBinding,
         private val clickCallback: (SearchClickCallback) -> Unit,
         var itemCount: Int,
         private val nextFocusUp: Int? = null,
         private val nextFocusDown: Int? = null,
-        private val isHorizontal: Boolean = false
+        private val isHorizontal: Boolean = false,
+        private val isRtl: Boolean
     ) :
-        RecyclerView.ViewHolder(itemView) {
+        RecyclerView.ViewHolder(binding.root) {
 
         fun bind(card: SearchResponse, position: Int) {
 
             // TV focus fixing
-            val nextFocusBehavior = when (position) {
+            /*val nextFocusBehavior = when (position) {
                 0 -> true
                 itemCount - 1 -> false
                 else -> null
             }
 
-            (itemView.image_holder ?: itemView.background_card)?.apply {
-                val min = 114.toPx
-                val max = 180.toPx
+            if (position == 0) { // to fix tv
+                if (isRtl) {
+                    itemView.nextFocusRightId = R.id.nav_rail_view
+                    itemView.nextFocusLeftId = -1
+                }
+                else {
+                    itemView.nextFocusLeftId = R.id.nav_rail_view
+                    itemView.nextFocusRightId = -1
+                }
+            } else {
+                itemView.nextFocusRightId = -1
+                itemView.nextFocusLeftId = -1
+            }*/
 
-                layoutParams =
-                    layoutParams.apply {
-                        width = if (!isHorizontal) {
-                            min
-                        } else {
-                            max
-                        }
-                        height = if (!isHorizontal) {
-                            max
-                        } else {
-                            min
-                        }
+
+            when (binding) {
+                is HomeResultGridBinding -> {
+                    binding.backgroundCard.apply {
+                        val min = 114.toPx
+                        val max = 180.toPx
+
+                        layoutParams =
+                            layoutParams.apply {
+                                width = if (!isHorizontal) {
+                                    min
+                                } else {
+                                    max
+                                }
+                                height = if (!isHorizontal) {
+                                    max
+                                } else {
+                                    min
+                                }
+                            }
                     }
-            }
 
 
+                }
+
+                is HomeResultGridExpandedBinding -> {
+                    binding.backgroundCard.apply {
+                        val min = 114.toPx
+                        val max = 180.toPx
+
+                        layoutParams =
+                            layoutParams.apply {
+                                width = if (!isHorizontal) {
+                                    min
+                                } else {
+                                    max
+                                }
+                                height = if (!isHorizontal) {
+                                    max
+                                } else {
+                                    min
+                                }
+                            }
+                    }
+
+                    if (position == 0) { // to fix tv
+                        binding.backgroundCard.nextFocusLeftId = R.id.nav_rail_view
+                    }
+                }
+            }
+
             SearchResultBuilder.bind(
                 clickCallback,
                 card,
                 position,
                 itemView,
-                nextFocusBehavior,
+                null, // nextFocusBehavior,
                 nextFocusUp,
                 nextFocusDown
             )
             itemView.tag = position
 
-            if (position == 0) { // to fix tv
-                itemView.background_card?.nextFocusLeftId = R.id.nav_rail_view
-            }
             //val ani = ScaleAnimation(0.9f, 1.0f, 0.9f, 1f)
             //ani.fillAfter = true
             //ani.duration = 200
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 1545bc32..49ad98f6 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
@@ -31,18 +31,24 @@ 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.afterBackupRestoreEvent
 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
+import com.lagradost.cloudstream3.databinding.TvtypesChipsBinding
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 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.AutofitRecyclerView
 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
@@ -64,25 +70,7 @@ 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 kotlinx.android.synthetic.main.activity_main_tv.*
-import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_home.home_api_fab
-import kotlinx.android.synthetic.main.fragment_home.home_change_api_loading
-import kotlinx.android.synthetic.main.fragment_home.home_loading
-import kotlinx.android.synthetic.main.fragment_home.home_loading_error
-import kotlinx.android.synthetic.main.fragment_home.home_loading_shimmer
-import kotlinx.android.synthetic.main.fragment_home.home_loading_statusbar
-import kotlinx.android.synthetic.main.fragment_home.home_master_recycler
-import kotlinx.android.synthetic.main.fragment_home.home_reload_connection_open_in_browser
-import kotlinx.android.synthetic.main.fragment_home.home_reload_connectionerror
-import kotlinx.android.synthetic.main.fragment_home.result_error_text
-import kotlinx.android.synthetic.main.fragment_home_tv.*
-import kotlinx.android.synthetic.main.fragment_result.*
-import kotlinx.android.synthetic.main.fragment_search.*
-import kotlinx.android.synthetic.main.home_episodes_expanded.*
-import kotlinx.android.synthetic.main.tvtypes_chips.*
-import kotlinx.android.synthetic.main.tvtypes_chips.view.*
+
 import java.util.*
 
 
@@ -126,22 +114,26 @@ class HomeFragment : Fragment() {
             expand: HomeViewModel.ExpandableHomepageList,
             deleteCallback: (() -> Unit)? = null,
             expandCallback: (suspend (String) -> HomeViewModel.ExpandableHomepageList?)? = null,
-            dismissCallback : (() -> Unit),
+            dismissCallback: (() -> Unit),
         ): BottomSheetDialog {
             val context = this
             val bottomSheetDialogBuilder = BottomSheetDialog(context)
-
-            bottomSheetDialogBuilder.setContentView(R.layout.home_episodes_expanded)
-            val title = bottomSheetDialogBuilder.findViewById<TextView>(R.id.home_expanded_text)!!
+            val binding: HomeEpisodesExpandedBinding = HomeEpisodesExpandedBinding.inflate(
+                bottomSheetDialogBuilder.layoutInflater,
+                null,
+                false
+            )
+            bottomSheetDialogBuilder.setContentView(binding.root)
+            //val title = bottomSheetDialogBuilder.findViewById<TextView>(R.id.home_expanded_text)!!
 
             //title.findViewTreeLifecycleOwner().lifecycle.addObserver()
 
             val item = expand.list
-            title.text = item.name
-            val recycle =
-                bottomSheetDialogBuilder.findViewById<AutofitRecyclerView>(R.id.home_expanded_recycler)!!
-            val titleHolder =
-                bottomSheetDialogBuilder.findViewById<FrameLayout>(R.id.home_expanded_drag_down)!!
+            binding.homeExpandedText.text = item.name
+            // val recycle =
+            //    bottomSheetDialogBuilder.findViewById<AutofitRecyclerView>(R.id.home_expanded_recycler)!!
+            //val titleHolder =
+            //    bottomSheetDialogBuilder.findViewById<FrameLayout>(R.id.home_expanded_drag_down)!!
 
             // main {
             //(bottomSheetDialogBuilder.ownerActivity as androidx.fragment.app.FragmentActivity?)?.supportFragmentManager?.fragments?.lastOrNull()?.viewLifecycleOwner?.apply {
@@ -160,10 +152,10 @@ class HomeFragment : Fragment() {
             //    })
             //}
             // }
-            val delete = bottomSheetDialogBuilder.home_expanded_delete
-            delete.isGone = deleteCallback == null
+            //val delete = bottomSheetDialogBuilder.home_expanded_delete
+            binding.homeExpandedDelete.isGone = deleteCallback == null
             if (deleteCallback != null) {
-                delete.setOnClickListener {
+                binding.homeExpandedDelete.setOnClickListener {
                     try {
                         val builder: AlertDialog.Builder = AlertDialog.Builder(context)
                         val dialogClickListener =
@@ -173,6 +165,7 @@ class HomeFragment : Fragment() {
                                         deleteCallback.invoke()
                                         bottomSheetDialogBuilder.dismissSafe(this)
                                     }
+
                                     DialogInterface.BUTTON_NEGATIVE -> {}
                                 }
                             }
@@ -192,26 +185,27 @@ class HomeFragment : Fragment() {
                     }
                 }
             }
-
-            titleHolder.setOnClickListener {
+            binding.homeExpandedDragDown.setOnClickListener {
                 bottomSheetDialogBuilder.dismissSafe(this)
             }
 
 
             // Span settings
-            recycle.spanCount = currentSpan
+            binding.homeExpandedRecycler.spanCount = currentSpan
 
-            recycle.adapter = SearchAdapter(item.list.toMutableList(), recycle) { callback ->
-                handleSearchClickCallback(this, callback)
-                if (callback.action == SEARCH_ACTION_LOAD || callback.action == SEARCH_ACTION_PLAY_FILE) {
-                    bottomSheetDialogBuilder.ownHide() // we hide here because we want to resume it later
-                    //bottomSheetDialogBuilder.dismissSafe(this)
+            binding.homeExpandedRecycler.adapter =
+                SearchAdapter(item.list.toMutableList(), binding.homeExpandedRecycler) { callback ->
+                    handleSearchClickCallback(callback)
+                    if (callback.action == SEARCH_ACTION_LOAD || callback.action == SEARCH_ACTION_PLAY_FILE) {
+                        bottomSheetDialogBuilder.ownHide() // we hide here because we want to resume it later
+                        //bottomSheetDialogBuilder.dismissSafe(this)
+                    }
+                }.apply {
+                    hasNext = expand.hasNext
                 }
-            }.apply {
-                hasNext = expand.hasNext
-            }
 
-            recycle.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            binding.homeExpandedRecycler.addOnScrollListener(object :
+                RecyclerView.OnScrollListener() {
                 var expandCount = 0
                 val name = expand.list.name
 
@@ -239,7 +233,7 @@ class HomeFragment : Fragment() {
             })
 
             val spanListener = { span: Int ->
-                recycle.spanCount = span
+                binding.homeExpandedRecycler.spanCount = span
                 //(recycle.adapter as SearchAdapter).notifyDataSetChanged()
             }
 
@@ -281,19 +275,19 @@ class HomeFragment : Fragment() {
             )
         }
 
-        private fun getPairList(header: ChipGroup) = getPairList(
-            header.home_select_anime,
-            header.home_select_cartoons,
-            header.home_select_tv_series,
-            header.home_select_documentaries,
-            header.home_select_movies,
-            header.home_select_asian,
-            header.home_select_livestreams,
-            header.home_select_nsfw,
-            header.home_select_others
+        private fun getPairList(header: TvtypesChipsBinding) = getPairList(
+            header.homeSelectAnime,
+            header.homeSelectCartoons,
+            header.homeSelectTvSeries,
+            header.homeSelectDocumentaries,
+            header.homeSelectMovies,
+            header.homeSelectAsian,
+            header.homeSelectLivestreams,
+            header.homeSelectNsfw,
+            header.homeSelectOthers
         )
 
-        fun validateChips(header: ChipGroup?, validTypes: List<TvType>) {
+        fun validateChips(header: TvtypesChipsBinding?, validTypes: List<TvType>) {
             if (header == null) return
             val pairList = getPairList(header)
             for ((button, types) in pairList) {
@@ -302,7 +296,7 @@ class HomeFragment : Fragment() {
             }
         }
 
-        fun updateChips(header: ChipGroup?, selectedTypes: List<TvType>) {
+        fun updateChips(header: TvtypesChipsBinding?, selectedTypes: List<TvType>) {
             if (header == null) return
             val pairList = getPairList(header)
             for ((button, types) in pairList) {
@@ -312,10 +306,21 @@ class HomeFragment : Fragment() {
         }
 
         fun bindChips(
-            header: ChipGroup?,
+            header: TvtypesChipsBinding?,
             selectedTypes: List<TvType>,
             validTypes: List<TvType>,
             callback: (List<TvType>) -> Unit
+        ) {
+            bindChips(header, selectedTypes, validTypes, callback, null, null)
+        }
+
+        fun bindChips(
+            header: TvtypesChipsBinding?,
+            selectedTypes: List<TvType>,
+            validTypes: List<TvType>,
+            callback: (List<TvType>) -> Unit,
+            nextFocusDown: Int?,
+            nextFocusUp: Int?
         ) {
             if (header == null) return
             val pairList = getPairList(header)
@@ -323,6 +328,17 @@ class HomeFragment : Fragment() {
                 val isValid = validTypes.any { types.contains(it) }
                 button?.isVisible = isValid
                 button?.isChecked = isValid && selectedTypes.any { types.contains(it) }
+                button?.isFocusable = true
+                if (isTrueTvSettings()) {
+                    button?.isFocusableInTouchMode = true
+                }
+
+                if (nextFocusDown != null)
+                    button?.nextFocusDownId = nextFocusDown
+
+                if (nextFocusUp != null)
+                    button?.nextFocusUpId = nextFocusUp
+
                 button?.setOnCheckedChangeListener { _, _ ->
                     val list = ArrayList<TvType>()
                     for ((sbutton, vvalidTypes) in pairList) {
@@ -345,7 +361,13 @@ class HomeFragment : Fragment() {
                 BottomSheetDialog(this)
 
             builder.behavior.state = BottomSheetBehavior.STATE_EXPANDED
-            builder.setContentView(R.layout.home_select_mainpage)
+            val binding: HomeSelectMainpageBinding = HomeSelectMainpageBinding.inflate(
+                builder.layoutInflater,
+                null,
+                false
+            )
+
+            builder.setContentView(binding.root)
             builder.show()
             builder.let { dialog ->
                 val isMultiLang = getApiProviderLangSettings().let { set ->
@@ -361,14 +383,11 @@ class HomeFragment : Fragment() {
                     ?.toMutableList()
                     ?: mutableListOf(TvType.Movie, TvType.TvSeries)
 
-                val cancelBtt = dialog.findViewById<MaterialButton>(R.id.cancel_btt)
-                val applyBtt = dialog.findViewById<MaterialButton>(R.id.apply_btt)
-
-                cancelBtt?.setOnClickListener {
+                binding.cancelBtt.setOnClickListener {
                     dialog.dismissSafe()
                 }
 
-                applyBtt?.setOnClickListener {
+                binding.applyBtt.setOnClickListener {
                     if (currentApiName != selectedApiName) {
                         currentApiName?.let(callback)
                     }
@@ -409,7 +428,7 @@ class HomeFragment : Fragment() {
                 }
 
                 bindChips(
-                    dialog.home_select_group,
+                    binding.tvtypesChipsScroll.tvtypesChips,
                     preSelectedTypes,
                     validAPIs.flatMap { it.supportedTypes }.distinct()
                 ) { list ->
@@ -424,6 +443,9 @@ class HomeFragment : Fragment() {
 
     private val homeViewModel: HomeViewModel by activityViewModels()
 
+    var binding: FragmentHomeBinding? = null
+
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -431,14 +453,25 @@ class HomeFragment : Fragment() {
     ): View? {
         //homeViewModel =
         //     ViewModelProvider(this).get(HomeViewModel::class.java)
+
         bottomSheetDialog?.ownShow()
         val layout =
             if (isTvSettings()) R.layout.fragment_home_tv else R.layout.fragment_home
-        return inflater.inflate(layout, container, false)
+        val root = inflater.inflate(layout, container, false)
+        binding = try {
+            FragmentHomeBinding.bind(root)
+        } catch (t: Throwable) {
+            showToast(txt(R.string.unable_to_inflate, t.message ?: ""), Toast.LENGTH_LONG)
+            logError(t)
+            null
+        }
+
+        return root
     }
 
     override fun onDestroyView() {
         bottomSheetDialog?.ownHide()
+        binding = null
         super.onDestroyView()
     }
 
@@ -451,7 +484,7 @@ class HomeFragment : Fragment() {
 
     private val apiChangeClickListener = View.OnClickListener { view ->
         view.context.selectHomepage(currentApiName) { api ->
-            homeViewModel.loadAndCancel(api)
+            homeViewModel.loadAndCancel(api, forceReload = true, fromUI = true)
         }
         /*val validAPIs = view.context?.filterProviderByPreferredMedia()?.toMutableList() ?: mutableListOf()
 
@@ -528,138 +561,137 @@ class HomeFragment : Fragment() {
 
     private var bottomSheetDialog: BottomSheetDialog? = null
 
+
     @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         fixGrid()
 
-        home_change_api_loading?.setOnClickListener(apiChangeClickListener)
-        home_api_fab?.setOnClickListener(apiChangeClickListener)
-        home_random?.setOnClickListener {
-            if (listHomepageItems.isNotEmpty()) {
-                activity.loadSearchResult(listHomepageItems.random())
+        binding?.apply {
+            //homeChangeApiLoading.setOnClickListener(apiChangeClickListener)
+            //homeChangeApiLoading.setOnClickListener(apiChangeClickListener)
+            homeApiFab.setOnClickListener(apiChangeClickListener)
+            homeChangeApi.setOnClickListener(apiChangeClickListener)
+            homeSwitchAccount.setOnClickListener { v ->
+                DataStoreHelper.showWhoIsWatching(v?.context ?: return@setOnClickListener)
             }
+            homeRandom.setOnClickListener {
+                if (listHomepageItems.isNotEmpty()) {
+                    activity.loadSearchResult(listHomepageItems.random())
+                }
+            }
+
+            homeMasterRecycler.adapter =
+                HomeParentItemAdapterPreview(
+                    mutableListOf(),
+                    homeViewModel
+                )
+            //fixPaddingStatusbar(homeLoadingStatusbar)
+
+            homeApiFab.isVisible = !isTvSettings()
+
+            homeMasterRecycler.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                    if (dy > 0) { //check for scroll down
+                        homeApiFab.shrink() // hide
+                        homeRandom.shrink()
+                    } else if (dy < -5) {
+                        if (!isTvSettings()) {
+                            homeApiFab.extend() // show
+                            homeRandom.extend()
+                        }
+                    }
+                    super.onScrolled(recyclerView, dx, dy)
+                }
+            })
         }
 
+
         //Load value for toggling Random button. Hide at startup
         context?.let {
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(it)
             toggleRandomButton =
-                settingsManager.getBoolean(getString(R.string.random_button_key), false)
-            home_random?.visibility = View.GONE
-        }
-
-        observe(homeViewModel.preview) { preview ->
-            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setPreviewData(
-                preview
-            )
+                settingsManager.getBoolean(
+                    getString(R.string.random_button_key),
+                    false
+                ) && !isTvSettings()
+            binding?.homeRandom?.visibility = View.GONE
         }
 
         observe(homeViewModel.apiName) { apiName ->
             currentApiName = apiName
-            home_api_fab?.text = apiName
-            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setApiName(
-                apiName
-            )
+            binding?.homeApiFab?.text = apiName
+            binding?.homeChangeApi?.text = apiName
         }
 
         observe(homeViewModel.page) { data ->
-            when (data) {
-                is Resource.Success -> {
-                    home_loading_shimmer?.stopShimmer()
+            binding?.apply {
+                when (data) {
+                    is Resource.Success -> {
+                        homeLoadingShimmer.stopShimmer()
 
-                    val d = data.value
-                    val mutableListOfResponse = mutableListOf<SearchResponse>()
-                    listHomepageItems.clear()
+                        val d = data.value
+                        val mutableListOfResponse = mutableListOf<SearchResponse>()
+                        listHomepageItems.clear()
 
-                    (home_master_recycler?.adapter as? ParentItemAdapter)?.updateList(
-                        d.values.toMutableList(),
-                        home_master_recycler
-                    )
+                        (homeMasterRecycler.adapter as? ParentItemAdapter)?.updateList(
+                            d.values.toMutableList(),
+                            homeMasterRecycler
+                        )
 
-                    home_loading?.isVisible = false
-                    home_loading_error?.isVisible = false
-                    home_master_recycler?.isVisible = true
-                    //home_loaded?.isVisible = true
-                    if (toggleRandomButton) {
-                        //Flatten list
-                        d.values.forEach { dlist ->
-                            mutableListOfResponse.addAll(dlist.list.list)
+                        homeLoading.isVisible = false
+                        homeLoadingError.isVisible = false
+                        homeMasterRecycler.isVisible = true
+                        //home_loaded?.isVisible = true
+                        if (toggleRandomButton) {
+                            //Flatten list
+                            d.values.forEach { dlist ->
+                                mutableListOfResponse.addAll(dlist.list.list)
+                            }
+                            listHomepageItems.addAll(mutableListOfResponse.distinctBy { it.url })
+
+                            homeRandom.isVisible = listHomepageItems.isNotEmpty()
+                        } else {
+                            homeRandom.isGone = true
                         }
-                        listHomepageItems.addAll(mutableListOfResponse.distinctBy { it.url })
-                        home_random?.isVisible = listHomepageItems.isNotEmpty()
-                    } else {
-                        home_random?.isGone = true
                     }
-                }
-                is Resource.Failure -> {
-                    home_loading_shimmer?.stopShimmer()
 
-                    result_error_text.text = data.errorString
+                    is Resource.Failure -> {
+                        homeLoadingShimmer.stopShimmer()
+                        resultErrorText.text = data.errorString
+                        homeReloadConnectionerror.setOnClickListener(apiChangeClickListener)
+                        homeReloadConnectionOpenInBrowser.setOnClickListener { view ->
+                            val validAPIs = apis//.filter { api -> api.hasMainPage }
 
-                    home_reload_connectionerror.setOnClickListener(apiChangeClickListener)
-
-                    home_reload_connection_open_in_browser.setOnClickListener { view ->
-                        val validAPIs = apis//.filter { api -> api.hasMainPage }
-
-                        view.popupMenuNoIconsAndNoStringRes(validAPIs.mapIndexed { index, api ->
-                            Pair(
-                                index,
-                                api.name
-                            )
-                        }) {
-                            try {
-                                val i = Intent(Intent.ACTION_VIEW)
-                                i.data = Uri.parse(validAPIs[itemId].mainUrl)
-                                startActivity(i)
-                            } catch (e: Exception) {
-                                logError(e)
+                            view.popupMenuNoIconsAndNoStringRes(validAPIs.mapIndexed { index, api ->
+                                Pair(
+                                    index,
+                                    api.name
+                                )
+                            }) {
+                                try {
+                                    val i = Intent(Intent.ACTION_VIEW)
+                                    i.data = Uri.parse(validAPIs[itemId].mainUrl)
+                                    startActivity(i)
+                                } catch (e: Exception) {
+                                    logError(e)
+                                }
                             }
                         }
+
+                        homeLoading.isVisible = false
+                        homeLoadingError.isVisible = true
+                        homeMasterRecycler.isVisible = false
+                        //home_loaded?.isVisible = false
                     }
 
-                    home_loading?.isVisible = false
-                    home_loading_error?.isVisible = true
-                    home_master_recycler?.isVisible = false
-                    //home_loaded?.isVisible = false
-                }
-                is Resource.Loading -> {
-                    (home_master_recycler?.adapter as? ParentItemAdapter)?.updateList(listOf())
-                    home_loading_shimmer?.startShimmer()
-                    home_loading?.isVisible = true
-                    home_loading_error?.isVisible = false
-                    home_master_recycler?.isVisible = false
-                    //home_loaded?.isVisible = false
-                }
-            }
-        }
-
-
-
-        observe(homeViewModel.availableWatchStatusTypes) { availableWatchStatusTypes ->
-            context?.setKey(
-                HOME_BOOKMARK_VALUE_LIST,
-                availableWatchStatusTypes.first.map { it.internalId }.toIntArray()
-            )
-            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setAvailableWatchStatusTypes(
-                availableWatchStatusTypes
-            )
-        }
-
-        observe(homeViewModel.bookmarks) { data ->
-            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setBookmarkData(
-                data
-            )
-        }
-
-        observe(homeViewModel.resumeWatching) { resumeWatching ->
-            (home_master_recycler?.adapter as? HomeParentItemAdapterPreview?)?.setResumeWatchingData(
-                resumeWatching
-            )
-            if (isTrueTvSettings()) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    ioSafe {
-                        activity?.addProgramsToContinueWatching(resumeWatching.mapNotNull { it as? DataStoreHelper.ResumeWatchingResult })
+                    is Resource.Loading -> {
+                        (homeMasterRecycler.adapter as? ParentItemAdapter)?.updateList(listOf())
+                        homeLoadingShimmer.startShimmer()
+                        homeLoading.isVisible = true
+                        homeLoadingError.isVisible = false
+                        homeMasterRecycler.isVisible = false
+                        //home_loaded?.isVisible = false
                     }
                 }
             }
@@ -668,72 +700,37 @@ class HomeFragment : Fragment() {
 
         //context?.fixPaddingStatusbarView(home_statusbar)
         //context?.fixPaddingStatusbar(home_padding)
-        context?.fixPaddingStatusbar(home_loading_statusbar)
 
-        home_master_recycler?.adapter =
-            HomeParentItemAdapterPreview(mutableListOf(), { callback ->
-                homeHandleSearch(callback)
-            }, { item ->
-                bottomSheetDialog = activity?.loadHomepageList(item, expandCallback = {
-                    homeViewModel.expandAndReturn(it)
-                }, dismissCallback = {
-                    bottomSheetDialog = null
-                })
-            }, { name ->
-                homeViewModel.expand(name)
-            }, { load ->
-                activity?.loadResult(load.response.url, load.response.apiName, load.action)
-            }, {
-                homeViewModel.loadMoreHomeScrollResponses()
-            }, {
-                apiChangeClickListener.onClick(it)
-            }, reloadStored = {
-                reloadStored()
-            }, loadStoredData = {
-                homeViewModel.loadStoredData(it)
-            }, { (isQuickSearch, text) ->
-                if (!isQuickSearch) {
-                    QuickSearchFragment.pushSearch(
-                        activity,
-                        text,
-                        currentApiName?.let { arrayOf(it) })
-                }
-            })
-
-        reloadStored()
-        loadHomePage(false)
-        home_master_recycler?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                if (dy > 0) { //check for scroll down
-                    home_api_fab?.shrink() // hide
-                    home_random?.shrink()
-                } else if (dy < -5) {
-                    if (!isTvSettings()) {
-                        home_api_fab?.extend() // show
-                        home_random?.extend()
-                    }
-                }
-
-                super.onScrolled(recyclerView, dx, dy)
+        observeNullable(homeViewModel.popup) { item ->
+            if (item == null) {
+                bottomSheetDialog?.dismissSafe()
+                bottomSheetDialog = null
+                return@observeNullable
             }
-        })
+
+            // don't recreate
+            if (bottomSheetDialog != null) {
+                return@observeNullable
+            }
+
+            val (items, delete) = item
+
+            bottomSheetDialog = activity?.loadHomepageList(items, expandCallback = {
+                homeViewModel.expandAndReturn(it)
+            }, dismissCallback = {
+                homeViewModel.popup(null)
+                bottomSheetDialog = null
+            }, deleteCallback = delete)
+        }
+
+        homeViewModel.reloadStored()
+        homeViewModel.loadAndCancel(DataStoreHelper.currentHomePage, false)
+        //loadHomePage(false)
 
         // nice profile pic on homepage
         //home_profile_picture_holder?.isVisible = false
         // just in case
-        if (isTvSettings()) {
-            home_api_fab?.isVisible = false
-            if (isTrueTvSettings()) {
-                home_change_api_loading?.isVisible = true
-                home_change_api_loading?.isFocusable = true
-                home_change_api_loading?.isFocusableInTouchMode = true
-            }
-            // home_bookmark_select?.isFocusable = true
-            // home_bookmark_select?.isFocusableInTouchMode = true
-        } else {
-            home_api_fab?.isVisible = true
-            home_change_api_loading?.isVisible = false
-        }
+
         //TODO READD THIS
         /*for (syncApi in OAuth2Apis) {
             val login = syncApi.loginInfo()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
index 58c6dbe0..163a60a1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
@@ -3,50 +3,20 @@ package com.lagradost.cloudstream3.ui.home
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.core.content.ContextCompat
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListUpdateCallback
 import androidx.recyclerview.widget.RecyclerView
-import androidx.transition.ChangeBounds
-import androidx.transition.TransitionManager
-import androidx.viewpager2.widget.ViewPager2
-import com.google.android.material.chip.Chip
-import com.google.android.material.chip.ChipDrawable
-import com.lagradost.cloudstream3.APIHolder.getId
-import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
 import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.SearchResponse
-import com.lagradost.cloudstream3.mvvm.Resource
-import com.lagradost.cloudstream3.ui.WatchType
-import com.lagradost.cloudstream3.ui.result.LinearListLayout
-import com.lagradost.cloudstream3.ui.result.ResultViewModel2
-import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
+import com.lagradost.cloudstream3.databinding.HomepageParentBinding
+import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
-import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchFragment.Companion.filterSearchResponse
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.isRecyclerScrollable
-import com.lagradost.cloudstream3.utils.AppUtils.loadResult
-import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
-import kotlinx.android.synthetic.main.activity_main_tv.*
-import kotlinx.android.synthetic.main.activity_main_tv.view.*
-import kotlinx.android.synthetic.main.fragment_home.*
-import kotlinx.android.synthetic.main.fragment_home.view.*
-import kotlinx.android.synthetic.main.fragment_home_head_tv.*
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.*
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_viewpager
-import kotlinx.android.synthetic.main.homepage_parent.view.*
 
 class LoadClickCallback(
     val action: Int = 0,
@@ -57,17 +27,23 @@ class LoadClickCallback(
 
 open class ParentItemAdapter(
     private var items: MutableList<HomeViewModel.ExpandableHomepageList>,
+    //private val viewModel: HomeViewModel,
     private val clickCallback: (SearchClickCallback) -> Unit,
     private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit,
     private val expandCallback: ((String) -> Unit)? = null,
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+
+        val root = LayoutInflater.from(parent.context).inflate(
+            if (isTvSettings()) R.layout.homepage_parent_tv else R.layout.homepage_parent,
+            parent,
+            false
+        )
+
+        val binding = HomepageParentBinding.bind(root)
+
         return ParentViewHolder(
-            LayoutInflater.from(parent.context).inflate(
-                if (isTvSettings()) R.layout.homepage_parent_tv else R.layout.homepage_parent,
-                parent,
-                false
-            ),
+            binding,
             clickCallback,
             moreInfoClickCallback,
             expandCallback
@@ -178,15 +154,17 @@ open class ParentItemAdapter(
 
     class ParentViewHolder
     constructor(
-        itemView: View,
+        val binding: HomepageParentBinding,
+        // val viewModel: HomeViewModel,
         private val clickCallback: (SearchClickCallback) -> Unit,
         private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit,
         private val expandCallback: ((String) -> Unit)? = null,
     ) :
-        RecyclerView.ViewHolder(itemView) {
-        val title: TextView = itemView.home_child_more_info
-        private val recyclerView: RecyclerView = itemView.home_child_recyclerview
-
+        RecyclerView.ViewHolder(binding.root) {
+        val title: TextView = binding.homeChildMoreInfo
+        private val recyclerView: RecyclerView = binding.homeChildRecyclerview
+        private val startFocus = R.id.nav_rail_view
+        private val endFocus = FOCUS_SELF
         fun update(expand: HomeViewModel.ExpandableHomepageList) {
             val info = expand.list
             (recyclerView.adapter as? HomeChildItemAdapter?)?.apply {
@@ -200,8 +178,13 @@ open class ParentItemAdapter(
                     nextFocusDown = recyclerView.nextFocusDownId,
                 ).apply {
                     isHorizontal = info.isHorizontalImages
+                    hasNext = expand.hasNext
                 }
-                recyclerView.setLinearListLayout()
+                recyclerView.setLinearListLayout(
+                    isHorizontal = true,
+                    nextLeft = startFocus,
+                    nextRight = endFocus,
+                )
             }
         }
 
@@ -216,7 +199,11 @@ open class ParentItemAdapter(
                 isHorizontal = info.isHorizontalImages
                 hasNext = expand.hasNext
             }
-            recyclerView.setLinearListLayout()
+            recyclerView.setLinearListLayout(
+                isHorizontal = true,
+                nextLeft = startFocus,
+                nextRight = endFocus,
+            )
             title.text = info.name
 
             recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
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 94a1a526..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
@@ -3,25 +3,35 @@ package com.lagradost.cloudstream3.ui.home
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.chip.Chip
-import com.google.android.material.chip.ChipDrawable
+import com.google.android.material.chip.ChipGroup
 import com.lagradost.cloudstream3.APIHolder.getId
 import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.databinding.FragmentHomeHeadBinding
+import com.lagradost.cloudstream3.databinding.FragmentHomeHeadTvBinding
 import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.debugException
+import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.selectHomepage
+import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.ResultViewModel2
 import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
+import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_SHOW_METADATA
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
@@ -29,121 +39,54 @@ import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSet
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectStringRes
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarMargin
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.activity_main.view.*
-import kotlinx.android.synthetic.main.fragment_home_head.view.*
-import kotlinx.android.synthetic.main.fragment_home_head.view.home_bookmarked_child_recyclerview
-import kotlinx.android.synthetic.main.fragment_home_head.view.home_watch_parent_item_title
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.*
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_bookmarked_holder
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_none_padding
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_plan_to_watch_btt
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_preview_viewpager
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_completed_btt
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_dropped_btt
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_on_hold_btt
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_type_watching_btt
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_watch_child_recyclerview
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.home_watch_holder
-import kotlinx.android.synthetic.main.toast.view.*
+import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 
 class HomeParentItemAdapterPreview(
     items: MutableList<HomeViewModel.ExpandableHomepageList>,
-    val clickCallback: (SearchClickCallback) -> Unit,
-    private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit,
-    expandCallback: ((String) -> Unit)? = null,
-    private val loadCallback: (LoadClickCallback) -> Unit,
-    private val loadMoreCallback: (() -> Unit),
-    private val changeHomePageCallback: ((View) -> Unit),
-    private val reloadStored: (() -> Unit),
-    private val loadStoredData: ((Set<WatchType>) -> Unit),
-    private val searchQueryCallback: ((Pair<Boolean, String>) -> Unit)
-) : ParentItemAdapter(items, clickCallback, moreInfoClickCallback, expandCallback) {
-    private var previewData: Resource<Pair<Boolean, List<LoadResponse>>> = Resource.Loading()
-    private var resumeWatchingData: List<SearchResponse> = listOf()
-    private var bookmarkData: Pair<Boolean, List<SearchResponse>> =
-        false to listOf()
-    private var apiName: String = "NONE"
-
+    private val viewModel: HomeViewModel,
+) : ParentItemAdapter(items, clickCallback = {
+    viewModel.click(it)
+}, moreInfoClickCallback = {
+    viewModel.popup(it)
+}, expandCallback = {
+    viewModel.expand(it)
+}) {
     val headItems = 1
 
-    private var availableWatchStatusTypes: Pair<Set<WatchType>, Set<WatchType>> =
-        setOf<WatchType>() to setOf()
-
-    fun setAvailableWatchStatusTypes(data: Pair<Set<WatchType>, Set<WatchType>>) {
-        availableWatchStatusTypes = data
-        holder?.setAvailableWatchStatusTypes(data)
-    }
-
     companion object {
         private const val VIEW_TYPE_HEADER = 2
         private const val VIEW_TYPE_ITEM = 1
     }
 
-    fun setResumeWatchingData(resumeWatching: List<SearchResponse>) {
-        resumeWatchingData = resumeWatching
-        holder?.updateResume(resumeWatchingData)
-    }
-
-    fun setPreviewData(preview: Resource<Pair<Boolean, List<LoadResponse>>>) {
-        previewData = preview
-        holder?.updatePreview(preview)
-    }
-
-    fun setApiName(name: String) {
-        apiName = name
-        holder?.updateApiName(name)
-    }
-
-    fun setBookmarkData(data: Pair<Boolean, List<SearchResponse>>) {
-        bookmarkData = data
-        holder?.updateBookmarks(data)
-    }
-
     override fun getItemViewType(position: Int) = when (position) {
         0 -> VIEW_TYPE_HEADER
         else -> VIEW_TYPE_ITEM
     }
 
-    var holder: HeaderViewHolder? = null
-
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         when (holder) {
-            is HeaderViewHolder -> {
-                holder.updatePreview(previewData)
-                holder.updateResume(resumeWatchingData)
-                holder.updateBookmarks(bookmarkData)
-                holder.setAvailableWatchStatusTypes(availableWatchStatusTypes)
-                holder.updateApiName(apiName)
-            }
-            else -> super.onBindViewHolder(holder, position - 1)
+            is HeaderViewHolder -> {}
+            else -> super.onBindViewHolder(holder, position - headItems)
         }
     }
 
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        println("onCreateViewHolder $viewType")
         return when (viewType) {
-            VIEW_TYPE_HEADER -> HeaderViewHolder(
-                LayoutInflater.from(parent.context).inflate(
-                    if (isTvSettings()) R.layout.fragment_home_head_tv else R.layout.fragment_home_head,
+            VIEW_TYPE_HEADER -> {
+                val inflater = LayoutInflater.from(parent.context)
+                val binding = if (isTvSettings()) FragmentHomeHeadTvBinding.inflate(
+                    inflater,
                     parent,
                     false
-                ),
-                loadCallback,
-                loadMoreCallback,
-                changeHomePageCallback,
-                clickCallback,
-                reloadStored,
-                loadStoredData,
-                searchQueryCallback,
-                moreInfoClickCallback
-            ).also {
-                this.holder = it
+                ) else FragmentHomeHeadBinding.inflate(inflater, parent, false)
+                HeaderViewHolder(
+                    binding,
+                    viewModel,
+                )
             }
+
             VIEW_TYPE_ITEM -> super.onCreateViewHolder(parent, viewType)
             else -> error("Unhandled viewType=$viewType")
         }
@@ -154,7 +97,7 @@ class HomeParentItemAdapterPreview(
     }
 
     override fun getItemId(position: Int): Long {
-        if (position == 0) return previewData.hashCode().toLong()
+        if (position == 0) return 0//previewData.hashCode().toLong()
         return super.getItemId(position - headItems)
     }
 
@@ -163,6 +106,7 @@ class HomeParentItemAdapterPreview(
             is HeaderViewHolder -> {
                 holder.onViewDetachedFromWindow()
             }
+
             else -> super.onViewDetachedFromWindow(holder)
         }
     }
@@ -172,487 +116,486 @@ class HomeParentItemAdapterPreview(
             is HeaderViewHolder -> {
                 holder.onViewAttachedToWindow()
             }
+
             else -> super.onViewAttachedToWindow(holder)
         }
     }
 
-
     class HeaderViewHolder
     constructor(
-        itemView: View,
-        private val clickCallback: ((LoadClickCallback) -> Unit)?,
-        private val loadMoreCallback: (() -> Unit),
-        private val changeHomePageCallback: ((View) -> Unit),
-        private val searchClickCallback: (SearchClickCallback) -> Unit,
-        private val reloadStored: () -> Unit,
-        private val loadStoredData: ((Set<WatchType>) -> Unit),
-        private val searchQueryCallback: ((Pair<Boolean, String>) -> Unit),
-        private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit
-    ) : RecyclerView.ViewHolder(itemView) {
-        private var previewAdapter: HomeScrollAdapter? = null
-        private val previewViewpager: ViewPager2? = itemView.home_preview_viewpager
-        private val previewHeader: FrameLayout? = itemView.home_preview
+        val binding: ViewBinding,
+        val viewModel: HomeViewModel,
+    ) : RecyclerView.ViewHolder(binding.root) {
+        private var previewAdapter: HomeScrollAdapter = HomeScrollAdapter()
+        private var resumeAdapter: HomeChildItemAdapter = HomeChildItemAdapter(
+            ArrayList(),
+            nextFocusUp = itemView.nextFocusUpId,
+            nextFocusDown = itemView.nextFocusDownId
+        ) { callback ->
+            if (callback.action != SEARCH_ACTION_SHOW_METADATA) {
+                viewModel.click(callback)
+                return@HomeChildItemAdapter
+            }
+            callback.view.context?.getActivity()?.showOptionSelectStringRes(
+                callback.view,
+                callback.card.posterUrl,
+                listOf(
+                    R.string.action_open_watching,
+                    R.string.action_remove_watching
+                ),
+                listOf(
+                    R.string.action_open_play,
+                    R.string.action_open_watching,
+                    R.string.action_remove_watching
+                )
+            ) { (isTv, actionId) ->
+                when (actionId + if (isTv) 0 else 1) {
+                    // play
+                    0 -> {
+                        viewModel.click(
+                            SearchClickCallback(
+                                START_ACTION_RESUME_LATEST,
+                                callback.view,
+                                -1,
+                                callback.card
+                            )
+                        )
+                    }
+                    //info
+                    1 -> {
+                        viewModel.click(
+                            SearchClickCallback(
+                                SEARCH_ACTION_LOAD,
+                                callback.view,
+                                -1,
+                                callback.card
+                            )
+                        )
+                    }
+                    // remove
+                    2 -> {
+                        val card = callback.card
+                        if (card is DataStoreHelper.ResumeWatchingResult) {
+                            DataStoreHelper.removeLastWatched(card.parentId)
+                            viewModel.reloadStored()
+                        }
+                    }
+                }
+            }
+        }
+        private var bookmarkAdapter: HomeChildItemAdapter = HomeChildItemAdapter(
+            ArrayList(),
+            nextFocusUp = itemView.nextFocusUpId,
+            nextFocusDown = itemView.nextFocusDownId
+        ) { callback ->
+            if (callback.action != SEARCH_ACTION_SHOW_METADATA) {
+                viewModel.click(callback)
+                return@HomeChildItemAdapter
+            }
+            callback.view.context?.getActivity()?.showOptionSelectStringRes(
+                callback.view,
+                callback.card.posterUrl,
+                listOf(
+                    R.string.action_open_watching,
+                    R.string.action_remove_from_bookmarks,
+                ),
+                listOf(
+                    R.string.action_open_play,
+                    R.string.action_open_watching,
+                    R.string.action_remove_from_bookmarks
+                )
+            ) { (isTv, actionId) ->
+                when (actionId + if (isTv) 0 else 1) { // play
+                    0 -> {
+                        viewModel.click(
+                            SearchClickCallback(
+                                START_ACTION_RESUME_LATEST,
+                                callback.view,
+                                -1,
+                                callback.card
+                            )
+                        )
+                    }
+
+                    1 -> { // info
+                        viewModel.click(
+                            SearchClickCallback(
+                                SEARCH_ACTION_LOAD,
+                                callback.view,
+                                -1,
+                                callback.card
+                            )
+                        )
+                    }
+
+                    2 -> { // remove
+                        DataStoreHelper.setResultWatchState(
+                            callback.card.id,
+                            WatchType.NONE.internalId
+                        )
+                        viewModel.reloadStored()
+                    }
+                }
+            }
+        }
+
+
+        private val previewViewpager: ViewPager2 =
+            itemView.findViewById(R.id.home_preview_viewpager)
+
+        private val previewViewpagerText: ViewGroup =
+            itemView.findViewById(R.id.home_preview_viewpager_text)
+
+        // private val previewHeader: FrameLayout = itemView.findViewById(R.id.home_preview)
+        private var resumeHolder: View = itemView.findViewById(R.id.home_watch_holder)
+        private var resumeRecyclerView: RecyclerView =
+            itemView.findViewById(R.id.home_watch_child_recyclerview)
+        private var bookmarkHolder: View = itemView.findViewById(R.id.home_bookmarked_holder)
+        private var bookmarkRecyclerView: RecyclerView =
+            itemView.findViewById(R.id.home_bookmarked_child_recyclerview)
+
+        private var homeAccount: View? =
+            itemView.findViewById(R.id.home_preview_switch_account)
+
+        private var topPadding: View? = itemView.findViewById(R.id.home_padding)
+
+        private val homeNonePadding: View = itemView.findViewById(R.id.home_none_padding)
+
         private val previewCallback: ViewPager2.OnPageChangeCallback =
             object : ViewPager2.OnPageChangeCallback() {
                 override fun onPageSelected(position: Int) {
-                    // home_search?.isIconified = true
-                    //home_search?.isVisible = true
-                    //home_search?.clearFocus()
-
-                    previewAdapter?.apply {
+                    previewAdapter.apply {
                         if (position >= itemCount - 1 && hasMoreItems) {
-                            hasMoreItems = false // dont make two requests
-                            loadMoreCallback()
-                            //homeViewModel.loadMoreHomeScrollResponses()
+                            hasMoreItems = false // don't make two requests
+                            viewModel.loadMoreHomeScrollResponses()
                         }
                     }
-                    previewAdapter?.getItem(position)
-                        ?.apply {
-                            //itemView.home_preview_title_holder?.let { parent ->
-                            //    TransitionManager.beginDelayedTransition(
-                            //        parent,
-                            //        ChangeBounds()
-                            //    )
-                            //}
-                            itemView.home_preview_description?.isGone =
-                                this.plot.isNullOrBlank()
-                            itemView.home_preview_description?.text =
-                                this.plot ?: ""
-                            itemView.home_preview_text?.text = this.name
-                            itemView.home_preview_tags?.apply {
-                                removeAllViews()
-                                tags?.forEach { tag ->
-                                    val chip = Chip(context)
-                                    val chipDrawable =
-                                        ChipDrawable.createFromAttributes(
-                                            context,
-                                            null,
-                                            0,
-                                            R.style.ChipFilledSemiTransparent
-                                        )
-                                    chip.setChipDrawable(chipDrawable)
-                                    chip.text = tag
-                                    chip.isChecked = false
-                                    chip.isCheckable = false
-                                    chip.isFocusable = false
-                                    chip.isClickable = false
-                                    addView(chip)
-                                }
-                            }
-                            itemView.home_preview_tags?.isGone =
-                                tags.isNullOrEmpty()
-                            itemView.home_preview_image?.setImage(
-                                posterUrl,
-                                posterHeaders
-                            )
-                            //  itemView.home_preview_title?.text = name
-
-                            itemView.home_preview_play?.setOnClickListener { view ->
-                                clickCallback?.invoke(
-                                    LoadClickCallback(
-                                        START_ACTION_RESUME_LATEST,
-                                        view,
-                                        position,
-                                        this
-                                    )
-                                )
-                            }
-                            itemView.home_preview_info?.setOnClickListener { view ->
-                                clickCallback?.invoke(
-                                    LoadClickCallback(0, view, position, this)
-                                )
-                            }
-
-                            itemView.home_preview_play_btt?.setOnClickListener { view ->
-                                clickCallback?.invoke(
-                                    LoadClickCallback(
-                                        START_ACTION_RESUME_LATEST,
-                                        view,
-                                        position,
-                                        this
-                                    )
-                                )
-                            }
-
-                            // 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
-                            itemView.home_preview_info_btt?.setOnFocusChangeListener { _, hasFocus ->
-                                itemView.home_preview_hidden_next_focus?.isFocusable = hasFocus
-                            }
-                            itemView.home_preview_play_btt?.setOnFocusChangeListener { _, hasFocus ->
-                                itemView.home_preview_hidden_prev_focus?.isFocusable = hasFocus
-                            }
-
-
-                            itemView.home_preview_info_btt?.setOnClickListener { view ->
-                                clickCallback?.invoke(
-                                    LoadClickCallback(0, view, position, this)
-                                )
-                            }
-
-                            itemView.home_preview_hidden_next_focus?.setOnFocusChangeListener { _, hasFocus ->
-                                if (hasFocus) {
-                                    previewViewpager?.apply {
-                                        setCurrentItem(currentItem + 1, true)
-                                    }
-                                    itemView.home_preview_info_btt?.requestFocus()
-                                }
-                            }
-
-                            itemView.home_preview_hidden_prev_focus?.setOnFocusChangeListener { _, hasFocus ->
-                                if (hasFocus) {
-                                    previewViewpager?.apply {
-                                        if (currentItem <= 0) {
-                                            nav_rail_view?.menu?.getItem(0)?.actionView?.requestFocus()
-                                        } else {
-                                            setCurrentItem(currentItem - 1, true)
-                                            itemView.home_preview_play_btt?.requestFocus()
-                                        }
-                                    }
-                                }
-                            }
-                            // very ugly code, but I dont care
-                            val watchType =
-                                DataStoreHelper.getResultWatchState(this.getId())
-                            itemView.home_preview_bookmark?.setText(watchType.stringRes)
-                            itemView.home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
-                                null,
-                                ContextCompat.getDrawable(
-                                    itemView.home_preview_bookmark.context,
-                                    watchType.iconRes
-                                ),
-                                null,
-                                null
-                            )
-                            itemView.home_preview_bookmark?.setOnClickListener { fab ->
-                                fab.context.getActivity()?.showBottomDialog(
-                                    WatchType.values()
-                                        .map { fab.context.getString(it.stringRes) }
-                                        .toList(),
-                                    DataStoreHelper.getResultWatchState(this.getId()).ordinal,
-                                    fab.context.getString(R.string.action_add_to_bookmarks),
-                                    showApply = false,
-                                    {}) {
-                                    val newValue = WatchType.values()[it]
-                                    itemView.home_preview_bookmark?.setCompoundDrawablesWithIntrinsicBounds(
-                                        null,
-                                        ContextCompat.getDrawable(
-                                            itemView.home_preview_bookmark.context,
-                                            newValue.iconRes
-                                        ),
-                                        null,
-                                        null
-                                    )
-                                    itemView.home_preview_bookmark?.setText(newValue.stringRes)
-
-                                    ResultViewModel2.updateWatchStatus(
-                                        this,
-                                        newValue
-                                    )
-                                    reloadStored()
-                                }
-                            }
-                        }
+                    val item = previewAdapter.getItem(position) ?: return
+                    onSelect(item, position)
                 }
             }
 
-        private var resumeAdapter: HomeChildItemAdapter? = null
-        private var resumeHolder: View? = itemView.home_watch_holder
-        private var resumeRecyclerView: RecyclerView? = itemView.home_watch_child_recyclerview
+        fun onSelect(item: LoadResponse, position: Int) {
+            (binding as? FragmentHomeHeadTvBinding)?.apply {
+                homePreviewDescription.isGone =
+                    item.plot.isNullOrBlank()
+                homePreviewDescription.text =
+                    item.plot ?: ""
 
-        private var bookmarkHolder: View? = itemView.home_bookmarked_holder
-        private var bookmarkAdapter: HomeChildItemAdapter? = null
-        private var bookmarkRecyclerView: RecyclerView? =
-            itemView.home_bookmarked_child_recyclerview
+                homePreviewText.text = item.name
+                populateChips(
+                    homePreviewTags,
+                    item.tags ?: emptyList(),
+                    R.style.ChipFilledSemiTransparent
+                )
+
+                homePreviewTags.isGone =
+                    item.tags.isNullOrEmpty()
+
+                homePreviewPlayBtt.setOnClickListener { view ->
+                    viewModel.click(
+                        LoadClickCallback(
+                            START_ACTION_RESUME_LATEST,
+                            view,
+                            position,
+                            item
+                        )
+                    )
+                }
+
+                homePreviewInfoBtt.setOnClickListener { view ->
+                    viewModel.click(
+                        LoadClickCallback(0, view, position, item)
+                    )
+                }
+
+            }
+            (binding as? FragmentHomeHeadBinding)?.apply {
+                //homePreviewImage.setImage(item.posterUrl, item.posterHeaders)
+
+                homePreviewPlay.setOnClickListener { view ->
+                    viewModel.click(
+                        LoadClickCallback(
+                            START_ACTION_RESUME_LATEST,
+                            view,
+                            position,
+                            item
+                        )
+                    )
+                }
+
+                homePreviewInfo.setOnClickListener { view ->
+                    viewModel.click(
+                        LoadClickCallback(0, view, position, item)
+                    )
+                }
+
+                // very ugly code, but I don't care
+                val id = item.getId()
+                val watchType =
+                    DataStoreHelper.getResultWatchState(id)
+                homePreviewBookmark.setText(watchType.stringRes)
+                homePreviewBookmark.setCompoundDrawablesWithIntrinsicBounds(
+                    null,
+                    ContextCompat.getDrawable(
+                        homePreviewBookmark.context,
+                        watchType.iconRes
+                    ),
+                    null,
+                    null
+                )
+
+                homePreviewBookmark.setOnClickListener { fab ->
+                    fab.context.getActivity()?.showBottomDialog(
+                        WatchType.values()
+                            .map { fab.context.getString(it.stringRes) }
+                            .toList(),
+                        DataStoreHelper.getResultWatchState(id).ordinal,
+                        fab.context.getString(R.string.action_add_to_bookmarks),
+                        showApply = false,
+                        {}) {
+                        val newValue = WatchType.values()[it]
+                        homePreviewBookmark.setCompoundDrawablesWithIntrinsicBounds(
+                            null,
+                            ContextCompat.getDrawable(
+                                homePreviewBookmark.context,
+                                newValue.iconRes
+                            ),
+                            null,
+                            null
+                        )
+                        homePreviewBookmark.setText(newValue.stringRes)
+
+                        ResultViewModel2.updateWatchStatus(
+                            item,
+                            newValue
+                        )
+                    }
+                }
+            }
+        }
 
         fun onViewDetachedFromWindow() {
-            previewViewpager?.unregisterOnPageChangeCallback(previewCallback)
+            previewViewpager.unregisterOnPageChangeCallback(previewCallback)
         }
 
         fun onViewAttachedToWindow() {
-            previewViewpager?.registerOnPageChangeCallback(previewCallback)
+            previewViewpager.registerOnPageChangeCallback(previewCallback)
+
+            binding.root.findViewTreeLifecycleOwner()?.apply {
+                observe(viewModel.preview) {
+                    updatePreview(it)
+                }
+                if (binding is FragmentHomeHeadTvBinding) {
+                    observe(viewModel.apiName) { name ->
+                        binding.homePreviewChangeApi.text = name
+                    }
+                }
+                observe(viewModel.resumeWatching) {
+                    updateResume(it)
+                }
+                observe(viewModel.bookmarks) {
+                    updateBookmarks(it)
+                }
+                observe(viewModel.availableWatchStatusTypes) { (checked, visible) ->
+                    for ((chip, watch) in toggleList) {
+                        chip.apply {
+                            isVisible = visible.contains(watch)
+                            isChecked = checked.contains(watch)
+                        }
+                    }
+                    toggleListHolder?.isGone = visible.isEmpty()
+                }
+            } ?: debugException { "Expected findViewTreeLifecycleOwner" }
         }
 
-        private val toggleList = listOf(
-            Pair(itemView.home_type_watching_btt, WatchType.WATCHING),
-            Pair(itemView.home_type_completed_btt, WatchType.COMPLETED),
-            Pair(itemView.home_type_dropped_btt, WatchType.DROPPED),
-            Pair(itemView.home_type_on_hold_btt, WatchType.ONHOLD),
-            Pair(itemView.home_plan_to_watch_btt, WatchType.PLANTOWATCH),
+        private val toggleList = listOf<Pair<Chip, WatchType>>(
+            Pair(itemView.findViewById(R.id.home_type_watching_btt), WatchType.WATCHING),
+            Pair(itemView.findViewById(R.id.home_type_completed_btt), WatchType.COMPLETED),
+            Pair(itemView.findViewById(R.id.home_type_dropped_btt), WatchType.DROPPED),
+            Pair(itemView.findViewById(R.id.home_type_on_hold_btt), WatchType.ONHOLD),
+            Pair(itemView.findViewById(R.id.home_plan_to_watch_btt), WatchType.PLANTOWATCH),
         )
 
+        private val toggleListHolder: ChipGroup? = itemView.findViewById(R.id.home_type_holder)
+
         init {
-            itemView.home_preview_change_api?.setOnClickListener { view ->
-                changeHomePageCallback(view)
-            }
-            itemView.home_preview_change_api2?.setOnClickListener { view ->
-                changeHomePageCallback(view)
-            }
+            previewViewpager.setPageTransformer(HomeScrollTransformer())
 
-            previewViewpager?.apply {
-                //if (!isTvSettings())
-                setPageTransformer(HomeScrollTransformer())
-                //else
-                //    setPageTransformer(null)
+            previewViewpager.adapter = previewAdapter
+            resumeRecyclerView.adapter = resumeAdapter
+            bookmarkRecyclerView.adapter = bookmarkAdapter
 
-                if (adapter == null)
-                    adapter = HomeScrollAdapter(
-                        if (isTvSettings()) R.layout.home_scroll_view_tv else R.layout.home_scroll_view,
-                        if (isTvSettings()) true else null
-                    )
-            }
-            previewAdapter = previewViewpager?.adapter as? HomeScrollAdapter?
-            // previewViewpager?.registerOnPageChangeCallback(previewCallback)
+            resumeRecyclerView.setLinearListLayout(
+                nextLeft = R.id.nav_rail_view,
+                nextRight = FOCUS_SELF
+            )
+            bookmarkRecyclerView.setLinearListLayout(
+                nextLeft = R.id.nav_rail_view,
+                nextRight = FOCUS_SELF
+            )
 
-            if (resumeAdapter == null) {
-                resumeRecyclerView?.adapter = HomeChildItemAdapter(
-                    ArrayList(),
-                    nextFocusUp = itemView.nextFocusUpId,
-                    nextFocusDown = itemView.nextFocusDownId
-                ) { callback ->
-                    if (callback.action != SEARCH_ACTION_SHOW_METADATA) {
-                        searchClickCallback(callback)
-                        return@HomeChildItemAdapter
-                    }
-                    callback.view.context?.getActivity()?.showOptionSelectStringRes(
-                        callback.view,
-                        callback.card.posterUrl,
-                        listOf(
-                            R.string.action_open_watching,
-                            R.string.action_remove_watching
-                        ),
-                        listOf(
-                            R.string.action_open_play,
-                            R.string.action_open_watching,
-                            R.string.action_remove_watching
-                        )
-                    ) { (isTv, actionId) ->
-                        when (actionId + if (isTv) 0 else 1) {
-                            // play
-                            0 -> {
-                                searchClickCallback.invoke(
-                                    SearchClickCallback(
-                                        START_ACTION_RESUME_LATEST,
-                                        callback.view,
-                                        -1,
-                                        callback.card
-                                    )
-                                )
-                                reloadStored()
-                            }
-                            //info
-                            1 -> {
-                                searchClickCallback(
-                                    SearchClickCallback(
-                                        SEARCH_ACTION_LOAD,
-                                        callback.view,
-                                        -1,
-                                        callback.card
-                                    )
-                                )
-
-                                reloadStored()
-                            }
-                            // remove
-                            2 -> {
-                                val card = callback.card
-                                if (card is DataStoreHelper.ResumeWatchingResult) {
-                                    DataStoreHelper.removeLastWatched(card.parentId)
-                                    reloadStored()
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            resumeAdapter = resumeRecyclerView?.adapter as? HomeChildItemAdapter
-            if (bookmarkAdapter == null) {
-                bookmarkRecyclerView?.adapter = HomeChildItemAdapter(
-                    ArrayList(),
-                    nextFocusUp = itemView.nextFocusUpId,
-                    nextFocusDown = itemView.nextFocusDownId
-                ) { callback ->
-                    if (callback.action != SEARCH_ACTION_SHOW_METADATA) {
-                        searchClickCallback(callback)
-                        return@HomeChildItemAdapter
-                    }
-                    callback.view.context?.getActivity()?.showOptionSelectStringRes(
-                        callback.view,
-                        callback.card.posterUrl,
-                        listOf(
-                            R.string.action_open_watching,
-                            R.string.action_remove_from_bookmarks,
-                        ),
-                        listOf(
-                            R.string.action_open_play,
-                            R.string.action_open_watching,
-                            R.string.action_remove_from_bookmarks
-                        )
-                    ) { (isTv, actionId) ->
-                        when (actionId + if (isTv) 0 else 1) { // play
-                            0 -> {
-                                searchClickCallback.invoke(
-                                    SearchClickCallback(
-                                        START_ACTION_RESUME_LATEST,
-                                        callback.view,
-                                        -1,
-                                        callback.card
-                                    )
-                                )
-                                reloadStored()
-                            }
-                            1 -> { // info
-                                searchClickCallback(
-                                    SearchClickCallback(
-                                        SEARCH_ACTION_LOAD,
-                                        callback.view,
-                                        -1,
-                                        callback.card
-                                    )
-                                )
-
-                                reloadStored()
-                            }
-                            2 -> { // remove
-                                DataStoreHelper.setResultWatchState(
-                                    callback.card.id,
-                                    WatchType.NONE.internalId
-                                )
-                                reloadStored()
-                            }
-                        }
-                    }
-                }
-            }
-            bookmarkAdapter = bookmarkRecyclerView?.adapter as? HomeChildItemAdapter
+            fixPaddingStatusbarMargin(topPadding)
 
             for ((chip, watch) in toggleList) {
-                chip?.isChecked = false
-                chip?.setOnCheckedChangeListener { _, isChecked ->
+                chip.isChecked = false
+                chip.setOnCheckedChangeListener { _, isChecked ->
                     if (isChecked) {
-                        loadStoredData(
-                            setOf(watch)
-                            // If we filter all buttons then two can be checked at the same time
-                            // Revert this if you want to go back to multi selection
-//                    toggleList.filter { it.first?.isChecked == true }.map { it.second }.toSet()
-                        )
+                        viewModel.loadStoredData(setOf(watch))
                     }
                     // Else if all are unchecked -> Do not load data
-                    else if (toggleList.all { it.first?.isChecked != true }) {
-                        loadStoredData(emptySet())
+                    else if (toggleList.all { !it.first.isChecked }) {
+                        viewModel.loadStoredData(emptySet())
                     }
                 }
             }
 
-            itemView.home_search?.context?.fixPaddingStatusbar(itemView.home_search)
+            homeAccount?.setOnClickListener { v ->
+                DataStoreHelper.showWhoIsWatching(v?.context ?: return@setOnClickListener)
+            }
 
-            itemView.home_search?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-                override fun onQueryTextSubmit(query: String): Boolean {
-                    searchQueryCallback.invoke(false to query)
-                    //QuickSearchFragment.pushSearch(activity, query, currentApiName?.let { arrayOf(it) }
-                    return true
+            (binding as? FragmentHomeHeadTvBinding)?.apply {
+                homePreviewChangeApi.setOnClickListener { view ->
+                    view.context.selectHomepage(viewModel.repo?.name) { api ->
+                        viewModel.loadAndCancel(api, forceReload = true, fromUI = true)
+                    }
                 }
 
-                override fun onQueryTextChange(newText: String): Boolean {
-                    searchQueryCallback.invoke(true to newText)
-                    //searchViewModel.quickSearch(newText)
-                    return true
+                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 ->
+                    homePreviewHiddenNextFocus.isFocusable = hasFocus
+                }
+
+                homePreviewPlayBtt.setOnFocusChangeListener { _, hasFocus ->
+                    homePreviewHiddenPrevFocus.isFocusable = hasFocus
+                }
+
+                homePreviewHiddenNextFocus.setOnFocusChangeListener { _, hasFocus ->
+                    if (!hasFocus) return@setOnFocusChangeListener
+                    previewViewpager.setCurrentItem(previewViewpager.currentItem + 1, true)
+                    homePreviewInfoBtt.requestFocus()
+                }
+
+                homePreviewHiddenPrevFocus.setOnFocusChangeListener { _, hasFocus ->
+                    if (!hasFocus) return@setOnFocusChangeListener
+                    if (previewViewpager.currentItem <= 0) {
+                        (activity as? MainActivity)?.binding?.navRailView?.requestFocus()
+                    } else {
+                        previewViewpager.setCurrentItem(previewViewpager.currentItem - 1, true)
+                        binding.homePreviewPlayBtt.requestFocus()
+                    }
+                }
+            }
+
+            (binding as? FragmentHomeHeadBinding)?.apply {
+                homeSearch.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                    override fun onQueryTextSubmit(query: String): Boolean {
+                        viewModel.queryTextSubmit(query)
+                        return true
+                    }
+
+                    override fun onQueryTextChange(newText: String): Boolean {
+                        viewModel.queryTextChange(newText)
+                        return true
+                    }
+                })
+            }
         }
 
-        fun updateApiName(name: String) {
-            itemView.home_preview_change_api2?.text = name
-            itemView.home_preview_change_api?.text = name
-        }
-
-        fun updatePreview(preview: Resource<Pair<Boolean, List<LoadResponse>>>) {
-            itemView.home_preview_change_api2?.isGone = preview is Resource.Success
+        private fun updatePreview(preview: Resource<Pair<Boolean, List<LoadResponse>>>) {
             if (preview is Resource.Success) {
-                itemView.home_none_padding?.apply {
+                homeNonePadding.apply {
                     val params = layoutParams
                     params.height = 0
                     layoutParams = params
                 }
             } else {
-                itemView.home_none_padding?.context?.fixPaddingStatusbarView(itemView.home_none_padding)
+                fixPaddingStatusbarView(homeNonePadding)
             }
+
             when (preview) {
                 is Resource.Success -> {
-                    if (true != previewAdapter?.setItems(
+                    if (!previewAdapter.setItems(
                             preview.value.second,
                             preview.value.first
                         )
                     ) {
                         // this might seam weird and useless, however this prevents a very weird andrid bug were the viewpager is not rendered properly
                         // I have no idea why that happens, but this is my ducktape solution
-                        previewViewpager?.setCurrentItem(0, false)
-                        previewViewpager?.beginFakeDrag()
-                        previewViewpager?.fakeDragBy(1f)
-                        previewViewpager?.endFakeDrag()
+                        previewViewpager.setCurrentItem(0, false)
+                        previewViewpager.beginFakeDrag()
+                        previewViewpager.fakeDragBy(1f)
+                        previewViewpager.endFakeDrag()
                         previewCallback.onPageSelected(0)
-                        previewHeader?.isVisible = true
+                        previewViewpager.isVisible = true
+                        previewViewpagerText.isVisible = true
+                        //previewHeader.isVisible = true
                     }
                 }
+
                 else -> {
-                    previewAdapter?.setItems(listOf(), false)
-                    previewViewpager?.setCurrentItem(0, false)
-                    previewHeader?.isVisible = false
+                    previewAdapter.setItems(listOf(), false)
+                    previewViewpager.setCurrentItem(0, false)
+                    previewViewpager.isVisible = false
+                    previewViewpagerText.isVisible = false
+                    //previewHeader.isVisible = false
                 }
             }
-            // previewViewpager?.postDelayed({ previewViewpager?.scr(100, 0) }, 1000)
-            //previewViewpager?.postInvalidate()
         }
 
-        fun updateResume(resumeWatching: List<SearchResponse>) {
-            resumeHolder?.isVisible = resumeWatching.isNotEmpty()
-            resumeAdapter?.updateList(resumeWatching)
+        private fun updateResume(resumeWatching: List<SearchResponse>) {
+            resumeHolder.isVisible = resumeWatching.isNotEmpty()
+            resumeAdapter.updateList(resumeWatching)
 
-            if (!isTvSettings()) {
-                itemView.home_watch_parent_item_title?.setOnClickListener {
-                    moreInfoClickCallback.invoke(
+            if (binding is FragmentHomeHeadBinding) {
+                binding.homeWatchParentItemTitle.setOnClickListener {
+                    viewModel.popup(
                         HomeViewModel.ExpandableHomepageList(
                             HomePageList(
-                                itemView.home_watch_parent_item_title?.text.toString(),
+                                binding.homeWatchParentItemTitle.text.toString(),
                                 resumeWatching,
                                 false
                             ), 1, false
-                        )
+                        ),
+                        deleteCallback = {
+                            viewModel.deleteResumeWatching()
+                        }
                     )
                 }
             }
         }
 
-        fun updateBookmarks(data: Pair<Boolean, List<SearchResponse>>) {
-            bookmarkHolder?.isVisible = data.first
-            bookmarkAdapter?.updateList(data.second)
-            if (!isTvSettings()) {
-                itemView.home_bookmark_parent_item_title?.setOnClickListener {
-                    val items = toggleList.mapNotNull { it.first }.filter { it.isChecked }
+        private fun updateBookmarks(data: Pair<Boolean, List<SearchResponse>>) {
+            val (visible, list) = data
+            bookmarkHolder.isVisible = visible
+            bookmarkAdapter.updateList(list)
+
+            if (binding is FragmentHomeHeadBinding) {
+                binding.homeBookmarkParentItemTitle.setOnClickListener {
+                    val items = toggleList.map { it.first }.filter { it.isChecked }
                     if (items.isEmpty()) return@setOnClickListener // we don't want to show an empty dialog
                     val textSum = items
                         .mapNotNull { it.text }.joinToString()
 
-                    moreInfoClickCallback.invoke(
+                    viewModel.popup(
                         HomeViewModel.ExpandableHomepageList(
                             HomePageList(
                                 textSum,
-                                data.second,
+                                list,
                                 false
                             ), 1, false
-                        )
+                        ), deleteCallback = {
+                            viewModel.deleteBookmarks(list)
+                        }
                     )
                 }
             }
         }
-
-        fun setAvailableWatchStatusTypes(availableWatchStatusTypes: Pair<Set<WatchType>, Set<WatchType>>) {
-            for ((chip, watch) in toggleList) {
-                chip?.apply {
-                    isVisible = availableWatchStatusTypes.second.contains(watch)
-                    isChecked = availableWatchStatusTypes.first.contains(watch)
-                }
-            }
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
index f296e53d..9d95a5fa 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
@@ -2,24 +2,18 @@ package com.lagradost.cloudstream3.ui.home
 
 import android.content.res.Configuration
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import androidx.annotation.LayoutRes
 import androidx.core.view.isGone
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.LoadResponse
-import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.HomeScrollViewBinding
+import com.lagradost.cloudstream3.databinding.HomeScrollViewTvBinding
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.fragment_home_head_tv.*
-import kotlinx.android.synthetic.main.fragment_home_head_tv.view.*
-import kotlinx.android.synthetic.main.home_scroll_view.view.*
 
-
-class HomeScrollAdapter(
-    @LayoutRes val layout: Int = R.layout.home_scroll_view,
-    private val forceHorizontalPosters: Boolean? = null
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class HomeScrollAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private var items: MutableList<LoadResponse> = mutableListOf()
     var hasMoreItems: Boolean = false
 
@@ -45,9 +39,16 @@ class HomeScrollAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        val binding = if (isTvSettings()) {
+            HomeScrollViewTvBinding.inflate(inflater, parent, false)
+        } else {
+            HomeScrollViewBinding.inflate(inflater, parent, false)
+        }
+
         return CardViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false),
-            forceHorizontalPosters
+            binding,
+            //forceHorizontalPosters
         )
     }
 
@@ -61,22 +62,32 @@ class HomeScrollAdapter(
 
     class CardViewHolder
     constructor(
-        itemView: View,
-        private val forceHorizontalPosters: Boolean? = null
+        val binding: ViewBinding,
+        //private val forceHorizontalPosters: Boolean? = null
     ) :
-        RecyclerView.ViewHolder(itemView) {
+        RecyclerView.ViewHolder(binding.root) {
 
         fun bind(card: LoadResponse) {
-            card.apply {
-                val isHorizontal =
-                    (forceHorizontalPosters == true) || ((forceHorizontalPosters != false) && itemView.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE)
+            val isHorizontal =
+                binding is HomeScrollViewTvBinding || itemView.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
 
-                val posterUrl = if (isHorizontal) backgroundPosterUrl ?: posterUrl else posterUrl
-                    ?: backgroundPosterUrl
-                itemView.home_scroll_preview_tags?.text = tags?.joinToString(" • ") ?: ""
-                itemView.home_scroll_preview_tags?.isGone = tags.isNullOrEmpty()
-                itemView.home_scroll_preview?.setImage(posterUrl, posterHeaders)
-                itemView.home_scroll_preview_title?.text = name
+            val posterUrl =
+                if (isHorizontal) card.backgroundPosterUrl ?: card.posterUrl else card.posterUrl
+                    ?: card.backgroundPosterUrl
+
+            when (binding) {
+                is HomeScrollViewBinding -> {
+                    binding.homeScrollPreview.setImage(posterUrl)
+                    binding.homeScrollPreviewTags.apply {
+                        text = card.tags?.joinToString(" • ") ?: ""
+                        isGone = card.tags.isNullOrEmpty()
+                    }
+                    binding.homeScrollPreviewTitle.text = card.name
+                }
+
+                is HomeScrollViewTvBinding -> {
+                    binding.homeScrollPreview.setImage(posterUrl)
+                }
             }
         }
     }
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 edf58008..13d34b59 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
@@ -1,10 +1,10 @@
 package com.lagradost.cloudstream3.ui.home
 
+import android.os.Build
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.filterHomePageListByFilmQuality
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
@@ -13,26 +13,47 @@ 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.mvvm.*
+import com.lagradost.cloudstream3.CommonActivity.activity
+import com.lagradost.cloudstream3.HomePageList
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.MainAPI
+import com.lagradost.cloudstream3.MainActivity
+import com.lagradost.cloudstream3.MainActivity.Companion.lastError
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.amap
+import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.debugAssert
+import com.lagradost.cloudstream3.mvvm.debugWarning
+import com.lagradost.cloudstream3.mvvm.launchSafe
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.ui.APIRepository
 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.search.SEARCH_ACTION_FOCUSED
+import com.lagradost.cloudstream3.ui.search.SearchClickCallback
+import com.lagradost.cloudstream3.ui.search.SearchHelper
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
+import com.lagradost.cloudstream3.utils.AppUtils.addProgramsToContinueWatching
+import com.lagradost.cloudstream3.utils.AppUtils.loadResult
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE
 import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteAllBookmarkedData
+import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteAllResumeStateIds
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllResumeStateIds
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllWatchStateIds
 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
 import kotlinx.coroutines.withContext
-import java.util.*
+import java.util.EnumSet
 import kotlin.collections.set
 
 class HomeViewModel : ViewModel() {
@@ -72,7 +93,22 @@ class HomeViewModel : ViewModel() {
         }
     }
 
-    private var repo: APIRepository? = null
+    fun deleteResumeWatching() {
+        deleteAllResumeStateIds()
+        loadResumeWatching()
+    }
+
+    fun deleteBookmarks(list: List<SearchResponse>) {
+        list.forEach { DataStoreHelper.deleteBookmarkedData(it.id) }
+        loadStoredData()
+    }
+
+    fun deleteBookmarks() {
+        deleteAllBookmarkedData()
+        loadStoredData()
+    }
+
+    var repo: APIRepository? = null
 
     private val _apiName = MutableLiveData<String>()
     val apiName: LiveData<String> = _apiName
@@ -83,7 +119,7 @@ class HomeViewModel : ViewModel() {
     private var currentShuffledList: List<SearchResponse> = listOf()
 
     private fun autoloadRepo(): APIRepository {
-        return APIRepository(apis.first { it.hasMainPage })
+        return APIRepository(synchronized(apis) { apis.first { it.hasMainPage } })
     }
 
     private val _availableWatchStatusTypes =
@@ -101,8 +137,14 @@ class HomeViewModel : ViewModel() {
     val resumeWatching: LiveData<List<SearchResponse>> = _resumeWatching
     val preview: LiveData<Resource<Pair<Boolean, List<LoadResponse>>>> = _preview
 
-    fun loadResumeWatching() = viewModelScope.launchSafe {
+    private fun loadResumeWatching() = viewModelScope.launchSafe {
         val resumeWatchingResult = getResumeWatching()
+        if (isTrueTvSettings() && resumeWatchingResult != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            ioSafe {
+                // this WILL crash on non tvs, so keep this inside a try catch
+                activity?.addProgramsToContinueWatching(resumeWatchingResult)
+            }
+        }
         resumeWatchingResult?.let {
             _resumeWatching.postValue(it)
         }
@@ -128,6 +170,10 @@ class HomeViewModel : ViewModel() {
         currentWatchTypes.remove(WatchType.NONE)
 
         if (currentWatchTypes.size <= 0) {
+            setKey(
+                HOME_BOOKMARK_VALUE_LIST,
+                intArrayOf()
+            )
             _availableWatchStatusTypes.postValue(setOf<WatchType>() to setOf())
             _bookmarks.postValue(Pair(false, ArrayList()))
             return@launchSafe
@@ -135,7 +181,10 @@ 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()
+        )
         _availableWatchStatusTypes.postValue(
             Pair(
                 watchPrefNotNull,
@@ -152,8 +201,11 @@ class HomeViewModel : ViewModel() {
     }
 
     private var onGoingLoad: Job? = null
-    private fun loadAndCancel(api: MainAPI?) {
+    private var isCurrentlyLoadingName: String? = null
+    private fun loadAndCancel(api: MainAPI) {
+        //println("loaded ${api.name}")
         onGoingLoad?.cancel()
+        isCurrentlyLoadingName = api.name
         onGoingLoad = load(api)
     }
 
@@ -255,12 +307,12 @@ class HomeViewModel : ViewModel() {
         }
     }
 
-    private fun load(api: MainAPI?) = ioSafe {
-        repo = if (api != null) {
+    private fun load(api: MainAPI): Job = ioSafe {
+        repo = //if (api != null) {
             APIRepository(api)
-        } else {
-            autoloadRepo()
-        }
+        //} else {
+        //    autoloadRepo()
+        //}
 
         _apiName.postValue(repo?.name)
         _randomItems.postValue(listOf())
@@ -274,6 +326,7 @@ class HomeViewModel : ViewModel() {
 
         _page.postValue(Resource.Loading())
         _preview.postValue(Resource.Loading())
+        // cancel the current preview expand as that is no longer relevant
         addJob?.cancel()
 
         when (val data = repo?.getMainPage(1, null)) {
@@ -337,41 +390,142 @@ class HomeViewModel : ViewModel() {
                     logError(e)
                 }
             }
+
             is Resource.Failure -> {
                 _page.postValue(data!!)
                 _preview.postValue(data!!)
             }
+
             else -> Unit
         }
+        isCurrentlyLoadingName = null
+    }
+
+    fun click(callback: SearchClickCallback) {
+        if (callback.action == SEARCH_ACTION_FOCUSED) {
+            //focusCallback(callback.card)
+        } else {
+            SearchHelper.handleSearchClickCallback(callback)
+        }
     }
 
-    fun loadAndCancel(preferredApiName: String?, forceReload: Boolean = true) =
-        viewModelScope.launchSafe {
+
+    private val _popup = MutableLiveData<Pair<ExpandableHomepageList, (() -> Unit)?>?>(null)
+    val popup: LiveData<Pair<ExpandableHomepageList, (() -> Unit)?>?> = _popup
+
+    fun popup(list: ExpandableHomepageList?, deleteCallback: (() -> Unit)? = null) {
+        if (list == null)
+            _popup.postValue(null)
+        else
+            _popup.postValue(list to deleteCallback)
+    }
+
+    private fun bookmarksUpdated(unused: Boolean) {
+        reloadStored()
+    }
+
+    private fun afterPluginsLoaded(forceReload: Boolean) {
+        loadAndCancel(DataStoreHelper.currentHomePage, forceReload)
+    }
+
+    private fun afterMainPluginsLoaded(unused: Boolean = 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()
+    }
+
+    fun queryTextSubmit(query: String) {
+        QuickSearchFragment.pushSearch(
+            query,
+            repo?.name?.let { arrayOf(it) })
+    }
+
+    fun queryTextChange(newText: String) {
+        // do nothing
+    }
+
+    fun loadStoredData() {
+        val list = EnumSet.noneOf(WatchType::class.java)
+        getKey<IntArray>(HOME_BOOKMARK_VALUE_LIST)?.map { WatchType.fromInternalId(it) }?.let {
+            list.addAll(it)
+        }
+        loadStoredData(list)
+    }
+
+    fun reloadStored() {
+        loadResumeWatching()
+        loadStoredData()
+    }
+
+    fun click(load: LoadClickCallback) {
+        loadResult(load.response.url, load.response.apiName, load.action)
+    }
+
+    // only save the key if it is from UI, as we don't want internal functions changing the setting
+    fun loadAndCancel(
+        preferredApiName: String?,
+        forceReload: Boolean = true,
+        fromUI: Boolean = false
+    ) =
+        ioSafe {
+            //println("trying to load $preferredApiName")
             // Since plugins are loaded in stages this function can get called multiple times.
             // The issue with this is that the homepage may be fetched multiple times while the first request is loading
-            val api = getApiFromNameNull(preferredApiName)
-            if (!forceReload && api?.let { expandable[it.name]?.list?.list?.isNotEmpty() } == true) {
-                return@launchSafe
+            // api?.let { expandable[it.name]?.list?.list?.isNotEmpty() } == true
+            val currentPage = page.value
+
+            // if we don't need to reload and we have a valid homepage or currently loading the same thing then return
+            val currentLoading = isCurrentlyLoadingName
+            if (!forceReload && (currentPage is Resource.Success && currentPage.value.isNotEmpty() || (currentLoading != null && currentLoading == preferredApiName))) {
+                return@ioSafe
             }
 
+            val api = getApiFromNameNull(preferredApiName)
             if (preferredApiName == noneApi.name) {
-                setKey(USER_SELECTED_HOMEPAGE_API, noneApi.name)
+                // just set to random
+                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
+                // then use nothing
                 val validAPIs = context?.filterProviderByPreferredMedia()
                 if (validAPIs.isNullOrEmpty()) {
-                    // Do not set USER_SELECTED_HOMEPAGE_API when there is no plugins loaded
                     loadAndCancel(noneApi)
                 } else {
                     val apiRandom = validAPIs.random()
                     loadAndCancel(apiRandom)
-                    setKey(USER_SELECTED_HOMEPAGE_API, apiRandom.name)
+                    if (fromUI) DataStoreHelper.currentHomePage = apiRandom.name
                 }
-                // If the plugin isn't loaded yet. (Does not set the key)
             } else if (api == null) {
-                loadAndCancel(noneApi)
+                // API is not found aka not loaded or removed, post the loading
+                // progress if waiting for plugins, otherwise nothing
+                if (PluginManager.loadedOnlinePlugins || PluginManager.checkSafeModeFile() || lastError != null) {
+                    loadAndCancel(noneApi)
+                } else {
+                    _page.postValue(Resource.Loading())
+                    if (preferredApiName != null)
+                        _apiName.postValue(preferredApiName)
+                }
             } else {
-                setKey(USER_SELECTED_HOMEPAGE_API, api.name)
+                // if the api is found, then set it to it and save key
+                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 bb336d3e..9affef8c 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
@@ -15,6 +15,7 @@ import android.view.animation.AlphaAnimation
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.google.android.material.tabs.TabLayoutMediator
 import com.lagradost.cloudstream3.APIHolder
@@ -24,6 +25,7 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.MainActivity
 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.observe
@@ -40,7 +42,6 @@ import com.lagradost.cloudstream3.utils.AppUtils.reduceDragSensitivity
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
-import kotlinx.android.synthetic.main.fragment_library.*
 import org.checkerframework.framework.qual.Unused
 import kotlin.math.abs
 
@@ -77,11 +78,22 @@ class LibraryFragment : Fragment() {
 
     private val libraryViewModel: LibraryViewModel by activityViewModels()
 
+    var binding: FragmentLibraryBinding? = null
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         MainActivity.afterBackupRestoreEvent += ::onNewSyncData
-        return inflater.inflate(R.layout.fragment_library, container, false)
+        val localBinding = FragmentLibraryBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+
+        //return inflater.inflate(R.layout.fragment_library, container, false)
+    }
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
     override fun onDestroyView() {
@@ -90,7 +102,7 @@ class LibraryFragment : Fragment() {
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        viewpager?.currentItem?.let { currentItem ->
+        binding?.viewpager?.currentItem?.let { currentItem ->
             outState.putInt(VIEWPAGER_ITEM_KEY, currentItem)
         }
         super.onSaveInstanceState(outState)
@@ -98,9 +110,9 @@ class LibraryFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(search_status_bar_padding)
+        fixPaddingStatusbar(binding?.searchStatusBarPadding)
 
-        sort_fab?.setOnClickListener {
+        binding?.sortFab?.setOnClickListener {
             val methods = libraryViewModel.sortingMethods.map {
                 txt(it.stringRes).asString(view.context)
             }
@@ -116,7 +128,7 @@ class LibraryFragment : Fragment() {
                 })
         }
 
-        main_search?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+        binding?.mainSearch?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {
                 libraryViewModel.sort(ListSorting.Query, query)
                 return true
@@ -139,7 +151,7 @@ class LibraryFragment : Fragment() {
 
         libraryViewModel.reloadPages(false)
 
-        list_selector?.setOnClickListener {
+        binding?.listSelector?.setOnClickListener {
             val items = libraryViewModel.availableApiNames
             val currentItem = libraryViewModel.currentApiName.value
 
@@ -162,12 +174,14 @@ class LibraryFragment : Fragment() {
             syncId: SyncIdName,
             apiName: String? = null,
         ) {
-            val availableProviders = allProviders.filter {
-                it.supportedSyncNames.contains(syncId)
-            }.map { it.name } +
-                    // Add the api if it exists
-                    (APIHolder.getApiFromNameNull(apiName)?.let { listOf(it.name) } ?: emptyList())
-
+            val availableProviders = synchronized(allProviders) {
+                allProviders.filter {
+                    it.supportedSyncNames.contains(syncId)
+                }.map { it.name } +
+                        // Add the api if it exists
+                        (APIHolder.getApiFromNameNull(apiName)?.let { listOf(it.name) }
+                            ?: emptyList())
+            }
             val baseOptions = listOf(
                 LibraryOpenerType.Default,
                 LibraryOpenerType.None,
@@ -219,20 +233,22 @@ class LibraryFragment : Fragment() {
             }
         }
 
-        provider_selector?.setOnClickListener {
+        binding?.providerSelector?.setOnClickListener {
             val syncName = libraryViewModel.currentSyncApi?.syncIdName ?: return@setOnClickListener
             activity?.showPluginSelectionDialog(syncName.name, syncName)
         }
 
-        viewpager?.setPageTransformer(LibraryScrollTransformer())
-        viewpager?.adapter =
-            viewpager.adapter ?: ViewpagerAdapter(mutableListOf(), { isScrollingDown: Boolean ->
-                if (isScrollingDown) {
-                    sort_fab?.shrink()
-                } else {
-                    sort_fab?.extend()
-                }
-            }) callback@{ searchClickCallback ->
+        binding?.viewpager?.setPageTransformer(LibraryScrollTransformer())
+        binding?.viewpager?.adapter =
+            binding?.viewpager?.adapter ?: ViewpagerAdapter(
+                mutableListOf(),
+                { isScrollingDown: Boolean ->
+                    if (isScrollingDown) {
+                        binding?.sortFab?.shrink()
+                    } else {
+                        binding?.sortFab?.extend()
+                    }
+                }) callback@{ searchClickCallback ->
                 // To prevent future accidents
                 debugAssert({
                     searchClickCallback.card !is SyncAPI.LibraryItem
@@ -277,6 +293,7 @@ class LibraryFragment : Fragment() {
                                     )
                                 }
                             }
+
                             LibraryOpenerType.None -> {}
                             LibraryOpenerType.Provider ->
                                 savedSelection.providerData?.apiName?.let { apiName ->
@@ -285,8 +302,10 @@ class LibraryFragment : Fragment() {
                                         apiName,
                                     )
                                 }
+
                             LibraryOpenerType.Browser ->
                                 openBrowser(searchClickCallback.card.url)
+
                             LibraryOpenerType.Search -> {
                                 QuickSearchFragment.pushSearch(
                                     activity,
@@ -298,22 +317,28 @@ class LibraryFragment : Fragment() {
                 }
             }
 
-        viewpager?.offscreenPageLimit = 2
-        viewpager?.reduceDragSensitivity()
+        binding?.apply {
+            viewpager.offscreenPageLimit = 2
+            viewpager.reduceDragSensitivity()
+        }
 
         val startLoading = Runnable {
-            gridview?.numColumns = context?.getSpanCount() ?: 3
-            gridview?.adapter =
-                context?.let { LoadingPosterAdapter(it, 6 * 3) }
-            library_loading_overlay?.isVisible = true
-            library_loading_shimmer?.startShimmer()
-            empty_list_textview?.isVisible = false
+            binding?.apply {
+                gridview.numColumns = context?.getSpanCount() ?: 3
+                gridview.adapter =
+                    context?.let { LoadingPosterAdapter(it, 6 * 3) }
+                libraryLoadingOverlay.isVisible = true
+                libraryLoadingShimmer.startShimmer()
+                emptyListTextview.isVisible = false
+            }
         }
 
         val stopLoading = Runnable {
-            gridview?.adapter = null
-            library_loading_overlay?.isVisible = false
-            library_loading_shimmer?.stopShimmer()
+            binding?.apply {
+                gridview.adapter = null
+                libraryLoadingOverlay.isVisible = false
+                libraryLoadingShimmer.stopShimmer()
+            }
         }
 
         val handler = Handler(Looper.getMainLooper())
@@ -324,65 +349,75 @@ class LibraryFragment : Fragment() {
                     handler.removeCallbacks(startLoading)
                     val pages = resource.value
                     val showNotice = pages.all { it.items.isEmpty() }
-                    empty_list_textview?.isVisible = showNotice
-                    if (showNotice) {
-                        if (libraryViewModel.availableApiNames.size > 1) {
-                            empty_list_textview?.setText(R.string.empty_library_logged_in_message)
-                        } else {
-                            empty_list_textview?.setText(R.string.empty_library_no_accounts_message)
+
+
+                    binding?.apply {
+                        emptyListTextview.isVisible = showNotice
+                        if (showNotice) {
+                            if (libraryViewModel.availableApiNames.size > 1) {
+                                emptyListTextview.setText(R.string.empty_library_logged_in_message)
+                            } else {
+                                emptyListTextview.setText(R.string.empty_library_no_accounts_message)
+                            }
                         }
+
+                        (viewpager.adapter as? ViewpagerAdapter)?.pages = pages
+                        // Using notifyItemRangeChanged keeps the animations when sorting
+                        viewpager.adapter?.notifyItemRangeChanged(
+                            0,
+                            viewpager.adapter?.itemCount ?: 0
+                        )
+
+                        // Only stop loading after 300ms to hide the fade effect the viewpager produces when updating
+                        // Without this there would be a flashing effect:
+                        // loading -> show old viewpager -> black screen -> show new viewpager
+                        handler.postDelayed(stopLoading, 300)
+
+                        savedInstanceState?.getInt(VIEWPAGER_ITEM_KEY)?.let { currentPos ->
+                            if (currentPos < 0) return@let
+                            viewpager.setCurrentItem(currentPos, false)
+                            // Using remove() sets the key to 0 instead of removing it
+                            savedInstanceState.putInt(VIEWPAGER_ITEM_KEY, -1)
+                        }
+
+                        // Since the animation to scroll multiple items is so much its better to just hide
+                        // the viewpager a bit while the fastest animation is running
+                        fun hideViewpager(distance: Int) {
+                            if (distance < 3) return
+
+                            val hideAnimation = AlphaAnimation(1f, 0f).apply {
+                                duration = distance * 50L
+                                fillAfter = true
+                            }
+                            val showAnimation = AlphaAnimation(0f, 1f).apply {
+                                duration = distance * 50L
+                                startOffset = distance * 100L
+                                fillAfter = true
+                            }
+                            viewpager.startAnimation(hideAnimation)
+                            viewpager.startAnimation(showAnimation)
+                        }
+
+                        TabLayoutMediator(
+                            libraryTabLayout,
+                            viewpager,
+                        ) { tab, position ->
+                            tab.text = pages.getOrNull(position)?.title?.asStringNull(context)
+                            tab.view.setOnClickListener {
+                                val currentItem =
+                                    binding?.viewpager?.currentItem ?: return@setOnClickListener
+                                val distance = abs(position - currentItem)
+                                hideViewpager(distance)
+                            }
+                        }.attach()
                     }
-
-                    (viewpager.adapter as? ViewpagerAdapter)?.pages = pages
-                    // Using notifyItemRangeChanged keeps the animations when sorting
-                    viewpager.adapter?.notifyItemRangeChanged(0, viewpager.adapter?.itemCount ?: 0)
-
-                    // Only stop loading after 300ms to hide the fade effect the viewpager produces when updating
-                    // Without this there would be a flashing effect:
-                    // loading -> show old viewpager -> black screen -> show new viewpager
-                    handler.postDelayed(stopLoading, 300)
-
-                    savedInstanceState?.getInt(VIEWPAGER_ITEM_KEY)?.let { currentPos ->
-                        if (currentPos < 0) return@let
-                        viewpager?.setCurrentItem(currentPos, false)
-                        // Using remove() sets the key to 0 instead of removing it
-                        savedInstanceState.putInt(VIEWPAGER_ITEM_KEY, -1)
-                    }
-
-                    // Since the animation to scroll multiple items is so much its better to just hide
-                    // the viewpager a bit while the fastest animation is running
-                    fun hideViewpager(distance: Int) {
-                        if (distance < 3) return
-
-                        val hideAnimation = AlphaAnimation(1f, 0f).apply {
-                            duration = distance * 50L
-                            fillAfter = true
-                        }
-                        val showAnimation = AlphaAnimation(0f, 1f).apply {
-                            duration = distance * 50L
-                            startOffset = distance * 100L
-                            fillAfter = true
-                        }
-                        viewpager?.startAnimation(hideAnimation)
-                        viewpager?.startAnimation(showAnimation)
-                    }
-
-                    TabLayoutMediator(
-                        library_tab_layout,
-                        viewpager,
-                    ) { tab, position ->
-                        tab.text = pages.getOrNull(position)?.title?.asStringNull(context)
-                        tab.view.setOnClickListener {
-                            val currentItem = viewpager?.currentItem ?: return@setOnClickListener
-                            val distance = abs(position - currentItem)
-                            hideViewpager(distance)
-                        }
-                    }.attach()
                 }
+
                 is Resource.Loading -> {
                     // Only start loading after 200ms to prevent loading cached lists
                     handler.postDelayed(startLoading, 200)
                 }
+
                 is Resource.Failure -> {
                     stopLoading.run()
                     // No user indication it failed :(
@@ -393,7 +428,7 @@ class LibraryFragment : Fragment() {
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
-        (viewpager.adapter as? ViewpagerAdapter)?.rebind()
+        (binding?.viewpager?.adapter as? ViewpagerAdapter)?.rebind()
         super.onConfigurationChanged(newConfig)
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryScrollTransformer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryScrollTransformer.kt
index 8aafbdd6..c3cee183 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryScrollTransformer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryScrollTransformer.kt
@@ -2,13 +2,13 @@ package com.lagradost.cloudstream3.ui.library
 
 import android.view.View
 import androidx.viewpager2.widget.ViewPager2
-import kotlinx.android.synthetic.main.library_viewpager_page.view.*
+import com.lagradost.cloudstream3.R
 import kotlin.math.roundToInt
 
 class LibraryScrollTransformer : ViewPager2.PageTransformer {
     override fun transformPage(page: View, position: Float) {
         val padding = (-position * page.width).roundToInt()
-        page.page_recyclerview.setPadding(
+        page.findViewById<View>(R.id.page_recyclerview).setPadding(
             padding, 0,
             -padding, 0
         )
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 5f64880c..14d31356 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
@@ -11,7 +11,6 @@ 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 kotlinx.coroutines.delay
 
 enum class ListSorting(@StringRes val stringRes: Int) {
     Query(R.string.none),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LoadingPosterAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LoadingPosterAdapter.kt
index a637133b..160fbe2b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LoadingPosterAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LoadingPosterAdapter.kt
@@ -5,15 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
-import android.widget.FrameLayout
-import android.widget.LinearLayout
-import android.widget.ListPopupWindow.MATCH_PARENT
-import android.widget.RelativeLayout
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.loading_poster_dynamic.view.*
-import kotlin.math.roundToInt
-import kotlin.math.sqrt
 
 class LoadingPosterAdapter(context: Context, private val itemCount: Int) :
     BaseAdapter() {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt
index 2435f8be..b8feb656 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt
@@ -3,23 +3,21 @@ package com.lagradost.cloudstream3.ui.library
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.AcraApplication
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.SearchResultGridExpandedBinding
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.AutofitRecyclerView
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.search_result_grid_expanded.view.*
 import kotlin.math.roundToInt
 
 
@@ -32,8 +30,11 @@ class PageAdapter(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return LibraryItemViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(R.layout.search_result_grid_expanded, parent, false)
+            SearchResultGridExpandedBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
         )
     }
 
@@ -57,8 +58,8 @@ class PageAdapter(
         }
     }
 
-    inner class LibraryItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val cardView: ImageView = itemView.imageView
+    inner class LibraryItemViewHolder(val binding: SearchResultGridExpandedBinding) :
+        RecyclerView.ViewHolder(binding.root) {
 
         private val compactView = false//itemView.context.getGridIsCompact()
         private val coverHeight: Int =
@@ -85,11 +86,12 @@ class PageAdapter(
 
                         val fg =
                             getDifferentColor(bg)//palette.getVibrantColor(ContextCompat.getColor(ctx,R.color.ratingColor))
-                        itemView.text_rating.apply {
+                        binding.textRating.apply {
                             setTextColor(ColorStateList.valueOf(fg))
                         }
-                        itemView.text_rating_holder?.backgroundTintList = ColorStateList.valueOf(bg)
-                        itemView.watchProgress?.apply {
+                        binding.textRating.compoundDrawables.getOrNull(0)?.setTint(fg)
+                        binding.textRating.backgroundTintList = ColorStateList.valueOf(bg)
+                        binding.watchProgress.apply {
                             progressTintList = ColorStateList.valueOf(fg)
                             progressBackgroundTintList = ColorStateList.valueOf(bg)
                         }
@@ -99,7 +101,7 @@ class PageAdapter(
 
             // See searchAdaptor for this, it basically fixes the height
             if (!compactView) {
-                cardView.apply {
+                binding.imageView.apply {
                     layoutParams = FrameLayout.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT,
                         coverHeight
@@ -108,23 +110,13 @@ class PageAdapter(
             }
 
             val showProgress = item.episodesCompleted != null && item.episodesTotal != null
-            itemView.watchProgress.isVisible = showProgress
+            binding.watchProgress.isVisible = showProgress
             if (showProgress) {
-                itemView.watchProgress.max = item.episodesTotal!!
-                itemView.watchProgress.progress = item.episodesCompleted!!
+                binding.watchProgress.max = item.episodesTotal!!
+                binding.watchProgress.progress = item.episodesCompleted!!
             }
 
-            itemView.imageText.text = item.name
-
-            val showRating = (item.personalRating ?: 0) != 0
-            itemView.text_rating_holder.isVisible = showRating
-            if (showRating) {
-                // We want to show 8.5 but not 8.0 hence the replace
-                val rating = ((item.personalRating ?: 0).toDouble() / 10).toString()
-                    .replace(".0", "")
-
-                itemView.text_rating.text = "★ $rating"
-            }
+            binding.imageText.text = item.name
         }
     }
 }
\ 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 33a40386..95fefcbe 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
@@ -2,16 +2,14 @@ package com.lagradost.cloudstream3.ui.library
 
 import android.os.Build
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.doOnAttach
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.OnFlingListener
-import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.LibraryViewpagerPageBinding
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
-import kotlinx.android.synthetic.main.library_viewpager_page.view.*
 
 class ViewpagerAdapter(
     var pages: List<SyncAPI.Page>,
@@ -20,8 +18,7 @@ class ViewpagerAdapter(
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return PageViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(R.layout.library_viewpager_page, parent, false)
+            LibraryViewpagerPageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         )
     }
 
@@ -34,6 +31,7 @@ class ViewpagerAdapter(
     }
 
     private val unbound = mutableSetOf<Int>()
+
     /**
      * Used to mark all pages for re-binding and forces all items to be refreshed
      * Without this the pages will still use the same adapters
@@ -43,44 +41,46 @@ class ViewpagerAdapter(
         this.notifyItemRangeChanged(0, pages.size)
     }
 
-    inner class PageViewHolder(private val itemViewTest: View) :
-        RecyclerView.ViewHolder(itemViewTest) {
+    inner class PageViewHolder(private val binding: LibraryViewpagerPageBinding) :
+        RecyclerView.ViewHolder(binding.root) {
         fun bind(page: SyncAPI.Page, rebind: Boolean) {
-            itemView.page_recyclerview?.spanCount =
-                this@PageViewHolder.itemView.context.getSpanCount() ?: 3
-
-            if (itemViewTest.page_recyclerview?.adapter == null || rebind) {
-                // Only add the items after it has been attached since the items rely on ItemWidth
-                // Which is only determined after the recyclerview is attached.
-                // If this fails then item height becomes 0 when there is only one item
-                itemViewTest.page_recyclerview?.doOnAttach {
-                    itemViewTest.page_recyclerview?.adapter = PageAdapter(
-                        page.items.toMutableList(),
-                        itemViewTest.page_recyclerview,
-                        clickCallback
-                    )
+            binding.pageRecyclerview.apply {
+                spanCount =
+                    this@PageViewHolder.itemView.context.getSpanCount() ?: 3
+                if (adapter == null || rebind) {
+                    // Only add the items after it has been attached since the items rely on ItemWidth
+                    // Which is only determined after the recyclerview is attached.
+                    // If this fails then item height becomes 0 when there is only one item
+                    doOnAttach {
+                        adapter = PageAdapter(
+                            page.items.toMutableList(),
+                            this,
+                            clickCallback
+                        )
+                    }
+                } else {
+                    (adapter as? PageAdapter)?.updateList(page.items)
+                    scrollToPosition(0)
                 }
-            } else {
-                (itemViewTest.page_recyclerview?.adapter as? PageAdapter)?.updateList(page.items)
-                itemViewTest.page_recyclerview?.scrollToPosition(0)
-            }
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                itemViewTest.page_recyclerview.setOnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
-                    val diff = scrollY - oldScrollY
-                    if (diff == 0) return@setOnScrollChangeListener
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+                        val diff = scrollY - oldScrollY
+                        if (diff == 0) return@setOnScrollChangeListener
 
-                    scrollCallback.invoke(diff > 0)
-                }
-            } else {
-                itemViewTest.page_recyclerview.onFlingListener = object : OnFlingListener() {
-                    override fun onFling(velocityX: Int, velocityY: Int): Boolean {
-                        scrollCallback.invoke(velocityY > 0)
-                        return false
+                        scrollCallback.invoke(diff > 0)
+                    }
+                } else {
+                    onFlingListener = object : OnFlingListener() {
+                        override fun onFling(velocityX: Int, velocityY: Int): Boolean {
+                            scrollCallback.invoke(velocityY > 0)
+                            return false
+                        }
                     }
                 }
             }
 
+
         }
     }
 
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 52f0b760..8388e58f 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
@@ -7,24 +7,29 @@ import android.graphics.drawable.AnimatedVectorDrawable
 import android.media.metrics.PlaybackErrorEvent
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.media.session.MediaSessionCompat
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.ProgressBar
 import android.widget.Toast
 import androidx.annotation.LayoutRes
 import androidx.annotation.StringRes
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import androidx.media.session.MediaButtonReceiver
 import androidx.preference.PreferenceManager
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.google.android.exoplayer2.ExoPlayer
-import com.google.android.exoplayer2.PlaybackException
-import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
-import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
-import com.google.android.exoplayer2.ui.SubtitleView
+import androidx.media3.common.PlaybackException
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.session.MediaSession
+import androidx.media3.ui.AspectRatioFrameLayout
+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 com.lagradost.cloudstream3.CommonActivity.canEnterPipMode
@@ -34,6 +39,8 @@ import com.lagradost.cloudstream3.CommonActivity.playerEventListener
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.unixTimeMs
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
 import com.lagradost.cloudstream3.utils.AppUtils
@@ -42,8 +49,6 @@ import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import kotlinx.android.synthetic.main.fragment_player.*
-import kotlinx.android.synthetic.main.player_custom_layout.*
 
 enum class PlayerResize(@StringRes val nameRes: Int) {
     Fit(R.string.resize_fit),
@@ -72,9 +77,15 @@ 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
 
     @LayoutRes
-    protected var layout: Int = R.layout.fragment_player
+    protected open var layout: Int = R.layout.fragment_player
 
     open fun nextEpisode() {
         throw NotImplementedError()
@@ -84,11 +95,11 @@ abstract class AbstractPlayerFragment(
         throw NotImplementedError()
     }
 
-    open fun playerPositionChanged(posDur: Pair<Long, Long>) {
+    open fun playerPositionChanged(position: Long, duration : Long) {
         throw NotImplementedError()
     }
 
-    open fun playerDimensionsLoaded(widthHeight: Pair<Int, Int>) {
+    open fun playerDimensionsLoaded(width: Int, height : Int) {
         throw NotImplementedError()
     }
 
@@ -124,8 +135,8 @@ abstract class AbstractPlayerFragment(
         }
     }
 
-    private fun updateIsPlaying(playing: Pair<CSPlayerLoading, CSPlayerLoading>) {
-        val (wasPlaying, isPlaying) = playing
+    private fun updateIsPlaying(wasPlaying : CSPlayerLoading,
+                                isPlaying : CSPlayerLoading) {
         val isPlayingRightNow = CSPlayerLoading.IsPlaying == isPlaying
         val isPausedRightNow = CSPlayerLoading.IsPaused == isPlaying
 
@@ -133,15 +144,15 @@ abstract class AbstractPlayerFragment(
 
         isBuffering = CSPlayerLoading.IsBuffering == isPlaying
         if (isBuffering) {
-            player_pause_play_holder_holder?.isVisible = false
-            player_buffering?.isVisible = true
+            playerPausePlayHolderHolder?.isVisible = false
+            playerBuffering?.isVisible = true
         } else {
-            player_pause_play_holder_holder?.isVisible = true
-            player_buffering?.isVisible = false
+            playerPausePlayHolderHolder?.isVisible = true
+            playerBuffering?.isVisible = false
 
             if (wasPlaying != isPlaying) {
-                player_pause_play?.setImageResource(if (isPlayingRightNow) R.drawable.play_to_pause else R.drawable.pause_to_play)
-                val drawable = player_pause_play?.drawable
+                playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.play_to_pause else R.drawable.pause_to_play)
+                val drawable = playerPausePlay?.drawable
 
                 var startedAnimation = false
                 if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
@@ -163,23 +174,24 @@ abstract class AbstractPlayerFragment(
 
                 // somehow the phone is wacked
                 if (!startedAnimation) {
-                    player_pause_play?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
+                    playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
                 }
             } else {
-                player_pause_play?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
+                playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
             }
         }
 
         canEnterPipMode = isPlayingRightNow && hasPipModeSupport
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isInPIPMode) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             activity?.let { act ->
-                PlayerPipHelper.updatePIPModeActions(act, isPlayingRightNow)
+                PlayerPipHelper.updatePIPModeActions(act, isPlayingRightNow, player.getAspectRatio())
             }
         }
     }
 
     private var pipReceiver: BroadcastReceiver? = null
     override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode)
         try {
             isInPIPMode = isInPictureInPictureMode
             if (isInPictureInPictureMode) {
@@ -197,25 +209,26 @@ abstract class AbstractPlayerFragment(
                             CSPlayerEvent.values()[intent.getIntExtra(
                                 EXTRA_CONTROL_TYPE,
                                 0
-                            )]
+                            )], source = PlayerEventSource.UI
                         )
                     }
                 }
                 val filter = IntentFilter()
-                filter.addAction(
-                    ACTION_MEDIA_CONTROL
-                )
+                filter.addAction(ACTION_MEDIA_CONTROL)
                 activity?.registerReceiver(pipReceiver, filter)
                 val isPlaying = player.getIsPlaying()
                 val isPlayingValue =
                     if (isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused
-                updateIsPlaying(Pair(isPlayingValue, isPlayingValue))
+                updateIsPlaying(isPlayingValue, isPlayingValue)
             } else {
                 // Restore the full-screen UI.
                 piphide?.isVisible = true
                 exitedPipMode()
                 pipReceiver?.let {
-                    activity?.unregisterReceiver(it)
+                    // Prevents java.lang.IllegalArgumentException: Receiver not registered
+                    normalSafeApiCall {
+                        activity?.unregisterReceiver(it)
+                    }
                 }
                 activity?.hideSystemUI()
                 this.view?.let { UIHelper.hideKeyboard(it) }
@@ -239,18 +252,16 @@ abstract class AbstractPlayerFragment(
         }
     }
 
-    open fun playerError(exception: Exception) {
+    open fun playerError(exception: Throwable) {
         fun showToast(message: String, gotoNext: Boolean = false) {
             if (gotoNext && hasNextMirror()) {
                 showToast(
-                    activity,
                     message,
                     Toast.LENGTH_SHORT
                 )
                 nextMirror()
             } else {
                 showToast(
-                    activity,
                     context?.getString(R.string.no_links_found_toast) + "\n" + message,
                     Toast.LENGTH_LONG
                 )
@@ -270,18 +281,21 @@ abstract class AbstractPlayerFragment(
                             gotoNext = true
                         )
                     }
+
                     PlaybackException.ERROR_CODE_REMOTE_ERROR, PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS, PlaybackException.ERROR_CODE_TIMEOUT, PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED, PlaybackException.ERROR_CODE_IO_INVALID_HTTP_CONTENT_TYPE -> {
                         showToast(
                             "${ctx.getString(R.string.remote_error)}\n$errorName ($code)\n$msg",
                             gotoNext = true
                         )
                     }
+
                     PlaybackException.ERROR_CODE_DECODING_FAILED, PlaybackErrorEvent.ERROR_AUDIO_TRACK_INIT_FAILED, PlaybackErrorEvent.ERROR_AUDIO_TRACK_OTHER, PlaybackException.ERROR_CODE_AUDIO_TRACK_WRITE_FAILED, PlaybackException.ERROR_CODE_DECODER_INIT_FAILED, PlaybackException.ERROR_CODE_DECODER_QUERY_FAILED -> {
                         showToast(
                             "${ctx.getString(R.string.render_error)}\n$errorName ($code)\n$msg",
                             gotoNext = true
                         )
                     }
+
                     else -> {
                         showToast(
                             "${ctx.getString(R.string.unexpected_error)}\n$errorName ($code)\n$msg",
@@ -290,12 +304,14 @@ abstract class AbstractPlayerFragment(
                     }
                 }
             }
+
             is InvalidFileException -> {
                 showToast(
                     "${ctx.getString(R.string.source_error)}\n${exception.message}",
                     gotoNext = true
                 )
             }
+
             else -> {
                 exception.message?.let {
                     showToast(
@@ -313,29 +329,25 @@ abstract class AbstractPlayerFragment(
         }
     }
 
+    @SuppressLint("UnsafeOptInUsageError")
     private fun playerUpdated(player: Any?) {
         if (player is ExoPlayer) {
             context?.let { ctx ->
-                val mediaButtonReceiver = ComponentName(ctx, MediaButtonReceiver::class.java)
-                MediaSessionCompat(ctx, "Player", mediaButtonReceiver, null).let { media ->
-                    //media.setCallback(mMediaSessionCallback)
-                    //media.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS or MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS)
-                    val mediaSessionConnector = MediaSessionConnector(media)
-                    mediaSessionConnector.setPlayer(player)
-                    media.isActive = true
-                    mMediaSessionCompat = media
-                }
+                mMediaSession?.release()
+                mMediaSession = MediaSession.Builder(ctx, player)
+                    // Ensure unique ID for concurrent players
+                    .setId(unixTimeMs.toString())
+                    .build()
             }
 
             // Necessary for multiple combined videos
-            player_view?.setShowMultiWindowTimeBar(true)
-            player_view?.player = player
-            player_view?.performClick()
+            playerView?.setShowMultiWindowTimeBar(true)
+            playerView?.player = player
+            playerView?.performClick()
         }
     }
 
-    private var mediaSessionConnector: MediaSessionConnector? = null
-    private var mMediaSessionCompat: MediaSessionCompat? = null
+    private var mMediaSession: MediaSession? = null
 
     // this can be used in the future for players other than exoplayer
     //private val mMediaSessionCallback: MediaSessionCompat.Callback = object : MediaSessionCompat.Callback() {
@@ -358,39 +370,106 @@ 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) {
+        Log.i(TAG, "Handle event: $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) {
+                    -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)
+                    if (PreferenceManager.getDefaultSharedPreferences(ctx)
+                            ?.getBoolean(
+                                ctx.getString(R.string.autoplay_next_key),
+                                true
+                            ) == true
+                    ) {
+                        player.handleEvent(
+                            CSPlayerEvent.NextEpisode,
+                            source = PlayerEventSource.Player
+                        )
+                    }
+                }
+            }
+            is PauseEvent -> Unit
+            is PlayEvent -> Unit
+        }
+    }
 
-    @SuppressLint("SetTextI18n")
+    @SuppressLint("SetTextI18n", "UnsafeOptInUsageError")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         resizeMode = getKey(RESIZE_MODE_KEY) ?: 0
         resize(resizeMode, false)
 
         player.releaseCallbacks()
         player.initCallbacks(
-            playerUpdated = ::playerUpdated,
-            updateIsPlaying = ::updateIsPlaying,
-            playerError = ::playerError,
-            requestAutoFocus = ::requestAudioFocus,
-            nextEpisode = ::nextEpisode,
-            prevEpisode = ::prevEpisode,
-            playerPositionChanged = ::playerPositionChanged,
-            playerDimensionsLoaded = ::playerDimensionsLoaded,
+            eventHandler = ::mainCallback,
             requestedListeningPercentages = listOf(
                 SKIP_OP_VIDEO_PERCENTAGE,
                 PRELOAD_NEXT_EPISODE_PERCENTAGE,
                 NEXT_WATCH_EPISODE_PERCENTAGE,
                 UPDATE_SYNC_PROGRESS_PERCENTAGE,
             ),
-            subtitlesUpdates = ::subtitlesChanged,
-            embeddedSubtitlesFetched = ::embeddedSubtitlesFetched,
-            onTracksInfoChanged = ::onTracksInfoChanged,
-            onTimestampInvoked = ::onTimestamp,
-            onTimestampSkipped = ::onTimestampSkipped
         )
 
         if (player is CS3IPlayer) {
-            subView = player_view?.findViewById(R.id.exo_subtitles)
+            subView = playerView?.findViewById(R.id.exo_subtitles)
             subStyle = SubtitlesFragment.getCurrentSavedStyle()
-            player.initSubtitles(subView, subtitle_holder, subStyle)
+            player.initSubtitles(subView, subtitleHolder, subStyle)
+
+            /** 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))
+                }
+            })
 
             SubtitlesFragment.applyStyleEvent += ::onSubStyleChanged
 
@@ -436,6 +515,9 @@ abstract class AbstractPlayerFragment(
         playerEventListener = null
         keyEventListener = null
         canEnterPipMode = false
+        mMediaSession?.release()
+        mMediaSession = null
+        playerView?.player = null
         SubtitlesFragment.applyStyleEvent -= ::onSubStyleChanged
 
         keepScreenOn(false)
@@ -451,6 +533,7 @@ abstract class AbstractPlayerFragment(
         resize(PlayerResize.values()[resize], showToast)
     }
 
+    @SuppressLint("UnsafeOptInUsageError")
     fun resize(resize: PlayerResize, showToast: Boolean) {
         setKey(RESIZE_MODE_KEY, resize.ordinal)
         val type = when (resize) {
@@ -458,10 +541,10 @@ abstract class AbstractPlayerFragment(
             PlayerResize.Fit -> AspectRatioFrameLayout.RESIZE_MODE_FIT
             PlayerResize.Zoom -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
         }
-        player_view?.resizeMode = type
+        playerView?.resizeMode = type
 
         if (showToast)
-            showToast(activity, resize.nameRes, Toast.LENGTH_SHORT)
+            showToast(resize.nameRes, Toast.LENGTH_SHORT)
     }
 
     override fun onStop() {
@@ -482,6 +565,13 @@ abstract class AbstractPlayerFragment(
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(layout, container, false)
+        val root = inflater.inflate(layout, container, false)
+        playerPausePlayHolderHolder = root.findViewById(R.id.player_pause_play_holder_holder)
+        playerPausePlay = root.findViewById(R.id.player_pause_play)
+        playerBuffering = root.findViewById(R.id.player_buffering)
+        playerView = root.findViewById(R.id.player_view)
+        piphide = root.findViewById(R.id.piphide)
+        subtitleHolder = root.findViewById(R.id.subtitle_holder)
+        return root
     }
 }
\ No newline at end of file
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 9ec18b9c..331cfb73 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
@@ -1,50 +1,71 @@
 package com.lagradost.cloudstream3.ui.player
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.net.Uri
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import android.util.Rational
 import android.widget.FrameLayout
+import androidx.media3.common.C.*
+import androidx.media3.common.Format
+import androidx.media3.common.MediaItem
+import androidx.media3.common.MimeTypes
+import androidx.media3.common.PlaybackException
+import androidx.media3.common.Player
+import androidx.media3.common.TrackGroup
+import androidx.media3.common.TrackSelectionOverride
+import androidx.media3.common.Tracks
+import androidx.media3.common.VideoSize
+import androidx.media3.database.StandaloneDatabaseProvider
+import androidx.media3.datasource.DataSource
+import androidx.media3.datasource.DefaultDataSourceFactory
+import androidx.media3.datasource.DefaultHttpDataSource
+import androidx.media3.datasource.HttpDataSource
+import androidx.media3.datasource.cache.CacheDataSource
+import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
+import androidx.media3.datasource.cache.SimpleCache
+import androidx.media3.datasource.okhttp.OkHttpDataSource
+import androidx.media3.exoplayer.DefaultLoadControl
+import androidx.media3.exoplayer.DefaultRenderersFactory
+import androidx.media3.exoplayer.DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.SeekParameters
+import androidx.media3.exoplayer.dash.DashMediaSource
+import androidx.media3.exoplayer.drm.DefaultDrmSessionManager
+import androidx.media3.exoplayer.drm.FrameworkMediaDrm
+import androidx.media3.exoplayer.drm.LocalMediaDrmCallback
+import androidx.media3.exoplayer.source.ClippingMediaSource
+import androidx.media3.exoplayer.source.ConcatenatingMediaSource
+import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
+import androidx.media3.exoplayer.source.MergingMediaSource
+import androidx.media3.exoplayer.source.SingleSampleMediaSource
+import androidx.media3.exoplayer.text.TextRenderer
+import androidx.media3.exoplayer.trackselection.DefaultTrackSelector
+import androidx.media3.exoplayer.trackselection.TrackSelector
+import androidx.media3.ui.SubtitleView
 import androidx.preference.PreferenceManager
-import com.google.android.exoplayer2.*
-import com.google.android.exoplayer2.C.*
-import com.google.android.exoplayer2.DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON
-import com.google.android.exoplayer2.DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER
-import com.google.android.exoplayer2.database.StandaloneDatabaseProvider
-import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource
-import com.google.android.exoplayer2.mediacodec.MediaCodecSelector
-import com.google.android.exoplayer2.source.*
-import com.google.android.exoplayer2.text.TextRenderer
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
-import com.google.android.exoplayer2.trackselection.TrackSelectionOverride
-import com.google.android.exoplayer2.trackselection.TrackSelector
-import com.google.android.exoplayer2.ui.SubtitleView
-import com.google.android.exoplayer2.upstream.DataSource
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
-import com.google.android.exoplayer2.upstream.HttpDataSource
-import com.google.android.exoplayer2.upstream.cache.CacheDataSource
-import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
-import com.google.android.exoplayer2.upstream.cache.SimpleCache
-import com.google.android.exoplayer2.util.MimeTypes
-import com.google.android.exoplayer2.video.VideoSize
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 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.EpisodeSkip
 import com.lagradost.cloudstream3.utils.AppUtils.isUsingMobileData
+import com.lagradost.cloudstream3.utils.DrmExtractorLink
+import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkPlayList
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.ExtractorUri
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage
 import java.io.File
-import java.time.Duration
+import java.lang.IllegalArgumentException
+import java.util.UUID
 import javax.net.ssl.HttpsURLConnection
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLSession
@@ -52,11 +73,25 @@ import javax.net.ssl.SSLSession
 const val TAG = "CS3ExoPlayer"
 const val PREFERRED_AUDIO_LANGUAGE_KEY = "preferred_audio_language"
 
-/** Cache */
+/** toleranceBeforeUs – The maximum time that the actual position seeked to may precede the
+ * requested seek position, in microseconds. Must be non-negative. */
+const val toleranceBeforeUs = 300_000L
+
+/**
+ * toleranceAfterUs – The maximum time that the actual position seeked to may exceed the requested
+ * seek position, in microseconds. Must be non-negative.
+ */
+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
@@ -83,7 +118,16 @@ class CS3IPlayer : IPlayer {
      * */
     data class MediaItemSlice(
         val mediaItem: MediaItem,
-        val durationUs: Long
+        val durationUs: Long,
+        val drm: DrmMetadata? = null
+    )
+
+    data class DrmMetadata(
+        val kid: String,
+        val key: String,
+        val uuid: UUID,
+        val kty: String,
+        val keyRequestParameters: HashMap<String, String>,
     )
 
     override fun getDuration(): Long? = exoPlayer?.duration
@@ -97,80 +141,24 @@ class CS3IPlayer : IPlayer {
      * Boolean = if it's active
      * */
     private var playerSelectedSubtitleTracks = listOf<Pair<String, Boolean>>()
-
-    /** isPlaying */
-    private var updateIsPlaying: ((Pair<CSPlayerLoading, CSPlayerLoading>) -> Unit)? = null
-    private var requestAutoFocus: (() -> Unit)? = null
-    private var playerError: ((Exception) -> Unit)? = null
-    private var subtitlesUpdates: (() -> Unit)? = null
-
-    /** width x height */
-    private var playerDimensionsLoaded: ((Pair<Int, Int>) -> Unit)? = null
-
-    /** used for playerPositionChanged */
     private var requestedListeningPercentages: List<Int>? = null
 
-    /** Fired when seeking the player or on requestedListeningPercentages,
-     * used to make things appear on que
-     * position, duration */
-    private var playerPositionChanged: ((Pair<Long, Long>) -> Unit)? = null
+    private var eventHandler: ((PlayerEvent) -> Unit)? = null
 
-    private var nextEpisode: (() -> Unit)? = null
-    private var prevEpisode: (() -> Unit)? = null
-
-    private var playerUpdated: ((Any?) -> Unit)? = null
-    private var embeddedSubtitlesFetched: ((List<SubtitleData>) -> Unit)? = null
-    private var onTracksInfoChanged: (() -> Unit)? = null
-    private var onTimestampInvoked: ((EpisodeSkip.SkipStamp?) -> Unit)? = null
-    private var onTimestampSkipped: ((EpisodeSkip.SkipStamp) -> Unit)? = null
+    fun event(event: PlayerEvent) {
+        eventHandler?.invoke(event)
+    }
 
     override fun releaseCallbacks() {
-        playerUpdated = null
-        updateIsPlaying = null
-        requestAutoFocus = null
-        playerError = null
-        playerDimensionsLoaded = null
-        requestedListeningPercentages = null
-        playerPositionChanged = null
-        nextEpisode = null
-        prevEpisode = null
-        subtitlesUpdates = null
-        onTracksInfoChanged = null
-        onTimestampInvoked = null
-        requestSubtitleUpdate = null
-        onTimestampSkipped = null
+        eventHandler = null
     }
 
     override fun initCallbacks(
-        playerUpdated: (Any?) -> Unit,
-        updateIsPlaying: ((Pair<CSPlayerLoading, CSPlayerLoading>) -> Unit)?,
-        requestAutoFocus: (() -> Unit)?,
-        playerError: ((Exception) -> Unit)?,
-        playerDimensionsLoaded: ((Pair<Int, Int>) -> Unit)?,
+        eventHandler: ((PlayerEvent) -> Unit),
         requestedListeningPercentages: List<Int>?,
-        playerPositionChanged: ((Pair<Long, Long>) -> Unit)?,
-        nextEpisode: (() -> Unit)?,
-        prevEpisode: (() -> Unit)?,
-        subtitlesUpdates: (() -> Unit)?,
-        embeddedSubtitlesFetched: ((List<SubtitleData>) -> Unit)?,
-        onTracksInfoChanged: (() -> Unit)?,
-        onTimestampInvoked: ((EpisodeSkip.SkipStamp?) -> Unit)?,
-        onTimestampSkipped: ((EpisodeSkip.SkipStamp) -> Unit)?,
     ) {
-        this.playerUpdated = playerUpdated
-        this.updateIsPlaying = updateIsPlaying
-        this.requestAutoFocus = requestAutoFocus
-        this.playerError = playerError
-        this.playerDimensionsLoaded = playerDimensionsLoaded
         this.requestedListeningPercentages = requestedListeningPercentages
-        this.playerPositionChanged = playerPositionChanged
-        this.nextEpisode = nextEpisode
-        this.prevEpisode = prevEpisode
-        this.subtitlesUpdates = subtitlesUpdates
-        this.embeddedSubtitlesFetched = embeddedSubtitlesFetched
-        this.onTracksInfoChanged = onTracksInfoChanged
-        this.onTimestampInvoked = onTimestampInvoked
-        this.onTimestampSkipped = onTimestampSkipped
+        this.eventHandler = eventHandler
     }
 
     // I know, this is not a perfect solution, however it works for fixing subs
@@ -179,7 +167,7 @@ class CS3IPlayer : IPlayer {
             try {
                 Handler(it).post {
                     try {
-                        seekTime(1L)
+                        seekTime(1L, source = PlayerEventSource.Player)
                     } catch (e: Exception) {
                         logError(e)
                     }
@@ -233,8 +221,9 @@ class CS3IPlayer : IPlayer {
         subtitleHelper.setAllSubtitles(subtitles)
     }
 
-    var currentSubtitles: SubtitleData? = null
+    private var currentSubtitles: SubtitleData? = null
 
+    @SuppressLint("UnsafeOptInUsageError")
     private fun List<Tracks.Group>.getTrack(id: String?): Pair<TrackGroup, Int>? {
         if (id == null) return null
         // This beast of an expression does:
@@ -319,6 +308,7 @@ class CS3IPlayer : IPlayer {
         }.flatten()
     }
 
+    @SuppressLint("UnsafeOptInUsageError")
     private fun Tracks.Group.getFormats(): List<Pair<Format, Int>> {
         return (0 until this.mediaTrackGroup.length).mapNotNull { i ->
             if (this.isSupported)
@@ -347,6 +337,7 @@ class CS3IPlayer : IPlayer {
         )
     }
 
+    @SuppressLint("UnsafeOptInUsageError")
     override fun getVideoTracks(): CurrentTracks {
         val allTracks = exoPlayer?.currentTracks?.groups ?: emptyList()
         val videoTracks = allTracks.filter { it.type == TRACK_TYPE_VIDEO }
@@ -366,6 +357,7 @@ class CS3IPlayer : IPlayer {
     /**
      * @return True if the player should be reloaded
      * */
+    @SuppressLint("UnsafeOptInUsageError")
     override fun setPreferredSubtitles(subtitle: SubtitleData?): Boolean {
         Log.i(TAG, "setPreferredSubtitles init $subtitle")
         currentSubtitles = subtitle
@@ -378,7 +370,7 @@ class CS3IPlayer : IPlayer {
             if (subtitle == null) {
                 trackSelector.setParameters(
                     trackSelector.buildUponParameters()
-                        .setPreferredTextLanguage(null)
+                        .setTrackTypeDisabled(TRACK_TYPE_TEXT, true)
                         .clearOverridesOfType(TRACK_TYPE_TEXT)
                 )
             } else {
@@ -387,6 +379,7 @@ class CS3IPlayer : IPlayer {
                         Log.i(TAG, "setPreferredSubtitles REQUIRES_RELOAD")
                         return@let true
                     }
+
                     SubtitleStatus.IS_ACTIVE -> {
                         Log.i(TAG, "setPreferredSubtitles IS_ACTIVE")
 
@@ -395,6 +388,7 @@ class CS3IPlayer : IPlayer {
                                 .apply {
                                     val track = getTextTrack(subtitle.getId())
                                     if (track != null) {
+                                        setTrackTypeDisabled(TRACK_TYPE_TEXT, false)
                                         setOverrideForType(
                                             TrackSelectionOverride(
                                                 track.first,
@@ -412,6 +406,7 @@ class CS3IPlayer : IPlayer {
                         //    }, 1)
                         //}
                     }
+
                     SubtitleStatus.NOT_FOUND -> {
                         Log.i(TAG, "setPreferredSubtitles NOT_FOUND")
                         return@let true
@@ -441,10 +436,18 @@ class CS3IPlayer : IPlayer {
         }
     }
 
+    @SuppressLint("UnsafeOptInUsageError")
+    override fun getAspectRatio(): Rational? {
+        return exoPlayer?.videoFormat?.let { format ->
+            Rational(format.width, format.height)
+        }
+    }
+
     override fun updateSubtitleStyle(style: SaveCaptionStyle) {
         subtitleHelper.setSubStyle(style)
     }
 
+    @SuppressLint("UnsafeOptInUsageError")
     override fun saveData() {
         Log.i(TAG, "saveData")
         updatedTime()
@@ -474,14 +477,14 @@ class CS3IPlayer : IPlayer {
         Log.i(TAG, "onStop")
 
         saveData()
-        exoPlayer?.pause()
+        handleEvent(CSPlayerEvent.Pause, PlayerEventSource.Player)
         //releasePlayer()
     }
 
     override fun onPause() {
         Log.i(TAG, "onPause")
         saveData()
-        exoPlayer?.pause()
+        handleEvent(CSPlayerEvent.Pause, PlayerEventSource.Player)
         //releasePlayer()
     }
 
@@ -518,6 +521,7 @@ class CS3IPlayer : IPlayer {
 
         var requestSubtitleUpdate: (() -> Unit)? = null
 
+        @SuppressLint("UnsafeOptInUsageError")
         private fun createOnlineSource(headers: Map<String, String>): HttpDataSource.Factory {
             val source = OkHttpDataSource.Factory(app.baseClient).setUserAgent(USER_AGENT)
             return source.apply {
@@ -525,6 +529,7 @@ class CS3IPlayer : IPlayer {
             }
         }
 
+        @SuppressLint("UnsafeOptInUsageError")
         private fun createOnlineSource(link: ExtractorLink): HttpDataSource.Factory {
             val provider = getApiFromNameNull(link.source)
             val interceptor = provider?.getVideoInterceptor(link)
@@ -557,6 +562,7 @@ class CS3IPlayer : IPlayer {
             }
         }
 
+        @SuppressLint("UnsafeOptInUsageError")
         private fun Context.createOfflineSource(): DataSource.Factory {
             return DefaultDataSourceFactory(this, USER_AGENT)
         }
@@ -602,6 +608,7 @@ class CS3IPlayer : IPlayer {
             return Pair(subSources, activeSubtitles)
         }*/
 
+        @SuppressLint("UnsafeOptInUsageError")
         private fun getCache(context: Context, cacheSize: Long): SimpleCache? {
             return try {
                 val databaseProvider = StandaloneDatabaseProvider(context)
@@ -633,14 +640,10 @@ class CS3IPlayer : IPlayer {
             return getMediaItemBuilder(mimeType).setUri(url).build()
         }
 
+        @SuppressLint("UnsafeOptInUsageError")
         private fun getTrackSelector(context: Context, maxVideoHeight: Int?): TrackSelector {
             val trackSelector = DefaultTrackSelector(context)
-            trackSelector.parameters = DefaultTrackSelector.ParametersBuilder(context)
-                // .setRendererDisabled(C.TRACK_TYPE_VIDEO, true)
-                .setRendererDisabled(C.TRACK_TYPE_TEXT, true)
-                // Experimental, I think this causes issues with audio track init 5001
-//                .setTunnelingEnabled(true)
-                .setDisabledTextTrackSelectionFlags(C.TRACK_TYPE_TEXT)
+            trackSelector.parameters = trackSelector.buildUponParameters()
                 // This will not force higher quality videos to fail
                 // but will make the m3u8 pick the correct preferred
                 .setMaxVideoSize(Int.MAX_VALUE, maxVideoHeight ?: Int.MAX_VALUE)
@@ -651,6 +654,7 @@ class CS3IPlayer : IPlayer {
 
         var currentTextRenderer: CustomTextRenderer? = null
 
+        @SuppressLint("UnsafeOptInUsageError")
         private fun buildExoPlayer(
             context: Context,
             mediaItemSlices: List<MediaItemSlice>,
@@ -674,26 +678,26 @@ class CS3IPlayer : IPlayer {
                 ExoPlayer.Builder(context)
                     .setRenderersFactory { eventHandler, videoRendererEventListener, audioRendererEventListener, textRendererOutput, metadataRendererOutput ->
                         DefaultRenderersFactory(context).apply {
-//                            setEnableDecoderFallback(true)
+                            setEnableDecoderFallback(true)
                             // Enable Ffmpeg extension
-//                            setExtensionRendererMode(EXTENSION_RENDERER_MODE_ON)
+                            setExtensionRendererMode(EXTENSION_RENDERER_MODE_ON)
                         }.createRenderers(
-                                eventHandler,
-                                videoRendererEventListener,
-                                audioRendererEventListener,
-                                textRendererOutput,
-                                metadataRendererOutput
-                            ).map {
-                                if (it is TextRenderer) {
-                                    currentTextRenderer = CustomTextRenderer(
-                                        subtitleOffset,
-                                        textRendererOutput,
-                                        eventHandler.looper,
-                                        CustomSubtitleDecoderFactory()
-                                    )
-                                    currentTextRenderer!!
-                                } else it
-                            }.toTypedArray()
+                            eventHandler,
+                            videoRendererEventListener,
+                            audioRendererEventListener,
+                            textRendererOutput,
+                            metadataRendererOutput
+                        ).map {
+                            if (it is TextRenderer) {
+                                val currentTextRenderer = CustomTextRenderer(
+                                    subtitleOffset,
+                                    textRendererOutput,
+                                    eventHandler.looper,
+                                    CustomSubtitleDecoderFactory()
+                                ).also { this.currentTextRenderer = it }
+                                currentTextRenderer
+                            } else it
+                        }.toTypedArray()
                     }
                     .setTrackSelector(
                         trackSelector ?: getTrackSelector(
@@ -702,7 +706,7 @@ class CS3IPlayer : IPlayer {
                         )
                     )
                     // Allows any seeking to be +- 0.3s to allow for faster seeking
-                    .setSeekParameters(SeekParameters(300_000, 300_000))
+                    .setSeekParameters(SeekParameters(toleranceBeforeUs, toleranceAfterUs))
                     .setLoadControl(
                         DefaultLoadControl.Builder()
                             .setTargetBufferBytes(
@@ -735,15 +739,33 @@ class CS3IPlayer : IPlayer {
 
             // If there is only one item then treat it as normal, if multiple: concatenate the items.
             val videoMediaSource = if (mediaItemSlices.size == 1) {
-                factory.createMediaSource(mediaItemSlices.first().mediaItem)
+                val item = mediaItemSlices.first()
+
+                item.drm?.let { drm ->
+                    val drmCallback =
+                        LocalMediaDrmCallback("{\"keys\":[{\"kty\":\"${drm.kty}\",\"k\":\"${drm.key}\",\"kid\":\"${drm.kid}\"}],\"type\":\"temporary\"}".toByteArray())
+                    val manager = DefaultDrmSessionManager.Builder()
+                        .setPlayClearSamplesWithoutKeys(true)
+                        .setMultiSession(false)
+                        .setKeyRequestParameters(drm.keyRequestParameters)
+                        .setUuidAndExoMediaDrmProvider(drm.uuid, FrameworkMediaDrm.DEFAULT_PROVIDER)
+                        .build(drmCallback)
+                    val manifestDataSourceFactory = DefaultHttpDataSource.Factory()
+
+                    DashMediaSource.Factory(manifestDataSourceFactory)
+                        .setDrmSessionManagerProvider { manager }
+                        .createMediaSource(item.mediaItem)
+                } ?: run {
+                    factory.createMediaSource(item.mediaItem)
+                }
             } else {
                 val source = ConcatenatingMediaSource()
-                mediaItemSlices.map {
+                mediaItemSlices.map { item ->
                     source.addMediaSource(
                         // The duration MUST be known for it to work properly, see https://github.com/google/ExoPlayer/issues/4727
                         ClippingMediaSource(
-                            factory.createMediaSource(it.mediaItem),
-                            it.durationUs
+                            factory.createMediaSource(item.mediaItem),
+                            item.durationUs
                         )
                     )
                 }
@@ -769,50 +791,65 @@ class CS3IPlayer : IPlayer {
     private fun getCurrentTimestamp(writePosition: Long? = null): EpisodeSkip.SkipStamp? {
         val position = writePosition ?: this@CS3IPlayer.getPosition() ?: return null
         for (lastTimeStamp in lastTimeStamps) {
-            if (lastTimeStamp.startMs <= position && position < lastTimeStamp.endMs) {
+            if (lastTimeStamp.startMs <= position && (position + (toleranceBeforeUs / 1000L) + 1) < lastTimeStamp.endMs) {
                 return lastTimeStamp
             }
         }
         return null
     }
 
-    fun updatedTime(writePosition: Long? = null) {
-        getCurrentTimestamp(writePosition)?.let { timestamp ->
-            onTimestampInvoked?.invoke(timestamp)
+    fun updatedTime(
+        writePosition: Long? = null,
+        source: PlayerEventSource = PlayerEventSource.Player
+    ) {
+        val position = writePosition ?: exoPlayer?.currentPosition
+
+        getCurrentTimestamp(position)?.let { timestamp ->
+            event(TimestampInvokedEvent(timestamp, source))
         }
 
-        val position = writePosition ?: exoPlayer?.currentPosition
         val duration = exoPlayer?.contentDuration
         if (duration != null && position != null) {
-            playerPositionChanged?.invoke(Pair(position, duration))
+            event(
+                PositionEvent(
+                    source,
+                    fromMs = exoPlayer?.currentPosition ?: 0,
+                    position,
+                    duration
+                )
+            )
         }
     }
 
-    override fun seekTime(time: Long) {
-        exoPlayer?.seekTime(time)
+    override fun seekTime(time: Long, source: PlayerEventSource) {
+        exoPlayer?.seekTime(time, source)
     }
 
-    override fun seekTo(time: Long) {
-        updatedTime(time)
+    override fun seekTo(time: Long, source: PlayerEventSource) {
+        updatedTime(time, source)
         exoPlayer?.seekTo(time)
     }
 
-    private fun ExoPlayer.seekTime(time: Long) {
-        updatedTime(currentPosition + time)
+    private fun ExoPlayer.seekTime(time: Long, source: PlayerEventSource) {
+        updatedTime(currentPosition + time, source)
         seekTo(currentPosition + time)
     }
 
-    override fun handleEvent(event: CSPlayerEvent) {
+    override fun handleEvent(event: CSPlayerEvent, source: PlayerEventSource) {
         Log.i(TAG, "handleEvent ${event.name}")
         try {
             exoPlayer?.apply {
                 when (event) {
                     CSPlayerEvent.Play -> {
+                        event(PlayEvent(source))
                         play()
                     }
+
                     CSPlayerEvent.Pause -> {
+                        event(PauseEvent(source))
                         pause()
                     }
+
                     CSPlayerEvent.ToggleMute -> {
                         if (volume <= 0) {
                             //is muted
@@ -823,33 +860,35 @@ class CS3IPlayer : IPlayer {
                             volume = 0f
                         }
                     }
+
                     CSPlayerEvent.PlayPauseToggle -> {
                         if (isPlaying) {
-                            pause()
+                            handleEvent(CSPlayerEvent.Pause, source)
                         } else {
-                            play()
+                            handleEvent(CSPlayerEvent.Play, source)
                         }
                     }
-                    CSPlayerEvent.SeekForward -> seekTime(seekActionTime)
-                    CSPlayerEvent.SeekBack -> seekTime(-seekActionTime)
-                    CSPlayerEvent.NextEpisode -> nextEpisode?.invoke()
-                    CSPlayerEvent.PrevEpisode -> prevEpisode?.invoke()
+
+                    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.SkipCurrentChapter -> {
                         //val dur = this@CS3IPlayer.getDuration() ?: return@apply
                         getCurrentTimestamp()?.let { lastTimeStamp ->
                             if (lastTimeStamp.skipToNextEpisode) {
-                                handleEvent(CSPlayerEvent.NextEpisode)
+                                handleEvent(CSPlayerEvent.NextEpisode, source)
                             } else {
                                 seekTo(lastTimeStamp.endMs + 1L)
                             }
-                            onTimestampSkipped?.invoke(lastTimeStamp)
+                            event(TimestampSkippedEvent(timestamp = lastTimeStamp, source = source))
                         }
                     }
                 }
             }
-        } catch (e: Exception) {
-            Log.e(TAG, "handleEvent error", e)
-            playerError?.invoke(e)
+        } catch (t: Throwable) {
+            Log.e(TAG, "handleEvent error", t)
+            event(ErrorEvent(t))
         }
     }
 
@@ -888,18 +927,14 @@ class CS3IPlayer : IPlayer {
 
             requestSubtitleUpdate = ::reloadSubs
 
-            playerUpdated?.invoke(exoPlayer)
+            event(PlayerAttachedEvent(exoPlayer))
             exoPlayer?.prepare()
 
             exoPlayer?.let { exo ->
-                updateIsPlaying?.invoke(
-                    Pair(
-                        CSPlayerLoading.IsBuffering,
-                        CSPlayerLoading.IsBuffering
-                    )
-                )
+                event(StatusEvent(CSPlayerLoading.IsBuffering, CSPlayerLoading.IsBuffering))
                 isPlaying = exo.isPlaying
             }
+
             exoPlayer?.addListener(object : Player.Listener {
                 override fun onTracksChanged(tracks: Tracks) {
                     normalSafeApiCall {
@@ -933,18 +968,19 @@ class CS3IPlayer : IPlayer {
                                     )
                                 }
 
-                        embeddedSubtitlesFetched?.invoke(exoPlayerReportedTracks)
-                        onTracksInfoChanged?.invoke()
-                        subtitlesUpdates?.invoke()
+                        event(EmbeddedSubtitlesFetchedEvent(tracks = exoPlayerReportedTracks))
+                        event(TracksChangedEvent())
+                        event(SubtitlesUpdatedEvent())
                     }
                 }
 
+                @SuppressLint("UnsafeOptInUsageError")
                 override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) {
                     exoPlayer?.let { exo ->
-                        updateIsPlaying?.invoke(
-                            Pair(
-                                if (isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused,
-                                if (playbackState == Player.STATE_BUFFERING) CSPlayerLoading.IsBuffering else if (exo.isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused
+                        event(
+                            StatusEvent(
+                                wasPlaying = if (isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused,
+                                isPlaying = if (playbackState == Player.STATE_BUFFERING) CSPlayerLoading.IsBuffering else if (exo.isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused
                             )
                         )
                         isPlaying = exo.isPlaying
@@ -954,6 +990,7 @@ class CS3IPlayer : IPlayer {
                         Player.STATE_READY -> {
                             onRenderFirst()
                         }
+
                         else -> {}
                     }
 
@@ -963,23 +1000,19 @@ class CS3IPlayer : IPlayer {
                             Player.STATE_READY -> {
 
                             }
+
                             Player.STATE_ENDED -> {
-                                // Only play next episode if autoplay is on (default)
-                                if (PreferenceManager.getDefaultSharedPreferences(context)
-                                        ?.getBoolean(
-                                            context.getString(com.lagradost.cloudstream3.R.string.autoplay_next_key),
-                                            true
-                                        ) == true
-                                ) {
-                                    handleEvent(CSPlayerEvent.NextEpisode)
-                                }
+                                event(VideoEndedEvent())
                             }
+
                             Player.STATE_BUFFERING -> {
-                                updatedTime()
+                                updatedTime(source = PlayerEventSource.Player)
                             }
+
                             Player.STATE_IDLE -> {
-                                // IDLE
+
                             }
+
                             else -> Unit
                         }
                     }
@@ -994,13 +1027,15 @@ class CS3IPlayer : IPlayer {
                                 && exoPlayer?.duration != TIME_UNSET -> {
                             exoPlayer?.prepare()
                         }
+
                         error.errorCode == PlaybackException.ERROR_CODE_BEHIND_LIVE_WINDOW -> {
                             // Re-initialize player at the current live window default position.
                             exoPlayer?.seekToDefaultPosition()
                             exoPlayer?.prepare()
                         }
+
                         else -> {
-                            playerError?.invoke(error)
+                            event(ErrorEvent(error))
                         }
                     }
 
@@ -1014,7 +1049,7 @@ class CS3IPlayer : IPlayer {
                 override fun onIsPlayingChanged(isPlaying: Boolean) {
                     super.onIsPlayingChanged(isPlaying)
                     if (isPlaying) {
-                        requestAutoFocus?.invoke()
+                        event(RequestAudioFocusEvent())
                         onRenderFirst()
                     }
                 }
@@ -1025,6 +1060,7 @@ class CS3IPlayer : IPlayer {
                         Player.STATE_READY -> {
 
                         }
+
                         Player.STATE_ENDED -> {
                             // Only play next episode if autoplay is on (default)
                             if (PreferenceManager.getDefaultSharedPreferences(context)
@@ -1033,42 +1069,50 @@ class CS3IPlayer : IPlayer {
                                         true
                                     ) == true
                             ) {
-                                handleEvent(CSPlayerEvent.NextEpisode)
+                                handleEvent(
+                                    CSPlayerEvent.NextEpisode,
+                                    source = PlayerEventSource.Player
+                                )
                             }
                         }
+
                         Player.STATE_BUFFERING -> {
-                            updatedTime()
+                            updatedTime(source = PlayerEventSource.Player)
                         }
+
                         Player.STATE_IDLE -> {
                             // IDLE
                         }
+
                         else -> Unit
                     }
                 }
 
                 override fun onVideoSizeChanged(videoSize: VideoSize) {
                     super.onVideoSizeChanged(videoSize)
-                    playerDimensionsLoaded?.invoke(Pair(videoSize.width, videoSize.height))
+                    event(ResizedEvent(height = videoSize.height, width = videoSize.width))
                 }
 
                 override fun onRenderedFirstFrame() {
-                    updatedTime()
                     super.onRenderedFirstFrame()
                     onRenderFirst()
+                    updatedTime(source = PlayerEventSource.Player)
                 }
             })
-        } catch (e: Exception) {
-            Log.e(TAG, "loadExo error", e)
-            playerError?.invoke(e)
+        } catch (t: Throwable) {
+            Log.e(TAG, "loadExo error", t)
+            event(ErrorEvent(t))
         }
     }
 
     private var lastTimeStamps: List<EpisodeSkip.SkipStamp> = emptyList()
+
+    @SuppressLint("UnsafeOptInUsageError")
     override fun addTimeStamps(timeStamps: List<EpisodeSkip.SkipStamp>) {
         lastTimeStamps = timeStamps
         timeStamps.forEach { timestamp ->
             exoPlayer?.createMessage { _, _ ->
-                updatedTime()
+                updatedTime(source = PlayerEventSource.Player)
                 //if (payload is EpisodeSkip.SkipStamp) // this should always be true
                 //    onTimestampInvoked?.invoke(payload)
             }
@@ -1078,46 +1122,48 @@ class CS3IPlayer : IPlayer {
                 ?.setDeleteAfterDelivery(false)
                 ?.send()
         }
-        updatedTime()
+        updatedTime(source = PlayerEventSource.Player)
     }
 
+    @SuppressLint("UnsafeOptInUsageError")
     fun onRenderFirst() {
-        if (!hasUsedFirstRender) { // this insures that we only call this once per player load
-            Log.i(TAG, "Rendered first frame")
-            val invalid = exoPlayer?.duration?.let { duration ->
-                // Only errors short playback when not playing downloaded files
-                duration < 20_000L && currentDownloadedFile == null
-                        // Concatenated sources (non 1 periodCount) bypasses the invalid check as exoPlayer.duration gives only the current period
-                        // If you can get the total time that'd be better, but this is already niche.
-                        && exoPlayer?.currentTimeline?.periodCount == 1
-                        && exoPlayer?.isCurrentMediaItemLive != true
-            } ?: false
+        if (hasUsedFirstRender) { // this insures that we only call this once per player load
+            return
+        }
+        Log.i(TAG, "Rendered first frame")
+        hasUsedFirstRender = true
+        val invalid = exoPlayer?.duration?.let { duration ->
+            // Only errors short playback when not playing downloaded files
+            duration < 20_000L && currentDownloadedFile == null
+                    // Concatenated sources (non 1 periodCount) bypasses the invalid check as exoPlayer.duration gives only the current period
+                    // If you can get the total time that'd be better, but this is already niche.
+                    && exoPlayer?.currentTimeline?.periodCount == 1
+                    && exoPlayer?.isCurrentMediaItemLive != true
+        } ?: false
 
-            if (invalid) {
-                releasePlayer(saveTime = false)
-                playerError?.invoke(InvalidFileException("Too short playback"))
-                return
-            }
+        if (invalid) {
+            releasePlayer(saveTime = false)
+            event(ErrorEvent(InvalidFileException("Too short playback")))
+            return
+        }
 
-            setPreferredSubtitles(currentSubtitles)
-            hasUsedFirstRender = true
-            val format = exoPlayer?.videoFormat
-            val width = format?.width
-            val height = format?.height
-            if (height != null && width != null) {
-                playerDimensionsLoaded?.invoke(Pair(width, height))
-                updatedTime()
-                exoPlayer?.apply {
-                    requestedListeningPercentages?.forEach { percentage ->
-                        createMessage { _, _ ->
-                            updatedTime()
-                        }
-                            .setLooper(Looper.getMainLooper())
-                            .setPosition( /* positionMs= */contentDuration * percentage / 100)
-                            //   .setPayload(customPayloadData)
-                            .setDeleteAfterDelivery(false)
-                            .send()
+        setPreferredSubtitles(currentSubtitles)
+        val format = exoPlayer?.videoFormat
+        val width = format?.width
+        val height = format?.height
+        if (height != null && width != null) {
+            event(ResizedEvent(width = width, height = height))
+            updatedTime()
+            exoPlayer?.apply {
+                requestedListeningPercentages?.forEach { percentage ->
+                    createMessage { _, _ ->
+                        updatedTime()
                     }
+                        .setLooper(Looper.getMainLooper())
+                        .setPosition(contentDuration * percentage / 100)
+                        //   .setPayload(customPayloadData)
+                        .setDeleteAfterDelivery(false)
+                        .send()
                 }
             }
         }
@@ -1140,12 +1186,13 @@ class CS3IPlayer : IPlayer {
 
             subtitleHelper.setActiveSubtitles(activeSubtitles.toSet())
             loadExo(context, listOf(MediaItemSlice(mediaItem, Long.MIN_VALUE)), subSources)
-        } catch (e: Exception) {
-            Log.e(TAG, "loadOfflinePlayer error", e)
-            playerError?.invoke(e)
+        } catch (t: Throwable) {
+            Log.e(TAG, "loadOfflinePlayer error", t)
+            event(ErrorEvent(t))
         }
     }
 
+    @SuppressLint("UnsafeOptInUsageError")
     private fun getSubSources(
         onlineSourceFactory: HttpDataSource.Factory?,
         offlineSourceFactory: DataSource.Factory?,
@@ -1169,6 +1216,7 @@ class CS3IPlayer : IPlayer {
                         null
                     }
                 }
+
                 SubtitleOrigin.URL -> {
                     if (onlineSourceFactory != null) {
                         activeSubtitles.add(sub)
@@ -1181,6 +1229,7 @@ class CS3IPlayer : IPlayer {
                         null
                     }
                 }
+
                 SubtitleOrigin.EMBEDDED_IN_VIDEO -> {
                     if (offlineSourceFactory != null) {
                         activeSubtitles.add(sub)
@@ -1199,6 +1248,7 @@ class CS3IPlayer : IPlayer {
         return exoPlayer != null
     }
 
+    @SuppressLint("UnsafeOptInUsageError")
     private fun loadOnlinePlayer(context: Context, link: ExtractorLink) {
         Log.i(TAG, "loadOnlinePlayer $link")
         try {
@@ -1215,18 +1265,37 @@ class CS3IPlayer : IPlayer {
                 HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.socketFactory)
             }
 
-            val mime = when {
-                link.isM3u8 -> MimeTypes.APPLICATION_M3U8
-                link.isDash -> MimeTypes.APPLICATION_MPD
-                else -> MimeTypes.VIDEO_MP4
+            val mime = when (link.type) {
+                ExtractorLinkType.M3U8 -> MimeTypes.APPLICATION_M3U8
+                ExtractorLinkType.DASH -> MimeTypes.APPLICATION_MPD
+                ExtractorLinkType.VIDEO -> MimeTypes.VIDEO_MP4
+                ExtractorLinkType.TORRENT -> throw IllegalArgumentException("No torrent support")
+                ExtractorLinkType.MAGNET -> throw IllegalArgumentException("No magnet support")
             }
 
-            val mediaItems = if (link is ExtractorLinkPlayList) {
-                link.playlist.map {
+
+            val mediaItems = when (link) {
+                is ExtractorLinkPlayList -> link.playlist.map {
                     MediaItemSlice(getMediaItem(mime, it.url), it.durationUs)
                 }
-            } else {
-                listOf(
+
+                is DrmExtractorLink -> {
+                    listOf(
+                        // Single sliced list with unset length
+                        MediaItemSlice(
+                            getMediaItem(mime, link.url), Long.MIN_VALUE,
+                            drm = DrmMetadata(
+                                kid = link.kid,
+                                key = link.key,
+                                uuid = link.uuid,
+                                kty = link.kty,
+                                keyRequestParameters = link.keyRequestParameters
+                            )
+                        )
+                    )
+                }
+
+                else -> listOf(
                     // Single sliced list with unset length
                     MediaItemSlice(getMediaItem(mime, link.url), Long.MIN_VALUE)
                 )
@@ -1252,16 +1321,16 @@ class CS3IPlayer : IPlayer {
             }
 
             loadExo(context, mediaItems, subSources, cacheFactory)
-        } catch (e: Exception) {
-            Log.e(TAG, "loadOnlinePlayer error", e)
-            playerError?.invoke(e)
+        } catch (t: Throwable) {
+            Log.e(TAG, "loadOnlinePlayer error", t)
+            event(ErrorEvent(t))
         }
     }
 
     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/CustomSubtitleDecoderFactory.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt
index 974a5d26..b830d4e0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt
@@ -3,19 +3,23 @@ package com.lagradost.cloudstream3.ui.player
 import android.content.Context
 import android.util.Log
 import androidx.preference.PreferenceManager
-import com.google.android.exoplayer2.Format
-import com.google.android.exoplayer2.text.*
-import com.google.android.exoplayer2.text.cea.Cea608Decoder
-import com.google.android.exoplayer2.text.cea.Cea708Decoder
-import com.google.android.exoplayer2.text.dvb.DvbDecoder
-import com.google.android.exoplayer2.text.pgs.PgsDecoder
-import com.google.android.exoplayer2.text.ssa.SsaDecoder
-import com.google.android.exoplayer2.text.subrip.SubripDecoder
-import com.google.android.exoplayer2.text.ttml.TtmlDecoder
-import com.google.android.exoplayer2.text.tx3g.Tx3gDecoder
-import com.google.android.exoplayer2.text.webvtt.Mp4WebvttDecoder
-import com.google.android.exoplayer2.text.webvtt.WebvttDecoder
-import com.google.android.exoplayer2.util.MimeTypes
+import androidx.media3.common.Format
+import androidx.media3.common.MimeTypes
+import androidx.media3.exoplayer.text.ExoplayerCuesDecoder
+import androidx.media3.exoplayer.text.SubtitleDecoderFactory
+import androidx.media3.extractor.text.SubtitleDecoder
+import androidx.media3.extractor.text.SubtitleInputBuffer
+import androidx.media3.extractor.text.SubtitleOutputBuffer
+import androidx.media3.extractor.text.cea.Cea608Decoder
+import androidx.media3.extractor.text.cea.Cea708Decoder
+import androidx.media3.extractor.text.dvb.DvbDecoder
+import androidx.media3.extractor.text.pgs.PgsDecoder
+import androidx.media3.extractor.text.ssa.SsaDecoder
+import androidx.media3.extractor.text.subrip.SubripDecoder
+import androidx.media3.extractor.text.ttml.TtmlDecoder
+import androidx.media3.extractor.text.tx3g.Tx3gDecoder
+import androidx.media3.extractor.text.webvtt.Mp4WebvttDecoder
+import androidx.media3.extractor.text.webvtt.WebvttDecoder
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import org.mozilla.universalchardet.UniversalDetector
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomTextRenderer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomTextRenderer.kt
index d3f4171a..514aaeab 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomTextRenderer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomTextRenderer.kt
@@ -1,8 +1,8 @@
 package com.lagradost.cloudstream3.ui.player
 
 import android.os.Looper
-import com.google.android.exoplayer2.text.SubtitleDecoderFactory
-import com.google.android.exoplayer2.text.TextOutput
+import androidx.media3.exoplayer.text.SubtitleDecoderFactory
+import androidx.media3.exoplayer.text.TextOutput
 
 class CustomTextRenderer(
     offset: Long,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt
index baf7ed52..b0223bb5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt
@@ -50,47 +50,60 @@ class DownloadFileGenerator(
         return null
     }
 
+    fun cleanDisplayName(name: String): String {
+        return name.substringBeforeLast('.').trim()
+    }
+
     override suspend fun generateLinks(
         clearCache: Boolean,
-        isCasting: Boolean,
+        type: LoadType,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
-        offset: Int,
+        offset: Int
     ): Boolean {
         val meta = episodes[currentIndex + offset]
-        callback(Pair(null, meta))
+        callback(null to meta)
 
-        context?.let { ctx ->
-            val relative = meta.relativePath
-            val display = meta.displayName
+        val ctx = context ?: return true
+        val relative = meta.relativePath ?: return true
+        val display = meta.displayName ?: return true
 
-            if (display == null || relative == null) {
-                return@let
+        val cleanDisplay = cleanDisplayName(display)
+
+        VideoDownloadManager.getFolder(ctx, relative, meta.basePath)
+            ?.forEach { (name, uri) ->
+                // only these files are allowed, so no videos as subtitles
+                if (listOf(
+                        ".vtt",
+                        ".srt",
+                        ".txt",
+                        ".ass",
+                        ".ttml",
+                        ".sbv",
+                        ".dfxp"
+                    ).none { name.contains(it, true) }
+                ) return@forEach
+
+                // cant have the exact same file as a subtitle
+                if (name.equals(display, true)) return@forEach
+
+                val cleanName = cleanDisplayName(name)
+
+                // we only want files with the approx same name
+                if (!cleanName.startsWith(cleanDisplay, true)) return@forEach
+
+                val realName = cleanName.removePrefix(cleanDisplay)
+
+                subtitleCallback(
+                    SubtitleData(
+                        realName.ifBlank { ctx.getString(R.string.default_subtitles) },
+                        uri.toString(),
+                        SubtitleOrigin.DOWNLOADED_FILE,
+                        name.toSubtitleMimeType(),
+                        emptyMap()
+                    )
+                )
             }
-            VideoDownloadManager.getFolder(ctx, relative, meta.basePath)
-                ?.forEach { file ->
-                    val name = display.removeSuffix(".mp4")
-                    if (file.first != meta.displayName && file.first.startsWith(name)) {
-                        val realName = file.first.removePrefix(name)
-                            .removeSuffix(".vtt")
-                            .removeSuffix(".srt")
-                            .removeSuffix(".txt")
-                            .trim()
-                            .removePrefix("(")
-                            .removeSuffix(")")
-
-                        subtitleCallback(
-                            SubtitleData(
-                                realName.ifBlank { ctx.getString(R.string.default_subtitles) },
-                                file.second.toString(),
-                                SubtitleOrigin.DOWNLOADED_FILE,
-                                name.toSubtitleMimeType(),
-                                emptyMap()
-                            )
-                        )
-                    }
-                }
-        }
 
         return true
     }
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 6f40e145..d181e175 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
@@ -1,16 +1,17 @@
 package com.lagradost.cloudstream3.ui.player
 
+import android.content.ContentUris
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent
 import androidx.appcompat.app.AppCompatActivity
-import com.hippo.unifile.UniFile
 import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.utils.ExtractorUri
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
+import com.lagradost.safefile.SafeFile
 
 const val DTAG = "PlayerActivity"
 
@@ -50,14 +51,17 @@ class DownloadedPlayerActivity : AppCompatActivity() {
     }
 
     private fun playUri(uri: Uri) {
-        val name = UniFile.fromUri(this, uri).name
+        val name = SafeFile.fromUri(this, uri)?.name()
         this.navigate(
             R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
                 DownloadFileGenerator(
                     listOf(
                         ExtractorUri(
                             uri = uri,
-                            name = name ?: getString(R.string.downloaded_file)
+                            name = name ?: getString(R.string.downloaded_file),
+                            // well not the same as a normal id, but we take it as users may want to
+                            // play downloaded files and save the location
+                            id = kotlin.runCatching { ContentUris.parseId(uri) }.getOrNull()?.hashCode()
                         )
                     )
                 )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt
index 7c19e97d..d8d2d537 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt
@@ -37,14 +37,17 @@ class ExtractorLinkGenerator(
 
     override suspend fun generateLinks(
         clearCache: Boolean,
-        isCasting: Boolean,
+        type: LoadType,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
         offset: Int
     ): Boolean {
         subtitles.forEach(subtitleCallback)
+        val allowedTypes = type.toSet()
         links.forEach {
-            callback.invoke(it to null)
+            if(allowedTypes.contains(it.type)) {
+                callback.invoke(it to null)
+            }
         }
 
         return true
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 9ff1c52d..e698191d 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
@@ -2,9 +2,11 @@ package com.lagradost.cloudstream3.ui.player
 
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.Context
 import android.content.pm.ActivityInfo
 import android.content.res.ColorStateList
+import android.content.res.Configuration
 import android.content.res.Resources
 import android.graphics.Color
 import android.media.AudioManager
@@ -14,16 +16,16 @@ import android.provider.Settings
 import android.text.Editable
 import android.util.DisplayMetrics
 import android.view.KeyEvent
+import android.view.LayoutInflater
 import android.view.MotionEvent
+import android.view.Surface
 import android.view.View
+import android.view.ViewGroup
 import android.view.WindowManager
 import android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
 import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
-import android.widget.EditText
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.graphics.blue
 import androidx.core.graphics.green
@@ -36,11 +38,16 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.keyEventListener
 import com.lagradost.cloudstream3.CommonActivity.playerEventListener
+import com.lagradost.cloudstream3.CommonActivity.screenHeight
+import com.lagradost.cloudstream3.CommonActivity.screenWidth
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutBinding
+import com.lagradost.cloudstream3.databinding.SubtitleOffsetBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer.Companion.subsProvidersIsActive
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper
-import com.lagradost.cloudstream3.utils.Qualities
+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.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
@@ -52,31 +59,9 @@ import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import com.lagradost.cloudstream3.utils.UIHelper.showSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.Vector2
-import kotlinx.android.synthetic.main.player_custom_layout.*
-import kotlinx.android.synthetic.main.player_custom_layout.bottom_player_bar
-import kotlinx.android.synthetic.main.player_custom_layout.exo_ffwd
-import kotlinx.android.synthetic.main.player_custom_layout.exo_ffwd_text
-import kotlinx.android.synthetic.main.player_custom_layout.exo_progress
-import kotlinx.android.synthetic.main.player_custom_layout.exo_rew
-import kotlinx.android.synthetic.main.player_custom_layout.exo_rew_text
-import kotlinx.android.synthetic.main.player_custom_layout.player_center_menu
-import kotlinx.android.synthetic.main.player_custom_layout.player_ffwd_holder
-import kotlinx.android.synthetic.main.player_custom_layout.player_holder
-import kotlinx.android.synthetic.main.player_custom_layout.player_pause_play
-import kotlinx.android.synthetic.main.player_custom_layout.player_pause_play_holder
-import kotlinx.android.synthetic.main.player_custom_layout.player_progressbar_left
-import kotlinx.android.synthetic.main.player_custom_layout.player_progressbar_left_holder
-import kotlinx.android.synthetic.main.player_custom_layout.player_progressbar_left_icon
-import kotlinx.android.synthetic.main.player_custom_layout.player_progressbar_right
-import kotlinx.android.synthetic.main.player_custom_layout.player_progressbar_right_holder
-import kotlinx.android.synthetic.main.player_custom_layout.player_progressbar_right_icon
-import kotlinx.android.synthetic.main.player_custom_layout.player_rew_holder
-import kotlinx.android.synthetic.main.player_custom_layout.player_time_text
-import kotlinx.android.synthetic.main.player_custom_layout.player_video_bar
-import kotlinx.android.synthetic.main.player_custom_layout.shadow_overlay
-import kotlinx.android.synthetic.main.trailer_custom_layout.*
 import kotlin.math.*
 
+
 const val MINIMUM_SEEK_TIME = 7000L         // when swipe seeking
 const val MINIMUM_VERTICAL_SWIPE = 2.0f     // in percentage
 const val MINIMUM_HORIZONTAL_SWIPE = 2.0f   // in percentage
@@ -93,16 +78,13 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     protected open var isFullScreenPlayer = true
     protected open var isTv = false
 
+    protected var playerBinding: PlayerCustomLayoutBinding? = null
+
+
     // state of player UI
     protected var isShowing = false
     protected var isLocked = false
 
-    //private var episodes: List<Any> = listOf()
-    protected fun setEpisodes(ep: List<Any>) {
-        //hasEpisodes = ep.size > 1 // if has 2 episodes or more because you dont want to switch to your current episode
-        //(player_episode_list?.adapter as? PlayerEpisodeAdapter?)?.updateList(ep)
-    }
-
     protected var hasEpisodes = false
         private set
     //protected val hasEpisodes
@@ -116,11 +98,12 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
      * This will be set in runtime based on settings.
      **/
     protected var currentQualityProfile = 1
-//    protected var currentPrefQuality =
+
+    //    protected var currentPrefQuality =
 //        Qualities.P2160.value // preferred maximum quality, used for ppl w bad internet or on cell
     protected var fastForwardTime = 10000L
-    protected var androidTVInterfaceOffSeekTime = 10000L;
-    protected var androidTVInterfaceOnSeekTime = 30000L;
+    protected var androidTVInterfaceOffSeekTime = 10000L
+    protected var androidTVInterfaceOnSeekTime = 30000L
     protected var swipeHorizontalEnabled = false
     protected var swipeVerticalEnabled = false
     protected var playBackSpeedEnabled = false
@@ -145,19 +128,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     protected var useTrueSystemBrightness = true
     private val fullscreenNotch = true //TODO SETTING
 
-    protected val displayMetrics: DisplayMetrics = Resources.getSystem().displayMetrics
-
-    // screenWidth and screenHeight does always
-    // refer to the screen while in landscape mode
-    protected val screenWidth: Int
-        get() {
-            return max(displayMetrics.widthPixels, displayMetrics.heightPixels)
-        }
-    protected val screenHeight: Int
-        get() {
-            return min(displayMetrics.widthPixels, displayMetrics.heightPixels)
-        }
-
     private var statusBarHeight: Int? = null
     private var navigationBarHeight: Int? = null
 
@@ -184,6 +154,21 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         R.drawable.ic_baseline_volume_up_24,
     )
 
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val root = super.onCreateView(inflater, container, savedInstanceState) ?: return null
+        playerBinding = PlayerCustomLayoutBinding.bind(root.findViewById(R.id.player_holder))
+        return root
+    }
+
+    override fun onDestroyView() {
+        playerBinding = null
+        super.onDestroyView()
+    }
+
     open fun showMirrorsDialogue() {
         throw NotImplementedError()
     }
@@ -216,24 +201,24 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         if (isShowing) {
             updateUIVisibility()
         } else {
-            player_holder?.postDelayed({ updateUIVisibility() }, 200)
+            playerBinding?.playerHolder?.postDelayed({ updateUIVisibility() }, 200)
         }
 
         val titleMove = if (isShowing) 0f else -50.toPx.toFloat()
-        player_video_title?.let {
+        playerBinding?.playerVideoTitle?.let {
             ObjectAnimator.ofFloat(it, "translationY", titleMove).apply {
                 duration = 200
                 start()
             }
         }
-        player_video_title_rez?.let {
+        playerBinding?.playerVideoTitleRez?.let {
             ObjectAnimator.ofFloat(it, "translationY", titleMove).apply {
                 duration = 200
                 start()
             }
         }
         val playerBarMove = if (isShowing) 0f else 50.toPx.toFloat()
-        bottom_player_bar?.let {
+        playerBinding?.bottomPlayerBar?.let {
             ObjectAnimator.ofFloat(it, "translationY", playerBarMove).apply {
                 duration = 200
                 start()
@@ -249,7 +234,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         val sView = subView
         val sStyle = subStyle
         if (sView != null && sStyle != null) {
-            val move = if (isShowing) -((bottom_player_bar?.height?.toFloat()
+            val move = if (isShowing) -((playerBinding?.bottomPlayerBar?.height?.toFloat()
                 ?: 0f) + 40.toPx) else -sStyle.elevation.toPx.toFloat()
             ObjectAnimator.ofFloat(sView, "translationY", move).apply {
                 duration = 200
@@ -258,42 +243,76 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
         val playerSourceMove = if (isShowing) 0f else -50.toPx.toFloat()
-        player_open_source?.let {
-            ObjectAnimator.ofFloat(it, "translationY", playerSourceMove).apply {
-                duration = 200
-                start()
+
+
+        playerBinding?.apply {
+            playerOpenSource.let {
+                ObjectAnimator.ofFloat(it, "translationY", playerSourceMove).apply {
+                    duration = 200
+                    start()
+                }
             }
+
+            if (!isLocked) {
+                playerFfwdHolder.alpha = 1f
+                playerRewHolder.alpha = 1f
+                // player_pause_play_holder?.alpha = 1f
+                shadowOverlay.isVisible = true
+                shadowOverlay.startAnimation(fadeAnimation)
+                playerFfwdHolder.startAnimation(fadeAnimation)
+                playerRewHolder.startAnimation(fadeAnimation)
+                playerPausePlay.startAnimation(fadeAnimation)
+
+                /*if (isBuffering) {
+                        player_pause_play?.isVisible = false
+                        player_pause_play_holder?.isVisible = false
+                    } else {
+                        player_pause_play?.isVisible = true
+                        player_pause_play_holder?.startAnimation(fadeAnimation)
+                        player_pause_play?.startAnimation(fadeAnimation)
+                    }*/
+                //player_buffering?.startAnimation(fadeAnimation)
+            }
+
+            bottomPlayerBar.startAnimation(fadeAnimation)
+            playerOpenSource.startAnimation(fadeAnimation)
+            playerTopHolder.startAnimation(fadeAnimation)
         }
-
-
-        if (!isLocked) {
-            player_ffwd_holder?.alpha = 1f
-            player_rew_holder?.alpha = 1f
-            // player_pause_play_holder?.alpha = 1f
-            shadow_overlay?.isVisible = true
-            shadow_overlay?.startAnimation(fadeAnimation)
-            player_ffwd_holder?.startAnimation(fadeAnimation)
-            player_rew_holder?.startAnimation(fadeAnimation)
-            player_pause_play?.startAnimation(fadeAnimation)
-
-            /*if (isBuffering) {
-                    player_pause_play?.isVisible = false
-                    player_pause_play_holder?.isVisible = false
-                } else {
-                    player_pause_play?.isVisible = true
-                    player_pause_play_holder?.startAnimation(fadeAnimation)
-                    player_pause_play?.startAnimation(fadeAnimation)
-                }*/
-            //player_buffering?.startAnimation(fadeAnimation)
-        }
-
-        bottom_player_bar?.startAnimation(fadeAnimation)
-        player_open_source?.startAnimation(fadeAnimation)
-        player_top_holder?.startAnimation(fadeAnimation)
     }
 
     override fun subtitlesChanged() {
-        player_subtitle_offset_btt?.isGone = player.getCurrentPreferredSubtitle() == null
+        playerBinding?.playerSubtitleOffsetBtt?.isGone =
+            player.getCurrentPreferredSubtitle() == null
+    }
+
+    open fun lockOrientation(activity: Activity) {
+        val display =
+            (activity.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay
+        val rotation = display.rotation
+        val currentOrientation = activity.resources.configuration.orientation
+        var orientation = 0
+        when (currentOrientation) {
+            Configuration.ORIENTATION_LANDSCAPE -> orientation =
+                if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_90) ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE else ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
+
+            Configuration.ORIENTATION_SQUARE, Configuration.ORIENTATION_UNDEFINED, Configuration.ORIENTATION_PORTRAIT -> ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+            //Configuration.ORIENTATION_PORTRAIT -> orientation =
+            //    if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_270) ActivityInfo.SCREEN_ORIENTATION_PORTRAIT else ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
+        }
+        activity.requestedOrientation = orientation
+    }
+
+    private fun updateOrientation() {
+        activity?.apply {
+            if(lockRotation) {
+                if(isLocked) {
+                    lockOrientation(this)
+                }
+                else {
+                    requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+                }
+            }
+        }
     }
 
     protected fun enterFullscreen() {
@@ -305,8 +324,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 activity?.window?.attributes = params
             }
         }
-        if (lockRotation)
-            activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+        updateOrientation()
     }
 
     protected fun exitFullscreen() {
@@ -339,7 +357,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     private fun setPlayBackSpeed(speed: Float) {
         try {
             setKey(PLAYBACK_SPEED_KEY, speed)
-            player_speed_btt?.text =
+            playerBinding?.playerSpeedBtt?.text =
                 getString(R.string.player_speed_text_format).format(speed)
                     .replace(".0x", "x")
         } catch (e: Exception) {
@@ -355,67 +373,68 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     private fun showSubtitleOffsetDialog() {
-        context?.let { ctx ->
-            val builder =
-                AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
-                    .setView(R.layout.subtitle_offset)
-            val dialog = builder.create()
-            dialog.show()
+        val ctx = context ?: return
 
-            val beforeOffset = subtitleDelay
+        val binding = SubtitleOffsetBinding.inflate(LayoutInflater.from(ctx), null, false)
 
-            val applyButton = dialog.findViewById<TextView>(R.id.apply_btt)!!
-            val cancelButton = dialog.findViewById<TextView>(R.id.cancel_btt)!!
-            val input = dialog.findViewById<EditText>(R.id.subtitle_offset_input)!!
-            val sub = dialog.findViewById<ImageView>(R.id.subtitle_offset_subtract)!!
-            val subMore = dialog.findViewById<ImageView>(R.id.subtitle_offset_subtract_more)!!
-            val add = dialog.findViewById<ImageView>(R.id.subtitle_offset_add)!!
-            val addMore = dialog.findViewById<ImageView>(R.id.subtitle_offset_add_more)!!
-            val subTitle = dialog.findViewById<TextView>(R.id.subtitle_offset_sub_title)!!
+        val builder =
+            AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                .setView(binding.root)
+        val dialog = builder.create()
+        dialog.show()
 
-            input.doOnTextChanged { text, _, _, _ ->
-                text?.toString()?.toLongOrNull()?.let {
-                    subtitleDelay = it
-                    when {
-                        it > 0L -> {
-                            context?.getString(R.string.subtitle_offset_extra_hint_later_format)
-                                ?.format(it)
+        val beforeOffset = subtitleDelay
+
+        /*val applyButton = dialog.findViewById<TextView>(R.id.apply_btt)!!
+        val cancelButton = dialog.findViewById<TextView>(R.id.cancel_btt)!!
+        val input = dialog.findViewById<EditText>(R.id.subtitle_offset_input)!!
+        val sub = dialog.findViewById<ImageView>(R.id.subtitle_offset_subtract)!!
+        val subMore = dialog.findViewById<ImageView>(R.id.subtitle_offset_subtract_more)!!
+        val add = dialog.findViewById<ImageView>(R.id.subtitle_offset_add)!!
+        val addMore = dialog.findViewById<ImageView>(R.id.subtitle_offset_add_more)!!
+        val subTitle = dialog.findViewById<TextView>(R.id.subtitle_offset_sub_title)!!*/
+        binding.apply {
+            subtitleOffsetInput.doOnTextChanged { text, _, _, _ ->
+                text?.toString()?.toLongOrNull()?.let { time ->
+                    subtitleDelay = time
+                    val str = when {
+                        time > 0L -> {
+                            txt(R.string.subtitle_offset_extra_hint_later_format, time)
                         }
-                        it < 0L -> {
-                            context?.getString(R.string.subtitle_offset_extra_hint_before_format)
-                                ?.format(-it)
-                        }
-                        it == 0L -> {
-                            context?.getString(R.string.subtitle_offset_extra_hint_none_format)
+
+                        time < 0L -> {
+                            txt(R.string.subtitle_offset_extra_hint_before_format, -time)
                         }
+
                         else -> {
-                            null
+                            txt(R.string.subtitle_offset_extra_hint_none_format)
                         }
-                    }?.let { str ->
-                        subTitle.text = str
                     }
+                    subtitleOffsetSubTitle.setText(str)
                 }
             }
-            input.text = Editable.Factory.getInstance()?.newEditable(beforeOffset.toString())
+            subtitleOffsetInput.text =
+                Editable.Factory.getInstance()?.newEditable(beforeOffset.toString())
 
             val buttonChange = 100L
             val buttonChangeMore = 1000L
 
             fun changeBy(by: Long) {
-                val current = (input.text?.toString()?.toLongOrNull() ?: 0) + by
-                input.text = Editable.Factory.getInstance()?.newEditable(current.toString())
+                val current = (subtitleOffsetInput.text?.toString()?.toLongOrNull() ?: 0) + by
+                subtitleOffsetInput.text =
+                    Editable.Factory.getInstance()?.newEditable(current.toString())
             }
 
-            add.setOnClickListener {
+            subtitleOffsetAdd.setOnClickListener {
                 changeBy(buttonChange)
             }
-            addMore.setOnClickListener {
+            subtitleOffsetAddMore.setOnClickListener {
                 changeBy(buttonChangeMore)
             }
-            sub.setOnClickListener {
+            subtitleOffsetSubtract.setOnClickListener {
                 changeBy(-buttonChange)
             }
-            subMore.setOnClickListener {
+            subtitleOffsetSubtractMore.setOnClickListener {
                 changeBy(-buttonChangeMore)
             }
 
@@ -423,17 +442,18 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 if (isFullScreenPlayer)
                     activity?.hideSystemUI()
             }
-            applyButton.setOnClickListener {
+            applyBtt.setOnClickListener {
                 dialog.dismissSafe(activity)
                 player.seekTime(1L)
             }
-            cancelButton.setOnClickListener {
+            cancelBtt.setOnClickListener {
                 subtitleDelay = beforeOffset
                 dialog.dismissSafe(activity)
             }
         }
     }
 
+
     private fun showSpeedDialog() {
         val speedsText =
             listOf(
@@ -470,39 +490,42 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     fun resetRewindText() {
-        exo_rew_text?.text =
+        playerBinding?.exoRewText?.text =
             getString(R.string.rew_text_regular_format).format(fastForwardTime / 1000)
     }
 
     fun resetFastForwardText() {
-        exo_ffwd_text?.text =
+        playerBinding?.exoFfwdText?.text =
             getString(R.string.ffw_text_regular_format).format(fastForwardTime / 1000)
     }
 
     private fun rewind() {
         try {
-            player_center_menu?.isGone = false
-            player_rew_holder?.alpha = 1f
+            playerBinding?.apply {
+                playerCenterMenu.isGone = false
+                playerRewHolder.alpha = 1f
 
-            val rotateLeft = AnimationUtils.loadAnimation(context, R.anim.rotate_left)
-            exo_rew?.startAnimation(rotateLeft)
+                val rotateLeft = AnimationUtils.loadAnimation(context, R.anim.rotate_left)
+                exoRew.startAnimation(rotateLeft)
 
-            val goLeft = AnimationUtils.loadAnimation(context, R.anim.go_left)
-            goLeft.setAnimationListener(object : Animation.AnimationListener {
-                override fun onAnimationStart(animation: Animation?) {}
+                val goLeft = AnimationUtils.loadAnimation(context, R.anim.go_left)
+                goLeft.setAnimationListener(object : Animation.AnimationListener {
+                    override fun onAnimationStart(animation: Animation?) {}
 
-                override fun onAnimationRepeat(animation: Animation?) {}
+                    override fun onAnimationRepeat(animation: Animation?) {}
 
-                override fun onAnimationEnd(animation: Animation?) {
-                    exo_rew_text?.post {
-                        resetRewindText()
-                        player_center_menu?.isGone = !isShowing
-                        player_rew_holder?.alpha = if (isShowing) 1f else 0f
+                    override fun onAnimationEnd(animation: Animation?) {
+                        exoRewText.post {
+                            resetRewindText()
+                            playerCenterMenu.isGone = !isShowing
+                            playerRewHolder.alpha = if (isShowing) 1f else 0f
+                        }
                     }
-                }
-            })
-            exo_rew_text?.startAnimation(goLeft)
-            exo_rew_text?.text = getString(R.string.rew_text_format).format(fastForwardTime / 1000)
+                })
+                exoRewText.startAnimation(goLeft)
+                exoRewText.text =
+                    getString(R.string.rew_text_format).format(fastForwardTime / 1000)
+            }
             player.seekTime(-fastForwardTime)
         } catch (e: Exception) {
             logError(e)
@@ -511,28 +534,31 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
     private fun fastForward() {
         try {
-            player_center_menu?.isGone = false
-            player_ffwd_holder?.alpha = 1f
+            playerBinding?.apply {
+                playerCenterMenu.isGone = false
+                playerFfwdHolder.alpha = 1f
 
-            val rotateRight = AnimationUtils.loadAnimation(context, R.anim.rotate_right)
-            exo_ffwd?.startAnimation(rotateRight)
+                val rotateRight = AnimationUtils.loadAnimation(context, R.anim.rotate_right)
+                exoFfwd.startAnimation(rotateRight)
 
-            val goRight = AnimationUtils.loadAnimation(context, R.anim.go_right)
-            goRight.setAnimationListener(object : Animation.AnimationListener {
-                override fun onAnimationStart(animation: Animation?) {}
+                val goRight = AnimationUtils.loadAnimation(context, R.anim.go_right)
+                goRight.setAnimationListener(object : Animation.AnimationListener {
+                    override fun onAnimationStart(animation: Animation?) {}
 
-                override fun onAnimationRepeat(animation: Animation?) {}
+                    override fun onAnimationRepeat(animation: Animation?) {}
 
-                override fun onAnimationEnd(animation: Animation?) {
-                    exo_ffwd_text?.post {
-                        resetFastForwardText()
-                        player_center_menu?.isGone = !isShowing
-                        player_ffwd_holder?.alpha = if (isShowing) 1f else 0f
+                    override fun onAnimationEnd(animation: Animation?) {
+                        exoFfwdText.post {
+                            resetFastForwardText()
+                            playerCenterMenu.isGone = !isShowing
+                            playerFfwdHolder.alpha = if (isShowing) 1f else 0f
+                        }
                     }
-                }
-            })
-            exo_ffwd_text?.startAnimation(goRight)
-            exo_ffwd_text?.text = getString(R.string.ffw_text_format).format(fastForwardTime / 1000)
+                })
+                exoFfwdText.startAnimation(goRight)
+                exoFfwdText.text =
+                    getString(R.string.ffw_text_format).format(fastForwardTime / 1000)
+            }
             player.seekTime(fastForwardTime)
         } catch (e: Exception) {
             logError(e)
@@ -542,13 +568,13 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     private fun onClickChange() {
         isShowing = !isShowing
         if (isShowing) {
-            player_intro_play?.isGone = true
+            playerBinding?.playerIntroPlay?.isGone = true
             autoHide()
         }
         if (isFullScreenPlayer)
             activity?.hideSystemUI()
         animateLayoutChanges()
-        player_pause_play?.requestFocus()
+        playerBinding?.playerPausePlay?.requestFocus()
     }
 
     private fun toggleLock() {
@@ -557,8 +583,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
         isLocked = !isLocked
+        updateOrientation()
+
         if (isLocked && isShowing) {
-            player_holder?.postDelayed({
+            playerBinding?.playerHolder?.postDelayed({
                 if (isLocked && isShowing) {
                     onClickChange()
                 }
@@ -566,36 +594,36 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
         val fadeTo = if (isLocked) 0f else 1f
+        playerBinding?.apply {
+            val fadeAnimation = AlphaAnimation(playerVideoTitle.alpha, fadeTo).apply {
+                duration = 100
+                fillAfter = true
+            }
 
-        val fadeAnimation = AlphaAnimation(player_video_title.alpha, fadeTo).apply {
-            duration = 100
-            fillAfter = true
+            updateUIVisibility()
+            // MENUS
+            //centerMenu.startAnimation(fadeAnimation)
+            playerPausePlay.startAnimation(fadeAnimation)
+            playerFfwdHolder.startAnimation(fadeAnimation)
+            playerRewHolder.startAnimation(fadeAnimation)
+
+            //if (hasEpisodes)
+            //    player_episodes_button?.startAnimation(fadeAnimation)
+            //player_media_route_button?.startAnimation(fadeAnimation)
+            //video_bar.startAnimation(fadeAnimation)
+
+            //TITLE
+            playerVideoTitleRez.startAnimation(fadeAnimation)
+            playerEpisodeFiller.startAnimation(fadeAnimation)
+            playerVideoTitle.startAnimation(fadeAnimation)
+            playerTopHolder.startAnimation(fadeAnimation)
+            // BOTTOM
+            playerLockHolder.startAnimation(fadeAnimation)
+            //player_go_back_holder?.startAnimation(fadeAnimation)
+
+            shadowOverlay.isVisible = true
+            shadowOverlay.startAnimation(fadeAnimation)
         }
-
-        updateUIVisibility()
-        // MENUS
-        //centerMenu.startAnimation(fadeAnimation)
-        player_pause_play?.startAnimation(fadeAnimation)
-        player_ffwd_holder?.startAnimation(fadeAnimation)
-        player_rew_holder?.startAnimation(fadeAnimation)
-
-        //if (hasEpisodes)
-        //    player_episodes_button?.startAnimation(fadeAnimation)
-        //player_media_route_button?.startAnimation(fadeAnimation)
-        //video_bar.startAnimation(fadeAnimation)
-
-        //TITLE
-        player_video_title_rez?.startAnimation(fadeAnimation)
-        player_episode_filler?.startAnimation(fadeAnimation)
-        player_video_title?.startAnimation(fadeAnimation)
-        player_top_holder?.startAnimation(fadeAnimation)
-        // BOTTOM
-        player_lock_holder?.startAnimation(fadeAnimation)
-        //player_go_back_holder?.startAnimation(fadeAnimation)
-
-        shadow_overlay?.isVisible = true
-        shadow_overlay?.startAnimation(fadeAnimation)
-
         updateLockUI()
     }
 
@@ -609,34 +637,39 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 togglePlayerTitleGone = true
             }
         }
-        player_lock_holder?.isGone = isGone
-        player_video_bar?.isGone = isGone
-        player_pause_play_holder?.isGone = isGone
-        player_pause_play?.isGone = isGone
-        //player_buffering?.isGone = isGone
-        player_top_holder?.isGone = isGone
-        //player_episodes_button?.isVisible = !isGone && hasEpisodes
-        player_video_title?.isGone = togglePlayerTitleGone
+        playerBinding?.apply {
+
+            playerLockHolder.isGone = isGone
+            playerVideoBar.isGone = isGone
+
+            playerPausePlay.isGone = isGone
+            //player_buffering?.isGone = isGone
+            playerTopHolder.isGone = isGone
+            //player_episodes_button?.isVisible = !isGone && hasEpisodes
+            playerVideoTitle.isGone = togglePlayerTitleGone
 //        player_video_title_rez?.isGone = isGone
-        player_episode_filler?.isGone = isGone
-        player_center_menu?.isGone = isGone
-        player_lock?.isGone = !isShowing
-        //player_media_route_button?.isClickable = !isGone
-        player_go_back_holder?.isGone = isGone
-        player_sources_btt?.isGone = isGone
-        player_skip_episode?.isClickable = !isGone
+            playerEpisodeFiller.isGone = isGone
+            playerCenterMenu.isGone = isGone
+            playerLock.isGone = !isShowing
+            //player_media_route_button?.isClickable = !isGone
+            playerGoBackHolder.isGone = isGone
+            playerSourcesBtt.isGone = isGone
+            playerSkipEpisode.isClickable = !isGone
+        }
     }
 
     private fun updateLockUI() {
-        player_lock?.setIconResource(if (isLocked) R.drawable.video_locked else R.drawable.video_unlocked)
-        if (layout == R.layout.fragment_player) {
-            val color = if (isLocked) context?.colorFromAttribute(R.attr.colorPrimary)
-            else Color.WHITE
-            if (color != null) {
-                player_lock?.setTextColor(color)
-                player_lock?.iconTint = ColorStateList.valueOf(color)
-                player_lock?.rippleColor =
-                    ColorStateList.valueOf(Color.argb(50, color.red, color.green, color.blue))
+        playerBinding?.apply {
+            playerLock.setIconResource(if (isLocked) R.drawable.video_locked else R.drawable.video_unlocked)
+            if (layout == R.layout.fragment_player) {
+                val color = if (isLocked) context?.colorFromAttribute(R.attr.colorPrimary)
+                else Color.WHITE
+                if (color != null) {
+                    playerLock.setTextColor(color)
+                    playerLock.iconTint = ColorStateList.valueOf(color)
+                    playerLock.rippleColor =
+                        ColorStateList.valueOf(Color.argb(50, color.red, color.green, color.blue))
+                }
             }
         }
     }
@@ -645,7 +678,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     protected fun autoHide() {
         currentTapIndex++
         val index = currentTapIndex
-        player_holder?.postDelayed({
+        playerBinding?.playerHolder?.postDelayed({
             if (!isCurrentTouchValid && isShowing && index == currentTapIndex && player.getIsPlaying()) {
                 onClickChange()
             }
@@ -657,7 +690,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     private fun toggleShowDelayed() {
         if (doubleTapEnabled || doubleTapPauseEnabled) {
             val index = currentDoubleTapIndex
-            player_holder?.postDelayed({
+            playerBinding?.playerHolder?.postDelayed({
                 if (index == currentDoubleTapIndex) {
                     onClickChange()
                 }
@@ -788,249 +821,267 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         if (event == null || view == null) return false
         val currentTouch = Vector2(event.x, event.y)
         val startTouch = currentTouchStart
-        player_intro_play?.isGone = true
-        when (event.action) {
-            MotionEvent.ACTION_DOWN -> {
-                // validates if the touch is inside of the player area
-                isCurrentTouchValid = isValidTouch(currentTouch.x, currentTouch.y)
-                /*if (isCurrentTouchValid && player_episode_list?.isVisible == true) {
-                    player_episode_list?.isVisible = false
-                } else*/ if (isCurrentTouchValid) {
-                    currentTouchStartTime = System.currentTimeMillis()
-                    currentTouchStart = currentTouch
-                    currentTouchLast = currentTouch
-                    currentTouchStartPlayerTime = player.getPosition()
 
-                    getBrightness()?.let {
-                        currentRequestedBrightness = it
-                    }
-                    (activity?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager)?.let { audioManager ->
-                        val currentVolume =
-                            audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
-                        val maxVolume =
-                            audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+        playerBinding?.apply {
+            playerIntroPlay.isGone = true
 
-                        currentRequestedVolume = currentVolume.toFloat() / maxVolume.toFloat()
-                    }
-                }
-            }
-            MotionEvent.ACTION_UP -> {
-                if (isCurrentTouchValid && !isLocked && isFullScreenPlayer) {
-                    // seek time
-                    if (swipeHorizontalEnabled && currentTouchAction == TouchAction.Time) {
-                        val startTime = currentTouchStartPlayerTime
-                        if (startTime != null) {
-                            calculateNewTime(startTime, startTouch, currentTouch)?.let { seekTo ->
-                                if (abs(seekTo - startTime) > MINIMUM_SEEK_TIME) {
-                                    player.seekTo(seekTo)
-                                }
-                            }
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    // validates if the touch is inside of the player area
+                    isCurrentTouchValid = isValidTouch(currentTouch.x, currentTouch.y)
+                    /*if (isCurrentTouchValid && player_episode_list?.isVisible == true) {
+                        player_episode_list?.isVisible = false
+                    } else*/ if (isCurrentTouchValid) {
+                        currentTouchStartTime = System.currentTimeMillis()
+                        currentTouchStart = currentTouch
+                        currentTouchLast = currentTouch
+                        currentTouchStartPlayerTime = player.getPosition()
+
+                        getBrightness()?.let {
+                            currentRequestedBrightness = it
+                        }
+                        (activity?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager)?.let { audioManager ->
+                            val currentVolume =
+                                audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
+                            val maxVolume =
+                                audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+
+                            currentRequestedVolume = currentVolume.toFloat() / maxVolume.toFloat()
                         }
                     }
                 }
 
-                // see if click is eligible for seek 10s
-                val holdTime = currentTouchStartTime?.minus(System.currentTimeMillis())
-                if (isCurrentTouchValid // is valid
-                    && currentTouchAction == null // no other action like swiping is taking place
-                    && currentLastTouchAction == null // last action was none, this prevents mis input random seek
-                    && holdTime != null
-                    && holdTime < DOUBLE_TAB_MAXIMUM_HOLD_TIME // it is a click not a long hold
-                ) {
-                    if (!isLocked
-                        && (System.currentTimeMillis() - currentLastTouchEndTime) < DOUBLE_TAB_MINIMUM_TIME_BETWEEN // the time since the last action is short
-                    ) {
-                        currentClickCount++
-
-                        if (currentClickCount >= 1) { // have double clicked
-                            currentDoubleTapIndex++
-                            if (doubleTapPauseEnabled && isFullScreenPlayer) { // you can pause if your tap is in the middle of the screen
-                                when {
-                                    currentTouch.x < screenWidth / 2 - (DOUBLE_TAB_PAUSE_PERCENTAGE * screenWidth) -> {
-                                        if (doubleTapEnabled)
-                                            rewind()
+                MotionEvent.ACTION_UP -> {
+                    if (isCurrentTouchValid && !isLocked && isFullScreenPlayer) {
+                        // seek time
+                        if (swipeHorizontalEnabled && currentTouchAction == TouchAction.Time) {
+                            val startTime = currentTouchStartPlayerTime
+                            if (startTime != null) {
+                                calculateNewTime(
+                                    startTime,
+                                    startTouch,
+                                    currentTouch
+                                )?.let { seekTo ->
+                                    if (abs(seekTo - startTime) > MINIMUM_SEEK_TIME) {
+                                        player.seekTo(seekTo, PlayerEventSource.UI)
                                     }
-                                    currentTouch.x > screenWidth / 2 + (DOUBLE_TAB_PAUSE_PERCENTAGE * screenWidth) -> {
-                                        if (doubleTapEnabled)
-                                            fastForward()
-                                    }
-                                    else -> {
-                                        player.handleEvent(CSPlayerEvent.PlayPauseToggle)
-                                    }
-                                }
-                            } else if (doubleTapEnabled && isFullScreenPlayer) {
-                                if (currentTouch.x < screenWidth / 2) {
-                                    rewind()
-                                } else {
-                                    fastForward()
                                 }
                             }
                         }
+                    }
+
+                    // see if click is eligible for seek 10s
+                    val holdTime = currentTouchStartTime?.minus(System.currentTimeMillis())
+                    if (isCurrentTouchValid // is valid
+                        && currentTouchAction == null // no other action like swiping is taking place
+                        && currentLastTouchAction == null // last action was none, this prevents mis input random seek
+                        && holdTime != null
+                        && holdTime < DOUBLE_TAB_MAXIMUM_HOLD_TIME // it is a click not a long hold
+                    ) {
+                        if (!isLocked
+                            && (System.currentTimeMillis() - currentLastTouchEndTime) < DOUBLE_TAB_MINIMUM_TIME_BETWEEN // the time since the last action is short
+                        ) {
+                            currentClickCount++
+
+                            if (currentClickCount >= 1) { // have double clicked
+                                currentDoubleTapIndex++
+                                if (doubleTapPauseEnabled && isFullScreenPlayer) { // you can pause if your tap is in the middle of the screen
+                                    when {
+                                        currentTouch.x < screenWidth / 2 - (DOUBLE_TAB_PAUSE_PERCENTAGE * screenWidth) -> {
+                                            if (doubleTapEnabled)
+                                                rewind()
+                                        }
+
+                                        currentTouch.x > screenWidth / 2 + (DOUBLE_TAB_PAUSE_PERCENTAGE * screenWidth) -> {
+                                            if (doubleTapEnabled)
+                                                fastForward()
+                                        }
+
+                                        else -> {
+                                            player.handleEvent(CSPlayerEvent.PlayPauseToggle, PlayerEventSource.UI)
+                                        }
+                                    }
+                                } else if (doubleTapEnabled && isFullScreenPlayer) {
+                                    if (currentTouch.x < screenWidth / 2) {
+                                        rewind()
+                                    } else {
+                                        fastForward()
+                                    }
+                                }
+                            }
+                        } else {
+                            // is a valid click but not fast enough for seek
+                            currentClickCount = 0
+                            toggleShowDelayed()
+                            //onClickChange()
+                        }
                     } else {
-                        // is a valid click but not fast enough for seek
                         currentClickCount = 0
-                        toggleShowDelayed()
-                        //onClickChange()
                     }
-                } else {
-                    currentClickCount = 0
+
+                    // call auto hide as it wont hide when you have your finger down
+                    autoHide()
+
+                    // reset variables
+                    isCurrentTouchValid = false
+                    currentTouchStart = null
+                    currentLastTouchAction = currentTouchAction
+                    currentTouchAction = null
+                    currentTouchStartPlayerTime = null
+                    currentTouchLast = null
+                    currentTouchStartTime = null
+
+                    // resets UI
+                    playerTimeText.isVisible = false
+                    playerProgressbarLeftHolder.isVisible = false
+                    playerProgressbarRightHolder.isVisible = false
+
+                    currentLastTouchEndTime = System.currentTimeMillis()
                 }
 
-                // call auto hide as it wont hide when you have your finger down
-                autoHide()
+                MotionEvent.ACTION_MOVE -> {
+                    // if current touch is valid
+                    if (startTouch != null && isCurrentTouchValid && !isLocked && isFullScreenPlayer) {
+                        // action is unassigned and can therefore be assigned
+                        if (currentTouchAction == null) {
+                            val diffFromStart = startTouch - currentTouch
 
-                // reset variables
-                isCurrentTouchValid = false
-                currentTouchStart = null
-                currentLastTouchAction = currentTouchAction
-                currentTouchAction = null
-                currentTouchStartPlayerTime = null
-                currentTouchLast = null
-                currentTouchStartTime = null
+                            if (swipeVerticalEnabled) {
+                                if (abs(diffFromStart.y * 100 / screenHeight) > MINIMUM_VERTICAL_SWIPE) {
+                                    // left = Brightness, right = Volume, but the UI is reversed to show the UI better
+                                    currentTouchAction = if (startTouch.x < screenWidth / 2) {
+                                        // hide the UI if you hold brightness to show screen better, better UX
+                                        if (isShowing) {
+                                            isShowing = false
+                                            animateLayoutChanges()
+                                        }
 
-                // resets UI
-                player_time_text?.isVisible = false
-                player_progressbar_left_holder?.isVisible = false
-                player_progressbar_right_holder?.isVisible = false
-                currentLastTouchEndTime = System.currentTimeMillis()
-            }
-            MotionEvent.ACTION_MOVE -> {
-                // if current touch is valid
-                if (startTouch != null && isCurrentTouchValid && !isLocked && isFullScreenPlayer) {
-                    // action is unassigned and can therefore be assigned
-                    if (currentTouchAction == null) {
-                        val diffFromStart = startTouch - currentTouch
-
-                        if (swipeVerticalEnabled) {
-                            if (abs(diffFromStart.y * 100 / screenHeight) > MINIMUM_VERTICAL_SWIPE) {
-                                // left = Brightness, right = Volume, but the UI is reversed to show the UI better
-                                currentTouchAction = if (startTouch.x < screenWidth / 2) {
-                                    // hide the UI if you hold brightness to show screen better, better UX
-                                    if (isShowing) {
-                                        isShowing = false
-                                        animateLayoutChanges()
-                                    }
-
-                                    TouchAction.Brightness
-                                } else {
-                                    TouchAction.Volume
-                                }
-                            }
-                        }
-                        if (swipeHorizontalEnabled) {
-                            if (abs(diffFromStart.x * 100 / screenHeight) > MINIMUM_HORIZONTAL_SWIPE) {
-                                currentTouchAction = TouchAction.Time
-                            }
-                        }
-                    }
-
-                    // display action
-                    val lastTouch = currentTouchLast
-                    if (lastTouch != null) {
-                        val diffFromLast = lastTouch - currentTouch
-                        val verticalAddition =
-                            diffFromLast.y * VERTICAL_MULTIPLIER / screenHeight.toFloat()
-
-                        // update UI
-                        player_time_text?.isVisible = false
-                        player_progressbar_left_holder?.isVisible = false
-                        player_progressbar_right_holder?.isVisible = false
-
-                        when (currentTouchAction) {
-                            TouchAction.Time -> {
-                                // this simply updates UI as the seek logic happens on release
-                                // startTime is rounded to make the UI sync in a nice way
-                                val startTime =
-                                    currentTouchStartPlayerTime?.div(1000L)?.times(1000L)
-                                if (startTime != null) {
-                                    calculateNewTime(
-                                        startTime,
-                                        startTouch,
-                                        currentTouch
-                                    )?.let { newMs ->
-                                        val skipMs = newMs - startTime
-                                        player_time_text?.text =
-                                            "${convertTimeToString(newMs / 1000)} [${
-                                                (if (abs(skipMs) < 1000) "" else (if (skipMs > 0) "+" else "-"))
-                                            }${convertTimeToString(abs(skipMs / 1000))}]"
-                                        player_time_text?.isVisible = true
+                                        TouchAction.Brightness
+                                    } else {
+                                        TouchAction.Volume
                                     }
                                 }
                             }
-                            TouchAction.Brightness -> {
-                                player_progressbar_right_holder?.isVisible = true
-                                val lastRequested = currentRequestedBrightness
-                                currentRequestedBrightness =
-                                    min(
-                                        1.0f,
-                                        max(currentRequestedBrightness + verticalAddition, 0.0f)
-                                    )
-
-                                // this is to not spam request it, just in case it fucks over someone
-                                if (lastRequested != currentRequestedBrightness)
-                                    setBrightness(currentRequestedBrightness)
-
-                                // max is set high to make it smooth
-                                player_progressbar_right?.max = 100_000
-                                player_progressbar_right?.progress =
-                                    max(2_000, (currentRequestedBrightness * 100_000f).toInt())
-
-                                player_progressbar_right_icon?.setImageResource(
-                                    brightnessIcons[min( // clamp the value just in case
-                                        brightnessIcons.size - 1,
-                                        max(
-                                            0,
-                                            round(currentRequestedBrightness * (brightnessIcons.size - 1)).toInt()
-                                        )
-                                    )]
-                                )
+                            if (swipeHorizontalEnabled) {
+                                if (abs(diffFromStart.x * 100 / screenHeight) > MINIMUM_HORIZONTAL_SWIPE) {
+                                    currentTouchAction = TouchAction.Time
+                                }
                             }
-                            TouchAction.Volume -> {
-                                (activity?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager)?.let { audioManager ->
-                                    player_progressbar_left_holder?.isVisible = true
-                                    val maxVolume =
-                                        audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-                                    val currentVolume =
-                                        audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
+                        }
 
-                                    // clamps volume and adds swipe
-                                    currentRequestedVolume =
+                        // display action
+                        val lastTouch = currentTouchLast
+                        if (lastTouch != null) {
+                            val diffFromLast = lastTouch - currentTouch
+                            val verticalAddition =
+                                diffFromLast.y * VERTICAL_MULTIPLIER / screenHeight.toFloat()
+
+                            // update UI
+                            playerTimeText.isVisible = false
+                            playerProgressbarLeftHolder.isVisible = false
+                            playerProgressbarRightHolder.isVisible = false
+
+                            when (currentTouchAction) {
+                                TouchAction.Time -> {
+                                    // this simply updates UI as the seek logic happens on release
+                                    // startTime is rounded to make the UI sync in a nice way
+                                    val startTime =
+                                        currentTouchStartPlayerTime?.div(1000L)?.times(1000L)
+                                    if (startTime != null) {
+                                        calculateNewTime(
+                                            startTime,
+                                            startTouch,
+                                            currentTouch
+                                        )?.let { newMs ->
+                                            val skipMs = newMs - startTime
+                                            playerTimeText.apply {
+                                                text =
+                                                    "${convertTimeToString(newMs / 1000)} [${
+                                                        (if (abs(skipMs) < 1000) "" else (if (skipMs > 0) "+" else "-"))
+                                                    }${convertTimeToString(abs(skipMs / 1000))}]"
+                                                isVisible = true
+                                            }
+                                        }
+                                    }
+                                }
+
+                                TouchAction.Brightness -> {
+                                    playerProgressbarRightHolder.isVisible = true
+                                    val lastRequested = currentRequestedBrightness
+                                    currentRequestedBrightness =
                                         min(
                                             1.0f,
-                                            max(currentRequestedVolume + verticalAddition, 0.0f)
+                                            max(currentRequestedBrightness + verticalAddition, 0.0f)
                                         )
 
-                                    // max is set high to make it smooth
-                                    player_progressbar_left?.max = 100_000
-                                    player_progressbar_left?.progress =
-                                        max(2_000, (currentRequestedVolume * 100_000f).toInt())
+                                    // this is to not spam request it, just in case it fucks over someone
+                                    if (lastRequested != currentRequestedBrightness)
+                                        setBrightness(currentRequestedBrightness)
 
-                                    player_progressbar_left_icon?.setImageResource(
-                                        volumeIcons[min( // clamp the value just in case
-                                            volumeIcons.size - 1,
+                                    // max is set high to make it smooth
+                                    playerProgressbarRight.max = 100_000
+                                    playerProgressbarRight.progress =
+                                        max(2_000, (currentRequestedBrightness * 100_000f).toInt())
+
+                                    playerProgressbarRightIcon.setImageResource(
+                                        brightnessIcons[min( // clamp the value just in case
+                                            brightnessIcons.size - 1,
                                             max(
                                                 0,
-                                                round(currentRequestedVolume * (volumeIcons.size - 1)).toInt()
+                                                round(currentRequestedBrightness * (brightnessIcons.size - 1)).toInt()
                                             )
                                         )]
                                     )
+                                }
 
-                                    // this is used instead of set volume because old devices does not support it
-                                    val desiredVolume =
-                                        round(currentRequestedVolume * maxVolume).toInt()
-                                    if (desiredVolume != currentVolume) {
-                                        val newVolumeAdjusted =
-                                            if (desiredVolume < currentVolume) AudioManager.ADJUST_LOWER else AudioManager.ADJUST_RAISE
+                                TouchAction.Volume -> {
+                                    (activity?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager)?.let { audioManager ->
+                                        playerProgressbarLeftHolder.isVisible = true
+                                        val maxVolume =
+                                            audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+                                        val currentVolume =
+                                            audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
 
-                                        audioManager.adjustStreamVolume(
-                                            AudioManager.STREAM_MUSIC,
-                                            newVolumeAdjusted,
-                                            0
+                                        // clamps volume and adds swipe
+                                        currentRequestedVolume =
+                                            min(
+                                                1.0f,
+                                                max(currentRequestedVolume + verticalAddition, 0.0f)
+                                            )
+
+                                        // max is set high to make it smooth
+                                        playerProgressbarLeft.max = 100_000
+                                        playerProgressbarLeft.progress =
+                                            max(2_000, (currentRequestedVolume * 100_000f).toInt())
+
+                                        playerProgressbarLeftIcon.setImageResource(
+                                            volumeIcons[min( // clamp the value just in case
+                                                volumeIcons.size - 1,
+                                                max(
+                                                    0,
+                                                    round(currentRequestedVolume * (volumeIcons.size - 1)).toInt()
+                                                )
+                                            )]
                                         )
+
+                                        // this is used instead of set volume because old devices does not support it
+                                        val desiredVolume =
+                                            round(currentRequestedVolume * maxVolume).toInt()
+                                        if (desiredVolume != currentVolume) {
+                                            val newVolumeAdjusted =
+                                                if (desiredVolume < currentVolume) AudioManager.ADJUST_LOWER else AudioManager.ADJUST_RAISE
+
+                                            audioManager.adjustStreamVolume(
+                                                AudioManager.STREAM_MUSIC,
+                                                newVolumeAdjusted,
+                                                0
+                                            )
+                                        }
                                     }
                                 }
+
+                                else -> Unit
                             }
-                            else -> Unit
                         }
                     }
                 }
@@ -1055,26 +1106,29 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                                     return true
                                 }
                             }
+
                             KeyEvent.KEYCODE_DPAD_UP -> {
                                 if (!isShowing) {
                                     onClickChange()
                                     return true
                                 }
                             }
+
                             KeyEvent.KEYCODE_DPAD_LEFT -> {
                                 if (!isShowing && !isLocked) {
                                     player.seekTime(-androidTVInterfaceOffSeekTime)
                                     return true
-                                } else if (player_pause_play?.isFocused == true) {
+                                } else if (playerBinding?.playerPausePlay?.isFocused == true) {
                                     player.seekTime(-androidTVInterfaceOnSeekTime)
                                     return true
                                 }
                             }
+
                             KeyEvent.KEYCODE_DPAD_RIGHT -> {
                                 if (!isShowing && !isLocked) {
                                     player.seekTime(androidTVInterfaceOffSeekTime)
                                     return true
-                                } else if (player_pause_play?.isFocused == true) {
+                                } else if (playerBinding?.playerPausePlay?.isFocused == true) {
                                     player.seekTime(androidTVInterfaceOnSeekTime)
                                     return true
                                 }
@@ -1117,11 +1171,12 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         isShowing = false
 
         // if nothing has loaded these buttons should not be visible
-        player_skip_episode?.isVisible = false
-        player_tracks_btt?.isVisible = false
-        player_skip_op?.isVisible = false
-        shadow_overlay?.isVisible = false
-
+        playerBinding?.apply {
+            playerSkipEpisode.isVisible = false
+            playerTracksBtt.isVisible = false
+            playerSkipOp.isVisible = false
+            shadowOverlay.isVisible = false
+        }
         updateLockUI()
         updateUIVisibility()
         animateLayoutChanges()
@@ -1150,50 +1205,65 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 PlayerEventType.Lock -> {
                     toggleLock()
                 }
+
                 PlayerEventType.NextEpisode -> {
                     player.handleEvent(CSPlayerEvent.NextEpisode)
                 }
+
                 PlayerEventType.Pause -> {
                     player.handleEvent(CSPlayerEvent.Pause)
                 }
+
                 PlayerEventType.PlayPauseToggle -> {
                     player.handleEvent(CSPlayerEvent.PlayPauseToggle)
                 }
+
                 PlayerEventType.Play -> {
                     player.handleEvent(CSPlayerEvent.Play)
                 }
+
                 PlayerEventType.SkipCurrentChapter -> {
                     player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
                 }
+
                 PlayerEventType.Resize -> {
                     nextResize()
                 }
+
                 PlayerEventType.PrevEpisode -> {
                     player.handleEvent(CSPlayerEvent.PrevEpisode)
                 }
+
                 PlayerEventType.SeekForward -> {
                     player.handleEvent(CSPlayerEvent.SeekForward)
                 }
+
                 PlayerEventType.ShowSpeed -> {
                     showSpeedDialog()
                 }
+
                 PlayerEventType.SeekBack -> {
                     player.handleEvent(CSPlayerEvent.SeekBack)
                 }
+
                 PlayerEventType.ToggleMute -> {
                     player.handleEvent(CSPlayerEvent.ToggleMute)
                 }
+
                 PlayerEventType.ToggleHide -> {
                     onClickChange()
                 }
+
                 PlayerEventType.ShowMirrors -> {
                     showMirrorsDialogue()
                 }
+
                 PlayerEventType.SearchSubtitlesOnline -> {
                     if (subsProvidersIsActive) {
                         openOnlineSubPicker(view.context, null) {}
                     }
                 }
+
                 PlayerEventType.SkipOp -> {
                     skipOp()
                 }
@@ -1288,93 +1358,97 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 // useSystemBrightness =
                 //    settingsManager.getBoolean(ctx.getString(R.string.use_system_brightness_key), false)
             }
-
-            player_speed_btt?.isVisible = playBackSpeedEnabled
-            player_resize_btt?.isVisible = playerResizeEnabled
+            playerBinding?.apply {
+                playerSpeedBtt.isVisible = playBackSpeedEnabled
+                playerResizeBtt.isVisible = playerResizeEnabled
+            }
         } catch (e: Exception) {
             logError(e)
         }
-
-        player_pause_play?.setOnClickListener {
-            autoHide()
-            player.handleEvent(CSPlayerEvent.PlayPauseToggle)
-        }
-
-        skip_chapter_button?.setOnClickListener {
-            player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
-        }
-
-        // init clicks
-        player_resize_btt?.setOnClickListener {
-            autoHide()
-            nextResize()
-        }
-
-        player_speed_btt?.setOnClickListener {
-            autoHide()
-            showSpeedDialog()
-        }
-
-        player_skip_op?.setOnClickListener {
-            autoHide()
-            skipOp()
-        }
-
-        player_skip_episode?.setOnClickListener {
-            autoHide()
-            player.handleEvent(CSPlayerEvent.NextEpisode)
-        }
-
-        player_lock?.setOnClickListener {
-            autoHide()
-            toggleLock()
-        }
-
-        player_subtitle_offset_btt?.setOnClickListener {
-            showSubtitleOffsetDialog()
-        }
-
-        exo_rew?.setOnClickListener {
-            autoHide()
-            rewind()
-        }
-
-        exo_ffwd?.setOnClickListener {
-            autoHide()
-            fastForward()
-        }
-
-        player_go_back?.setOnClickListener {
-            activity?.popCurrentPage()
-        }
-
-        player_sources_btt?.setOnClickListener {
-            showMirrorsDialogue()
-        }
-
-        player_tracks_btt?.setOnClickListener {
-            showTracksDialogue()
-        }
-
-        // it is !not! a bug that you cant touch the right side, it does not register inputs on navbar or status bar
-        player_holder?.setOnTouchListener { callView, event ->
-            return@setOnTouchListener handleMotionEvent(callView, event)
-        }
-
-        exo_progress?.setOnTouchListener { _, event ->
-            // this makes the bar not disappear when sliding
-            when (event.action) {
-                MotionEvent.ACTION_DOWN -> {
-                    currentTapIndex++
-                }
-                MotionEvent.ACTION_MOVE -> {
-                    currentTapIndex++
-                }
-                MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_BUTTON_RELEASE -> {
-                    autoHide()
-                }
+        playerBinding?.apply {
+            playerPausePlay.setOnClickListener {
+                autoHide()
+                player.handleEvent(CSPlayerEvent.PlayPauseToggle)
+            }
+
+            skipChapterButton.setOnClickListener {
+                player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
+            }
+
+            // init clicks
+            playerResizeBtt.setOnClickListener {
+                autoHide()
+                nextResize()
+            }
+
+            playerSpeedBtt.setOnClickListener {
+                autoHide()
+                showSpeedDialog()
+            }
+
+            playerSkipOp.setOnClickListener {
+                autoHide()
+                skipOp()
+            }
+
+            playerSkipEpisode.setOnClickListener {
+                autoHide()
+                player.handleEvent(CSPlayerEvent.NextEpisode)
+            }
+
+            playerLock.setOnClickListener {
+                autoHide()
+                toggleLock()
+            }
+
+            playerSubtitleOffsetBtt.setOnClickListener {
+                showSubtitleOffsetDialog()
+            }
+
+            exoRew.setOnClickListener {
+                autoHide()
+                rewind()
+            }
+
+            exoFfwd.setOnClickListener {
+                autoHide()
+                fastForward()
+            }
+
+            playerGoBack.setOnClickListener {
+                activity?.popCurrentPage()
+            }
+
+            playerSourcesBtt.setOnClickListener {
+                showMirrorsDialogue()
+            }
+
+            playerTracksBtt.setOnClickListener {
+                showTracksDialogue()
+            }
+
+            // it is !not! a bug that you cant touch the right side, it does not register inputs on navbar or status bar
+            playerHolder.setOnTouchListener { callView, event ->
+                return@setOnTouchListener handleMotionEvent(callView, event)
+            }
+
+            exoProgress.setOnTouchListener { _, event ->
+                // this makes the bar not disappear when sliding
+                when (event.action) {
+                    MotionEvent.ACTION_DOWN -> {
+                        currentTapIndex++
+                    }
+
+                    MotionEvent.ACTION_MOVE -> {
+                        currentTapIndex++
+                    }
+
+                    MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_BUTTON_RELEASE -> {
+                        autoHide()
+                    }
+                }
+                return@setOnTouchListener false
             }
-            return@setOnTouchListener false
         }
         // init UI
         try {
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 645cecbc..cdb184a2 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
@@ -19,12 +19,15 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
-import com.google.android.exoplayer2.Format.NO_VALUE
-import com.google.android.exoplayer2.util.MimeTypes
-import com.hippo.unifile.UniFile
+import androidx.media3.common.Format.NO_VALUE
+import androidx.media3.common.MimeTypes
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.databinding.DialogOnlineSubtitlesBinding
+import com.lagradost.cloudstream3.databinding.FragmentPlayerBinding
+import com.lagradost.cloudstream3.databinding.PlayerSelectSourceAndSubsBinding
+import com.lagradost.cloudstream3.databinding.PlayerSelectTracksBinding
 import com.lagradost.cloudstream3.mvvm.*
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subtitleProviders
@@ -34,8 +37,6 @@ import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.updateForced
 import com.lagradost.cloudstream3.ui.player.PlayerSubtitleHelper.Companion.toSubtitleMimeType
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityProfileDialog
-import com.lagradost.cloudstream3.ui.player.source_priority.SourcePriority
-import com.lagradost.cloudstream3.ui.player.source_priority.SourcePriorityDialog
 import com.lagradost.cloudstream3.ui.result.*
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.getAutoSelectLanguageISO639_1
@@ -51,18 +52,9 @@ import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.dialog_online_subtitles.*
-import kotlinx.android.synthetic.main.dialog_online_subtitles.apply_btt
-import kotlinx.android.synthetic.main.dialog_online_subtitles.cancel_btt
-import kotlinx.android.synthetic.main.fragment_player.*
-import kotlinx.android.synthetic.main.player_custom_layout.*
-import kotlinx.android.synthetic.main.player_select_source_and_subs.*
-import kotlinx.android.synthetic.main.player_select_source_and_subs.subtitles_click_settings
-import kotlinx.android.synthetic.main.player_select_tracks.*
+import com.lagradost.safefile.SafeFile
 import kotlinx.coroutines.Job
 import java.util.*
-import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
 import kotlin.math.abs
 
 class GeneratorPlayer : FullScreenPlayer() {
@@ -100,12 +92,14 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     private var preferredAutoSelectSubtitles: String? = null // null means do nothing, "" means none
 
+    private var binding: FragmentPlayerBinding? = null
+
     private fun startLoading() {
         player.release()
         currentSelectedSubtitles = null
         isActive = false
-        overlay_loading_skip_button?.isVisible = false
-        player_loading_overlay?.isVisible = true
+        binding?.overlayLoadingSkipButton?.isVisible = false
+        binding?.playerLoadingOverlay?.isVisible = true
     }
 
     private fun setSubtitles(sub: SubtitleData?): Boolean {
@@ -120,7 +114,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     override fun onTracksInfoChanged() {
         val tracks = player.getVideoTracks()
-        player_tracks_btt?.isVisible =
+        playerBinding?.playerTracksBtt?.isVisible =
             tracks.allVideoTracks.size > 1 || tracks.allAudioTracks.size > 1
         // Only set the preferred language if it is available.
         // Otherwise it may give some users audio track init failed!
@@ -142,7 +136,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         return durPos.position
     }
 
-    var currentVerifyLink: Job? = null
+    private var currentVerifyLink: Job? = null
 
     private fun loadExtractorJob(extractorLink: ExtractorLink?) {
         currentVerifyLink?.cancel()
@@ -160,12 +154,12 @@ class GeneratorPlayer : FullScreenPlayer() {
         if (link == null) return
 
         // manage UI
-        player_loading_overlay?.isVisible = false
+        binding?.playerLoadingOverlay?.isVisible = false
         uiReset()
         currentSelectedLink = link
         currentMeta = viewModel.getMeta()
         nextMeta = viewModel.getNextMeta()
-        setEpisodes(viewModel.getAllMeta() ?: emptyList())
+        //  setEpisodes(viewModel.getAllMeta() ?: emptyList())
         isActive = true
         setPlayerDimen(null)
         setTitle()
@@ -211,7 +205,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             closestQuality(linkData?.quality)
         )
         val sourcePriority =
-            QualityDataHelper.getSourcePriority(qualityProfile, linkData?.name)
+            QualityDataHelper.getSourcePriority(qualityProfile, linkData?.source)
 
         // negative because we want to sort highest quality first
         return qualityPriority + sourcePriority
@@ -259,7 +253,9 @@ class GeneratorPlayer : FullScreenPlayer() {
         val isSingleProvider = subsProviders.size == 1
 
         val dialog = Dialog(context, R.style.AlertDialogCustomBlack)
-        dialog.setContentView(R.layout.dialog_online_subtitles)
+        val binding =
+            DialogOnlineSubtitlesBinding.inflate(LayoutInflater.from(context), null, false)
+        dialog.setContentView(binding.root)
 
         var currentSubtitles: List<AbstractSubtitleEntities.SubtitleEntity> = emptyList()
         var currentSubtitle: AbstractSubtitleEntities.SubtitleEntity? = null
@@ -297,6 +293,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     imageViewEnd.setImageDrawable(drawableEnd)
                 }
 
+                @SuppressLint("SetTextI18n")
                 override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
                     val view = convertView ?: LayoutInflater.from(context).inflate(layout, null)
 
@@ -320,16 +317,16 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
 
         dialog.show()
-        dialog.cancel_btt.setOnClickListener {
+        binding.cancelBtt.setOnClickListener {
             dialog.dismissSafe()
         }
 
-        dialog.subtitle_adapter.choiceMode = AbsListView.CHOICE_MODE_SINGLE
-        dialog.subtitle_adapter.adapter = arrayAdapter
+        binding.subtitleAdapter.choiceMode = AbsListView.CHOICE_MODE_SINGLE
+        binding.subtitleAdapter.adapter = arrayAdapter
         val adapter =
-            dialog.subtitle_adapter.adapter as? ArrayAdapter<AbstractSubtitleEntities.SubtitleEntity>
+            binding.subtitleAdapter.adapter as? ArrayAdapter<AbstractSubtitleEntities.SubtitleEntity>
 
-        dialog.subtitle_adapter.setOnItemClickListener { _, _, position, _ ->
+        binding.subtitleAdapter.setOnItemClickListener { _, _, position, _ ->
             currentSubtitle = currentSubtitles.getOrNull(position) ?: return@setOnItemClickListener
         }
 
@@ -345,16 +342,16 @@ class GeneratorPlayer : FullScreenPlayer() {
         val currentTempMeta = getMetaData()
         // bruh idk why it is not correct
         val color = ColorStateList.valueOf(context.colorFromAttribute(R.attr.colorAccent))
-        dialog.search_loading_bar.progressTintList = color
-        dialog.search_loading_bar.indeterminateTintList = color
+        binding.searchLoadingBar.progressTintList = color
+        binding.searchLoadingBar.indeterminateTintList = color
 
         observeNullable(viewModel.currentSubtitleYear) {
             // When year is changed search again
-            dialog.subtitles_search.setQuery(dialog.subtitles_search.query, true)
-            dialog.year_btt.text = it?.toString() ?: txt(R.string.none).asString(context)
+            binding.subtitlesSearch.setQuery(binding.subtitlesSearch.query, true)
+            binding.yearBtt.text = it?.toString() ?: txt(R.string.none).asString(context)
         }
 
-        dialog.year_btt?.setOnClickListener {
+        binding.yearBtt.setOnClickListener {
             val none = txt(R.string.none).asString(context)
             val currentYear = Calendar.getInstance().get(Calendar.YEAR)
             val earliestYear = 1900
@@ -382,10 +379,10 @@ class GeneratorPlayer : FullScreenPlayer() {
             )
         }
 
-        dialog.subtitles_search.setOnQueryTextListener(object :
+        binding.subtitlesSearch.setOnQueryTextListener(object :
             androidx.appcompat.widget.SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {
-                dialog.search_loading_bar?.show()
+                binding.searchLoadingBar.show()
                 ioSafe {
                     val search =
                         AbstractSubtitleEntities.SubtitleSearch(
@@ -417,7 +414,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     // ugly ik
                     activity?.runOnUiThread {
                         setSubtitlesList(items)
-                        dialog.search_loading_bar?.hide()
+                        binding.searchLoadingBar.hide()
                     }
                 }
 
@@ -429,7 +426,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         })
 
-        dialog.search_filter.setOnClickListener { view ->
+        binding.searchFilter.setOnClickListener { view ->
             val lang639_1 = languages.map { it.ISO_639_1 }
             activity?.showDialog(languages.map { it.languageName },
                 lang639_1.indexOf(currentLanguageTwoLetters),
@@ -438,11 +435,11 @@ class GeneratorPlayer : FullScreenPlayer() {
                 true,
                 { }) { index ->
                 currentLanguageTwoLetters = lang639_1[index]
-                dialog.subtitles_search.setQuery(dialog.subtitles_search.query, true)
+                binding.subtitlesSearch.setQuery(binding.subtitlesSearch.query, true)
             }
         }
 
-        dialog.apply_btt.setOnClickListener {
+        binding.applyBtt.setOnClickListener {
             currentSubtitle?.let { currentSubtitle ->
                 providers.firstOrNull { it.idPrefix == currentSubtitle.idPrefix }?.let { api ->
                     ioSafe {
@@ -468,7 +465,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
 
         dialog.show()
-        dialog.subtitles_search.setQuery(currentTempMeta.name, true)
+        binding.subtitlesSearch.setQuery(currentTempMeta.name, true)
         //TODO: Set year text from currently loaded movie on Player
         //dialog.subtitles_search_year?.setText(currentTempMeta.year)
     }
@@ -511,7 +508,6 @@ class GeneratorPlayer : FullScreenPlayer() {
         selectSourceDialog?.dismissSafe()
 
         showToast(
-            activity,
             String.format(ctx.getString(R.string.player_loaded_subtitles), subtitleData.name),
             Toast.LENGTH_LONG
         )
@@ -525,15 +521,16 @@ class GeneratorPlayer : FullScreenPlayer() {
                 if (uri == null) return@normalSafeApiCall
                 val ctx = context ?: AcraApplication.context ?: return@normalSafeApiCall
                 // RW perms for the path
-                val flags =
+                ctx.contentResolver.takePersistableUriPermission(
+                    uri,
                     Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                )
 
-                ctx.contentResolver.takePersistableUriPermission(uri, flags)
-
-                val file = UniFile.fromUri(ctx, uri)
-                println("Loaded subtitle file. Selected URI path: $uri - Name: ${file.name}")
+                val file = SafeFile.fromUri(ctx, uri)
+                val fileName = file?.name()
+                println("Loaded subtitle file. Selected URI path: $uri - Name: $fileName")
                 // DO NOT REMOVE THE FILE EXTENSION FROM NAME, IT'S NEEDED FOR MIME TYPES
-                val name = file.name ?: uri.toString()
+                val name = fileName ?: uri.toString()
 
                 val subtitleData = SubtitleData(
                     name,
@@ -556,17 +553,19 @@ class GeneratorPlayer : FullScreenPlayer() {
             //println("CURRENT SELECTED :$currentSelectedSubtitles of $currentSubs")
             context?.let { ctx ->
                 val isPlaying = player.getIsPlaying()
-                player.handleEvent(CSPlayerEvent.Pause)
+                player.handleEvent(CSPlayerEvent.Pause, PlayerEventSource.UI)
                 val currentSubtitles = sortSubs(currentSubs)
 
                 val sourceDialog = Dialog(ctx, R.style.AlertDialogCustomBlack)
-                sourceDialog.setContentView(R.layout.player_select_source_and_subs)
+                val binding =
+                    PlayerSelectSourceAndSubsBinding.inflate(LayoutInflater.from(ctx), null, false)
+                sourceDialog.setContentView(binding.root)
 
                 selectSourceDialog = sourceDialog
 
                 sourceDialog.show()
-                val providerList = sourceDialog.sort_providers
-                val subtitleList = sourceDialog.sort_subtitles
+                val providerList = binding.sortProviders
+                val subtitleList = binding.sortSubtitles
 
                 val loadFromFileFooter: TextView =
                     layoutInflater.inflate(R.layout.sort_bottom_footer_add_choice, null) as TextView
@@ -674,12 +673,12 @@ class GeneratorPlayer : FullScreenPlayer() {
                     }
                 }
 
-                sourceDialog.cancel_btt?.setOnClickListener {
+                binding.cancelBtt.setOnClickListener {
                     sourceDialog.dismissSafe(activity)
                 }
 
                 fun setProfileName(profile: Int) {
-                    sourceDialog.source_settings_btt.setText(
+                    binding.sourceSettingsBtt.setText(
                         QualityDataHelper.getProfileName(
                             profile
                         )
@@ -687,7 +686,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
                 setProfileName(currentQualityProfile)
 
-                sourceDialog.profiles_click_settings.setOnClickListener {
+                binding.profilesClickSettings.setOnClickListener {
                     val activity = activity ?: return@setOnClickListener
                     QualityProfileDialog(
                         activity,
@@ -701,7 +700,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     }.show()
                 }
 
-                sourceDialog.subtitles_encoding_format?.apply {
+                binding.subtitlesEncodingFormat.apply {
                     val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
 
                     val prefNames = ctx.resources.getStringArray(R.array.subtitles_encoding_list)
@@ -714,7 +713,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     text = prefNames[if (index == -1) 0 else index]
                 }
 
-                sourceDialog.subtitles_click_settings?.setOnClickListener {
+                binding.subtitlesClickSettings.setOnClickListener {
                     val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
                         .attachBackupListener(ctx.getSyncPrefs()).self
 
@@ -744,7 +743,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     }
                 }
 
-                sourceDialog.apply_btt?.setOnClickListener {
+                binding.applyBtt.setOnClickListener {
                     var init = false
                     if (sourceIndex != startSource) {
                         init = true
@@ -784,18 +783,19 @@ class GeneratorPlayer : FullScreenPlayer() {
                     it.height?.times(-1)
                 }
                 val currentAudioTracks = tracks.allAudioTracks
-
+                val binding: PlayerSelectTracksBinding =
+                    PlayerSelectTracksBinding.inflate(LayoutInflater.from(ctx), null, false)
                 val trackDialog = Dialog(ctx, R.style.AlertDialogCustomBlack)
-                trackDialog.setContentView(R.layout.player_select_tracks)
+                trackDialog.setContentView(binding.root)
                 trackDialog.show()
 
 //                selectTracksDialog = tracksDialog
 
-                val videosList = trackDialog.video_tracks_list
-                val audioList = trackDialog.auto_tracks_list
+                val videosList = binding.videoTracksList
+                val audioList = binding.autoTracksList
 
-                trackDialog.video_tracks_holder.isVisible = currentVideoTracks.size > 1
-                trackDialog.audio_tracks_holder.isVisible = currentAudioTracks.size > 1
+                binding.videoTracksHolder.isVisible = currentVideoTracks.size > 1
+                binding.audioTracksHolder.isVisible = currentAudioTracks.size > 1
 
                 fun dismiss() {
                     if (isPlaying) {
@@ -860,11 +860,11 @@ class GeneratorPlayer : FullScreenPlayer() {
                     audioList.setItemChecked(which, true)
                 }
 
-                trackDialog.cancel_btt?.setOnClickListener {
+                binding.cancelBtt.setOnClickListener {
                     trackDialog.dismissSafe(activity)
                 }
 
-                trackDialog.apply_btt?.setOnClickListener {
+                binding.applyBtt.setOnClickListener {
                     val currentTrack = currentAudioTracks.getOrNull(audioIndexStart)
                     player.setPreferredAudioTrack(
                         currentTrack?.language, currentTrack?.id
@@ -886,13 +886,13 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
 
-    override fun playerError(exception: Exception) {
+    override fun playerError(exception: Throwable) {
         Log.i(TAG, "playerError = $currentSelectedLink")
         super.playerError(exception)
     }
 
     private fun noLinksFound() {
-        showToast(activity, R.string.no_links_found_toast, Toast.LENGTH_SHORT)
+        showToast(R.string.no_links_found_toast, Toast.LENGTH_SHORT)
         activity?.popCurrentPage()
     }
 
@@ -948,14 +948,13 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     var maxEpisodeSet: Int? = null
     var hasRequestedStamps: Boolean = false
-    override fun playerPositionChanged(posDur: Pair<Long, Long>) {
+    override fun playerPositionChanged(position: Long, duration : Long) {
         // Don't save livestream data
         if ((currentMeta as? ResultEpisode)?.tvType?.isLiveStream() == true) return
 
         // Don't save NSFW data
         if ((currentMeta as? ResultEpisode)?.tvType == TvType.NSFW) return
 
-        val (position, duration) = posDur
         if (duration <= 0L) return // idk how you achieved this, but div by zero crash
         if (!hasRequestedStamps) {
             hasRequestedStamps = true
@@ -1033,8 +1032,10 @@ class GeneratorPlayer : FullScreenPlayer() {
                 if (meta.tvType.isAnimeOp()) isOpVisible = percentage < SKIP_OP_VIDEO_PERCENTAGE
             }
         }
-        player_skip_op?.isVisible = isOpVisible
-        player_skip_episode?.isVisible = !isOpVisible && viewModel.hasNextEpisode() == true
+
+        playerBinding?.playerSkipOp?.isVisible = isOpVisible
+        playerBinding?.playerSkipEpisode?.isVisible =
+            !isOpVisible && viewModel.hasNextEpisode() == true
 
         if (percentage >= PRELOAD_NEXT_EPISODE_PERCENTAGE) {
             viewModel.preLoadNextLinks()
@@ -1171,7 +1172,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         //Hide title, if set in setting
         if (limitTitle < 0) {
-            player_video_title?.visibility = View.GONE
+            playerBinding?.playerVideoTitle?.visibility = View.GONE
         } else {
             //Truncate video title if it exceeds limit
             val differenceInLength = playerVideoTitle.length - limitTitle
@@ -1182,8 +1183,8 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
         val isFiller: Boolean? = (currentMeta as? ResultEpisode)?.isFiller
 
-        player_episode_filler_holder?.isVisible = isFiller ?: false
-        player_video_title?.text = playerVideoTitle
+        playerBinding?.playerEpisodeFillerHolder?.isVisible = isFiller ?: false
+        playerBinding?.playerVideoTitle?.text = playerVideoTitle
     }
 
     @SuppressLint("SetTextI18n")
@@ -1204,12 +1205,14 @@ class GeneratorPlayer : FullScreenPlayer() {
             3 -> "$source - $extra"
             else -> ""
         }
-        player_video_title_rez?.text = title
-        player_video_title_rez?.isVisible = title.isNotBlank()
+        playerBinding?.playerVideoTitleRez?.apply {
+            text = title
+            isVisible = title.isNotBlank()
+        }
     }
 
-    override fun playerDimensionsLoaded(widthHeight: Pair<Int, Int>) {
-        setPlayerDimen(widthHeight)
+    override fun playerDimensionsLoaded(width: Int, height : Int) {
+        setPlayerDimen(width to height)
     }
 
     private fun unwrapBundle(savedInstanceState: Bundle?) {
@@ -1233,7 +1236,14 @@ class GeneratorPlayer : FullScreenPlayer() {
         unwrapBundle(savedInstanceState)
         unwrapBundle(arguments)
 
-        return super.onCreateView(inflater, container, savedInstanceState)
+        val root = super.onCreateView(inflater, container, savedInstanceState) ?: return null
+        binding = FragmentPlayerBinding.bind(root)
+        return root
+    }
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
     var timestampShowState = false
@@ -1244,9 +1254,8 @@ class GeneratorPlayer : FullScreenPlayer() {
     private fun displayTimeStamp(show: Boolean) {
         if (timestampShowState == show) return
         skipIndex++
-        println("displayTimeStamp = $show")
         timestampShowState = show
-        skip_chapter_button?.apply {
+        playerBinding?.skipChapterButton?.apply {
             val showWidth = 170.toPx
             val noShowWidth = 10.toPx
             //if((show && width == showWidth) || (!show && width == noShowWidth)) {
@@ -1266,7 +1275,18 @@ class GeneratorPlayer : FullScreenPlayer() {
                 from, to
             ).apply {
                 addListener(onEnd = {
-                    if (!show) skip_chapter_button?.isVisible = false
+                    if (show) {
+                        if (!isShowing) {
+                            // Automatically request focus if the menu is not opened
+                            playerBinding?.skipChapterButton?.requestFocus()
+                        }
+                    } else {
+                        playerBinding?.skipChapterButton?.isVisible = false
+                        if (!isShowing) {
+                            // Automatically return focus to play pause
+                            playerBinding?.playerPausePlay?.requestFocus()
+                        }
+                    }
                 })
                 addUpdateListener { valueAnimator ->
                     val value = valueAnimator.animatedValue as Int
@@ -1286,10 +1306,10 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     override fun onTimestamp(timestamp: EpisodeSkip.SkipStamp?) {
         if (timestamp != null) {
-            skip_chapter_button.setText(timestamp.uiText)
+            playerBinding?.skipChapterButton?.setText(timestamp.uiText)
             displayTimeStamp(true)
             val currentIndex = skipIndex
-            skip_chapter_button?.handler?.postDelayed({
+            playerBinding?.skipChapterButton?.handler?.postDelayed({
                 if (skipIndex == currentIndex)
                     displayTimeStamp(false)
             }, 6000)
@@ -1332,11 +1352,11 @@ class GeneratorPlayer : FullScreenPlayer() {
             viewModel.loadLinks()
         }
 
-        overlay_loading_skip_button?.setOnClickListener {
+        binding?.overlayLoadingSkipButton?.setOnClickListener {
             startPlayer()
         }
 
-        player_loading_go_back?.setOnClickListener {
+        binding?.playerLoadingGoBack?.setOnClickListener {
             player.release()
             activity?.popCurrentPage()
         }
@@ -1360,7 +1380,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 is Resource.Failure -> {
-                    showToast(activity, it.errorString, Toast.LENGTH_LONG)
+                    showToast(it.errorString, Toast.LENGTH_LONG)
                     startPlayer()
                 }
             }
@@ -1369,8 +1389,8 @@ class GeneratorPlayer : FullScreenPlayer() {
         observe(viewModel.currentLinks) {
             currentLinks = it
             val turnVisible = it.isNotEmpty()
-            val wasGone = overlay_loading_skip_button?.isGone == true
-            overlay_loading_skip_button?.isVisible = turnVisible
+            val wasGone = binding?.overlayLoadingSkipButton?.isGone == true
+            binding?.overlayLoadingSkipButton?.isVisible = turnVisible
 
             normalSafeApiCall {
                 if (currentLinks.any { link ->
@@ -1383,7 +1403,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
 
             if (turnVisible && wasGone) {
-                overlay_loading_skip_button?.requestFocus()
+                binding?.overlayLoadingSkipButton?.requestFocus()
             }
         }
 
@@ -1413,4 +1433,4 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IGenerator.kt
index a1287e6a..af74cb57 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IGenerator.kt
@@ -1,8 +1,43 @@
 package com.lagradost.cloudstream3.ui.player
 
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.ExtractorUri
 
+enum class LoadType {
+    Unknown,
+    InApp,
+    InAppDownload,
+    ExternalApp,
+    Browser,
+    Chromecast
+}
+
+fun LoadType.toSet() : Set<ExtractorLinkType> {
+    return when(this) {
+        LoadType.InApp -> setOf(
+            ExtractorLinkType.VIDEO,
+            ExtractorLinkType.DASH,
+            ExtractorLinkType.M3U8
+        )
+        LoadType.Browser -> setOf(
+            ExtractorLinkType.VIDEO,
+            ExtractorLinkType.DASH,
+            ExtractorLinkType.M3U8
+        )
+        LoadType.InAppDownload -> setOf(
+            ExtractorLinkType.VIDEO,
+            ExtractorLinkType.M3U8
+        )
+        LoadType.ExternalApp, LoadType.Unknown -> ExtractorLinkType.values().toSet()
+        LoadType.Chromecast -> setOf(
+            ExtractorLinkType.VIDEO,
+            ExtractorLinkType.DASH,
+            ExtractorLinkType.M3U8
+        )
+    }
+}
+
 interface IGenerator {
     val hasCache: Boolean
 
@@ -13,15 +48,15 @@ interface IGenerator {
     fun goto(index: Int)
 
     fun getCurrentId(): Int?                    // this is used to save data or read data about this id
-    fun getCurrent(offset : Int = 0): Any?      // this is used to get metadata about the current playing, can return null
-    fun getAll() : List<Any>?                   // this us used to get the metadata about all entries, not needed
+    fun getCurrent(offset: Int = 0): Any?      // this is used to get metadata about the current playing, can return null
+    fun getAll(): List<Any>?                   // this us used to get the metadata about all entries, not needed
 
     /* not safe, must use try catch */
     suspend fun generateLinks(
         clearCache: Boolean,
-        isCasting: Boolean,
+        type: LoadType,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
-        offset : Int = 0,
+        offset: Int = 0,
     ): Boolean
 }
\ No newline at end of file
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 ba5a4a85..ec006234 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.util.Rational
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -44,9 +45,120 @@ enum class CSPlayerLoading {
     IsPaused,
     IsPlaying,
     IsBuffering,
-    //IsDone,
 }
 
+enum class PlayerEventSource {
+    /** This event was invoked from the user pressing some button or selecting something */
+    UI,
+
+    /** This event was invoked automatically */
+    Player,
+
+    /** This event was invoked from a external sync tool like WatchTogether */
+    Sync,
+}
+
+abstract class PlayerEvent {
+    abstract val source: PlayerEventSource
+}
+
+/** this is used to update UI based of the current time,
+ * using requestedListeningPercentages as well as saving time */
+data class PositionEvent(
+    override val source: PlayerEventSource,
+    val fromMs: Long,
+    val toMs: Long,
+    /** duration of the entire video */
+    val durationMs: Long,
+) : PlayerEvent() {
+    /** how many ms (+-) we have skipped */
+    val seekMs : Long get() = toMs - fromMs
+}
+
+/** player error when rendering or misc, used to display toast or log */
+data class ErrorEvent(
+    val error: Throwable,
+    override val source: PlayerEventSource = PlayerEventSource.Player,
+) : PlayerEvent()
+
+/** Event when timestamps appear, null when it should disappear */
+data class TimestampInvokedEvent(
+    val timestamp: EpisodeSkip.SkipStamp,
+    override val source: PlayerEventSource = PlayerEventSource.Player,
+) : PlayerEvent()
+
+/** Event for when a chapter is skipped, aka when event is handled (or for future use when skip automatically ads/sponsor) */
+data class TimestampSkippedEvent(
+    val timestamp: EpisodeSkip.SkipStamp,
+    override val source: PlayerEventSource = PlayerEventSource.Player,
+) : PlayerEvent()
+
+/** this is used by the player to load the next or prev episode */
+data class EpisodeSeekEvent(
+    /** -1 = prev, 1 = next, will never be 0, atm the user cant seek more than +-1 */
+    val offset: Int,
+    override val source: PlayerEventSource = PlayerEventSource.Player,
+) : PlayerEvent() {
+    init {
+        assert(offset != 0)
+    }
+}
+
+/** Event when the video is resized aka changed resolution or mirror */
+data class ResizedEvent(
+    val height: Int,
+    val width: Int,
+    override val source: PlayerEventSource = PlayerEventSource.Player,
+) : PlayerEvent()
+
+/** Event when the player status update, along with the previous status (for animation)*/
+data class StatusEvent(
+    val wasPlaying: CSPlayerLoading,
+    val isPlaying: CSPlayerLoading,
+    override val source: PlayerEventSource = PlayerEventSource.Player
+) : PlayerEvent()
+
+/** Event when tracks are changed, used for UI changes */
+data class TracksChangedEvent(
+    override val source: PlayerEventSource = PlayerEventSource.Player
+) : PlayerEvent()
+
+/** Event from player to give all embedded subtitles */
+data class EmbeddedSubtitlesFetchedEvent(
+    val tracks: List<SubtitleData>,
+    override val source: PlayerEventSource = PlayerEventSource.Player
+) : PlayerEvent()
+
+/** on attach player to view */
+data class PlayerAttachedEvent(
+    val player: Any?,
+    override val source: PlayerEventSource = PlayerEventSource.Player
+) : PlayerEvent()
+
+/** Event from player to inform that subtitles have updated in some way */
+data class SubtitlesUpdatedEvent(
+    override val source: PlayerEventSource = PlayerEventSource.Player
+) : PlayerEvent()
+
+/** current player starts, asking for all other programs to shut the fuck up */
+data class RequestAudioFocusEvent(
+    override val source: PlayerEventSource = PlayerEventSource.Player
+) : PlayerEvent()
+
+/** Pause event, separate from StatusEvent */
+data class PauseEvent(
+    override val source: PlayerEventSource = PlayerEventSource.Player
+) : PlayerEvent()
+
+/** Play event, separate from StatusEvent */
+data class PlayEvent(
+    override val source: PlayerEventSource = PlayerEventSource.Player
+) : PlayerEvent()
+
+/** Event when the player video has ended, up to the settings on what to do when that happens */
+data class VideoEndedEvent(
+    override val source: PlayerEventSource = PlayerEventSource.Player
+) : PlayerEvent()
 
 interface Track {
     /**
@@ -107,27 +219,16 @@ interface IPlayer {
     fun getDuration(): Long?
     fun getPosition(): Long?
 
-    fun seekTime(time: Long)
-    fun seekTo(time: Long)
+    fun seekTime(time: Long, source: PlayerEventSource = PlayerEventSource.UI)
+    fun seekTo(time: Long, source: PlayerEventSource = PlayerEventSource.UI)
 
     fun getSubtitleOffset(): Long // in ms
     fun setSubtitleOffset(offset: Long) // in ms
 
     fun initCallbacks(
-        playerUpdated: (Any?) -> Unit,                              // attach player to view
-        updateIsPlaying: ((Pair<CSPlayerLoading, CSPlayerLoading>) -> Unit)? = null, // (wasPlaying, isPlaying)
-        requestAutoFocus: (() -> Unit)? = null,                     // current player starts, asking for all other programs to shut the fuck up
-        playerError: ((Exception) -> Unit)? = null,                 // player error when rendering or misc, used to display toast or log
-        playerDimensionsLoaded: ((Pair<Int, Int>) -> Unit)? = null, // (with, height), for UI
-        requestedListeningPercentages: List<Int>? = null,           // this is used to request when the player should report back view percentage
-        playerPositionChanged: ((Pair<Long, Long>) -> Unit)? = null,// (position, duration) this is used to update UI based of the current time
-        nextEpisode: (() -> Unit)? = null,                          // this is used by the player to load the next episode
-        prevEpisode: (() -> Unit)? = null,                          // this is used by the player to load the previous episode
-        subtitlesUpdates: (() -> Unit)? = null,                     // callback from player to inform that subtitles have updated in some way
-        embeddedSubtitlesFetched: ((List<SubtitleData>) -> Unit)? = null, // callback from player to give all embedded subtitles
-        onTracksInfoChanged: (() -> Unit)? = null,                  // Callback when tracks are changed, used for UI changes
-        onTimestampInvoked: ((EpisodeSkip.SkipStamp?) -> Unit)? = null, // Callback when timestamps appear, null when it should disappear
-        onTimestampSkipped: ((EpisodeSkip.SkipStamp) -> Unit)? = null, // callback for when a chapter is skipped, aka when event is handled (or for future use when skip automatically ads/sponsor)
+        eventHandler: ((PlayerEvent) -> Unit),
+        /** this is used to request when the player should report back view percentage */
+        requestedListeningPercentages: List<Int>? = null,
     )
 
     fun releaseCallbacks()
@@ -154,7 +255,7 @@ interface IPlayer {
     fun setPreferredSubtitles(subtitle: SubtitleData?): Boolean // returns true if the player requires a reload, null for nothing
     fun getCurrentPreferredSubtitle(): SubtitleData?
 
-    fun handleEvent(event: CSPlayerEvent)
+    fun handleEvent(event: CSPlayerEvent, source: PlayerEventSource = PlayerEventSource.UI)
 
     fun onStop()
     fun onPause()
@@ -167,6 +268,19 @@ interface IPlayer {
 
     fun getVideoTracks(): CurrentTracks
 
+    /**
+     * Original video aspect ratio used for PiP mode
+     *
+     * Set using: Width, Height.
+     * Example: Rational(16, 9)
+     *
+     * If null will default to set no aspect ratio.
+     *
+     * PiP functions calling this needs to coerce this value between 0.418410 and 2.390000
+     * to prevent crashes.
+     */
+    fun getAspectRatio(): Rational?
+
     /** If no parameters are set it'll default to no set size, Specifying the id allows for track overrides to force the player to pick the quality. */
     fun setMaxVideoSize(width: Int = Int.MAX_VALUE, height: Int = Int.MAX_VALUE, id: String? = null)
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt
index 0b560857..ca2d9c81 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt
@@ -48,7 +48,7 @@ class LinkGenerator(
 
     override suspend fun generateLinks(
         clearCache: Boolean,
-        isCasting: Boolean,
+        type: LoadType,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
         offset: Int
@@ -67,9 +67,8 @@ class LinkGenerator(
                         link.name ?: link.url,
                         unshortenLinkSafe(link.url), // unshorten because it might be a raw link
                         referer ?: "",
-                        Qualities.Unknown.value, isM3u8 ?: normalSafeApiCall {
-                            URI(link.url).path?.substringAfterLast(".")?.contains("m3u")
-                        } ?: false
+                        Qualities.Unknown.value,
+                        type = INFER_TYPE,
                     ) to null
                 )
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
index 3b47b27a..b5ecfe8f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
@@ -15,10 +15,10 @@
  */
 package com.lagradost.cloudstream3.ui.player;
 
-import static com.google.android.exoplayer2.text.Cue.DIMEN_UNSET;
-import static com.google.android.exoplayer2.text.Cue.LINE_TYPE_NUMBER;
-import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
-import static com.google.android.exoplayer2.util.Assertions.checkState;
+import static androidx.media3.common.text.Cue.DIMEN_UNSET;
+import static androidx.media3.common.text.Cue.LINE_TYPE_NUMBER;
+import static androidx.media3.common.util.Assertions.checkNotNull;
+import static androidx.media3.common.util.Assertions.checkState;
 import static java.lang.annotation.ElementType.TYPE_USE;
 
 import android.os.Handler;
@@ -28,25 +28,24 @@ import android.os.Message;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
-
-import com.google.android.exoplayer2.BaseRenderer;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.FormatHolder;
-import com.google.android.exoplayer2.RendererCapabilities;
-import com.google.android.exoplayer2.source.SampleStream.ReadDataResult;
-import com.google.android.exoplayer2.text.Cue;
-import com.google.android.exoplayer2.text.CueGroup;
-import com.google.android.exoplayer2.text.Subtitle;
-import com.google.android.exoplayer2.text.SubtitleDecoder;
-import com.google.android.exoplayer2.text.SubtitleDecoderException;
-import com.google.android.exoplayer2.text.SubtitleDecoderFactory;
-import com.google.android.exoplayer2.text.SubtitleInputBuffer;
-import com.google.android.exoplayer2.text.SubtitleOutputBuffer;
-import com.google.android.exoplayer2.text.TextOutput;
-import com.google.android.exoplayer2.util.Log;
-import com.google.android.exoplayer2.util.MimeTypes;
-import com.google.android.exoplayer2.util.Util;
+import androidx.media3.common.C;
+import androidx.media3.common.Format;
+import androidx.media3.common.text.Cue;
+import androidx.media3.common.text.CueGroup;
+import androidx.media3.common.MimeTypes;
+import androidx.media3.common.util.Log;
+import androidx.media3.common.util.Util;
+import androidx.media3.exoplayer.BaseRenderer;
+import androidx.media3.exoplayer.FormatHolder;
+import androidx.media3.exoplayer.RendererCapabilities;
+import androidx.media3.exoplayer.source.SampleStream;
+import androidx.media3.exoplayer.text.SubtitleDecoderFactory;
+import androidx.media3.exoplayer.text.TextOutput;
+import androidx.media3.extractor.text.Subtitle;
+import androidx.media3.extractor.text.SubtitleDecoder;
+import androidx.media3.extractor.text.SubtitleDecoderException;
+import androidx.media3.extractor.text.SubtitleInputBuffer;
+import androidx.media3.extractor.text.SubtitleOutputBuffer;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -310,7 +309,7 @@ public class NonFinalTextRenderer extends BaseRenderer implements Callback {
                     return;
                 }
                 // Try and read the next subtitle from the source.
-                @ReadDataResult int result = readSource(formatHolder, nextInputBuffer, /* readFlags= */ 0);
+                @SampleStream.ReadDataResult int result = readSource(formatHolder, nextInputBuffer, /* readFlags= */ 0);
                 if (result == C.RESULT_BUFFER_READ) {
                     if (nextInputBuffer.isEndOfStream()) {
                         inputStreamEnded = true;
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerEpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerEpisodeAdapter.kt
deleted file mode 100644
index cfe27a30..00000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerEpisodeAdapter.kt
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.lagradost.cloudstream3.ui.player
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import androidx.core.widget.ContentLoadingProgressBar
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.button.MaterialButton
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.ui.result.ResultEpisode
-import com.lagradost.cloudstream3.ui.result.getDisplayPosition
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
-import com.lagradost.cloudstream3.utils.AppUtils.html
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.player_episodes_large.view.episode_holder_large
-import kotlinx.android.synthetic.main.player_episodes_large.view.episode_progress
-import kotlinx.android.synthetic.main.player_episodes_small.view.episode_holder
-import kotlinx.android.synthetic.main.result_episode_large.view.*
-
-
-data class PlayerEpisodeClickEvent(val action: Int, val data: Any)
-
-class PlayerEpisodeAdapter(
-    private val items: MutableList<Any> = mutableListOf(),
-    private val clickCallback: (PlayerEpisodeClickEvent) -> Unit,
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return PlayerEpisodeCardViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(R.layout.player_episodes, parent, false),
-            clickCallback,
-        )
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        println("HOLDER $holder $position")
-
-        when (holder) {
-            is PlayerEpisodeCardViewHolder -> {
-                holder.bind(items[position])
-            }
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return items.size
-    }
-
-    fun updateList(newList: List<Any>) {
-        println("Updated list $newList")
-        val diffResult = DiffUtil.calculateDiff(EpisodeDiffCallback(this.items, newList))
-        items.clear()
-        items.addAll(newList)
-
-        diffResult.dispatchUpdatesTo(this)
-    }
-
-    class PlayerEpisodeCardViewHolder
-    constructor(
-        itemView: View,
-        private val clickCallback: (PlayerEpisodeClickEvent) -> Unit,
-    ) : RecyclerView.ViewHolder(itemView) {
-        @SuppressLint("SetTextI18n")
-        fun bind(card: Any) {
-            if (card is ResultEpisode) {
-                val (parentView, otherView) = if (card.poster == null) {
-                    itemView.episode_holder to itemView.episode_holder_large
-                } else {
-                    itemView.episode_holder_large to itemView.episode_holder
-                }
-
-                val episodeText: TextView? = parentView.episode_text
-                val episodeFiller: MaterialButton? = parentView.episode_filler
-                val episodeRating: TextView? = parentView.episode_rating
-                val episodeDescript: TextView? = parentView.episode_descript
-                val episodeProgress: ContentLoadingProgressBar? = parentView.episode_progress
-                val episodePoster: ImageView? = parentView.episode_poster
-
-                parentView.isVisible = true
-                otherView.isVisible = false
-
-
-                episodeText?.apply {
-                    val name =
-                        if (card.name == null) "${context.getString(R.string.episode)} ${card.episode}" else "${card.episode}. ${card.name}"
-
-                    text = name
-                    isSelected = true
-                }
-
-                episodeFiller?.isVisible = card.isFiller == true
-
-                val displayPos = card.getDisplayPosition()
-                episodeProgress?.max = (card.duration / 1000).toInt()
-                episodeProgress?.progress = (displayPos / 1000).toInt()
-                episodeProgress?.isVisible =  displayPos > 0L
-                episodePoster?.isVisible = episodePoster?.setImage(card.poster) == true
-
-                if (card.rating != null) {
-                    episodeRating?.text = episodeRating?.context?.getString(R.string.rated_format)
-                        ?.format(card.rating.toFloat() / 10f)
-                } else {
-                    episodeRating?.text = ""
-                }
-
-                episodeRating?.isGone = episodeRating?.text.isNullOrBlank()
-
-                episodeDescript?.apply {
-                    text = card.description.html()
-                    isGone = text.isNullOrBlank()
-                    //setOnClickListener {
-                    //    clickCallback.invoke(PlayerEpisodeClickEvent(ACTION_SHOW_DESCRIPTION, card))
-                    //}
-                }
-
-                parentView.setOnClickListener {
-                    clickCallback.invoke(PlayerEpisodeClickEvent(0, card))
-                }
-
-                if (isTrueTvSettings()) {
-                    parentView.isFocusable = true
-                    parentView.isFocusableInTouchMode = true
-                    parentView.touchscreenBlocksFocus = false
-                }
-            }
-        }
-    }
-}
-
-class EpisodeDiffCallback(
-    private val oldList: List<Any>,
-    private val newList: List<Any>
-) :
-    DiffUtil.Callback() {
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-        val a = oldList[oldItemPosition]
-        val b = newList[newItemPosition]
-        return if (a is ResultEpisode && b is ResultEpisode) {
-            a.id == b.id
-        } else {
-            a == b
-        }
-    }
-
-    override fun getOldListSize() = oldList.size
-
-    override fun getNewListSize() = newList.size
-
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition] == newList[newItemPosition]
-}
\ No newline at end of file
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 1b13b519..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(
-                        clearCache = false,
-                        isCasting = false,
-                        {},
-                        {},
-                        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
                 }
             }
         }
@@ -147,7 +168,7 @@ class PlayerGeneratorViewModel : ViewModel() {
         }
     }
 
-    fun loadLinks(clearCache: Boolean = false, isCasting: Boolean = false) {
+    fun loadLinks(clearCache: Boolean = false, type: LoadType = LoadType.InApp) {
         Log.i(TAG, "loadLinks")
         currentJob?.cancel()
 
@@ -162,14 +183,14 @@ class PlayerGeneratorViewModel : ViewModel() {
             // load more data
             _loadingLinks.postValue(Resource.Loading())
             val loadingState = safeApiCall {
-                generator?.generateLinks(clearCache = clearCache, isCasting = isCasting, {
+                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 = {
                     currentSubs.add(it)
                     normalSafeApiCall {
                         _currentSubs.postValue(currentSubs.toSet())
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt
index 0fbc22f6..93857234 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt
@@ -7,28 +7,23 @@ import android.app.RemoteAction
 import android.content.Intent
 import android.graphics.drawable.Icon
 import android.os.Build
+import android.util.Rational
 import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import kotlin.math.roundToInt
 
 class PlayerPipHelper {
     companion object {
+        @RequiresApi(Build.VERSION_CODES.O)
         private fun getPen(activity: Activity, code: Int): PendingIntent {
-            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                PendingIntent.getBroadcast(
-                    activity,
-                    code,
-                    Intent("media_control").putExtra("control_type", code),
-                    PendingIntent.FLAG_IMMUTABLE
-                )
-            } else {
-                PendingIntent.getBroadcast(
-                    activity,
-                    code,
-                    Intent("media_control").putExtra("control_type", code),
-                    0
-                )
-            }
+            return PendingIntent.getBroadcast(
+                activity,
+                code,
+                Intent(ACTION_MEDIA_CONTROL).putExtra(EXTRA_CONTROL_TYPE, code),
+                PendingIntent.FLAG_IMMUTABLE
+            )
         }
 
         @RequiresApi(Build.VERSION_CODES.O)
@@ -48,7 +43,7 @@ class PlayerPipHelper {
         }
 
         @RequiresApi(Build.VERSION_CODES.O)
-        fun updatePIPModeActions(activity: Activity, isPlaying: Boolean) {
+        fun updatePIPModeActions(activity: Activity, isPlaying: Boolean, aspectRatio: Rational?) {
             val actions: ArrayList<RemoteAction> = ArrayList()
             actions.add(
                 getRemoteAction(
@@ -87,9 +82,32 @@ class PlayerPipHelper {
                     CSPlayerEvent.SeekForward
                 )
             )
-            activity.setPictureInPictureParams(
-                PictureInPictureParams.Builder().setActions(actions).build()
-            )
+
+            // Nessecary to prevent crashing.
+            val mixAspectRatio = 0.41841f // ~1/2.39
+            val maxAspectRatio = 2.39f // widescreen standard
+            val ratioAccuracy = 100000 // To convert the float to int
+
+            // java.lang.IllegalArgumentException: setPictureInPictureParams: Aspect ratio is too extreme (must be between 0.418410 and 2.390000)
+            val fixedRational =
+                aspectRatio?.toFloat()?.coerceIn(mixAspectRatio, maxAspectRatio)?.let {
+                    Rational((it * ratioAccuracy).roundToInt(), ratioAccuracy)
+                }
+
+            normalSafeApiCall {
+                activity.setPictureInPictureParams(
+                    PictureInPictureParams.Builder()
+                        .apply {
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                                setSeamlessResizeEnabled(true)
+                                setAutoEnterEnabled(isPlaying)
+                            }
+                        }
+                        .setAspectRatio(fixedRational)
+                        .setActions(actions)
+                        .build()
+                )
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt
index 8d85f176..e532d1a3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt
@@ -4,8 +4,8 @@ import android.util.Log
 import android.util.TypedValue
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import com.google.android.exoplayer2.ui.SubtitleView
-import com.google.android.exoplayer2.util.MimeTypes
+import androidx.media3.common.MimeTypes
+import androidx.media3.ui.SubtitleView
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.regexSubtitlesToRemoveBloat
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.regexSubtitlesToRemoveCaptions
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt
index 2ce53ea5..d55da57c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt
@@ -67,18 +67,19 @@ class RepoLinkGenerator(
 
     override suspend fun generateLinks(
         clearCache: Boolean,
-        isCasting: Boolean,
+        type: LoadType,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
-        offset: Int,
+        offset: Int
     ): Boolean {
+        val allowedTypes = type.toSet()
         val index = currentIndex
         val current = episodes.getOrNull(index + offset) ?: return false
 
         val (currentLinkCache, currentSubsCache) = if (clearCache) {
             Pair(mutableSetOf(), mutableSetOf())
         } else {
-            cache[Pair(current.apiName, current.id)] ?: Pair(mutableSetOf(), mutableSetOf())
+            cache[current.apiName to current.id] ?: Pair(mutableSetOf(), mutableSetOf())
         }
 
         //val currentLinkCache = if (clearCache) mutableSetOf() else linkCache[index].toMutableSet()
@@ -88,9 +89,9 @@ class RepoLinkGenerator(
         val currentSubsUrls = mutableSetOf<String>()    // makes all subs urls unique
         val currentSubsNames = mutableSetOf<String>()   // makes all subs names unique
 
-        currentLinkCache.forEach { link ->
+        currentLinkCache.filter { allowedTypes.contains(it.type) }.forEach { link ->
             currentLinks.add(link.url)
-            callback(Pair(link, null))
+            callback(link to null)
         }
 
         currentSubsCache.forEach { sub ->
@@ -108,8 +109,8 @@ class RepoLinkGenerator(
         val result = APIRepository(
             getApiFromNameNull(current.apiName) ?: throw Exception("This provider does not exist")
         ).loadLinks(current.data,
-            isCasting,
-            { file ->
+            isCasting = LoadType.Chromecast == type,
+            subtitleCallback = { file ->
                 val correctFile = PlayerSubtitleHelper.getSubtitleData(file)
                 if (!currentSubsUrls.contains(correctFile.url)) {
                     currentSubsUrls.add(correctFile.url)
@@ -132,12 +133,14 @@ class RepoLinkGenerator(
                     }
                 }
             },
-            { link ->
+            callback = { link ->
                 Log.d(TAG, "Loaded ExtractorLink: $link")
                 if (!currentLinks.contains(link.url)) {
                     if (!currentLinkCache.contains(link)) {
                         currentLinks.add(link.url)
-                        callback(Pair(link, null))
+                        if (allowedTypes.contains(link.type)) {
+                            callback(Pair(link, null))
+                        }
                         currentLinkCache.add(link)
                         //linkCache[index] = currentLinkCache
                     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/PriorityAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/PriorityAdapter.kt
index 8e0ce67c..fb60ccce 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/PriorityAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/PriorityAdapter.kt
@@ -1,14 +1,10 @@
 package com.lagradost.cloudstream3.ui.player.source_priority
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.PlayerPrioritizeItemBinding
 import com.lagradost.cloudstream3.utils.AppUtils
-import kotlinx.android.synthetic.main.player_prioritize_item.view.*
 
 data class SourcePriority<T>(
     val data: T,
@@ -20,7 +16,8 @@ class PriorityAdapter<T>(override val items: MutableList<SourcePriority<T>>) :
     AppUtils.DiffAdapter<SourcePriority<T>>(items) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return PriorityViewHolder(
-            LayoutInflater.from(parent.context).inflate(R.layout.player_prioritize_item, parent, false)
+            PlayerPrioritizeItemBinding.inflate(LayoutInflater.from(parent.context),parent,false),
+            //LayoutInflater.from(parent.context).inflate(R.layout.player_prioritize_item, parent, false)
         )
     }
 
@@ -31,27 +28,27 @@ class PriorityAdapter<T>(override val items: MutableList<SourcePriority<T>>) :
     }
 
     class PriorityViewHolder(
-        itemView: View,
-    ) : RecyclerView.ViewHolder(itemView) {
+        val binding: PlayerPrioritizeItemBinding,
+    ) : RecyclerView.ViewHolder(binding.root) {
         fun <T> bind(item: SourcePriority<T>) {
-            val plusButton: ImageView = itemView.add_button
+           /* val plusButton: ImageView = itemView.add_button
             val subtractButton: ImageView = itemView.subtract_button
             val priorityText: TextView = itemView.priority_text
-            val priorityNumber: TextView = itemView.priority_number
-            priorityText.text = item.name
+            val priorityNumber: TextView = itemView.priority_number*/
+            binding.priorityText.text = item.name
 
             fun updatePriority() {
-                priorityNumber.text = item.priority.toString()
+                binding.priorityNumber.text = item.priority.toString()
             }
 
             updatePriority()
-            plusButton.setOnClickListener {
+            binding.addButton.setOnClickListener {
                 // If someone clicks til the integer limit then they deserve to crash.
                 item.priority++
                 updatePriority()
             }
 
-            subtractButton.setOnClickListener {
+            binding.subtractButton.setOnClickListener {
                 item.priority--
                 updatePriority()
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/ProfilesAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/ProfilesAdapter.kt
index ff84c1f5..8153d7a1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/ProfilesAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/ProfilesAdapter.kt
@@ -8,19 +8,13 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
-import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.PlayerQualityProfileItemBinding
 import com.lagradost.cloudstream3.ui.result.UiImage
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.player_quality_profile_item.view.card_view
-import kotlinx.android.synthetic.main.player_quality_profile_item.view.outline
-import kotlinx.android.synthetic.main.player_quality_profile_item.view.profile_image_background
-import kotlinx.android.synthetic.main.player_quality_profile_item.view.profile_text
-import kotlinx.android.synthetic.main.player_quality_profile_item.view.text_is_mobile_data
-import kotlinx.android.synthetic.main.player_quality_profile_item.view.text_is_wifi
 
 class ProfilesAdapter(
     override val items: MutableList<QualityDataHelper.QualityProfile>,
@@ -34,8 +28,9 @@ class ProfilesAdapter(
         }) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return ProfilesViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(R.layout.player_quality_profile_item, parent, false)
+            PlayerQualityProfileItemBinding.inflate(LayoutInflater.from(parent.context),parent,false)
+            //LayoutInflater.from(parent.context)
+            //    .inflate(R.layout.player_quality_profile_item, parent, false)
         )
     }
 
@@ -52,8 +47,8 @@ class ProfilesAdapter(
     }
 
     inner class ProfilesViewHolder(
-        itemView: View,
-    ) : RecyclerView.ViewHolder(itemView) {
+        val binding: PlayerQualityProfileItemBinding,
+    ) : RecyclerView.ViewHolder(binding.root) {
         private val art = listOf(
             R.drawable.profile_bg_teal,
             R.drawable.profile_bg_blue,
@@ -65,12 +60,12 @@ class ProfilesAdapter(
         )
 
         fun bind(item: QualityDataHelper.QualityProfile, index: Int) {
-            val priorityText: TextView = itemView.profile_text
-            val profileBg: ImageView = itemView.profile_image_background
-            val wifiText: TextView = itemView.text_is_wifi
-            val dataText: TextView = itemView.text_is_mobile_data
-            val outline: View = itemView.outline
-            val cardView: View = itemView.card_view
+            val priorityText: TextView = binding.profileText
+            val profileBg: ImageView = binding.profileImageBackground
+            val wifiText: TextView = binding.textIsWifi
+            val dataText: TextView = binding.textIsMobileData
+            val outline: View = binding.outline
+            val cardView: View = binding.cardView
 
             priorityText.text = item.name.asString(itemView.context)
             dataText.isVisible = item.type == QualityDataHelper.QualityProfileType.Data
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt
index 28a6365f..e3629158 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt
@@ -1,20 +1,16 @@
 package com.lagradost.cloudstream3.ui.player.source_priority
 
 import android.app.Dialog
-import android.view.View
-import android.widget.TextView
 import androidx.annotation.StyleRes
-import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.PlayerQualityProfileDialogBinding
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getProfileName
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getProfiles
 import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import kotlinx.android.synthetic.main.player_quality_profile_dialog.*
 
 class QualityProfileDialog(
     val activity: FragmentActivity,
@@ -24,83 +20,86 @@ class QualityProfileDialog(
     private val profileSelectionCallback: (QualityDataHelper.QualityProfile) -> Unit
 ) : Dialog(activity, themeRes) {
     override fun show() {
-        setContentView(R.layout.player_quality_profile_dialog)
-        val profilesRecyclerView: RecyclerView = profiles_recyclerview
+
+        val binding = PlayerQualityProfileDialogBinding.inflate(this.layoutInflater, null, false)
+
+        setContentView(binding.root)//R.layout.player_quality_profile_dialog)
+        /*val profilesRecyclerView: RecyclerView = profiles_recyclerview
         val useBtt: View = use_btt
         val editBtt: View = edit_btt
         val cancelBtt: View = cancel_btt
         val defaultBtt: View = set_default_btt
         val currentProfileText: TextView = currently_selected_profile_text
-        val selectedItemActionsHolder: View = selected_item_holder
-
-        fun getCurrentProfile(): QualityDataHelper.QualityProfile? {
-            return (profilesRecyclerView.adapter as? ProfilesAdapter)?.getCurrentProfile()
-        }
-
-        fun refreshProfiles() {
-            currentProfileText.text = getProfileName(usedProfile).asString(context)
-            (profilesRecyclerView.adapter as? ProfilesAdapter)?.updateList(getProfiles())
-        }
-
-        profilesRecyclerView.adapter = ProfilesAdapter(
-            mutableListOf(),
-            usedProfile,
-        ) { oldIndex: Int?, newIndex: Int ->
-            profilesRecyclerView.adapter?.notifyItemChanged(newIndex)
-            selectedItemActionsHolder.alpha = 1f
-            if (oldIndex != null) {
-                profilesRecyclerView.adapter?.notifyItemChanged(oldIndex)
+        val selectedItemActionsHolder: View = selected_item_holder*/
+        binding.apply {
+            fun getCurrentProfile(): QualityDataHelper.QualityProfile? {
+                return (profilesRecyclerview.adapter as? ProfilesAdapter)?.getCurrentProfile()
             }
-        }
 
-        refreshProfiles()
-
-        editBtt.setOnClickListener {
-            getCurrentProfile()?.let { profile ->
-                SourcePriorityDialog(context, themeRes, links, profile) {
-                    refreshProfiles()
-                }.show()
+            fun refreshProfiles() {
+                currentlySelectedProfileText.text = getProfileName(usedProfile).asString(context)
+                (profilesRecyclerview.adapter as? ProfilesAdapter)?.updateList(getProfiles())
+            }
+
+            profilesRecyclerview.adapter = ProfilesAdapter(
+                mutableListOf(),
+                usedProfile,
+            ) { oldIndex: Int?, newIndex: Int ->
+                profilesRecyclerview.adapter?.notifyItemChanged(newIndex)
+                selectedItemHolder.alpha = 1f
+                if (oldIndex != null) {
+                    profilesRecyclerview.adapter?.notifyItemChanged(oldIndex)
+                }
+            }
+
+            refreshProfiles()
+
+            editBtt.setOnClickListener {
+                getCurrentProfile()?.let { profile ->
+                    SourcePriorityDialog(context, themeRes, links, profile) {
+                        refreshProfiles()
+                    }.show()
+                }
             }
-        }
 
 
-        defaultBtt.setOnClickListener {
-            val currentProfile = getCurrentProfile() ?: return@setOnClickListener
-            val choices = QualityDataHelper.QualityProfileType.values()
-                .filter { it != QualityDataHelper.QualityProfileType.None }
-            val choiceNames = choices.map { txt(it.stringRes).asString(context) }
+            setDefaultBtt.setOnClickListener {
+                val currentProfile = getCurrentProfile() ?: return@setOnClickListener
+                val choices = QualityDataHelper.QualityProfileType.values()
+                    .filter { it != QualityDataHelper.QualityProfileType.None }
+                val choiceNames = choices.map { txt(it.stringRes).asString(context) }
 
-            activity.showBottomDialog(
-                choiceNames,
-                choices.indexOf(currentProfile.type),
-                txt(R.string.set_default).asString(context),
-                false,
-                {},
-                { index ->
-                    val pickedChoice = choices.getOrNull(index) ?: return@showBottomDialog
-                    // Remove previous picks
-                    if (pickedChoice.unique) {
-                        getProfiles().filter { it.type == pickedChoice }.forEach {
-                            QualityDataHelper.setQualityProfileType(it.id, null)
+                activity.showBottomDialog(
+                    choiceNames,
+                    choices.indexOf(currentProfile.type),
+                    txt(R.string.set_default).asString(context),
+                    false,
+                    {},
+                    { index ->
+                        val pickedChoice = choices.getOrNull(index) ?: return@showBottomDialog
+                        // Remove previous picks
+                        if (pickedChoice.unique) {
+                            getProfiles().filter { it.type == pickedChoice }.forEach {
+                                QualityDataHelper.setQualityProfileType(it.id, null)
+                            }
                         }
-                    }
 
-                    QualityDataHelper.setQualityProfileType(currentProfile.id, pickedChoice)
-                    refreshProfiles()
-                })
-        }
+                        QualityDataHelper.setQualityProfileType(currentProfile.id, pickedChoice)
+                        refreshProfiles()
+                    })
+            }
 
-        cancelBtt.setOnClickListener {
-            this.dismissSafe()
-        }
+            cancelBtt.setOnClickListener {
+                this@QualityProfileDialog.dismissSafe()
+            }
 
-        useBtt.setOnClickListener {
-            getCurrentProfile()?.let {
-                profileSelectionCallback.invoke(it)
-                this.dismissSafe()
+            useBtt.setOnClickListener {
+                getCurrentProfile()?.let {
+                    profileSelectionCallback.invoke(it)
+                    this@QualityProfileDialog.dismissSafe()
+                }
             }
         }
-
         super.show()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt
index efc1f1b8..1b59882e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt
@@ -2,24 +2,18 @@ package com.lagradost.cloudstream3.ui.player.source_priority
 
 import android.app.Dialog
 import android.content.Context
-import android.view.View
-import android.widget.EditText
-import android.widget.TextView
+import android.view.LayoutInflater
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.FragmentActivity
-import androidx.recyclerview.widget.RecyclerView
-import androidx.work.impl.constraints.controllers.ConstraintController
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.PlayerSelectSourcePriorityBinding
 import com.lagradost.cloudstream3.ui.result.txt
-import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import kotlinx.android.synthetic.main.player_select_source_priority.*
 
 class SourcePriorityDialog(
-    ctx: Context,
+    val ctx: Context,
     @StyleRes themeRes: Int,
     val links: List<ExtractorLink>,
     private val profile: QualityDataHelper.QualityProfile,
@@ -30,13 +24,14 @@ class SourcePriorityDialog(
     private val updatedCallback: () -> Unit
 ) : Dialog(ctx, themeRes) {
     override fun show() {
-        setContentView(R.layout.player_select_source_priority)
-        val sourcesRecyclerView: RecyclerView = sort_sources
-        val qualitiesRecyclerView: RecyclerView = sort_qualities
-        val profileText: EditText = profile_text_editable
-        val saveBtt: View = save_btt
-        val exitBtt: View = close_btt
-        val helpBtt: View = help_btt
+        val binding = PlayerSelectSourcePriorityBinding.inflate(LayoutInflater.from(ctx), null, false)
+        setContentView(binding.root)
+        val sourcesRecyclerView = binding.sortSources
+        val qualitiesRecyclerView = binding.sortQualities
+        val profileText = binding.profileTextEditable
+        val saveBtt = binding.saveBtt
+        val exitBtt = binding.closeBtt
+        val helpBtt = binding.helpBtt
 
         profileText.setText(QualityDataHelper.getProfileName(profile.id).asString(context))
         profileText.hint = txt(R.string.profile_number, profile.id).asString(context)
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 ba57d2de..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
@@ -19,8 +19,10 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.APIHolder.filterSearchResultByFilmQuality
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.QuickSearchBinding
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
@@ -31,13 +33,13 @@ 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
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import kotlinx.android.synthetic.main.quick_search.*
 import java.util.concurrent.locks.ReentrantLock
 
 class QuickSearchFragment : Fragment() {
@@ -45,6 +47,13 @@ class QuickSearchFragment : Fragment() {
         const val AUTOSEARCH_KEY = "autosearch"
         const val PROVIDER_KEY = "providers"
 
+        fun pushSearch(
+            autoSearch: String? = null,
+            providers: Array<String>? = null
+        ) {
+            pushSearch(activity, autoSearch, providers)
+        }
+
         fun pushSearch(
             activity: Activity?,
             autoSearch: String? = null,
@@ -72,6 +81,8 @@ class QuickSearchFragment : Fragment() {
 
     private var providers: Set<String>? = null
     private lateinit var searchViewModel: SearchViewModel
+    var binding: QuickSearchBinding? = null
+
 
     private var bottomSheetDialog: BottomSheetDialog? = null
 
@@ -79,13 +90,21 @@ class QuickSearchFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         activity?.window?.setSoftInputMode(
             WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
         )
         searchViewModel = ViewModelProvider(this)[SearchViewModel::class.java]
         bottomSheetDialog?.ownShow()
-        return inflater.inflate(R.layout.quick_search, container, false)
+        val localBinding = QuickSearchBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.quick_search, container, false)
+    }
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
     override fun onDestroy() {
@@ -111,7 +130,7 @@ class QuickSearchFragment : Fragment() {
         activity?.getSpanCount()?.let {
             HomeFragment.currentSpan = it
         }
-        quick_search_autofit_results.spanCount = HomeFragment.currentSpan
+        binding?.quickSearchAutofitResults?.spanCount = HomeFragment.currentSpan
         HomeFragment.currentSpan = HomeFragment.currentSpan
         HomeFragment.configEvent.invoke(HomeFragment.currentSpan)
     }
@@ -123,7 +142,7 @@ class QuickSearchFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(quick_search_root)
+        fixPaddingStatusbar(binding?.quickSearchRoot)
         fixGrid()
 
         arguments?.getStringArray(PROVIDER_KEY)?.let {
@@ -136,23 +155,25 @@ class QuickSearchFragment : Fragment() {
         } else false
 
         if (isSingleProvider) {
-            quick_search_autofit_results.adapter = activity?.let {
-                SearchAdapter(
+            binding?.quickSearchAutofitResults?.apply {
+                adapter = SearchAdapter(
                     ArrayList(),
-                    quick_search_autofit_results,
+                    this,
                 ) { callback ->
-                    SearchHelper.handleSearchClickCallback(activity, callback)
+                    SearchHelper.handleSearchClickCallback(callback)
                 }
             }
+
             try {
-                quick_search?.queryHint = getString(R.string.search_hint_site).format(providers?.first())
+                binding?.quickSearch?.queryHint =
+                    getString(R.string.search_hint_site).format(providers?.first())
             } catch (e: Exception) {
                 logError(e)
             }
         } else {
-            quick_search_master_recycler?.adapter =
+            binding?.quickSearchMasterRecycler?.adapter =
                 ParentItemAdapter(mutableListOf(), { callback ->
-                    SearchHelper.handleSearchClickCallback(activity, callback)
+                    SearchHelper.handleSearchClickCallback(callback)
                     //when (callback.action) {
                     //SEARCH_ACTION_LOAD -> {
                     //    clickCallback?.invoke(callback)
@@ -164,18 +185,17 @@ class QuickSearchFragment : Fragment() {
                         bottomSheetDialog = null
                     })
                 })
-            quick_search_master_recycler?.layoutManager = GridLayoutManager(context, 1)
+            binding?.quickSearchMasterRecycler?.layoutManager = GridLayoutManager(context, 1)
         }
-
-        quick_search_autofit_results?.isVisible = isSingleProvider
-        quick_search_master_recycler?.isGone = isSingleProvider
+        binding?.quickSearchAutofitResults?.isVisible = isSingleProvider
+        binding?.quickSearchMasterRecycler?.isGone = isSingleProvider
 
         val listLock = ReentrantLock()
         observe(searchViewModel.currentSearch) { list ->
             try {
                 // https://stackoverflow.com/questions/6866238/concurrent-modification-exception-adding-to-an-arraylist
                 listLock.lock()
-                (quick_search_master_recycler?.adapter as ParentItemAdapter?)?.apply {
+                (binding?.quickSearchMasterRecycler?.adapter as ParentItemAdapter?)?.apply {
                     updateList(list.map { ongoing ->
                         val ongoingList = HomePageList(
                             ongoing.apiName,
@@ -192,19 +212,18 @@ class QuickSearchFragment : Fragment() {
         }
 
         val searchExitIcon =
-            quick_search?.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
+            binding?.quickSearch?.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
 
         //val searchMagIcon =
-        //    quick_search?.findViewById<ImageView>(androidx.appcompat.R.id.search_mag_icon)
+        //    binding.quickSearch.findViewById<ImageView>(androidx.appcompat.R.id.search_mag_icon)
 
         //searchMagIcon?.scaleX = 0.65f
         //searchMagIcon?.scaleY = 0.65f
 
-
-        quick_search?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+        binding?.quickSearch?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
                 if (search(context, query, false))
-                    UIHelper.hideKeyboard(quick_search)
+                    UIHelper.hideKeyboard(binding?.quickSearch)
                 return true
             }
 
@@ -214,27 +233,28 @@ class QuickSearchFragment : Fragment() {
                 return true
             }
         })
-
-        quick_search_loading_bar.alpha = 0f
+        binding?.quickSearchLoadingBar?.alpha = 0f
         observe(searchViewModel.searchResponse) {
             when (it) {
                 is Resource.Success -> {
                     it.value.let { data ->
-                        (quick_search_autofit_results?.adapter as? SearchAdapter)?.updateList(
+                        (binding?.quickSearchAutofitResults?.adapter as? SearchAdapter)?.updateList(
                             context?.filterSearchResultByFilmQuality(data) ?: data
                         )
                     }
                     searchExitIcon?.alpha = 1f
-                    quick_search_loading_bar?.alpha = 0f
+                    binding?.quickSearchLoadingBar?.alpha = 0f
                 }
+
                 is Resource.Failure -> {
                     // Toast.makeText(activity, "Server error", Toast.LENGTH_LONG).show()
                     searchExitIcon?.alpha = 1f
-                    quick_search_loading_bar?.alpha = 0f
+                    binding?.quickSearchLoadingBar?.alpha = 0f
                 }
+
                 is Resource.Loading -> {
                     searchExitIcon?.alpha = 0f
-                    quick_search_loading_bar?.alpha = 1f
+                    binding?.quickSearchLoadingBar?.alpha = 1f
                 }
             }
         }
@@ -246,13 +266,16 @@ class QuickSearchFragment : Fragment() {
         //        UIHelper.showInputMethod(view.findFocus())
         //    }
         //}
-
-        quick_search_back.setOnClickListener {
+        binding?.quickSearchBack?.setOnClickListener {
             activity?.popCurrentPage()
         }
 
+        if (isTrueTvSettings()) {
+            binding?.quickSearch?.requestFocus()
+        }
+
         arguments?.getString(AUTOSEARCH_KEY)?.let {
-            quick_search?.setQuery(it, true)
+            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 92cecc37..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,18 +3,21 @@ package com.lagradost.cloudstream3.ui.result
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
+import androidx.annotation.IdRes
+import androidx.annotation.LayoutRes
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.ActorData
 import com.lagradost.cloudstream3.ActorRole
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.CastItemBinding
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.cast_item.view.*
 
-class ActorAdaptor() : 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,
@@ -24,7 +27,8 @@ class ActorAdaptor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return CardViewHolder(
-            LayoutInflater.from(parent.context).inflate(R.layout.cast_item, parent, false),
+            CastItemBinding.inflate(LayoutInflater.from(parent.context), parent, false),
+            focusCallback
         )
     }
 
@@ -66,17 +70,12 @@ class ActorAdaptor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
         }
     }
 
-    private class CardViewHolder
+    private inner class CardViewHolder
     constructor(
-        itemView: View,
+        val binding: CastItemBinding,
+        private val focusCallback: (View?) -> Unit = {}
     ) :
-        RecyclerView.ViewHolder(itemView) {
-        private val actorImage: ImageView = itemView.actor_image
-        private val actorName: TextView = itemView.actor_name
-        private val actorExtra: TextView = itemView.actor_extra
-        private val voiceActorImage: ImageView = itemView.voice_actor_image
-        private val voiceActorImageHolder: View = itemView.voice_actor_image_holder
-        private val voiceActorName: TextView = itemView.voice_actor_name
+        RecyclerView.ViewHolder(binding.root) {
 
         fun bind(actor: ActorData, isInverted: Boolean, position: Int, callback: (Int) -> Unit) {
             val (mainImg, vaImage) = if (!isInverted || actor.voiceActor?.image.isNullOrBlank()) {
@@ -85,43 +84,63 @@ class ActorAdaptor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
                 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) {
+                    focusCallback(v)
+                }
+            }
+
             itemView.setOnClickListener {
                 callback(position)
             }
 
-            actorImage.setImage(mainImg)
+            binding.apply {
+                actorImage.setImage(mainImg)
 
-            actorName.text = actor.actor.name
-            actor.role?.let {
-                actorExtra.context?.getString(
-                    when (it) {
-                        ActorRole.Main -> {
-                            R.string.actor_main
-                        }
-                        ActorRole.Supporting -> {
-                            R.string.actor_supporting
-                        }
-                        ActorRole.Background -> {
-                            R.string.actor_background
+                actorName.text = actor.actor.name
+                actor.role?.let {
+                    actorExtra.context?.getString(
+                        when (it) {
+                            ActorRole.Main -> {
+                                R.string.actor_main
+                            }
+
+                            ActorRole.Supporting -> {
+                                R.string.actor_supporting
+                            }
+
+                            ActorRole.Background -> {
+                                R.string.actor_background
+                            }
                         }
+                    )?.let { text ->
+                        actorExtra.isVisible = true
+                        actorExtra.text = text
                     }
-                )?.let { text ->
+                } ?: actor.roleString?.let {
                     actorExtra.isVisible = true
-                    actorExtra.text = text
+                    actorExtra.text = it
+                } ?: run {
+                    actorExtra.isVisible = false
                 }
-            } ?: actor.roleString?.let {
-                actorExtra.isVisible = true
-                actorExtra.text = it
-            } ?: run {
-                actorExtra.isVisible = false
-            }
 
-            if (actor.voiceActor == null) {
-                voiceActorImageHolder.isVisible = false
-                voiceActorName.isVisible = false
-            } else {
-                voiceActorName.text = actor.voiceActor.name
-                voiceActorImageHolder.isVisible = voiceActorImage.setImage(vaImage)
+                if (actor.voiceActor == null) {
+                    voiceActorImageHolder.isVisible = false
+                    voiceActorName.isVisible = false
+                } else {
+                    voiceActorName.text = actor.voiceActor.name
+                    voiceActorImageHolder.isVisible = voiceActorImage.setImage(vaImage)
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
index 0932b001..6b63e623 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
@@ -3,34 +3,24 @@ package com.lagradost.cloudstream3.ui.result
 import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import androidx.core.widget.ContentLoadingProgressBar
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.ResultEpisodeBinding
+import com.lagradost.cloudstream3.databinding.ResultEpisodeLargeBinding
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
-import com.lagradost.cloudstream3.ui.download.DownloadButtonViewHolder
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
 import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
-import com.lagradost.cloudstream3.ui.download.EasyDownloadButton
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
-import com.lagradost.cloudstream3.utils.VideoDownloadManager
-import kotlinx.android.synthetic.main.result_episode.view.*
-import kotlinx.android.synthetic.main.result_episode.view.episode_text
-import kotlinx.android.synthetic.main.result_episode_large.view.*
-import kotlinx.android.synthetic.main.result_episode_large.view.episode_filler
-import kotlinx.android.synthetic.main.result_episode_large.view.episode_progress
-import kotlinx.android.synthetic.main.result_episode_large.view.result_episode_download
-import kotlinx.android.synthetic.main.result_episode_large.view.result_episode_progress_downloaded
 import java.util.*
 
 const val ACTION_PLAY_EPISODE_IN_PLAYER = 1
@@ -59,7 +49,8 @@ const val ACTION_PLAY_EPISODE_IN_WEB_VIDEO = 16
 const val ACTION_PLAY_EPISODE_IN_MPV = 17
 
 const val ACTION_MARK_AS_WATCHED = 18
-
+const val TV_EP_SIZE_LARGE = 400
+const val TV_EP_SIZE_SMALL = 300
 data class EpisodeClickEvent(val action: Int, val data: ResultEpisode)
 
 class EpisodeAdapter(
@@ -88,49 +79,10 @@ class EpisodeAdapter(
 
     var cardList: MutableList<ResultEpisode> = mutableListOf()
 
-    private val mBoundViewHolders: HashSet<DownloadButtonViewHolder> = HashSet()
-    private fun getAllBoundViewHolders(): Set<DownloadButtonViewHolder?>? {
-        return Collections.unmodifiableSet(mBoundViewHolders)
-    }
-
-    fun killAdapter() {
-        getAllBoundViewHolders()?.forEach { view ->
-            view?.downloadButton?.dispose()
-        }
-    }
-
     override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
         if (holder.itemView.hasFocus()) {
             holder.itemView.clearFocus()
         }
-        //(holder.itemView as? FrameLayout?)?.descendantFocusability =
-        //    ViewGroup.FOCUS_BLOCK_DESCENDANTS
-
-        if (holder is DownloadButtonViewHolder) {
-            holder.downloadButton.dispose()
-        }
-    }
-
-    override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            holder.downloadButton.dispose()
-            mBoundViewHolders.remove(holder)
-            //(holder.itemView as? FrameLayout?)?.descendantFocusability =
-            //    ViewGroup.FOCUS_BLOCK_DESCENDANTS
-        }
-    }
-
-    override fun onViewAttachedToWindow(holder: RecyclerView.ViewHolder) {
-        if (holder is DownloadButtonViewHolder) {
-            //println("onViewAttachedToWindow = ${holder.absoluteAdapterPosition}")
-            //holder.itemView.post {
-            //    if (holder.itemView.isAttachedToWindow)
-            //        (holder.itemView as? FrameLayout?)?.descendantFocusability =
-            //            ViewGroup.FOCUS_AFTER_DESCENDANTS
-            //}
-
-            holder.reattachDownloadButton()
-        }
     }
 
     fun updateList(newList: List<ResultEpisode>) {
@@ -144,27 +96,62 @@ class EpisodeAdapter(
         diffResult.dispatchUpdatesTo(this)
     }
 
-    var layout = R.layout.result_episode_both
+    private fun getItem(position: Int): ResultEpisode {
+        return cardList[position]
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        val item = getItem(position)
+        return if (item.poster.isNullOrBlank()) 0 else 1
+    }
+
+
+    // private val layout = R.layout.result_episode_both
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         /*val layout = if (cardList.filter { it.poster != null }.size >= cardList.size / 2)
             R.layout.result_episode_large
         else R.layout.result_episode*/
 
-        return EpisodeCardViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(layout, parent, false),
-            hasDownloadSupport,
-            clickCallback,
-            downloadClickCallback
-        )
+        return when (viewType) {
+            0 -> {
+                EpisodeCardViewHolderSmall(
+                    ResultEpisodeBinding.inflate(
+                        LayoutInflater.from(parent.context),
+                        parent,
+                        false
+                    ),
+                    hasDownloadSupport,
+                    clickCallback,
+                    downloadClickCallback
+                )
+            }
+
+            1 -> {
+                EpisodeCardViewHolderLarge(
+                    ResultEpisodeLargeBinding.inflate(
+                        LayoutInflater.from(parent.context),
+                        parent,
+                        false
+                    ),
+                    hasDownloadSupport,
+                    clickCallback,
+                    downloadClickCallback
+                )
+            }
+
+            else -> throw NotImplementedError()
+        }
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         when (holder) {
-            is EpisodeCardViewHolder -> {
-                holder.bind(cardList[position])
-                mBoundViewHolders.add(holder)
+            is EpisodeCardViewHolderLarge -> {
+                holder.bind(getItem(position))
+            }
+
+            is EpisodeCardViewHolderSmall -> {
+                holder.bind(getItem(position))
             }
         }
     }
@@ -173,94 +160,108 @@ class EpisodeAdapter(
         return cardList.size
     }
 
-    class EpisodeCardViewHolder
+    class EpisodeCardViewHolderLarge
     constructor(
-        itemView: View,
+        val binding: ResultEpisodeLargeBinding,
         private val hasDownloadSupport: Boolean,
         private val clickCallback: (EpisodeClickEvent) -> Unit,
         private val downloadClickCallback: (DownloadClickEvent) -> Unit,
-    ) : RecyclerView.ViewHolder(itemView), DownloadButtonViewHolder {
-        override var downloadButton = EasyDownloadButton()
-
-        var episodeDownloadBar: ContentLoadingProgressBar? = null
-        var episodeDownloadImage: ImageView? = null
+    ) : RecyclerView.ViewHolder(binding.root) {
         var localCard: ResultEpisode? = null
 
         @SuppressLint("SetTextI18n")
         fun bind(card: ResultEpisode) {
             localCard = card
 
+            val setWidth =
+                if (isTvSettings()) TV_EP_SIZE_LARGE.toPx else ViewGroup.LayoutParams.MATCH_PARENT
+
+            binding.episodeLinHolder.layoutParams.width = setWidth
+            binding.episodeHolderLarge.layoutParams.width = setWidth
+            binding.episodeHolder.layoutParams.width = setWidth
+
             val isTrueTv = isTrueTvSettings()
 
-            val (parentView, otherView) = if (card.poster == null) {
-                itemView.episode_holder to itemView.episode_holder_large
-            } else {
-                itemView.episode_holder_large to itemView.episode_holder
-            }
-            parentView.isVisible = true
-            otherView.isVisible = false
+            binding.apply {
+                downloadButton.isVisible = hasDownloadSupport
+                downloadButton.setDefaultClickListener(
+                    VideoDownloadHelper.DownloadEpisodeCached(
+                        card.name,
+                        card.poster,
+                        card.episode,
+                        card.season,
+                        card.id,
+                        card.parentId,
+                        card.rating,
+                        card.description,
+                        System.currentTimeMillis(),
+                    ), null
+                ) {
+                    when (it.action) {
+                        DOWNLOAD_ACTION_DOWNLOAD -> {
+                            clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, card))
+                        }
 
-            val episodeText: TextView = parentView.episode_text
-            val episodeFiller: MaterialButton? = parentView.episode_filler
-            val episodeRating: TextView? = parentView.episode_rating
-            val episodeDescript: TextView? = parentView.episode_descript
-            val episodeProgress: ContentLoadingProgressBar? = parentView.episode_progress
-            val episodePoster: ImageView? = parentView.episode_poster
+                        DOWNLOAD_ACTION_LONG_CLICK -> {
+                            clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_MIRROR, card))
+                        }
 
-            episodeDownloadBar =
-                parentView.result_episode_progress_downloaded
-            episodeDownloadImage = parentView.result_episode_download
-
-            val name =
-                if (card.name == null) "${episodeText.context.getString(R.string.episode)} ${card.episode}" else "${card.episode}. ${card.name}"
-            episodeFiller?.isVisible = card.isFiller == true
-            episodeText.text =
-                name//if(card.isFiller == true) episodeText.context.getString(R.string.filler).format(name) else name
-            episodeText.isSelected = true // is needed for text repeating
-
-            if (card.videoWatchState == VideoWatchState.Watched) {
-                // This cannot be done in getDisplayPosition() as when you have not watched something
-                // the duration and position is 0
-                episodeProgress?.max = 1
-                episodeProgress?.progress = 1
-                episodeProgress?.isVisible = true
-            } else {
-                val displayPos = card.getDisplayPosition()
-                episodeProgress?.max = (card.duration / 1000).toInt()
-                episodeProgress?.progress = (displayPos / 1000).toInt()
-                episodeProgress?.isVisible = displayPos > 0L
-            }
-
-            episodePoster?.isVisible = episodePoster?.setImage(card.poster) == true
-
-            if (card.rating != null) {
-                episodeRating?.text = episodeRating?.context?.getString(R.string.rated_format)
-                    ?.format(card.rating.toFloat() / 10f)
-            } else {
-                episodeRating?.text = ""
-            }
-
-            episodeRating?.isGone = episodeRating?.text.isNullOrBlank()
-
-            episodeDescript?.apply {
-                text = card.description.html()
-                isGone = text.isNullOrBlank()
-                setOnClickListener {
-                    clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_DESCRIPTION, card))
-                }
-            }
-
-            if (!isTrueTv) {
-                episodePoster?.setOnClickListener {
-                    clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
+                        else -> {
+                            downloadClickCallback.invoke(it)
+                        }
+                    }
                 }
 
-                episodePoster?.setOnLongClickListener {
-                    clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_TOAST, card))
-                    return@setOnLongClickListener true
+                val name =
+                    if (card.name == null) "${episodeText.context.getString(R.string.episode)} ${card.episode}" else "${card.episode}. ${card.name}"
+                episodeFiller.isVisible = card.isFiller == true
+                episodeText.text =
+                    name//if(card.isFiller == true) episodeText.context.getString(R.string.filler).format(name) else name
+                episodeText.isSelected = true // is needed for text repeating
+
+                if (card.videoWatchState == VideoWatchState.Watched) {
+                    // This cannot be done in getDisplayPosition() as when you have not watched something
+                    // the duration and position is 0
+                    episodeProgress.max = 1
+                    episodeProgress.progress = 1
+                    episodeProgress.isVisible = true
+                } else {
+                    val displayPos = card.getDisplayPosition()
+                    episodeProgress.max = (card.duration / 1000).toInt()
+                    episodeProgress.progress = (displayPos / 1000).toInt()
+                    episodeProgress.isVisible = displayPos > 0L
+                }
+
+                episodePoster.isVisible = episodePoster.setImage(card.poster) == true
+
+                if (card.rating != null) {
+                    episodeRating.text = episodeRating.context?.getString(R.string.rated_format)
+                        ?.format(card.rating.toFloat() / 10f)
+                } else {
+                    episodeRating.text = ""
+                }
+
+                episodeRating.isGone = episodeRating.text.isNullOrBlank()
+
+                episodeDescript.apply {
+                    text = card.description.html()
+                    isGone = text.isNullOrBlank()
+                    setOnClickListener {
+                        clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_DESCRIPTION, card))
+                    }
+                }
+
+                if (!isTrueTv) {
+                    episodePoster.setOnClickListener {
+                        clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
+                    }
+
+                    episodePoster.setOnLongClickListener {
+                        clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_TOAST, card))
+                        return@setOnLongClickListener true
+                    }
                 }
             }
-
             itemView.setOnClickListener {
                 clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
             }
@@ -276,29 +277,30 @@ class EpisodeAdapter(
                 return@setOnLongClickListener true
             }
 
-            episodeDownloadImage?.isVisible = hasDownloadSupport
-            episodeDownloadBar?.isVisible = hasDownloadSupport
-            reattachDownloadButton()
+            //binding.resultEpisodeDownload.isVisible = hasDownloadSupport
+            //binding.resultEpisodeProgressDownloaded.isVisible = hasDownloadSupport
         }
+    }
 
-        override fun reattachDownloadButton() {
-            downloadButton.dispose()
-            val card = localCard
-            if (hasDownloadSupport && card != null) {
-                if (episodeDownloadBar == null ||
-                    episodeDownloadImage == null
-                ) return
-                val downloadInfo = VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(
-                    itemView.context,
-                    card.id
-                )
+    class EpisodeCardViewHolderSmall
+    constructor(
+        val binding: ResultEpisodeBinding,
+        private val hasDownloadSupport: Boolean,
+        private val clickCallback: (EpisodeClickEvent) -> Unit,
+        private val downloadClickCallback: (DownloadClickEvent) -> Unit,
+    ) : RecyclerView.ViewHolder(binding.root) {
+        @SuppressLint("SetTextI18n")
+        fun bind(card: ResultEpisode) {
+            val isTrueTv = isTrueTvSettings()
 
-                downloadButton.setUpButton(
-                    downloadInfo?.fileLength,
-                    downloadInfo?.totalBytes,
-                    episodeDownloadBar ?: return,
-                    episodeDownloadImage ?: return,
-                    null,
+            binding.episodeHolder.layoutParams.apply {
+                width =
+                    if (isTvSettings()) TV_EP_SIZE_SMALL.toPx else ViewGroup.LayoutParams.MATCH_PARENT
+            }
+
+            binding.apply {
+                downloadButton.isVisible = hasDownloadSupport
+                downloadButton.setDefaultClickListener(
                     VideoDownloadHelper.DownloadEpisodeCached(
                         card.name,
                         card.poster,
@@ -309,14 +311,60 @@ class EpisodeAdapter(
                         card.rating,
                         card.description,
                         System.currentTimeMillis(),
-                    )
+                    ), null
                 ) {
-                    if (it.action == DOWNLOAD_ACTION_DOWNLOAD) {
-                        clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, card))
-                    } else {
-                        downloadClickCallback.invoke(it)
+                    when (it.action) {
+                        DOWNLOAD_ACTION_DOWNLOAD -> {
+                            clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, card))
+                        }
+
+                        DOWNLOAD_ACTION_LONG_CLICK -> {
+                            clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_MIRROR, card))
+                        }
+
+                        else -> {
+                            downloadClickCallback.invoke(it)
+                        }
                     }
                 }
+
+                val name =
+                    if (card.name == null) "${episodeText.context.getString(R.string.episode)} ${card.episode}" else "${card.episode}. ${card.name}"
+                episodeFiller.isVisible = card.isFiller == true
+                episodeText.text =
+                    name//if(card.isFiller == true) episodeText.context.getString(R.string.filler).format(name) else name
+                episodeText.isSelected = true // is needed for text repeating
+
+                if (card.videoWatchState == VideoWatchState.Watched) {
+                    // This cannot be done in getDisplayPosition() as when you have not watched something
+                    // the duration and position is 0
+                    episodeProgress.max = 1
+                    episodeProgress.progress = 1
+                    episodeProgress.isVisible = true
+                } else {
+                    val displayPos = card.getDisplayPosition()
+                    episodeProgress.max = (card.duration / 1000).toInt()
+                    episodeProgress.progress = (displayPos / 1000).toInt()
+                    episodeProgress.isVisible = displayPos > 0L
+                }
+
+                itemView.setOnClickListener {
+                    clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
+                }
+
+                if (isTrueTv) {
+                    itemView.isFocusable = true
+                    itemView.isFocusableInTouchMode = true
+                    //itemView.touchscreenBlocksFocus = false
+                }
+
+                itemView.setOnLongClickListener {
+                    clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_OPTIONS, card))
+                    return@setOnLongClickListener true
+                }
+
+                //binding.resultEpisodeDownload.isVisible = hasDownloadSupport
+                //binding.resultEpisodeProgressDownloaded.isVisible = hasDownloadSupport
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
index ebd6a658..ca2934ef 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
@@ -1,11 +1,10 @@
 package com.lagradost.cloudstream3.ui.result
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
+import com.lagradost.cloudstream3.databinding.ResultMiniImageBinding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 
 /*
@@ -24,7 +23,6 @@ const val IMAGE_CLICK = 0
 const val IMAGE_LONG_CLICK = 1
 
 class ImageAdapter(
-    val layout: Int,
     val clickCallback: ((Int) -> Unit)? = null,
     val nextFocusUp: Int? = null,
     val nextFocusDown: Int? = null,
@@ -34,7 +32,9 @@ class ImageAdapter(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return ImageViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false)
+            //result_mini_image
+            ResultMiniImageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+           // LayoutInflater.from(parent.context).inflate(layout, parent, false)
         )
     }
 
@@ -66,15 +66,15 @@ class ImageAdapter(
     }
 
     class ImageViewHolder
-    constructor(itemView: View) :
-        RecyclerView.ViewHolder(itemView) {
+    constructor(val binding: ResultMiniImageBinding) :
+        RecyclerView.ViewHolder(binding.root) {
         fun bind(
             img: Int,
             clickCallback: ((Int) -> Unit)?,
             nextFocusUp: Int?,
             nextFocusDown: Int?,
         ) {
-            (itemView as? ImageView?)?.apply {
+            binding.root.apply {
                 setImageResource(img)
                 if (nextFocusDown != null) {
                     this.nextFocusDownId = nextFocusDown
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt
index affbcbb4..b4e3062b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt
@@ -4,18 +4,45 @@ import android.content.Context
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.lagradost.cloudstream3.CommonActivity
+import com.lagradost.cloudstream3.CommonActivity.activity
+import com.lagradost.cloudstream3.FocusDirection
 import com.lagradost.cloudstream3.mvvm.logError
 
-fun RecyclerView?.setLinearListLayout(isHorizontal: Boolean = true) {
+const val FOCUS_SELF = View.NO_ID - 1
+const val FOCUS_INHERIT = FOCUS_SELF - 1
+
+fun RecyclerView?.setLinearListLayout(
+    isHorizontal: Boolean = true,
+    nextLeft: Int = FOCUS_INHERIT,
+    nextRight: Int = FOCUS_INHERIT,
+    nextUp: Int = FOCUS_INHERIT,
+    nextDown: Int = FOCUS_INHERIT
+) {
     if (this == null) return
+    val ctx = this.context ?: return
     this.layoutManager =
-        this.context?.let { LinearListLayout(it).apply { if (isHorizontal) setHorizontal() else setVertical() } }
-            ?: this.layoutManager
+        LinearListLayout(ctx).apply {
+            if (isHorizontal) setHorizontal() else setVertical()
+            nextFocusLeft =
+                if (nextLeft == FOCUS_INHERIT) this@setLinearListLayout.nextFocusLeftId else nextLeft
+            nextFocusRight =
+                if (nextRight == FOCUS_INHERIT) this@setLinearListLayout.nextFocusRightId else nextRight
+            nextFocusUp =
+                if (nextUp == FOCUS_INHERIT) this@setLinearListLayout.nextFocusUpId else nextUp
+            nextFocusDown =
+                if (nextDown == FOCUS_INHERIT) this@setLinearListLayout.nextFocusDownId else nextDown
+        }
 }
 
 open class LinearListLayout(context: Context?) :
     LinearLayoutManager(context) {
 
+    var nextFocusLeft: Int = View.NO_ID
+    var nextFocusRight: Int = View.NO_ID
+    var nextFocusUp: Int = View.NO_ID
+    var nextFocusDown: Int = View.NO_ID
+
     fun setHorizontal() {
         orientation = HORIZONTAL
     }
@@ -55,8 +82,37 @@ open class LinearListLayout(context: Context?) :
         linearSmoothScroller.targetPosition = position
         startSmoothScroll(linearSmoothScroller)
     }*/
+
+    /** from the current focus go to a direction */
+    private fun getNextDirection(focused: View?, direction: FocusDirection): View? {
+        val id = when (direction) {
+            FocusDirection.Start -> if (isLayoutRTL) nextFocusRight else nextFocusLeft
+            FocusDirection.End -> if (isLayoutRTL) nextFocusLeft else nextFocusRight
+            FocusDirection.Up -> nextFocusUp
+            FocusDirection.Down -> nextFocusDown
+        }
+
+        return when (id) {
+            View.NO_ID -> null
+            FOCUS_SELF -> focused
+            else -> CommonActivity.continueGetNextFocus(
+                activity ?: focused,
+                focused ?: return null,
+                direction,
+                id
+            )
+        }
+    }
+
     override fun onInterceptFocusSearch(focused: View, direction: Int): View? {
         val dir = if (orientation == HORIZONTAL) {
+            if (direction == View.FOCUS_DOWN) getNextDirection(focused, FocusDirection.Down)?.let { newFocus ->
+                return newFocus
+            }
+            if (direction == View.FOCUS_UP) getNextDirection(focused, FocusDirection.Up)?.let { newFocus ->
+                return newFocus
+            }
+
             if (direction == View.FOCUS_DOWN || direction == View.FOCUS_UP) {
                 // This scrolls the recyclerview before doing focus search, which
                 // allows the focus search to work better.
@@ -66,24 +122,47 @@ open class LinearListLayout(context: Context?) :
                 (focused.parent as? RecyclerView)?.focusSearch(direction)
                 return null
             }
-            if (direction == View.FOCUS_RIGHT) 1 else -1
+            var ret = if (direction == View.FOCUS_RIGHT) 1 else -1
+            // only flip on horizontal layout
+            if (isLayoutRTL) {
+                ret = -ret
+            }
+            ret
         } else {
-            if (direction == View.FOCUS_RIGHT || direction == View.FOCUS_LEFT) return null
+            if (direction == View.FOCUS_RIGHT) getNextDirection(focused, FocusDirection.End)?.let { newFocus ->
+                return newFocus
+            }
+            if (direction == View.FOCUS_LEFT) getNextDirection(focused, FocusDirection.Start)?.let { newFocus ->
+                return newFocus
+            }
+
+            if (direction == View.FOCUS_RIGHT || direction == View.FOCUS_LEFT) {
+                (focused.parent as? RecyclerView)?.focusSearch(direction)
+                return null
+            }
+
+            //if (direction == View.FOCUS_RIGHT || direction == View.FOCUS_LEFT) return null
             if (direction == View.FOCUS_DOWN) 1 else -1
         }
 
-        return try {
-            getPosition(getCorrectParent(focused))?.let { position ->
-                val lookfor = dir + position
-                //clamp(dir + position, 0, recyclerView.adapter?.itemCount ?: return null)
-                getViewFromPos(lookfor) ?: run {
-                    scrollToPosition(lookfor)
+        try {
+            val position = getPosition(getCorrectParent(focused)) ?: return null
+            val lookFor = dir + position
+
+            // if out of bounds then refocus as specified
+            return if (lookFor >= itemCount) {
+                getNextDirection(focused, if(orientation == HORIZONTAL) FocusDirection.End else FocusDirection.Down)
+            } else if (lookFor < 0) {
+                getNextDirection(focused, if(orientation == HORIZONTAL) FocusDirection.Start else FocusDirection.Up)
+            } else {
+                getViewFromPos(lookFor) ?: run {
+                    scrollToPosition(lookFor)
                     null
                 }
             }
         } catch (e: Exception) {
             logError(e)
-            null
+            return null
         }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 5a3e28b4..7617bc11 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -1,112 +1,18 @@
 package com.lagradost.cloudstream3.ui.result
 
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.content.Intent.*
-import android.content.res.ColorStateList
-import android.net.Uri
-import android.os.Build
 import android.os.Bundle
-import android.text.Editable
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AbsListView
-import android.widget.ArrayAdapter
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import androidx.core.widget.doOnTextChanged
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.RecyclerView
-import com.discord.panels.OverlappingPanelsLayout
-import com.google.android.material.chip.Chip
-import com.google.android.material.chip.ChipDrawable
 import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings
-import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
-import com.lagradost.cloudstream3.APIHolder.updateHasTrailers
-import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.DubStatus
-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.mvvm.*
-import com.lagradost.cloudstream3.services.SubscriptionWorkManager
-import com.lagradost.cloudstream3.syncproviders.providers.Kitsu
-import com.lagradost.cloudstream3.ui.WatchType
-import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
-import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick
-import com.lagradost.cloudstream3.ui.download.EasyDownloadButton
-import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
 import com.lagradost.cloudstream3.ui.result.EpisodeAdapter.Companion.getPlayerAction
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.AppUtils.getNameFull
-import com.lagradost.cloudstream3.utils.AppUtils.html
-import com.lagradost.cloudstream3.utils.AppUtils.loadCache
-import com.lagradost.cloudstream3.utils.AppUtils.openBrowser
-import com.lagradost.cloudstream3.utils.Coroutines.ioWorkSafe
-import com.lagradost.cloudstream3.utils.Coroutines.main
+import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getVideoWatchState
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
-import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
-import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
-import kotlinx.android.synthetic.main.fragment_result.*
-import kotlinx.android.synthetic.main.fragment_result.result_cast_items
-import kotlinx.android.synthetic.main.fragment_result.result_cast_text
-import kotlinx.android.synthetic.main.fragment_result.result_coming_soon
-import kotlinx.android.synthetic.main.fragment_result.result_data_holder
-import kotlinx.android.synthetic.main.fragment_result.result_description
-import kotlinx.android.synthetic.main.fragment_result.result_download_movie
-import kotlinx.android.synthetic.main.fragment_result.result_episode_loading
-import kotlinx.android.synthetic.main.fragment_result.result_episodes
-import kotlinx.android.synthetic.main.fragment_result.result_error_text
-import kotlinx.android.synthetic.main.fragment_result.result_finish_loading
-import kotlinx.android.synthetic.main.fragment_result.result_info
-import kotlinx.android.synthetic.main.fragment_result.result_loading
-import kotlinx.android.synthetic.main.fragment_result.result_loading_error
-import kotlinx.android.synthetic.main.fragment_result.result_meta_duration
-import kotlinx.android.synthetic.main.fragment_result.result_meta_rating
-import kotlinx.android.synthetic.main.fragment_result.result_meta_site
-import kotlinx.android.synthetic.main.fragment_result.result_meta_type
-import kotlinx.android.synthetic.main.fragment_result.result_meta_year
-import kotlinx.android.synthetic.main.fragment_result.result_movie_download_icon
-import kotlinx.android.synthetic.main.fragment_result.result_movie_download_text
-import kotlinx.android.synthetic.main.fragment_result.result_movie_download_text_precentage
-import kotlinx.android.synthetic.main.fragment_result.result_movie_progress_downloaded
-import kotlinx.android.synthetic.main.fragment_result.result_movie_progress_downloaded_holder
-import kotlinx.android.synthetic.main.fragment_result.result_next_airing
-import kotlinx.android.synthetic.main.fragment_result.result_next_airing_time
-import kotlinx.android.synthetic.main.fragment_result.result_no_episodes
-import kotlinx.android.synthetic.main.fragment_result.result_play_movie
-import kotlinx.android.synthetic.main.fragment_result.result_poster
-import kotlinx.android.synthetic.main.fragment_result.result_poster_holder
-import kotlinx.android.synthetic.main.fragment_result.result_reload_connection_open_in_browser
-import kotlinx.android.synthetic.main.fragment_result.result_reload_connectionerror
-import kotlinx.android.synthetic.main.fragment_result.result_resume_parent
-import kotlinx.android.synthetic.main.fragment_result.result_resume_progress_holder
-import kotlinx.android.synthetic.main.fragment_result.result_resume_series_progress
-import kotlinx.android.synthetic.main.fragment_result.result_resume_series_progress_text
-import kotlinx.android.synthetic.main.fragment_result.result_resume_series_title
-import kotlinx.android.synthetic.main.fragment_result.result_tag
-import kotlinx.android.synthetic.main.fragment_result.result_tag_holder
-import kotlinx.android.synthetic.main.fragment_result.result_title
-import kotlinx.android.synthetic.main.fragment_result.result_vpn
-import kotlinx.android.synthetic.main.fragment_result_swipe.*
-import kotlinx.android.synthetic.main.fragment_result_tv.*
-import kotlinx.android.synthetic.main.result_sync.*
-import kotlinx.android.synthetic.main.trailer_custom_layout.*
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
+import com.lagradost.cloudstream3.utils.Event
 
 const val START_ACTION_RESUME_LATEST = 1
 const val START_ACTION_LOAD_EP = 2
@@ -206,286 +112,113 @@ fun ResultEpisode.getWatchProgress(): Float {
     return (getDisplayPosition() / 1000).toFloat() / (duration / 1000).toFloat()
 }
 
-open class ResultFragment : ResultTrailerPlayer() {
-    companion object {
-        const val URL_BUNDLE = "url"
-        const val API_NAME_BUNDLE = "apiName"
-        const val SEASON_BUNDLE = "season"
-        const val EPISODE_BUNDLE = "episode"
-        const val START_ACTION_BUNDLE = "startAction"
-        const val START_VALUE_BUNDLE = "startValue"
-        const val RESTART_BUNDLE = "restart"
+object ResultFragment {
+    private const val URL_BUNDLE = "url"
+    private const val API_NAME_BUNDLE = "apiName"
+    private const val SEASON_BUNDLE = "season"
+    private const val EPISODE_BUNDLE = "episode"
+    private const val START_ACTION_BUNDLE = "startAction"
+    private const val START_VALUE_BUNDLE = "startValue"
+    private const val RESTART_BUNDLE = "restart"
 
-        fun newInstance(
-            card: SearchResponse, startAction: Int = 0, startValue: Int? = null
-        ): Bundle {
-            return Bundle().apply {
-                putString(URL_BUNDLE, card.url)
-                putString(API_NAME_BUNDLE, card.apiName)
-                if (card is DataStoreHelper.ResumeWatchingResult) {
-                    if (card.season != null)
-                        putInt(SEASON_BUNDLE, card.season)
-                    if (card.episode != null)
-                        putInt(EPISODE_BUNDLE, card.episode)
-                }
-                putInt(START_ACTION_BUNDLE, startAction)
-                if (startValue != null)
-                    putInt(START_VALUE_BUNDLE, startValue)
-
-
-                putBoolean(RESTART_BUNDLE, true)
+    fun newInstance(
+        card: SearchResponse, startAction: Int = 0, startValue: Int? = null
+    ): Bundle {
+        return Bundle().apply {
+            putString(URL_BUNDLE, card.url)
+            putString(API_NAME_BUNDLE, card.apiName)
+            if (card is DataStoreHelper.ResumeWatchingResult) {
+                if (card.season != null)
+                    putInt(SEASON_BUNDLE, card.season)
+                if (card.episode != null)
+                    putInt(EPISODE_BUNDLE, card.episode)
             }
-        }
-
-        fun newInstance(
-            url: String,
-            apiName: String,
-            startAction: Int = 0,
-            startValue: Int = 0
-        ): Bundle {
-            return Bundle().apply {
-                putString(URL_BUNDLE, url)
-                putString(API_NAME_BUNDLE, apiName)
-                putInt(START_ACTION_BUNDLE, startAction)
+            putInt(START_ACTION_BUNDLE, startAction)
+            if (startValue != null)
                 putInt(START_VALUE_BUNDLE, startValue)
-                putBoolean(RESTART_BUNDLE, true)
-            }
-        }
 
-        fun updateUI() {
-            updateUIListener?.invoke()
-        }
 
-        private var updateUIListener: (() -> Unit)? = null
-    }
-
-    open fun setTrailers(trailers: List<ExtractorLink>?) {}
-
-    protected lateinit var viewModel: ResultViewModel2 //by activityViewModels()
-    protected lateinit var syncModel: SyncViewModel
-    protected open val resultLayout = R.layout.fragment_result_swipe
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View? {
-        viewModel =
-            ViewModelProvider(this)[ResultViewModel2::class.java]
-        syncModel =
-            ViewModelProvider(this)[SyncViewModel::class.java]
-
-        return inflater.inflate(resultLayout, container, false)
-    }
-
-    private var downloadButton: EasyDownloadButton? = null
-    override fun onDestroyView() {
-        updateUIListener = null
-        (result_episodes?.adapter as? EpisodeAdapter)?.killAdapter()
-        downloadButton?.dispose()
-
-        super.onDestroyView()
-    }
-
-    override fun onResume() {
-        afterPluginsLoadedEvent += ::reloadViewModel
-        super.onResume()
-        activity?.let {
-            it.window?.navigationBarColor =
-                it.colorFromAttribute(R.attr.primaryBlackBackground)
+            putBoolean(RESTART_BUNDLE, true)
         }
     }
 
-    override fun onDestroy() {
-        afterPluginsLoadedEvent -= ::reloadViewModel
-        super.onDestroy()
-    }
-
-    /// 0 = LOADING, 1 = ERROR LOADING, 2 = LOADED
-    private fun updateVisStatus(state: Int) {
-        when (state) {
-            0 -> {
-                result_bookmark_fab?.isGone = true
-                result_loading?.isVisible = true
-                result_finish_loading?.isVisible = false
-                result_loading_error?.isVisible = false
-            }
-            1 -> {
-                result_bookmark_fab?.isGone = true
-                result_loading?.isVisible = false
-                result_finish_loading?.isVisible = false
-                result_loading_error?.isVisible = true
-                result_reload_connection_open_in_browser?.isVisible = true
-            }
-            2 -> {
-                result_bookmark_fab?.isGone = isTrueTvSettings()
-                result_bookmark_fab?.extend()
-                //if (result_bookmark_button?.context?.isTrueTvSettings() == true) {
-                //    when {
-                //        result_play_movie?.isVisible == true -> {
-                //            result_play_movie?.requestFocus()
-                //        }
-                //        result_resume_series_button?.isVisible == true -> {
-                //            result_resume_series_button?.requestFocus()
-                //        }
-                //        else -> {
-                //            result_bookmark_button?.requestFocus()
-                //        }
-                //    }
-                //}
-
-                result_loading?.isVisible = false
-                result_finish_loading?.isVisible = true
-                result_loading_error?.isVisible = false
-            }
+    fun newInstance(
+        url: String,
+        apiName: String,
+        startAction: Int = 0,
+        startValue: Int = 0
+    ): Bundle {
+        return Bundle().apply {
+            putString(URL_BUNDLE, url)
+            putString(API_NAME_BUNDLE, apiName)
+            putInt(START_ACTION_BUNDLE, startAction)
+            putInt(START_VALUE_BUNDLE, startValue)
+            putBoolean(RESTART_BUNDLE, true)
         }
     }
 
-    open fun setRecommendations(rec: List<SearchResponse>?, validApiName: String?) {
-
+    fun updateUI(id: Int? = null) {
+       // updateUIListener?.invoke()
+        updateUIEvent.invoke(id)
     }
+    val updateUIEvent = Event<Int?>()
 
-    private fun updateUI() {
-        syncModel.updateUserData()
-        viewModel.reloadEpisodes()
-    }
+    //private var updateUIListener: (() -> Unit)? = null
 
-    open fun updateMovie(data: ResourceSome<Pair<UiText, ResultEpisode>>) {
-        when (data) {
-            is ResourceSome.Success -> {
-                data.value.let { (text, ep) ->
-                    result_play_movie.setText(text)
-                    result_play_movie?.setOnClickListener {
-                        viewModel.handleAction(
-                            activity,
-                            EpisodeClickEvent(ACTION_CLICK_DEFAULT, ep)
-                        )
-                    }
-                    result_play_movie?.setOnLongClickListener {
-                        viewModel.handleAction(
-                            activity,
-                            EpisodeClickEvent(ACTION_SHOW_OPTIONS, ep)
-                        )
-                        return@setOnLongClickListener true
-                    }
 
-                    main {
-                        val file =
-                            ioWorkSafe {
-                                context?.let {
-                                    VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(
-                                        it,
-                                        ep.id
-                                    )
-                                }
-                            }
+    //protected open val resultLayout = R.layout.fragment_result_swipe
 
-                        downloadButton?.dispose()
-                        downloadButton = EasyDownloadButton()
-                        downloadButton?.setUpMoreButton(
-                            file?.fileLength,
-                            file?.totalBytes,
-                            result_movie_progress_downloaded ?: return@main,
-                            result_movie_download_icon ?: return@main,
-                            result_movie_download_text ?: return@main,
-                            result_movie_download_text_precentage ?: return@main,
-                            result_download_movie ?: return@main,
-                            true,
-                            VideoDownloadHelper.DownloadEpisodeCached(
-                                ep.name,
-                                ep.poster,
-                                0,
-                                null,
-                                ep.id,
-                                ep.id,
-                                null,
-                                null,
-                                System.currentTimeMillis(),
-                            )
-                        ) { click ->
-                            when (click.action) {
-                                DOWNLOAD_ACTION_DOWNLOAD -> {
-                                    viewModel.handleAction(
-                                        activity,
-                                        EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, ep)
-                                    )
-                                }
-                                else -> handleDownloadClick(activity, click)
-                            }
-                        }
-                        result_movie_progress_downloaded_holder?.isVisible = true
-                    }
-                }
-            }
-            else -> {
-                result_movie_progress_downloaded_holder?.isVisible = false
-                result_play_movie?.isVisible = false
-            }
-        }
-    }
+    /* override var layout = R.layout.fragment_result_swipe
 
-    open fun updateEpisodes(episodes: ResourceSome<List<ResultEpisode>>) {
-        when (episodes) {
-            is ResourceSome.None -> {
-                result_episode_loading?.isVisible = false
-                result_episodes?.isVisible = false
-            }
-            is ResourceSome.Loading -> {
-                result_episode_loading?.isVisible = true
-                result_episodes?.isVisible = false
-            }
-            is ResourceSome.Success -> {
-                result_episodes?.isVisible = true
-                result_episode_loading?.isVisible = false
+     override fun onCreateView(
+         inflater: LayoutInflater,
+         container: ViewGroup?,
+         savedInstanceState: Bundle?,
+     ): View? {
 
-                /*
-                 * Okay so what is this fuckery?
-                 * Basically Android TV will crash if you request a new focus while
-                 * the adapter gets updated.
-                 *
-                 * This means that if you load thumbnails and request a next focus at the same time
-                 * the app will crash without any way to catch it!
-                 *
-                 * How to bypass this?
-                 * This code basically steals the focus for 500ms and puts it in an inescapable view
-                 * then lets out the focus by requesting focus to result_episodes
-                 */
+         return super.onCreateView(inflater, container, savedInstanceState)
+         //return inflater.inflate(resultLayout, container, false)
+     }
 
-                // Do not use this.isTv, that is the player
-                val isTv = isTvSettings()
-                val hasEpisodes =
-                    !(result_episodes?.adapter as? EpisodeAdapter?)?.cardList.isNullOrEmpty()
+     override fun onDestroyView() {
+         updateUIListener = null
+         super.onDestroyView()
+     }
 
-                if (isTv && hasEpisodes) {
-                    // Make it impossible to focus anywhere else!
-                    temporary_no_focus?.isFocusable = true
-                    temporary_no_focus?.requestFocus()
-                }
+     override fun onResume() {
+         afterPluginsLoadedEvent += ::reloadViewModel
+         super.onResume()
+         activity?.let {
+             it.window?.navigationBarColor =
+                 it.colorFromAttribute(R.attr.primaryBlackBackground)
+         }
+     }
 
-                (result_episodes?.adapter as? EpisodeAdapter)?.updateList(episodes.value)
+     override fun onDestroy() {
+         afterPluginsLoadedEvent -= ::reloadViewModel
+         super.onDestroy()
+     }
 
-                if (isTv && hasEpisodes) main {
-                    delay(500)
-                    temporary_no_focus?.isFocusable = false
-                    // This might make some people sad as it changes the focus when leaving an episode :(
-                    result_episodes?.requestFocus()
-                }
-            }
-        }
-    }
+
+     private fun updateUI() {
+         syncModel.updateUserData()
+         viewModel.reloadEpisodes()
+     }*/
 
     data class StoredData(
-        val url: String?,
+        val url: String,
         val apiName: String,
         val showFillers: Boolean,
         val dubStatus: DubStatus,
         val start: AutoResume?,
-        val playerAction: Int
+        val playerAction: Int,
+        val restart : Boolean,
     )
 
-    private fun getStoredData(context: Context): StoredData? {
+    fun Fragment.getStoredData(): StoredData? {
+        val context = this.context ?: this.activity ?: return null
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
-        val url = arguments?.getString(URL_BUNDLE)
+        val url = arguments?.getString(URL_BUNDLE) ?: return null
         val apiName = arguments?.getString(API_NAME_BUNDLE) ?: return null
         val showFillers =
             settingsManager.getBoolean(context.getString(R.string.show_fillers_key), false)
@@ -496,6 +229,11 @@ open class ResultFragment : ResultTrailerPlayer() {
 
         val playerAction = getPlayerAction(context)
 
+        val restart = arguments?.getBoolean(RESTART_BUNDLE) ?: false
+        if (restart) {
+            arguments?.putBoolean(RESTART_BUNDLE, false)
+        }
+
         val start = startAction?.let { action ->
             val startValue = arguments?.getInt(START_VALUE_BUNDLE)
             val resumeEpisode = arguments?.getInt(EPISODE_BUNDLE)
@@ -510,10 +248,10 @@ open class ResultFragment : ResultTrailerPlayer() {
                 season = resumeSeason
             )
         }
-        return StoredData(url, apiName, showFillers, dubStatus, start, playerAction)
+        return StoredData(url, apiName, showFillers, dubStatus, start, playerAction, restart)
     }
 
-    private fun reloadViewModel(forceReload: Boolean) {
+    /*private fun reloadViewModel(forceReload: Boolean) {
         if (!viewModel.hasLoaded() || forceReload) {
             val storedData = getStoredData(activity ?: context ?: return) ?: return
 
@@ -532,26 +270,6 @@ open class ResultFragment : ResultTrailerPlayer() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        result_cast_items?.layoutManager = object : LinearListLayout(view.context) {
-            override fun onRequestChildFocus(
-                parent: RecyclerView,
-                state: RecyclerView.State,
-                child: View,
-                focused: View?
-            ): Boolean {
-                // Make the cast always focus the first visible item when focused
-                // from somewhere else. Otherwise it jumps to the last item.
-                return if (parent.focusedChild == null) {
-                    scrollToPosition(this.findFirstCompletelyVisibleItemPosition())
-                    true
-                } else {
-                    super.onRequestChildFocus(parent, state, child, focused)
-                }
-            }
-        }.apply {
-            this.orientation = RecyclerView.HORIZONTAL
-        }
-        result_cast_items?.adapter = ActorAdaptor()
 
         updateUIListener = ::updateUI
 
@@ -565,7 +283,6 @@ open class ResultFragment : ResultTrailerPlayer() {
         context?.updateHasTrailers()
         activity?.loadCache()
 
-        activity?.fixPaddingStatusbar(result_top_bar)
         //activity?.fixPaddingStatusbar(result_barstatus)
 
         /* val backParameter = result_back.layoutParams as FrameLayout.LayoutParams
@@ -582,533 +299,13 @@ open class ResultFragment : ResultTrailerPlayer() {
         val storedData = (activity ?: context)?.let {
             getStoredData(it)
         }
-        syncModel.addFromUrl(storedData?.url)
-
-        val api = getApiFromNameNull(storedData?.apiName)
-
-        result_episodes?.adapter =
-            EpisodeAdapter(
-                api?.hasDownloadSupport == true,
-                { episodeClick ->
-                    viewModel.handleAction(activity, episodeClick)
-                },
-                { downloadClickEvent ->
-                    handleDownloadClick(activity, downloadClickEvent)
-                }
-            )
-
-
-        observe(viewModel.episodeSynopsis) { description ->
-            view.context?.let { ctx ->
-                val builder: AlertDialog.Builder =
-                    AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
-                builder.setMessage(description.html())
-                    .setTitle(R.string.synopsis)
-                    .setOnDismissListener {
-                        viewModel.releaseEpisodeSynopsis()
-                    }
-                    .show()
-            }
-        }
-
-        observe(viewModel.watchStatus) { watchType ->
-            result_bookmark_button?.text = getString(watchType.stringRes)
-            result_bookmark_fab?.text = getString(watchType.stringRes)
-
-            if (watchType == WatchType.NONE) {
-                result_bookmark_fab?.context?.colorFromAttribute(R.attr.white)
-            } else {
-                result_bookmark_fab?.context?.colorFromAttribute(R.attr.colorPrimary)
-            }?.let {
-                val colorState = ColorStateList.valueOf(it)
-                result_bookmark_fab?.iconTint = colorState
-                result_bookmark_fab?.setTextColor(colorState)
-            }
-
-            result_bookmark_fab?.setOnClickListener { fab ->
-                activity?.showBottomDialog(
-                    WatchType.values().map { fab.context.getString(it.stringRes) }.toList(),
-                    watchType.ordinal,
-                    fab.context.getString(R.string.action_add_to_bookmarks),
-                    showApply = false,
-                    {}) {
-                    viewModel.updateWatchStatus(WatchType.values()[it])
-                }
-            }
-
-            result_bookmark_button?.setOnClickListener { fab ->
-                activity?.showBottomDialog(
-                    WatchType.values().map { fab.context.getString(it.stringRes) }.toList(),
-                    watchType.ordinal,
-                    fab.context.getString(R.string.action_add_to_bookmarks),
-                    showApply = false,
-                    {}) {
-                    viewModel.updateWatchStatus(WatchType.values()[it])
-                }
-            }
-        }
 
         // This is to band-aid FireTV navigation
         val isTv = isTvSettings()
         result_season_button?.isFocusableInTouchMode = isTv
         result_episode_select?.isFocusableInTouchMode = isTv
         result_dub_select?.isFocusableInTouchMode = isTv
-
-        context?.let { ctx ->
-            val arrayAdapter = ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
-            /*
-            -1 -> None
-            0 -> Watching
-            1 -> Completed
-            2 -> OnHold
-            3 -> Dropped
-            4 -> PlanToWatch
-            5 -> ReWatching
-            */
-            val items = listOf(
-                R.string.none,
-                R.string.type_watching,
-                R.string.type_completed,
-                R.string.type_on_hold,
-                R.string.type_dropped,
-                R.string.type_plan_to_watch,
-                R.string.type_re_watching
-            ).map { ctx.getString(it) }
-            arrayAdapter.addAll(items)
-            result_sync_check?.choiceMode = AbsListView.CHOICE_MODE_SINGLE
-            result_sync_check?.adapter = arrayAdapter
-            UIHelper.setListViewHeightBasedOnItems(result_sync_check)
-
-            result_sync_check?.setOnItemClickListener { _, _, which, _ ->
-                syncModel.setStatus(which - 1)
-            }
-
-            result_sync_rating?.addOnChangeListener { _, value, _ ->
-                syncModel.setScore(value.toInt())
-            }
-
-            result_sync_add_episode?.setOnClickListener {
-                syncModel.setEpisodesDelta(1)
-            }
-
-            result_sync_sub_episode?.setOnClickListener {
-                syncModel.setEpisodesDelta(-1)
-            }
-
-            result_sync_current_episodes?.doOnTextChanged { text, _, before, count ->
-                if (count == before) return@doOnTextChanged
-                text?.toString()?.toIntOrNull()?.let { ep ->
-                    syncModel.setEpisodes(ep)
-                }
-            }
-        }
-
-        observe(syncModel.synced) { list ->
-            result_sync_names?.text =
-                list.filter { it.isSynced && it.hasAccount }.joinToString { it.name }
-
-            val newList = list.filter { it.isSynced && it.hasAccount }
-
-            result_mini_sync?.isVisible = newList.isNotEmpty()
-            (result_mini_sync?.adapter as? ImageAdapter)?.updateList(newList.mapNotNull { it.icon })
-        }
-
-        var currentSyncProgress = 0
-
-        fun setSyncMaxEpisodes(totalEpisodes: Int?) {
-            result_sync_episodes?.max = (totalEpisodes ?: 0) * 1000
-
-            normalSafeApiCall {
-                val ctx = result_sync_max_episodes?.context
-                result_sync_max_episodes?.text =
-                    totalEpisodes?.let { episodes ->
-                        ctx?.getString(R.string.sync_total_episodes_some)?.format(episodes)
-                    } ?: run {
-                        ctx?.getString(R.string.sync_total_episodes_none)
-                    }
-            }
-        }
-
-        observe(syncModel.metadata) { meta ->
-            when (meta) {
-                is Resource.Success -> {
-                    val d = meta.value
-                    result_sync_episodes?.progress = currentSyncProgress * 1000
-                    setSyncMaxEpisodes(d.totalEpisodes)
-
-                    viewModel.setMeta(d, syncModel.getSyncs())
-                }
-                is Resource.Loading -> {
-                    result_sync_max_episodes?.text =
-                        result_sync_max_episodes?.context?.getString(R.string.sync_total_episodes_none)
-                }
-                else -> {}
-            }
-        }
-
-        observe(syncModel.userData) { status ->
-            var closed = false
-            when (status) {
-                is Resource.Failure -> {
-                    result_sync_loading_shimmer?.stopShimmer()
-                    result_sync_loading_shimmer?.isVisible = false
-                    result_sync_holder?.isVisible = false
-                    closed = true
-                }
-                is Resource.Loading -> {
-                    result_sync_loading_shimmer?.startShimmer()
-                    result_sync_loading_shimmer?.isVisible = true
-                    result_sync_holder?.isVisible = false
-                }
-                is Resource.Success -> {
-                    result_sync_loading_shimmer?.stopShimmer()
-                    result_sync_loading_shimmer?.isVisible = false
-                    result_sync_holder?.isVisible = true
-
-                    val d = status.value
-                    result_sync_rating?.value = d.score?.toFloat() ?: 0.0f
-                    result_sync_check?.setItemChecked(d.status + 1, true)
-                    val watchedEpisodes = d.watchedEpisodes ?: 0
-                    currentSyncProgress = watchedEpisodes
-
-                    d.maxEpisodes?.let {
-                        // don't directly call it because we don't want to override metadata observe
-                        setSyncMaxEpisodes(it)
-                    }
-
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                        result_sync_episodes?.setProgress(watchedEpisodes * 1000, true)
-                    } else {
-                        result_sync_episodes?.progress = watchedEpisodes * 1000
-                    }
-                    result_sync_current_episodes?.text =
-                        Editable.Factory.getInstance()?.newEditable(watchedEpisodes.toString())
-                    normalSafeApiCall { // format might fail
-                        context?.getString(R.string.sync_score_format)?.format(d.score ?: 0)?.let {
-                            result_sync_score_text?.text = it
-                        }
-                    }
-                }
-                null -> {
-                    closed = false
-                }
-            }
-            result_overlapping_panels?.setStartPanelLockState(if (closed) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
-        }
-
-        observe(viewModel.resumeWatching) { resume ->
-            when (resume) {
-                is Some.Success -> {
-                    result_resume_parent?.isVisible = true
-                    val value = resume.value
-                    value.progress?.let { progress ->
-                        result_resume_series_title?.apply {
-                            isVisible = !value.isMovie
-                            text =
-                                if (value.isMovie) null else activity?.getNameFull(
-                                    value.result.name,
-                                    value.result.episode,
-                                    value.result.season
-                                )
-                        }
-                        result_resume_series_progress_text.setText(progress.progressLeft)
-                        result_resume_series_progress?.apply {
-                            isVisible = true
-                            this.max = progress.maxProgress
-                            this.progress = progress.progress
-                        }
-                        result_resume_progress_holder?.isVisible = true
-                    } ?: run {
-                        result_resume_progress_holder?.isVisible = false
-                        result_resume_series_progress?.isVisible = false
-                        result_resume_series_title?.isVisible = false
-                        result_resume_series_progress_text?.isVisible = false
-                    }
-
-                    result_resume_series_button?.isVisible = !value.isMovie
-                    result_resume_series_button_play?.isVisible = !value.isMovie
-
-                    val click = View.OnClickListener {
-                        viewModel.handleAction(
-                            activity,
-                            EpisodeClickEvent(
-                                storedData?.playerAction ?: ACTION_PLAY_EPISODE_IN_PLAYER,
-                                value.result
-                            )
-                        )
-                    }
-
-                    result_resume_series_button?.setOnClickListener(click)
-                    result_resume_series_button_play?.setOnClickListener(click)
-                }
-                is Some.None -> {
-                    result_resume_parent?.isVisible = false
-                }
-            }
-        }
-
-        observe(viewModel.episodes) { episodes ->
-            updateEpisodes(episodes)
-        }
-
-        result_cast_items?.setOnFocusChangeListener { _, hasFocus ->
-            // Always escape focus
-            if (hasFocus) result_bookmark_button?.requestFocus()
-        }
-
-        result_sync_set_score?.setOnClickListener {
-            syncModel.publishUserData()
-        }
-
-        observe(viewModel.trailers) { trailers ->
-            setTrailers(trailers.flatMap { it.mirros }) // I dont care about subtitles yet!
-        }
-
-        observe(viewModel.recommendations) { recommendations ->
-            setRecommendations(recommendations, null)
-        }
-
-        observe(viewModel.movie) { data ->
-            updateMovie(data)
-        }
-
-        observe(viewModel.page) { data ->
-            if (data == null) return@observe
-            when (data) {
-                is Resource.Success -> {
-                    val d = data.value
-
-                    updateVisStatus(2)
-
-                    result_vpn.setText(d.vpnText)
-                    result_info.setText(d.metaText)
-                    result_no_episodes.setText(d.noEpisodesFoundText)
-                    result_title.setText(d.titleText)
-                    result_meta_site.setText(d.apiName)
-                    result_meta_type.setText(d.typeText)
-                    result_meta_year.setText(d.yearText)
-                    result_meta_duration.setText(d.durationText)
-                    result_meta_rating.setText(d.ratingText)
-                    result_cast_text.setText(d.actorsText)
-                    result_next_airing.setText(d.nextAiringEpisode)
-                    result_next_airing_time.setText(d.nextAiringDate)
-                    result_poster.setImage(d.posterImage)
-                    result_poster_background.setImage(d.posterBackgroundImage)
-                    //result_trailer_thumbnail.setImage(d.posterBackgroundImage, fadeIn = false)
-
-                    if (d.posterImage != null && !isTrueTvSettings())
-                        result_poster_holder?.setOnClickListener {
-                            try {
-                                context?.let { ctx ->
-                                    runBlocking {
-                                        val sourceBuilder = AlertDialog.Builder(ctx)
-                                        sourceBuilder.setView(R.layout.result_poster)
-
-                                        val sourceDialog = sourceBuilder.create()
-                                        sourceDialog.show()
-
-                                        sourceDialog.findViewById<ImageView?>(R.id.imgPoster)
-                                            ?.apply {
-                                                setImage(d.posterImage)
-                                                setOnClickListener {
-                                                    sourceDialog.dismissSafe()
-                                                }
-                                            }
-                                    }
-                                }
-                            } catch (e: Exception) {
-                                logError(e)
-                            }
-                        }
-
-
-                    result_cast_items?.isVisible = d.actors != null
-                    (result_cast_items?.adapter as? ActorAdaptor)?.apply {
-                        updateList(d.actors ?: emptyList())
-                    }
-
-                    observeNullable(viewModel.subscribeStatus) { isSubscribed ->
-                        result_subscribe?.isVisible = isSubscribed != null
-                        if (isSubscribed == null) return@observeNullable
-
-                        val drawable = if (isSubscribed) {
-                            R.drawable.ic_baseline_notifications_active_24
-                        } else {
-                            R.drawable.baseline_notifications_none_24
-                        }
-
-                        result_subscribe?.setImageResource(drawable)
-                    }
-
-                    result_subscribe?.setOnClickListener {
-                        val isSubscribed =
-                            viewModel.toggleSubscriptionStatus() ?: return@setOnClickListener
-
-                        val message = if (isSubscribed) {
-                            // Kinda icky to have this here, but it works.
-                            SubscriptionWorkManager.enqueuePeriodicWork(context)
-                            R.string.subscription_new
-                        } else {
-                            R.string.subscription_deleted
-                        }
-
-                        val name = (viewModel.page.value as? Resource.Success)?.value?.title
-                            ?: txt(R.string.no_data).asStringNull(context) ?: ""
-                        showToast(activity, txt(message, name), Toast.LENGTH_SHORT)
-                    }
-
-                    result_open_in_browser?.isVisible = d.url.startsWith("http")
-                    result_open_in_browser?.setOnClickListener {
-                        val i = Intent(ACTION_VIEW)
-                        i.data = Uri.parse(d.url)
-                        try {
-                            startActivity(i)
-                        } catch (e: Exception) {
-                            logError(e)
-                        }
-                    }
-
-                    result_search?.setOnClickListener {
-                        QuickSearchFragment.pushSearch(activity, d.title)
-                    }
-
-                    result_share?.setOnClickListener {
-                        try {
-                            val i = Intent(ACTION_SEND)
-                            i.type = "text/plain"
-                            i.putExtra(EXTRA_SUBJECT, d.title)
-                            i.putExtra(EXTRA_TEXT, d.url)
-                            startActivity(createChooser(i, d.title))
-                        } catch (e: Exception) {
-                            logError(e)
-                        }
-                    }
-
-                    if (syncModel.addSyncs(d.syncData)) {
-                        syncModel.updateMetaAndUser()
-                        syncModel.updateSynced()
-                    } else {
-                        syncModel.addFromUrl(d.url)
-                    }
-
-                    result_description.setTextHtml(d.plotText)
-                    if (this !is ResultFragmentTv) // dont want this clickable on tv layout
-                        result_description?.setOnClickListener { view ->
-                            view.context?.let { ctx ->
-                                val builder: AlertDialog.Builder =
-                                    AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
-                                builder.setMessage(d.plotText.asString(ctx).html())
-                                    .setTitle(d.plotHeaderText.asString(ctx))
-                                    .show()
-                            }
-                        }
-
-
-                    d.comingSoon.let { soon ->
-                        result_coming_soon?.isVisible = soon
-                        result_data_holder?.isGone = soon
-                    }
-
-                    val tags = d.tags
-                    result_tag_holder?.isVisible = tags.isNotEmpty()
-                    result_tag?.apply {
-                        removeAllViews()
-                        tags.forEach { tag ->
-                            val chip = Chip(context)
-                            val chipDrawable = ChipDrawable.createFromAttributes(
-                                context,
-                                null,
-                                0,
-                                R.style.ChipFilled
-                            )
-                            chip.setChipDrawable(chipDrawable)
-                            chip.text = tag
-                            chip.isChecked = false
-                            chip.isCheckable = false
-                            chip.isFocusable = false
-                            chip.isClickable = false
-                            chip.setTextColor(context.colorFromAttribute(R.attr.textColor))
-                            addView(chip)
-                        }
-                    }
-                    // if (tags.isNotEmpty()) {
-                    //result_tag_holder?.visibility = VISIBLE
-                    //val isOnTv = isTrueTvSettings()
-
-
-                    /*for ((index, tag) in tags.withIndex()) {
-                            val viewBtt = layoutInflater.inflate(R.layout.result_tag, null)
-                            val btt = viewBtt.findViewById<MaterialButton>(R.id.result_tag_card)
-                            btt.text = tag
-                            btt.isFocusable = !isOnTv
-                            btt.isClickable = !isOnTv
-                            result_tag?.addView(viewBtt, index)
-                        }*/
-                    //}
-                }
-                is Resource.Failure -> {
-                    result_error_text.text = storedData?.url?.plus("\n") + data.errorString
-                    updateVisStatus(1)
-                }
-                is Resource.Loading -> {
-                    updateVisStatus(0)
-                }
-            }
-        }
-
-        context?.let { ctx ->
-
-            //result_bookmark_button?.isVisible = ctx.isTvSettings()
-
-            val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
-
-
-            Kitsu.isEnabled =
-                settingsManager.getBoolean(ctx.getString(R.string.show_kitsu_posters_key), true)
-
             if (storedData?.url != null) {
-                result_reload_connectionerror.setOnClickListener {
-                    viewModel.load(
-                        activity,
-                        storedData.url,
-                        storedData.apiName,
-                        storedData.showFillers,
-                        storedData.dubStatus,
-                        storedData.start
-                    )
-                }
-
-                result_reload_connection_open_in_browser?.setOnClickListener {
-                    val i = Intent(ACTION_VIEW)
-                    i.data = Uri.parse(storedData.url)
-                    try {
-                        startActivity(i)
-                    } catch (e: Exception) {
-                        logError(e)
-                    }
-                }
-
-                result_open_in_browser?.isVisible = storedData.url.startsWith("http")
-                result_open_in_browser?.setOnClickListener {
-                    val i = Intent(ACTION_VIEW)
-                    i.data = Uri.parse(storedData.url)
-                    try {
-                        startActivity(i)
-                    } catch (e: Exception) {
-                        logError(e)
-                    }
-                }
-
-                // bloats the navigation on tv
-                if (!isTrueTvSettings()) {
-                    result_meta_site?.setOnClickListener {
-                        it.context?.openBrowser(storedData.url)
-                    }
-                    result_meta_site?.isFocusable = true
-                } else {
-                    result_meta_site?.isFocusable = false
-                }
-
                 if (restart || !viewModel.hasLoaded()) {
                     //viewModel.clear()
                     viewModel.load(
@@ -1121,6 +318,5 @@ open class ResultFragment : ResultTrailerPlayer() {
                     )
                 }
             }
-        }
-    }
+    }*/
 }
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 2f232995..ef2ed0df 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
@@ -1,56 +1,123 @@
 package com.lagradost.cloudstream3.ui.result
 
+import android.annotation.SuppressLint
 import android.app.Dialog
+import android.content.Intent
+import android.content.res.ColorStateList
 import android.graphics.Rect
+import android.os.Build
 import android.os.Bundle
+import android.text.Editable
+import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.view.animation.DecelerateInterpolator
+import android.widget.AbsListView
+import android.widget.ArrayAdapter
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.widget.NestedScrollView
+import androidx.core.widget.doOnTextChanged
+import androidx.lifecycle.ViewModelProvider
 import com.discord.panels.OverlappingPanelsLayout
 import com.discord.panels.PanelsChildGestureRegionObserver
 import com.google.android.gms.cast.framework.CastButtonFactory
 import com.google.android.gms.cast.framework.CastContext
 import com.google.android.gms.cast.framework.CastState
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.updateHasTrailers
-import com.lagradost.cloudstream3.mvvm.Some
+import com.lagradost.cloudstream3.CommonActivity
+import com.lagradost.cloudstream3.DubStatus
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.databinding.FragmentResultBinding
+import com.lagradost.cloudstream3.databinding.FragmentResultSwipeBinding
+import com.lagradost.cloudstream3.databinding.ResultRecommendationsBinding
+import com.lagradost.cloudstream3.databinding.ResultSyncBinding
+import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.mvvm.observeNullable
+import com.lagradost.cloudstream3.services.SubscriptionWorkManager
+import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
+import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup
 import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
+import com.lagradost.cloudstream3.ui.player.FullScreenPlayer
+import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
+import com.lagradost.cloudstream3.ui.result.ResultFragment.getStoredData
+import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
+import com.lagradost.cloudstream3.utils.AppUtils.getNameFull
+import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
+import com.lagradost.cloudstream3.utils.AppUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppUtils.openBrowser
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
+import com.lagradost.cloudstream3.utils.UIHelper
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
+import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
-import kotlinx.android.synthetic.main.fragment_result.*
-import kotlinx.android.synthetic.main.fragment_result.result_cast_items
-import kotlinx.android.synthetic.main.fragment_result.result_episodes_text
-import kotlinx.android.synthetic.main.fragment_result.result_resume_parent
-import kotlinx.android.synthetic.main.fragment_result.result_scroll
-import kotlinx.android.synthetic.main.fragment_result.result_smallscreen_holder
-import kotlinx.android.synthetic.main.fragment_result_swipe.*
-import kotlinx.android.synthetic.main.fragment_result_swipe.result_back
-import kotlinx.android.synthetic.main.fragment_result_tv.*
-import kotlinx.android.synthetic.main.fragment_trailer.*
-import kotlinx.android.synthetic.main.result_recommendations.*
-import kotlinx.android.synthetic.main.result_recommendations.result_recommendations
-import kotlinx.android.synthetic.main.trailer_custom_layout.*
+import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 
 
-class ResultFragmentPhone : ResultFragment() {
+open class ResultFragmentPhone : FullScreenPlayer() {
+    private val gestureRegionsListener = object : PanelsChildGestureRegionObserver.GestureRegionsListener {
+        override fun onGestureRegionsUpdate(gestureRegions: List<Rect>) {
+            binding?.resultOverlappingPanels?.setChildGestureRegions(gestureRegions)
+        }
+    }
+
+    protected lateinit var viewModel: ResultViewModel2
+    protected lateinit var syncModel: SyncViewModel
+
+    protected var binding: FragmentResultSwipeBinding? = null
+    protected var resultBinding: FragmentResultBinding? = null
+    protected var recommendationBinding: ResultRecommendationsBinding? = null
+    protected var syncBinding: ResultSyncBinding? = null
+
+    override var layout = R.layout.fragment_result_swipe
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        viewModel =
+            ViewModelProvider(this)[ResultViewModel2::class.java]
+        syncModel =
+            ViewModelProvider(this)[SyncViewModel::class.java]
+        updateUIEvent += ::updateUI
+
+        val root = super.onCreateView(inflater, container, savedInstanceState) ?: return null
+        FragmentResultSwipeBinding.bind(root).let { bind ->
+            resultBinding =
+                bind.fragmentResult//FragmentResultBinding.bind(binding.root.findViewById(R.id.fragment_result))
+            recommendationBinding = bind.resultRecommendations
+            syncBinding = bind.resultSync
+            binding = bind
+        }
+
+        return root
+    }
+
     var currentTrailers: List<ExtractorLink> = emptyList()
     var currentTrailerIndex = 0
 
@@ -63,8 +130,8 @@ class ResultFragmentPhone : ResultFragment() {
         return currentTrailerIndex + 1 < currentTrailers.size
     }
 
-    override fun playerError(exception: Exception) {
-        if (player.getIsPlaying()) { // because we dont want random toasts in player
+    override fun playerError(exception: Throwable) {
+        if (player.getIsPlaying()) { // because we don't want random toasts in player
             super.playerError(exception)
         } else {
             nextMirror()
@@ -96,19 +163,30 @@ class ResultFragmentPhone : ResultFragment() {
         //result_trailer_thumbnail?.setImageBitmap(result_poster_background?.drawable?.toBitmap())
 
 
-        result_trailer_loading?.isVisible = isSuccess
+        // result_trailer_loading?.isVisible = isSuccess
         val turnVis = !isSuccess && !isFullScreenPlayer
-        result_smallscreen_holder?.isVisible = turnVis
-        result_poster_background_holder?.apply {
-            val fadeIn: Animation = AlphaAnimation(alpha, if (turnVis) 1.0f else 0.0f).apply {
-                interpolator = DecelerateInterpolator()
-                duration = 200
-                fillAfter = true
+        resultBinding?.apply {
+            resultSmallscreenHolder.isVisible = turnVis
+            resultPosterBackgroundHolder.apply {
+                val fadeIn: Animation = AlphaAnimation(alpha, if (turnVis) 1.0f else 0.0f).apply {
+                    interpolator = DecelerateInterpolator()
+                    duration = 200
+                    fillAfter = true
+                }
+                clearAnimation()
+                startAnimation(fadeIn)
             }
-            clearAnimation()
-            startAnimation(fadeIn)
+
+            // We don't want the trailer to be focusable if it's not visible
+            resultSmallscreenHolder.descendantFocusability = if (isSuccess) {
+                ViewGroup.FOCUS_AFTER_DESCENDANTS
+            } else {
+                ViewGroup.FOCUS_BLOCK_DESCENDANTS
+            }
+            binding?.resultFullscreenHolder?.isVisible = !isSuccess && isFullScreenPlayer
         }
 
+
         //player_view?.apply {
         //alpha = 0.0f
         //ObjectAnimator.ofFloat(player_view, "alpha", 1f).apply {
@@ -124,16 +202,10 @@ class ResultFragmentPhone : ResultFragment() {
         //startAnimation(fadeIn)
         // }
 
-        // We don't want the trailer to be focusable if it's not visible
-        result_smallscreen_holder?.descendantFocusability = if (isSuccess) {
-            ViewGroup.FOCUS_AFTER_DESCENDANTS
-        } else {
-            ViewGroup.FOCUS_BLOCK_DESCENDANTS
-        }
-        result_fullscreen_holder?.isVisible = !isSuccess && isFullScreenPlayer
+
     }
 
-    override fun setTrailers(trailers: List<ExtractorLink>?) {
+    private fun setTrailers(trailers: List<ExtractorLink>?) {
         context?.updateHasTrailers()
         if (!LoadResponse.isTrailersEnabled) return
         currentTrailers = trailers?.sortedBy { -it.quality } ?: emptyList()
@@ -141,15 +213,22 @@ class ResultFragmentPhone : ResultFragment() {
     }
 
     override fun onDestroyView() {
+
         //somehow this still leaks and I dont know why????
         // todo look at https://github.com/discord/OverlappingPanels/blob/70b4a7cf43c6771873b1e091029d332896d41a1a/sample_app/src/main/java/com/discord/sampleapp/MainActivity.kt
         PanelsChildGestureRegionObserver.Provider.get().let { obs ->
-            result_cast_items?.let {
+            resultBinding?.resultCastItems?.let {
                 obs.unregister(it)
             }
-            obs.removeGestureRegionsUpdateListener(this)
+
+            obs.removeGestureRegionsUpdateListener(gestureRegionsListener)
         }
 
+        updateUIEvent -= ::updateUI
+        binding = null
+        resultBinding = null
+        syncBinding = null
+        recommendationBinding = null
         super.onDestroyView()
     }
 
@@ -168,38 +247,254 @@ class ResultFragmentPhone : ResultFragment() {
 
     var selectSeason: String? = null
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val apiName = arguments?.getString(API_NAME_BUNDLE) ?: return
+    private fun setUrl(url: String?) {
+        if (url == null) {
+            binding?.resultOpenInBrowser?.isVisible = false
+            return
+        }
 
+        val valid = url.startsWith("http")
+
+        binding?.resultOpenInBrowser?.apply {
+            isVisible = valid
+            setOnClickListener {
+                context?.openBrowser(url)
+            }
+        }
+
+        resultBinding?.resultReloadConnectionOpenInBrowser?.setOnClickListener {
+            view?.context?.openBrowser(url)
+        }
+
+        resultBinding?.resultMetaSite?.setOnClickListener {
+            view?.context?.openBrowser(url)
+        }
+    }
+
+    private fun reloadViewModel(forceReload: Boolean) {
+        if (!viewModel.hasLoaded() || forceReload) {
+            val storedData = getStoredData() ?: return
+            viewModel.load(
+                activity,
+                storedData.url,
+                storedData.apiName,
+                storedData.showFillers,
+                storedData.dubStatus,
+                storedData.start
+            )
+        }
+    }
+
+    override fun onResume() {
+        afterPluginsLoadedEvent += ::reloadViewModel
+        activity?.let {
+            it.window?.navigationBarColor =
+                it.colorFromAttribute(R.attr.primaryBlackBackground)
+        }
+        super.onResume()
+        PanelsChildGestureRegionObserver.Provider.get()
+            .addGestureRegionsUpdateListener(gestureRegionsListener)
+    }
+
+    override fun onStop() {
+        afterPluginsLoadedEvent -= ::reloadViewModel
+        super.onStop()
+    }
+
+    private fun updateUI(id: Int?) {
+        syncModel.updateUserData()
+        viewModel.reloadEpisodes()
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        player_open_source?.setOnClickListener {
-            currentTrailers.getOrNull(currentTrailerIndex)?.let {
-                context?.openBrowser(it.url)
+        // ===== setup =====
+        UIHelper.fixPaddingStatusbar(binding?.resultTopBar)
+        val storedData = getStoredData() ?: return
+        activity?.window?.decorView?.clearFocus()
+        activity?.loadCache()
+        context?.updateHasTrailers()
+        hideKeyboard()
+        if (storedData.restart || !viewModel.hasLoaded())
+            viewModel.load(
+                activity,
+                storedData.url,
+                storedData.apiName,
+                storedData.showFillers,
+                storedData.dubStatus,
+                storedData.start
+            )
+
+        setUrl(storedData.url)
+        syncModel.addFromUrl(storedData.url)
+        val api = APIHolder.getApiFromNameNull(storedData.apiName)
+
+        PanelsChildGestureRegionObserver.Provider.get().apply {
+            resultBinding?.resultCastItems?.let {
+                register(it)
+            }
+            addGestureRegionsUpdateListener(gestureRegionsListener)
+        }
+
+
+
+        // ===== ===== =====
+
+        resultBinding?.apply {
+            resultReloadConnectionerror.setOnClickListener {
+                viewModel.load(
+                    activity,
+                    storedData.url,
+                    storedData.apiName,
+                    storedData.showFillers,
+                    storedData.dubStatus,
+                    storedData.start
+                )
+            }
+
+            resultCastItems.setLinearListLayout(
+                isHorizontal = true,
+                nextLeft = FOCUS_SELF,
+                nextRight = FOCUS_SELF
+            )
+            /*resultCastItems.layoutManager = object : LinearListLayout(view.context) {
+                override fun onRequestChildFocus(
+                    parent: RecyclerView,
+                    state: RecyclerView.State,
+                    child: View,
+                    focused: View?
+                ): Boolean {
+                    // Make the cast always focus the first visible item when focused
+                    // from somewhere else. Otherwise it jumps to the last item.
+                    return if (parent.focusedChild == null) {
+                        scrollToPosition(this.findFirstCompletelyVisibleItemPosition())
+                        true
+                    } else {
+                        super.onRequestChildFocus(parent, state, child, focused)
+                    }
+                }
+            }.apply {
+                this.orientation = RecyclerView.HORIZONTAL
+            }*/
+            resultCastItems.adapter = ActorAdaptor()
+
+            resultEpisodes.adapter =
+                EpisodeAdapter(
+                    api?.hasDownloadSupport == true,
+                    { episodeClick ->
+                        viewModel.handleAction(episodeClick)
+                    },
+                    { downloadClickEvent ->
+                        DownloadButtonSetup.handleDownloadClick(downloadClickEvent)
+                    }
+                )
+
+
+            resultScroll.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+                val dy = scrollY - oldScrollY
+                if (dy > 0) { //check for scroll down
+                    binding?.resultBookmarkFab?.shrink()
+                } else if (dy < -5) {
+                    binding?.resultBookmarkFab?.extend()
+                }
+                if (!isFullScreenPlayer && player.getIsPlaying()) {
+                    if (scrollY > (resultBinding?.fragmentTrailer?.playerBackground?.height
+                            ?: scrollY)
+                    ) {
+                        player.handleEvent(CSPlayerEvent.Pause)
+                    }
+                }
+            })
+        }
+
+        binding?.apply {
+            resultOverlappingPanels.setStartPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
+            resultOverlappingPanels.setEndPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
+            resultBack.setOnClickListener {
+                activity?.popCurrentPage()
+            }
+
+
+            resultMiniSync.adapter = ImageAdapter(
+                nextFocusDown = R.id.result_sync_set_score,
+                clickCallback = { action ->
+                    if (action == IMAGE_CLICK || action == IMAGE_LONG_CLICK) {
+                        if (binding?.resultOverlappingPanels?.getSelectedPanel()?.ordinal == 1) {
+                            binding?.resultOverlappingPanels?.openStartPanel()
+                        } else {
+                            binding?.resultOverlappingPanels?.closePanels()
+                        }
+                    }
+                })
+            resultSubscribe.setOnClickListener {
+                val isSubscribed =
+                    viewModel.toggleSubscriptionStatus() ?: return@setOnClickListener
+
+                val message = if (isSubscribed) {
+                    // Kinda icky to have this here, but it works.
+                    SubscriptionWorkManager.enqueuePeriodicWork(context)
+                    R.string.subscription_new
+                } else {
+                    R.string.subscription_deleted
+                }
+
+                val name = (viewModel.page.value as? Resource.Success)?.value?.title
+                    ?: txt(R.string.no_data).asStringNull(context) ?: ""
+                CommonActivity.showToast(txt(message, name), Toast.LENGTH_SHORT)
+            }
+            mediaRouteButton.apply {
+                val chromecastSupport = api?.hasChromecastSupport == true
+                alpha = if (chromecastSupport) 1f else 0.3f
+                if (!chromecastSupport) {
+                    setOnClickListener {
+                        CommonActivity.showToast(
+                            R.string.no_chromecast_support_toast,
+                            Toast.LENGTH_LONG
+                        )
+                    }
+                }
+                activity?.let { act ->
+                    if (act.isCastApiAvailable()) {
+                        try {
+                            CastButtonFactory.setUpMediaRouteButton(act, this)
+                            val castContext = CastContext.getSharedInstance(act.applicationContext)
+                            isGone = castContext.castState == CastState.NO_DEVICES_AVAILABLE
+                            // this shit leaks for some reason
+                            //castContext.addCastStateListener { state ->
+                            //    media_route_button?.isGone = state == CastState.NO_DEVICES_AVAILABLE
+                            //}
+                        } catch (e: Exception) {
+                            logError(e)
+                        }
+                    }
+                }
             }
         }
-        result_overlapping_panels?.setStartPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
-        result_overlapping_panels?.setEndPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
 
-        result_recommendations?.spanCount = 3
-        result_recommendations?.adapter =
-            SearchAdapter(
-                ArrayList(),
-                result_recommendations,
-            ) { callback ->
-                SearchHelper.handleSearchClickCallback(activity, callback)
+        playerBinding?.apply {
+            playerOpenSource.setOnClickListener {
+                currentTrailers.getOrNull(currentTrailerIndex)?.let {
+                    context?.openBrowser(it.url)
+                }
             }
-        PanelsChildGestureRegionObserver.Provider.get().addGestureRegionsUpdateListener(this)
-
-        result_cast_items?.let {
-            PanelsChildGestureRegionObserver.Provider.get().register(it)
         }
 
-
-        result_back?.setOnClickListener {
-            activity?.popCurrentPage()
+        recommendationBinding?.apply {
+            resultRecommendationsList.apply {
+                spanCount = 3
+                adapter =
+                    SearchAdapter(
+                        ArrayList(),
+                        this,
+                    ) { callback ->
+                        SearchHelper.handleSearchClickCallback(callback)
+                    }
+            }
         }
 
+
         /*
         result_bookmark_button?.setOnClickListener {
             it.popupMenuNoIcons(
@@ -211,169 +506,508 @@ class ResultFragmentPhone : ResultFragment() {
             }
         }*/
 
-        result_mini_sync?.adapter = ImageAdapter(
-            R.layout.result_mini_image,
-            nextFocusDown = R.id.result_sync_set_score,
-            clickCallback = { action ->
-                if (action == IMAGE_CLICK || action == IMAGE_LONG_CLICK) {
-                    if (result_overlapping_panels?.getSelectedPanel()?.ordinal == 1) {
-                        result_overlapping_panels?.openStartPanel()
-                    } else {
-                        result_overlapping_panels?.closePanels()
+        observeNullable(viewModel.resumeWatching) { resume ->
+            resultBinding?.apply {
+                if (resume == null) {
+                    resultResumeParent.isVisible = false
+                    return@observeNullable
+                }
+                resultResumeParent.isVisible = true
+                resume.progress?.let { progress ->
+                    resultResumeSeriesTitle.apply {
+                        isVisible = !resume.isMovie
+                        text =
+                            if (resume.isMovie) null else context?.getNameFull(
+                                resume.result.name,
+                                resume.result.episode,
+                                resume.result.season
+                            )
                     }
+
+                    resultResumeSeriesProgressText.setText(progress.progressLeft)
+                    resultResumeSeriesProgress.apply {
+                        isVisible = true
+                        this.max = progress.maxProgress
+                        this.progress = progress.progress
+                    }
+                    resultResumeProgressHolder.isVisible = true
+                } ?: run {
+                    resultResumeProgressHolder.isVisible = false
+                    resultResumeSeriesProgress.isVisible = false
+                    resultResumeSeriesTitle.isVisible = false
+                    resultResumeSeriesProgressText.isVisible = false
                 }
-            })
 
-
-        result_scroll?.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
-            val dy = scrollY - oldScrollY
-            if (dy > 0) { //check for scroll down
-                result_bookmark_fab?.shrink()
-            } else if (dy < -5) {
-                result_bookmark_fab?.extend()
-            }
-            if (!isFullScreenPlayer && player.getIsPlaying()) {
-                if (scrollY > (player_background?.height ?: scrollY)) {
-                    player.handleEvent(CSPlayerEvent.Pause)
-                }
-            }
-            //result_poster_blur_holder?.translationY = -scrollY.toFloat()
-        })
-        val api = APIHolder.getApiFromNameNull(apiName)
-
-        if (media_route_button != null) {
-            val chromecastSupport = api?.hasChromecastSupport == true
-            media_route_button?.alpha = if (chromecastSupport) 1f else 0.3f
-            if (!chromecastSupport) {
-                media_route_button?.setOnClickListener {
-                    CommonActivity.showToast(
-                        activity,
-                        R.string.no_chromecast_support_toast,
-                        Toast.LENGTH_LONG
+                resultResumeSeriesButton.isVisible = !resume.isMovie
+                resultResumeSeriesButton.setOnClickListener {
+                    viewModel.handleAction(
+                        EpisodeClickEvent(
+                            storedData.playerAction, //?: ACTION_PLAY_EPISODE_IN_PLAYER,
+                            resume.result
+                        )
                     )
                 }
             }
-            activity?.let { act ->
-                if (act.isCastApiAvailable()) {
-                    try {
-                        CastButtonFactory.setUpMediaRouteButton(act, media_route_button)
-                        val castContext = CastContext.getSharedInstance(act.applicationContext)
-                        media_route_button?.isGone =
-                            castContext.castState == CastState.NO_DEVICES_AVAILABLE
-                        // this shit leaks for some reason
-                        //castContext.addCastStateListener { state ->
-                        //    media_route_button?.isGone = state == CastState.NO_DEVICES_AVAILABLE
-                        //}
-                    } catch (e: Exception) {
-                        logError(e)
-                    }
+        }
+
+        observeNullable(viewModel.subscribeStatus) { isSubscribed ->
+            binding?.resultSubscribe?.isVisible = isSubscribed != null
+            if (isSubscribed == null) return@observeNullable
+
+            val drawable = if (isSubscribed) {
+                R.drawable.ic_baseline_notifications_active_24
+            } else {
+                R.drawable.baseline_notifications_none_24
+            }
+
+            binding?.resultSubscribe?.setImageResource(drawable)
+        }
+
+        observe(viewModel.trailers) { trailers ->
+            setTrailers(trailers.flatMap { it.mirros }) // I dont care about subtitles yet!
+        }
+
+        observeNullable(viewModel.episodes) { episodes ->
+            resultBinding?.apply {
+                // no failure?
+                resultEpisodeLoading.isVisible = episodes is Resource.Loading
+                resultEpisodes.isVisible = episodes is Resource.Success
+                if (episodes is Resource.Success) {
+                    (resultEpisodes.adapter as? EpisodeAdapter)?.updateList(episodes.value)
                 }
             }
         }
 
-        observe(viewModel.episodesCountText) { count ->
-            result_episodes_text.setText(count)
-        }
+        observeNullable(viewModel.movie) { data ->
+            resultBinding?.apply {
+                resultPlayMovie.isVisible = data is Resource.Success
+                downloadButton.isVisible =
+                    data is Resource.Success && viewModel.currentRepo?.api?.hasDownloadSupport == true
 
-        observe(viewModel.selectPopup) { popup ->
-            when (popup) {
-                is Some.Success -> {
-                    popupDialog?.dismissSafe(activity)
-
-                    popupDialog = activity?.let { act ->
-                        val pop = popup.value
-                        val options = pop.getOptions(act)
-                        val title = pop.getTitle(act)
-
-                        act.showBottomDialogInstant(
-                            options, title, {
-                                popupDialog = null
-                                pop.callback(null)
-                            }, {
-                                popupDialog = null
-                                pop.callback(it)
-                            }
+                (data as? Resource.Success)?.value?.let { (text, ep) ->
+                    resultPlayMovie.setText(text)
+                    resultPlayMovie.setOnClickListener {
+                        viewModel.handleAction(
+                            EpisodeClickEvent(ACTION_CLICK_DEFAULT, ep)
                         )
                     }
-                }
-                is Some.None -> {
-                    popupDialog?.dismissSafe(activity)
-                    popupDialog = null
-                }
-            }
-        }
-
-        observe(viewModel.loadedLinks) { load ->
-            when (load) {
-                is Some.Success -> {
-                    if (loadingDialog?.isShowing != true) {
-                        loadingDialog?.dismissSafe(activity)
-                        loadingDialog = null
+                    resultPlayMovie.setOnLongClickListener {
+                        viewModel.handleAction(
+                            EpisodeClickEvent(ACTION_SHOW_OPTIONS, ep)
+                        )
+                        return@setOnLongClickListener true
                     }
-                    loadingDialog = loadingDialog ?: context?.let { ctx ->
-                        val builder =
-                            BottomSheetDialog(ctx)
-                        builder.setContentView(R.layout.bottom_loading)
-                        builder.setOnDismissListener {
-                            loadingDialog = null
-                            viewModel.cancelLinks()
+                    downloadButton.setDefaultClickListener(
+                        VideoDownloadHelper.DownloadEpisodeCached(
+                            ep.name,
+                            ep.poster,
+                            0,
+                            null,
+                            ep.id,
+                            ep.id,
+                            null,
+                            null,
+                            System.currentTimeMillis(),
+                        ),
+                        null
+                    ) { click ->
+                        when (click.action) {
+                            DOWNLOAD_ACTION_DOWNLOAD -> {
+                                viewModel.handleAction(
+                                    EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, ep)
+                                )
+                            }
+
+                            DOWNLOAD_ACTION_LONG_CLICK -> {
+                                viewModel.handleAction(
+                                    EpisodeClickEvent(
+                                        ACTION_DOWNLOAD_MIRROR,
+                                        ep
+                                    )
+                                )
+                            }
+
+                            else -> DownloadButtonSetup.handleDownloadClick(click)
                         }
-                        //builder.setOnCancelListener {
-                        //    it?.dismiss()
-                        //}
-                        builder.setCanceledOnTouchOutside(true)
-                        builder.show()
-                        builder
                     }
                 }
-                is Some.None -> {
-                    loadingDialog?.dismissSafe(activity)
-                    loadingDialog = null
-                }
             }
         }
 
-        observe(viewModel.selectedSeason) { text ->
-            result_season_button.setText(text)
+        observe(viewModel.page) { data ->
+            if (data == null) return@observe
+            resultBinding?.apply {
+                (data as? Resource.Success)?.value?.let { d ->
+                    resultVpn.setText(d.vpnText)
+                    resultInfo.setText(d.metaText)
+                    resultNoEpisodes.setText(d.noEpisodesFoundText)
+                    resultTitle.setText(d.titleText)
+                    resultMetaSite.setText(d.apiName)
+                    resultMetaType.setText(d.typeText)
+                    resultMetaYear.setText(d.yearText)
+                    resultMetaDuration.setText(d.durationText)
+                    resultMetaRating.setText(d.ratingText)
+                    resultCastText.setText(d.actorsText)
+                    resultNextAiring.setText(d.nextAiringEpisode)
+                    resultNextAiringTime.setText(d.nextAiringDate)
+                    resultPoster.setImage(d.posterImage)
+                    resultPosterBackground.setImage(d.posterBackgroundImage)
+                    resultDescription.setTextHtml(d.plotText)
+                    resultDescription.setOnClickListener { view ->
+                        // todo bottom view?
+                        view.context?.let { ctx ->
+                            val builder: AlertDialog.Builder =
+                                AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                            builder.setMessage(d.plotText.asString(ctx).html())
+                                .setTitle(d.plotHeaderText.asString(ctx))
+                                .show()
+                        }
+                    }
 
-            selectSeason =
-                (if (text is Some.Success) text.value else null)?.asStringNull(result_season_button?.context)
-            // If the season button is visible the result season button will be next focus down
-            if (result_season_button?.isVisible == true)
-                if (result_resume_parent?.isVisible == true)
-                    setFocusUpAndDown(result_resume_series_button, result_season_button)
-            //else
-            //    setFocusUpAndDown(result_bookmark_button, result_season_button)
+                    populateChips(resultTag, d.tags)
+
+                    resultComingSoon.isVisible = d.comingSoon
+                    resultDataHolder.isGone = d.comingSoon
+
+                    resultCastItems.isGone = d.actors.isNullOrEmpty()
+                    (resultCastItems.adapter as? ActorAdaptor)?.updateList(d.actors ?: emptyList())
+
+                    if (syncModel.addSyncs(d.syncData)) {
+                        syncModel.updateMetaAndUser()
+                        syncModel.updateSynced()
+                    } else {
+                        syncModel.addFromUrl(d.url)
+                    }
+
+                    binding?.apply {
+                        resultSearch.setOnClickListener {
+                            QuickSearchFragment.pushSearch(activity, d.title)
+                        }
+
+                        resultShare.setOnClickListener {
+                            try {
+                                val i = Intent(Intent.ACTION_SEND)
+                                i.type = "text/plain"
+                                i.putExtra(Intent.EXTRA_SUBJECT, d.title)
+                                i.putExtra(Intent.EXTRA_TEXT, d.url)
+                                startActivity(Intent.createChooser(i, d.title))
+                            } catch (e: Exception) {
+                                logError(e)
+                            }
+                        }
+
+                        setUrl(d.url)
+                        resultBookmarkFab.apply {
+                            isVisible = true
+                            extend()
+                        }
+                    }
+                }
+
+                (data as? Resource.Failure)?.let { data ->
+                    resultErrorText.text = storedData.url.plus("\n") + data.errorString
+                }
+
+                binding?.resultBookmarkFab?.isVisible = data is Resource.Success
+                resultFinishLoading.isVisible = data is Resource.Success
+
+                resultLoading.isVisible = data is Resource.Loading
+
+                resultLoadingError.isVisible = data is Resource.Failure
+                resultErrorText.isVisible = data is Resource.Failure
+                resultReloadConnectionOpenInBrowser.isVisible = data is Resource.Failure
+            }
         }
 
-        observe(viewModel.selectedDubStatus) { status ->
-            result_dub_select?.setText(status)
-
-            if (result_dub_select?.isVisible == true)
-                if (result_season_button?.isVisible != true && result_episode_select?.isVisible != true) {
-                    if (result_resume_parent?.isVisible == true)
-                        setFocusUpAndDown(result_resume_series_button, result_dub_select)
-                    //else
-                    //    setFocusUpAndDown(result_bookmark_button, result_dub_select)
-                }
+        observeNullable(viewModel.episodesCountText) { count ->
+            resultBinding?.resultEpisodesText.setText(count)
         }
-        observe(viewModel.selectedRange) { range ->
-            result_episode_select.setText(range)
 
-            // If Season button is invisible then the bookmark button next focus is episode select
-            if (result_episode_select?.isVisible == true)
-                if (result_season_button?.isVisible != true) {
-                    if (result_resume_parent?.isVisible == true)
-                        setFocusUpAndDown(result_resume_series_button, result_episode_select)
-                    //else
-                    //    setFocusUpAndDown(result_bookmark_button, result_episode_select)
+        observeNullable(viewModel.selectPopup) { popup ->
+            if (popup == null) {
+                popupDialog?.dismissSafe(activity)
+                popupDialog = null
+                return@observeNullable
+            }
+            popupDialog?.dismissSafe(activity)
+
+            popupDialog = activity?.let { act ->
+                val options = popup.getOptions(act)
+                val title = popup.getTitle(act)
+
+                act.showBottomDialogInstant(
+                    options, title, {
+                        popupDialog = null
+                        popup.callback(null)
+                    }, {
+                        popupDialog = null
+                        popup.callback(it)
+                    }
+                )
+            }
+        }
+
+        observe(syncModel.synced) { list ->
+            syncBinding?.resultSyncNames?.text =
+                list.filter { it.isSynced && it.hasAccount }.joinToString { it.name }
+
+            val newList = list.filter { it.isSynced && it.hasAccount }
+
+            binding?.resultMiniSync?.isVisible = newList.isNotEmpty()
+            (binding?.resultMiniSync?.adapter as? ImageAdapter)?.updateList(newList.mapNotNull { it.icon })
+        }
+
+
+        var currentSyncProgress = 0
+        fun setSyncMaxEpisodes(totalEpisodes: Int?) {
+            syncBinding?.resultSyncEpisodes?.max = (totalEpisodes ?: 0) * 1000
+
+            normalSafeApiCall {
+                val ctx = syncBinding?.resultSyncEpisodes?.context
+                syncBinding?.resultSyncMaxEpisodes?.text =
+                    totalEpisodes?.let { episodes ->
+                        ctx?.getString(R.string.sync_total_episodes_some)?.format(episodes)
+                    } ?: run {
+                        ctx?.getString(R.string.sync_total_episodes_none)
+                    }
+            }
+        }
+        observe(syncModel.metadata) { meta ->
+            when (meta) {
+                is Resource.Success -> {
+                    val d = meta.value
+                    syncBinding?.resultSyncEpisodes?.progress = currentSyncProgress * 1000
+                    setSyncMaxEpisodes(d.totalEpisodes)
+
+                    viewModel.setMeta(d, syncModel.getSyncs())
                 }
+
+                is Resource.Loading -> {
+                    syncBinding?.resultSyncMaxEpisodes?.text =
+                        syncBinding?.resultSyncMaxEpisodes?.context?.getString(R.string.sync_total_episodes_none)
+                }
+
+                else -> {}
+            }
+        }
+
+
+        observe(syncModel.userData) { status ->
+            var closed = false
+            syncBinding?.apply {
+                when (status) {
+                    is Resource.Failure -> {
+                        resultSyncLoadingShimmer.stopShimmer()
+                        resultSyncLoadingShimmer.isVisible = false
+                        resultSyncHolder.isVisible = false
+                        closed = true
+                    }
+
+                    is Resource.Loading -> {
+                        resultSyncLoadingShimmer.startShimmer()
+                        resultSyncLoadingShimmer.isVisible = true
+                        resultSyncHolder.isVisible = false
+                    }
+
+                    is Resource.Success -> {
+                        resultSyncLoadingShimmer.stopShimmer()
+                        resultSyncLoadingShimmer.isVisible = false
+                        resultSyncHolder.isVisible = true
+
+                        val d = status.value
+                        resultSyncRating.value = d.score?.toFloat() ?: 0.0f
+                        resultSyncCheck.setItemChecked(d.status + 1, true)
+                        val watchedEpisodes = d.watchedEpisodes ?: 0
+                        currentSyncProgress = watchedEpisodes
+
+                        d.maxEpisodes?.let {
+                            // don't directly call it because we don't want to override metadata observe
+                            setSyncMaxEpisodes(it)
+                        }
+
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            resultSyncEpisodes.setProgress(watchedEpisodes * 1000, true)
+                        } else {
+                            resultSyncEpisodes.progress = watchedEpisodes * 1000
+                        }
+                        resultSyncCurrentEpisodes.text =
+                            Editable.Factory.getInstance()?.newEditable(watchedEpisodes.toString())
+                        normalSafeApiCall { // format might fail
+                            context?.getString(R.string.sync_score_format)?.format(d.score ?: 0)
+                                ?.let {
+                                    resultSyncScoreText.text = it
+                                }
+                        }
+                    }
+
+                    null -> {
+                        closed = false
+                    }
+                }
+            }
+            binding?.resultOverlappingPanels?.setStartPanelLockState(if (closed) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
+        }
+        observe(viewModel.recommendations) { recommendations ->
+            setRecommendations(recommendations, null)
+        }
+        observe(viewModel.episodeSynopsis) { description ->
+            // TODO bottom dialog
+            view.context?.let { ctx ->
+                val builder: AlertDialog.Builder =
+                    AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                builder.setMessage(description.html())
+                    .setTitle(R.string.synopsis)
+                    .setOnDismissListener {
+                        viewModel.releaseEpisodeSynopsis()
+                    }
+                    .show()
+            }
+        }
+        context?.let { ctx ->
+            val arrayAdapter = ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
+            /*
+            -1 -> None
+            0 -> Watching
+            1 -> Completed
+            2 -> OnHold
+            3 -> Dropped
+            4 -> PlanToWatch
+            5 -> ReWatching
+            */
+            val items = listOf(
+                R.string.none,
+                R.string.type_watching,
+                R.string.type_completed,
+                R.string.type_on_hold,
+                R.string.type_dropped,
+                R.string.type_plan_to_watch,
+                R.string.type_re_watching
+            ).map { ctx.getString(it) }
+            arrayAdapter.addAll(items)
+            syncBinding?.apply {
+                resultSyncCheck.choiceMode = AbsListView.CHOICE_MODE_SINGLE
+                resultSyncCheck.adapter = arrayAdapter
+                UIHelper.setListViewHeightBasedOnItems(resultSyncCheck)
+
+                resultSyncCheck.setOnItemClickListener { _, _, which, _ ->
+                    syncModel.setStatus(which - 1)
+                }
+
+                resultSyncRating.addOnChangeListener { _, value, _ ->
+                    syncModel.setScore(value.toInt())
+                }
+
+                resultSyncAddEpisode.setOnClickListener {
+                    syncModel.setEpisodesDelta(1)
+                }
+
+                resultSyncSubEpisode.setOnClickListener {
+                    syncModel.setEpisodesDelta(-1)
+                }
+
+                resultSyncCurrentEpisodes.doOnTextChanged { text, _, before, count ->
+                    if (count == before) return@doOnTextChanged
+                    text?.toString()?.toIntOrNull()?.let { ep ->
+                        syncModel.setEpisodes(ep)
+                    }
+                }
+            }
+        }
+
+        syncBinding?.resultSyncSetScore?.setOnClickListener {
+            syncModel.publishUserData()
+        }
+
+        observe(viewModel.watchStatus) { watchType ->
+            binding?.resultBookmarkFab?.apply {
+                setText(watchType.stringRes)
+                if (watchType == WatchType.NONE) {
+                    context?.colorFromAttribute(R.attr.white)
+                } else {
+                    context?.colorFromAttribute(R.attr.colorPrimary)
+                }?.let {
+                    val colorState = ColorStateList.valueOf(it)
+                    iconTint = colorState
+                    setTextColor(colorState)
+                }
+
+                setOnClickListener { fab ->
+                    activity?.showBottomDialog(
+                        WatchType.values().map { fab.context.getString(it.stringRes) }.toList(),
+                        watchType.ordinal,
+                        fab.context.getString(R.string.action_add_to_bookmarks),
+                        showApply = false,
+                        {}) {
+                        viewModel.updateWatchStatus(WatchType.values()[it])
+                    }
+                }
+            }
+        }
+
+
+        observeNullable(viewModel.loadedLinks) { load ->
+            if (load == null) {
+                loadingDialog?.dismissSafe(activity)
+                loadingDialog = null
+                return@observeNullable
+            }
+            if (loadingDialog?.isShowing != true) {
+                loadingDialog?.dismissSafe(activity)
+                loadingDialog = null
+            }
+            loadingDialog = loadingDialog ?: context?.let { ctx ->
+                val builder =
+                    BottomSheetDialog(ctx)
+                builder.setContentView(R.layout.bottom_loading)
+                builder.setOnDismissListener {
+                    loadingDialog = null
+                    viewModel.cancelLinks()
+                }
+                //builder.setOnCancelListener {
+                //    it?.dismiss()
+                //}
+                builder.setCanceledOnTouchOutside(true)
+                builder.show()
+                builder
+            }
+        }
+
+        observeNullable(viewModel.selectedSeason) { text ->
+            resultBinding?.apply {
+                resultSeasonButton.setText(text)
+
+                selectSeason =
+                    text?.asStringNull(resultSeasonButton.context)
+                // If the season button is visible the result season button will be next focus down
+                if (resultSeasonButton.isVisible && resultResumeParent.isVisible) {
+                    setFocusUpAndDown(resultResumeSeriesButton, resultSeasonButton)
+                }
+            }
+        }
+
+        observeNullable(viewModel.selectedDubStatus) { status ->
+            resultBinding?.apply {
+                resultDubSelect.setText(status)
+
+                if (resultDubSelect.isVisible && !resultSeasonButton.isVisible && !resultEpisodeSelect.isVisible && resultResumeParent.isVisible) {
+                    setFocusUpAndDown(resultResumeSeriesButton, resultDubSelect)
+                }
+            }
+        }
+        observeNullable(viewModel.selectedRange) { range ->
+            resultBinding?.apply {
+                resultEpisodeSelect.setText(range)
+                // If Season button is invisible then the bookmark button next focus is episode select
+                if (resultEpisodeSelect.isVisible && !resultSeasonButton.isVisible && resultResumeParent.isVisible) {
+                    setFocusUpAndDown(resultResumeSeriesButton, resultEpisodeSelect)
+                }
+            }
         }
 
 //        val preferDub = context?.getApiDubstatusSettings()?.all { it == DubStatus.Dubbed } == true
 
         observe(viewModel.dubSubSelections) { range ->
-            result_dub_select.setOnClickListener { view ->
+            resultBinding?.resultDubSelect?.setOnClickListener { view ->
                 view?.context?.let { ctx ->
                     view.popupMenuNoIconsAndNoStringRes(range
                         .mapNotNull { (text, status) ->
@@ -389,7 +1023,7 @@ class ResultFragmentPhone : ResultFragment() {
         }
 
         observe(viewModel.rangeSelections) { range ->
-            result_episode_select?.setOnClickListener { view ->
+            resultBinding?.resultEpisodeSelect?.setOnClickListener { view ->
                 view?.context?.let { ctx ->
                     val names = range
                         .mapNotNull { (text, r) ->
@@ -406,7 +1040,7 @@ class ResultFragmentPhone : ResultFragment() {
         }
 
         observe(viewModel.seasonSelections) { seasonList ->
-            result_season_button?.setOnClickListener { view ->
+            resultBinding?.resultSeasonButton?.setOnClickListener { view ->
 
                 view?.context?.let { ctx ->
                     val names = seasonList
@@ -436,55 +1070,59 @@ class ResultFragmentPhone : ResultFragment() {
 
     override fun onPause() {
         super.onPause()
-        PanelsChildGestureRegionObserver.Provider.get().addGestureRegionsUpdateListener(this)
+        PanelsChildGestureRegionObserver.Provider.get().addGestureRegionsUpdateListener(gestureRegionsListener)
     }
 
-    override fun onGestureRegionsUpdate(gestureRegions: List<Rect>) {
-        result_overlapping_panels?.setChildGestureRegions(gestureRegions)
-    }
-
-    override fun setRecommendations(rec: List<SearchResponse>?, validApiName: String?) {
+    private fun setRecommendations(rec: List<SearchResponse>?, validApiName: String?) {
         val isInvalid = rec.isNullOrEmpty()
-        result_recommendations?.isGone = isInvalid
-        result_recommendations_btt?.isGone = isInvalid
-        result_recommendations_btt?.setOnClickListener {
-            val nextFocusDown = if (result_overlapping_panels?.getSelectedPanel()?.ordinal == 1) {
-                result_overlapping_panels?.openEndPanel()
-                R.id.result_recommendations
-            } else {
-                result_overlapping_panels?.closePanels()
-                R.id.result_description
-            }
-
-            result_recommendations_btt?.nextFocusDownId = nextFocusDown
-            result_search?.nextFocusDownId = nextFocusDown
-            result_open_in_browser?.nextFocusDownId = nextFocusDown
-            result_share?.nextFocusDownId = nextFocusDown
-        }
-        result_overlapping_panels?.setEndPanelLockState(if (isInvalid) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
-
         val matchAgainst = validApiName ?: rec?.firstOrNull()?.apiName
-        rec?.map { it.apiName }?.distinct()?.let { apiNames ->
-            // very dirty selection
-            result_recommendations_filter_button?.isVisible = apiNames.size > 1
-            result_recommendations_filter_button?.text = matchAgainst
-            result_recommendations_filter_button?.setOnClickListener { _ ->
-                activity?.showBottomDialog(
-                    apiNames,
-                    apiNames.indexOf(matchAgainst),
-                    getString(R.string.home_change_provider_img_des), false, {}
-                ) {
-                    setRecommendations(rec, apiNames[it])
+
+        recommendationBinding?.apply {
+            root.isGone = isInvalid
+            root.post {
+                rec?.let { list ->
+                    (resultRecommendationsList.adapter as? SearchAdapter)?.updateList(list.filter { it.apiName == matchAgainst })
                 }
             }
-        } ?: run {
-            result_recommendations_filter_button?.isVisible = false
         }
 
-        result_recommendations?.post {
-            rec?.let { list ->
-                (result_recommendations?.adapter as? SearchAdapter)?.updateList(list.filter { it.apiName == matchAgainst })
+        binding?.apply {
+            resultRecommendationsBtt.isGone = isInvalid
+            resultRecommendationsBtt.setOnClickListener {
+                val nextFocusDown = if (resultOverlappingPanels.getSelectedPanel().ordinal == 1) {
+                    resultOverlappingPanels.openEndPanel()
+                    R.id.result_recommendations
+                } else {
+                    resultOverlappingPanels.closePanels()
+                    R.id.result_description
+                }
+                resultBinding?.apply {
+                    resultRecommendationsBtt.nextFocusDownId = nextFocusDown
+                    resultSearch.nextFocusDownId = nextFocusDown
+                    resultOpenInBrowser.nextFocusDownId = nextFocusDown
+                    resultShare.nextFocusDownId = nextFocusDown
+                }
+            }
+            resultOverlappingPanels.setEndPanelLockState(if (isInvalid) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
+
+            rec?.map { it.apiName }?.distinct()?.let { apiNames ->
+                // very dirty selection
+                recommendationBinding?.resultRecommendationsFilterButton?.apply {
+                    isVisible = apiNames.size > 1
+                    text = matchAgainst
+                    setOnClickListener { _ ->
+                        activity?.showBottomDialog(
+                            apiNames,
+                            apiNames.indexOf(matchAgainst),
+                            getString(R.string.home_change_provider_img_des), false, {}
+                        ) {
+                            setRecommendations(rec, apiNames[it])
+                        }
+                    }
+                }
+            } ?: run {
+                recommendationBinding?.resultRecommendationsFilterButton?.isVisible = false
             }
         }
     }
-}
\ No newline at end of file
+}
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 71ecb0e9..7c784a43 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
@@ -1,33 +1,81 @@
 package com.lagradost.cloudstream3.ui.result
 
+import android.animation.Animator
+import android.annotation.SuppressLint
 import android.app.Dialog
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import android.view.animation.DecelerateInterpolator
+import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.core.widget.NestedScrollView
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lagradost.cloudstream3.APIHolder.updateHasTrailers
 import com.lagradost.cloudstream3.DubStatus
 import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
-import com.lagradost.cloudstream3.mvvm.ResourceSome
-import com.lagradost.cloudstream3.mvvm.Some
+import com.lagradost.cloudstream3.databinding.FragmentResultTvBinding
+import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.mvvm.observeNullable
+import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup
 import com.lagradost.cloudstream3.ui.player.ExtractorLinkGenerator
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
+import com.lagradost.cloudstream3.ui.result.ResultFragment.getStoredData
+import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
+import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_FOCUSED
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
-import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.AppUtils.getNameFull
+import com.lagradost.cloudstream3.utils.AppUtils.html
+import com.lagradost.cloudstream3.utils.AppUtils.isRtl
+import com.lagradost.cloudstream3.utils.AppUtils.loadCache
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
+import com.lagradost.cloudstream3.utils.UIHelper
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import kotlinx.android.synthetic.main.fragment_result_tv.*
+import com.lagradost.cloudstream3.utils.UIHelper.setImage
 
-class ResultFragmentTv : ResultFragment() {
-    override val resultLayout = R.layout.fragment_result_tv
+class ResultFragmentTv : Fragment() {
+    protected lateinit var viewModel: ResultViewModel2
+    private var binding: FragmentResultTvBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        updateUIEvent -= ::updateUI
+        super.onDestroyView()
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        viewModel =
+            ViewModelProvider(this)[ResultViewModel2::class.java]
+        viewModel.EPISODE_RANGE_SIZE = 50
+        updateUIEvent += ::updateUI
+
+        val localBinding = FragmentResultTvBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+    }
+
+    private fun updateUI(id: Int?) {
+        viewModel.reloadEpisodes()
+    }
 
     private var currentRecommendations: List<SearchResponse> = emptyList()
 
@@ -36,12 +84,15 @@ class ResultFragmentTv : ResultFragment() {
             is EpisodeRange -> {
                 viewModel.changeRange(data)
             }
+
             is Int -> {
                 viewModel.changeSeason(data)
             }
+
             is DubStatus -> {
                 viewModel.changeDubStatus(data)
             }
+
             is String -> {
                 setRecommendations(currentRecommendations, data)
             }
@@ -63,175 +114,690 @@ class ResultFragmentTv : ResultFragment() {
         }
     }
 
-    private fun hasNoFocus(): Boolean {
-        val focus = activity?.currentFocus
-        if (focus == null || !focus.isVisible) return true
-        return focus == this.result_root
+//    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()
     }
 
-    override fun updateEpisodes(episodes: ResourceSome<List<ResultEpisode>>) {
-        super.updateEpisodes(episodes)
-        if (episodes is ResourceSome.Success && hasNoFocus()) {
-            result_episodes?.requestFocus()
-        }
-    }
-
-    override fun updateMovie(data: ResourceSome<Pair<UiText, ResultEpisode>>) {
-        super.updateMovie(data)
-        if (data is ResourceSome.Success && hasNoFocus()) {
-            result_play_movie?.requestFocus()
-        }
-    }
-
-    override fun setTrailers(trailers: List<ExtractorLink>?) {
-        context?.updateHasTrailers()
-        if (!LoadResponse.isTrailersEnabled) return
-
-        result_play_trailer?.isGone = trailers.isNullOrEmpty()
-        result_play_trailer?.setOnClickListener {
-            if (trailers.isNullOrEmpty()) return@setOnClickListener
-            activity.navigate(
-                R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
-                    ExtractorLinkGenerator(
-                        trailers,
-                        emptyList()
-                    )
-                )
-            )
-        }
-    }
-
-    override fun setRecommendations(rec: List<SearchResponse>?, validApiName: String?) {
+    private fun setRecommendations(rec: List<SearchResponse>?, validApiName: String?) {
         currentRecommendations = rec ?: emptyList()
         val isInvalid = rec.isNullOrEmpty()
-        result_recommendations?.isGone = isInvalid
-        result_recommendations_holder?.isGone = isInvalid
-        val matchAgainst = validApiName ?: rec?.firstOrNull()?.apiName
-        (result_recommendations?.adapter as? SearchAdapter)?.updateList(rec?.filter { it.apiName == matchAgainst }
-            ?: emptyList())
+        binding?.apply {
+            resultRecommendationsList.isGone = isInvalid
+            resultRecommendationsHolder.isGone = isInvalid
+            val matchAgainst = validApiName ?: rec?.firstOrNull()?.apiName
+            (resultRecommendationsList.adapter as? SearchAdapter)?.updateList(rec?.filter { it.apiName == matchAgainst }
+                ?: emptyList())
 
-        rec?.map { it.apiName }?.distinct()?.let { apiNames ->
-            // very dirty selection
-            result_recommendations_filter_selection?.isVisible = apiNames.size > 1
-            result_recommendations_filter_selection?.update(apiNames.map { txt(it) to it })
-            result_recommendations_filter_selection?.select(apiNames.indexOf(matchAgainst))
-        } ?: run {
-            result_recommendations_filter_selection?.isVisible = false
+            rec?.map { it.apiName }?.distinct()?.let { apiNames ->
+                // very dirty selection
+                resultRecommendationsFilterSelection.isVisible = apiNames.size > 1
+                resultRecommendationsFilterSelection.update(apiNames.map { txt(it) to it })
+                resultRecommendationsFilterSelection.select(apiNames.indexOf(matchAgainst))
+            } ?: run {
+                resultRecommendationsFilterSelection.isVisible = false
+            }
         }
     }
 
     var loadingDialog: Dialog? = null
     var popupDialog: Dialog? = null
+
+    private fun reloadViewModel(forceReload: Boolean) {
+        if (!viewModel.hasLoaded() || forceReload) {
+            val storedData = getStoredData() ?: return
+            viewModel.load(
+                activity,
+                storedData.url,
+                storedData.apiName,
+                storedData.showFillers,
+                storedData.dubStatus,
+                storedData.start
+            )
+        }
+    }
+
+    override fun onResume() {
+        activity?.let {
+            it.window?.navigationBarColor =
+                it.colorFromAttribute(R.attr.primaryBlackBackground)
+        }
+        afterPluginsLoadedEvent += ::reloadViewModel
+        super.onResume()
+    }
+
+    override fun onStop() {
+        afterPluginsLoadedEvent -= ::reloadViewModel
+        super.onStop()
+    }
+
+    private fun View.fade(turnVisible: Boolean) {
+        if (turnVisible) {
+            isVisible = true
+        }
+
+        this.animate().alpha(if (turnVisible) 0.97f else 0.0f).apply {
+            duration = 200
+            interpolator = DecelerateInterpolator()
+            setListener(object : Animator.AnimatorListener {
+                override fun onAnimationStart(animation: Animator) {
+                }
+
+                override fun onAnimationEnd(animation: Animator) {
+                    this@fade.isVisible = turnVisible
+                }
+
+                override fun onAnimationCancel(animation: Animator) {
+                }
+
+                override fun onAnimationRepeat(animation: Animator) {
+                }
+            })
+        }
+        this.animate().translationX(if (turnVisible) 0f else if (isRtl()) -100.0f else 100f).apply {
+            duration = 200
+            interpolator = DecelerateInterpolator()
+        }
+    }
+
+    private fun toggleEpisodes(show: Boolean) {
+        binding?.apply {
+            episodesShadow.fade(show)
+            episodeHolderTv.fade(show)
+            if (episodesShadow.isRtl()) {
+                episodesShadow.scaleX = -1.0f
+                episodesShadow.scaleY = -1.0f
+            } else {
+                episodesShadow.scaleX = 1.0f
+                episodesShadow.scaleY = 1.0f
+            }
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        result_episodes?.layoutManager =
-                //LinearListLayout(result_episodes ?: return, result_episodes?.context).apply {
-            LinearListLayout(result_episodes?.context).apply {
+        // ===== setup =====
+        val storedData = getStoredData() ?: return
+        activity?.window?.decorView?.clearFocus()
+        activity?.loadCache()
+        hideKeyboard()
+        if (storedData.restart || !viewModel.hasLoaded())
+            viewModel.load(
+                activity,
+                storedData.url,
+                storedData.apiName,
+                storedData.showFillers,
+                storedData.dubStatus,
+                storedData.start
+            )
+        // ===== ===== =====
+
+        binding?.apply {
+            //episodesShadow.rotationX = 180.0f//if(episodesShadow.isRtl()) 180.0f else 0.0f
+
+            val leftListener: View.OnFocusChangeListener =
+                View.OnFocusChangeListener { _, hasFocus ->
+                    if (!hasFocus) return@OnFocusChangeListener
+                    toggleEpisodes(false)
+                }
+
+            val rightListener: View.OnFocusChangeListener =
+                View.OnFocusChangeListener { _, hasFocus ->
+                    if (!hasFocus) return@OnFocusChangeListener
+                    toggleEpisodes(true)
+                }
+
+            resultPlayMovie.onFocusChangeListener = leftListener
+            resultPlaySeries.onFocusChangeListener = leftListener
+            resultResumeSeries.onFocusChangeListener = leftListener
+            resultPlayTrailer.onFocusChangeListener = leftListener
+            resultEpisodesShow.onFocusChangeListener = rightListener
+            resultDescription.onFocusChangeListener = leftListener
+            resultBookmarkButton.onFocusChangeListener = leftListener
+            resultEpisodesShow.setOnClickListener {
+                // toggle, to make it more touch accessable just in case someone thinks that a
+                // tv layout is better but is using a touch device
+                toggleEpisodes(!episodeHolderTv.isVisible)
+            }
+
+            //  resultEpisodes.onFocusChangeListener = leftListener
+
+            redirectToPlay.setOnFocusChangeListener { _, hasFocus ->
+                if (!hasFocus) return@setOnFocusChangeListener
+                toggleEpisodes(false)
+
+                binding?.apply {
+                    val views = listOf(
+                        resultPlayMovie,
+                        resultPlaySeries,
+                        resultResumeSeries,
+                        resultPlayTrailer,
+                        resultBookmarkButton
+                    )
+                    for (requestView in views) {
+                        if (!requestView.isVisible) continue
+                        if (requestView.requestFocus()) break
+                    }
+                }
+            }
+
+            // parallax on background
+            resultFinishLoading.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+                backgroundPosterHolder.translationY = -scrollY.toFloat() * 0.8f
+            })
+
+            redirectToEpisodes.setOnFocusChangeListener { _, hasFocus ->
+                if (!hasFocus) return@setOnFocusChangeListener
+                toggleEpisodes(true)
+                binding?.apply {
+                    val views = listOf(
+                        resultDubSelection,
+                        resultSeasonSelection,
+                        resultRangeSelection,
+                        resultEpisodes,
+                        resultPlayTrailer,
+                    )
+                    for (requestView in views) {
+                        if (!requestView.isShown) continue
+                        if (requestView.requestFocus()) break // View.FOCUS_RIGHT
+                    }
+                }
+            }
+
+            resultEpisodes.setLinearListLayout(
+                isHorizontal = false,
+                nextUp = FOCUS_SELF,
+                nextDown = FOCUS_SELF,
+                nextRight = FOCUS_SELF,
+            )
+            resultDubSelection.setLinearListLayout(
+                isHorizontal = false,
+                nextUp = FOCUS_SELF,
+                nextDown = FOCUS_SELF,
+            )
+            resultRangeSelection.setLinearListLayout(
+                isHorizontal = false,
+                nextUp = FOCUS_SELF,
+                nextDown = FOCUS_SELF,
+            )
+            resultSeasonSelection.setLinearListLayout(
+                isHorizontal = false,
+                nextUp = FOCUS_SELF,
+                nextDown = FOCUS_SELF,
+            )
+
+            /*.layoutManager =
+                LinearListLayout(resultEpisodes.context, resultEpisodes.isRtl()).apply {
+                    setVertical()
+                }*/
+
+            resultReloadConnectionerror.setOnClickListener {
+                viewModel.load(
+                    activity,
+                    storedData.url,
+                    storedData.apiName,
+                    storedData.showFillers,
+                    storedData.dubStatus,
+                    storedData.start
+                )
+
+            }
+
+            resultMetaSite.isFocusable = false
+
+            //resultReloadConnectionOpenInBrowser.setOnClickListener {view ->
+            //    view.context?.openBrowser(storedData?.url ?: return@setOnClickListener, fallbackWebview = true)
+            //}
+
+            resultSeasonSelection.setAdapter()
+            resultRangeSelection.setAdapter()
+            resultDubSelection.setAdapter()
+            resultRecommendationsFilterSelection.setAdapter()
+
+            resultCastItems.setOnFocusChangeListener { _, hasFocus ->
+                // Always escape focus
+                if (hasFocus) binding?.resultBookmarkButton?.requestFocus()
+            }
+            //resultBack.setOnClickListener {
+            //    activity?.popCurrentPage()
+            //}
+
+            resultRecommendationsList.spanCount = 8
+            resultRecommendationsList.adapter =
+                SearchAdapter(
+                    ArrayList(),
+                    resultRecommendationsList,
+                ) { callback ->
+                    if (callback.action == SEARCH_ACTION_FOCUSED)
+                        toggleEpisodes(false)
+                    else
+                        SearchHelper.handleSearchClickCallback(callback)
+                }
+
+            resultEpisodes.adapter =
+                EpisodeAdapter(
+                    false,
+                    { episodeClick ->
+                        viewModel.handleAction(episodeClick)
+                    },
+                    { downloadClickEvent ->
+                        DownloadButtonSetup.handleDownloadClick(downloadClickEvent)
+                    }
+                )
+
+            resultCastItems.layoutManager = object : LinearListLayout(view.context) {
+
+                override fun onInterceptFocusSearch(focused: View, direction: Int): View? {
+                    return super.onInterceptFocusSearch(focused, direction)
+                }
+
+                override fun onRequestChildFocus(
+                    parent: RecyclerView,
+                    state: RecyclerView.State,
+                    child: View,
+                    focused: View?
+                ): Boolean {
+                    // Make the cast always focus the first visible item when focused
+                    // from somewhere else. Otherwise it jumps to the last item.
+                    return if (parent.focusedChild == null) {
+                        scrollToPosition(this.findFirstCompletelyVisibleItemPosition())
+                        true
+                    } else {
+                        super.onRequestChildFocus(parent, state, child, focused)
+                    }
+                }
+            }.apply {
                 setHorizontal()
             }
-        (result_episodes?.adapter as EpisodeAdapter?)?.apply {
-            layout = R.layout.result_episode_both_tv
+
+            val aboveCast = listOf(
+                binding?.resultEpisodesShow,
+                binding?.resultBookmarkButton,
+            ).firstOrNull {
+                it?.isVisible == true
+            }
+            resultCastItems.adapter = ActorAdaptor(aboveCast?.id) {
+                toggleEpisodes(false)
+            }
         }
-        //result_episodes?.setMaxViewPoolSize(0, Int.MAX_VALUE)
 
-        result_season_selection.setAdapter()
-        result_range_selection.setAdapter()
-        result_dub_selection.setAdapter()
-        result_recommendations_filter_selection.setAdapter()
+        observeNullable(viewModel.resumeWatching) { resume ->
+            binding?.apply {
+                // show progress no matter if series or movie
+                resume?.progress?.let { progress ->
+                    resultResumeSeriesProgressText.setText(progress.progressLeft)
+                    resultResumeSeriesProgress.apply {
+                        isVisible = true
+                        this.max = progress.maxProgress
+                        this.progress = progress.progress
+                    }
+                    resultResumeProgressHolder.isVisible = true
+                } ?: run {
+                    resultResumeProgressHolder.isVisible = false
+                }
 
-        observe(viewModel.selectPopup) { popup ->
-            when (popup) {
-                is Some.Success -> {
-                    popupDialog?.dismissSafe(activity)
+                // if movie then hide both as movie button is
+                // always visible on movies, this is done in movie observe
 
-                    popupDialog = activity?.let { act ->
-                        val pop = popup.value
-                        val options = pop.getOptions(act)
-                        val title = pop.getTitle(act)
+                if (resume?.isMovie == true) {
+                    resultPlaySeries.isVisible = false
+                    resultResumeSeries.isVisible = false
+                    return@observeNullable
+                }
 
-                        act.showBottomDialogInstant(
-                            options, title, {
-                                popupDialog = null
-                                pop.callback(null)
-                            }, {
-                                popupDialog = null
-                                pop.callback(it)
-                            }
+                // if series then
+                // > resultPlaySeries is visible when null
+                // > resultResumeSeries is visible when not null
+                if (resume == null) {
+                    resultPlaySeries.isVisible = true
+                    resultResumeSeries.isVisible = false
+                    return@observeNullable
+                }
+
+                resultPlaySeries.isVisible = false
+                resultResumeSeries.isVisible = true
+
+                focusPlayButton()
+
+                resultResumeSeries.text =
+                    if (resume.isMovie) context?.getString(R.string.play_movie_button) else context?.getNameFull(
+                        null, // resume.result.name, we don't want episode title
+                        resume.result.episode,
+                        resume.result.season
+                    )
+
+                resultResumeSeries.setOnClickListener {
+                    viewModel.handleAction(
+                        EpisodeClickEvent(
+                            storedData.playerAction, //?: ACTION_PLAY_EPISODE_IN_PLAYER,
+                            resume.result
+                        )
+                    )
+                }
+
+                resultResumeSeries.setOnLongClickListener {
+                    viewModel.handleAction(
+                        EpisodeClickEvent(ACTION_SHOW_OPTIONS, resume.result)
+                    )
+                    return@setOnLongClickListener true
+                }
+
+            }
+        }
+
+        observe(viewModel.trailers) { trailersLinks ->
+            context?.updateHasTrailers()
+            if (!LoadResponse.isTrailersEnabled) return@observe
+            val trailers = trailersLinks.flatMap { it.mirros }
+            binding?.resultPlayTrailer?.apply {
+                isGone = trailers.isEmpty()
+                setOnClickListener {
+                    if (trailers.isEmpty()) return@setOnClickListener
+                    activity.navigate(
+                        R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
+                            ExtractorLinkGenerator(
+                                trailers,
+                                emptyList()
+                            )
+                        )
+                    )
+                }
+            }
+        }
+
+        observe(viewModel.watchStatus) { watchType ->
+            binding?.resultBookmarkButton?.apply {
+                setText(watchType.stringRes)
+                setOnClickListener { view ->
+                    activity?.showBottomDialog(
+                        WatchType.values().map { view.context.getString(it.stringRes) }.toList(),
+                        watchType.ordinal,
+                        view.context.getString(R.string.action_add_to_bookmarks),
+                        showApply = false,
+                        {}) {
+                        viewModel.updateWatchStatus(WatchType.values()[it])
+                    }
+                }
+            }
+        }
+
+        observeNullable(viewModel.movie) { data ->
+            binding?.apply {
+                resultPlayMovie.isVisible = data is Resource.Success
+                seriesHolder.isVisible = data == null
+                resultEpisodesShow.isVisible = data == null
+
+                (data as? Resource.Success)?.value?.let { (text, ep) ->
+                    resultPlayMovie.setText(text)
+                    resultPlayMovie.setOnClickListener {
+                        viewModel.handleAction(
+                            EpisodeClickEvent(ACTION_CLICK_DEFAULT, ep)
                         )
                     }
-                }
-                is Some.None -> {
-                    popupDialog?.dismissSafe(activity)
-                    popupDialog = null
+                    resultPlayMovie.setOnLongClickListener {
+                        viewModel.handleAction(
+                            EpisodeClickEvent(ACTION_SHOW_OPTIONS, ep)
+                        )
+                        return@setOnLongClickListener true
+                    }
+                    focusPlayButton()
                 }
             }
         }
 
-        observe(viewModel.loadedLinks) { load ->
-            when (load) {
-                is Some.Success -> {
-                    if (loadingDialog?.isShowing != true) {
-                        loadingDialog?.dismissSafe(activity)
-                        loadingDialog = null
+        observeNullable(viewModel.selectPopup) { popup ->
+            if (popup == null) {
+                popupDialog?.dismissSafe(activity)
+                popupDialog = null
+                return@observeNullable
+            }
+
+            popupDialog?.dismissSafe(activity)
+
+            popupDialog = activity?.let { act ->
+                val options = popup.getOptions(act)
+                val title = popup.getTitle(act)
+
+                act.showBottomDialogInstant(
+                    options, title, {
+                        popupDialog = null
+                        popup.callback(null)
+                    }, {
+                        popupDialog = null
+                        popup.callback(it)
                     }
-                    loadingDialog = loadingDialog ?: context?.let { ctx ->
-                        val builder = BottomSheetDialog(ctx)
-                        builder.setContentView(R.layout.bottom_loading)
-                        builder.setOnDismissListener {
-                            loadingDialog = null
-                            viewModel.cancelLinks()
-                        }
-                        //builder.setOnCancelListener {
-                        //    it?.dismiss()
-                        //}
-                        builder.setCanceledOnTouchOutside(true)
-                        builder.show()
-                        builder
-                    }
-                }
-                is Some.None -> {
-                    loadingDialog?.dismissSafe(activity)
+                )
+            }
+        }
+
+        observeNullable(viewModel.loadedLinks) { load ->
+            if (load == null) {
+                loadingDialog?.dismissSafe(activity)
+                loadingDialog = null
+                return@observeNullable
+            }
+            if (loadingDialog?.isShowing != true) {
+                loadingDialog?.dismissSafe(activity)
+                loadingDialog = null
+            }
+            loadingDialog = loadingDialog ?: context?.let { ctx ->
+                val builder = BottomSheetDialog(ctx)
+                builder.setContentView(R.layout.bottom_loading)
+                builder.setOnDismissListener {
                     loadingDialog = null
+                    viewModel.cancelLinks()
                 }
+                //builder.setOnCancelListener {
+                //    it?.dismiss()
+                //}
+                builder.setCanceledOnTouchOutside(true)
+                builder.show()
+                builder
             }
+
         }
 
 
-        observe(viewModel.episodesCountText) { count ->
-            result_episodes_text.setText(count)
+        observeNullable(viewModel.episodesCountText) { count ->
+            binding?.resultEpisodesText.setText(count)
         }
 
         observe(viewModel.selectedRangeIndex) { selected ->
-            result_range_selection.select(selected)
+            binding?.resultRangeSelection.select(selected)
         }
         observe(viewModel.selectedSeasonIndex) { selected ->
-            result_season_selection.select(selected)
+            binding?.resultSeasonSelection.select(selected)
         }
         observe(viewModel.selectedDubStatusIndex) { selected ->
-            result_dub_selection.select(selected)
+            binding?.resultDubSelection.select(selected)
         }
         observe(viewModel.rangeSelections) {
-            result_range_selection.update(it)
+            binding?.resultRangeSelection.update(it)
         }
         observe(viewModel.dubSubSelections) {
-            result_dub_selection.update(it)
+            binding?.resultDubSelection.update(it)
         }
         observe(viewModel.seasonSelections) {
-            result_season_selection.update(it)
+            binding?.resultSeasonSelection.update(it)
         }
-
-        result_back?.setOnClickListener {
-            activity?.popCurrentPage()
+        observe(viewModel.recommendations) { recommendations ->
+            setRecommendations(recommendations, null)
         }
-
-        result_recommendations?.spanCount = 8
-        result_recommendations?.adapter =
-            SearchAdapter(
-                ArrayList(),
-                result_recommendations,
-            ) { callback ->
-                SearchHelper.handleSearchClickCallback(activity, callback)
+        observe(viewModel.episodeSynopsis) { description ->
+            view.context?.let { ctx ->
+                val builder: AlertDialog.Builder =
+                    AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                builder.setMessage(description.html())
+                    .setTitle(R.string.synopsis)
+                    .setOnDismissListener {
+                        viewModel.releaseEpisodeSynopsis()
+                    }
+                    .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
+                //    resultEpisodeLoading.isVisible = episodes is Resource.Loading
+                if (episodes is Resource.Success) {
+                    val first = episodes.value.firstOrNull()
+                    if (first != null) {
+                        resultPlaySeries.text = context?.getNameFull(
+                            null, // resume.result.name, we don't want episode title
+                            first.episode,
+                            first.season
+                        )
+
+                        resultPlaySeries.setOnClickListener {
+                            viewModel.handleAction(
+                                EpisodeClickEvent(
+                                    ACTION_CLICK_DEFAULT,
+                                    first
+                                )
+                            )
+                        }
+                        resultPlaySeries.setOnLongClickListener {
+                            viewModel.handleAction(
+                                EpisodeClickEvent(ACTION_SHOW_OPTIONS, first)
+                            )
+                            return@setOnLongClickListener true
+                        }
+                        if (!hasLoadedEpisodesOnce) {
+                            hasLoadedEpisodesOnce = true
+                            focusPlayButton()
+                        }
+                    }
+
+                    /*
+                     * Okay so what is this fuckery?
+                     * Basically Android TV will crash if you request a new focus while
+                     * the adapter gets updated.
+                     *
+                     * This means that if you load thumbnails and request a next focus at the same time
+                     * the app will crash without any way to catch it!
+                     *
+                     * How to bypass this?
+                     * This code basically steals the focus for 500ms and puts it in an inescapable view
+                     * then lets out the focus by requesting focus to result_episodes
+                     */
+
+                    val hasEpisodes =
+                        !(resultEpisodes.adapter as? EpisodeAdapter?)?.cardList.isNullOrEmpty()
+                    /*val focus = activity?.currentFocus
+
+                    if (hasEpisodes) {
+                        // Make it impossible to focus anywhere else!
+                        temporaryNoFocus.isFocusable = true
+                        temporaryNoFocus.requestFocus()
+                    }*/
+
+                    (resultEpisodes.adapter as? EpisodeAdapter)?.updateList(episodes.value)
+
+                    /* if (hasEpisodes) main {
+
+                         delay(500)
+                         // This might make some people sad as it changes the focus when leaving an episode :(
+                         if(focus?.requestFocus() == true) {
+                             temporaryNoFocus.isFocusable = false
+                             return@main
+                         }
+                         temporaryNoFocus.isFocusable = false
+                         temporaryNoFocus.requestFocus()
+                     }
+
+                     if (hasNoFocus())
+                         binding?.resultEpisodes?.requestFocus()*/
+                }
+            }
+        }
+
+        observeNullable(viewModel.page) { data ->
+            if (data == null) return@observeNullable
+            binding?.apply {
+                when (data) {
+                    is Resource.Success -> {
+                        val d = data.value
+                        resultVpn.setText(d.vpnText)
+                        resultInfo.setText(d.metaText)
+                        resultNoEpisodes.setText(d.noEpisodesFoundText)
+                        resultTitle.setText(d.titleText)
+                        resultMetaSite.setText(d.apiName)
+                        resultMetaType.setText(d.typeText)
+                        resultMetaYear.setText(d.yearText)
+                        resultMetaDuration.setText(d.durationText)
+                        resultMetaRating.setText(d.ratingText)
+                        resultCastText.setText(d.actorsText)
+                        resultNextAiring.setText(d.nextAiringEpisode)
+                        resultNextAiringTime.setText(d.nextAiringDate)
+                        resultPoster.setImage(d.posterImage)
+                        resultDescription.setTextHtml(d.plotText)
+                        resultDescription.setOnClickListener { view ->
+                            view.context?.let { ctx ->
+                                val builder: AlertDialog.Builder =
+                                    AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                                builder.setMessage(d.plotText.asString(ctx).html())
+                                    .setTitle(d.plotHeaderText.asString(ctx))
+                                    .show()
+                            }
+                        }
+
+                        val error = listOf(
+                            R.drawable.profile_bg_dark_blue,
+                            R.drawable.profile_bg_blue,
+                            R.drawable.profile_bg_orange,
+                            R.drawable.profile_bg_pink,
+                            R.drawable.profile_bg_purple,
+                            R.drawable.profile_bg_red,
+                            R.drawable.profile_bg_teal
+                        ).random()
+                        backgroundPoster.setImage(
+                            d.posterBackgroundImage ?: UiImage.Drawable(error),
+                            radius = 0,
+                            errorImageDrawable = error
+                        )
+
+                        resultComingSoon.isVisible = d.comingSoon
+                        resultDataHolder.isGone = d.comingSoon
+                        UIHelper.populateChips(resultTag, d.tags)
+                        resultCastItems.isGone = d.actors.isNullOrEmpty()
+                        (resultCastItems.adapter as? ActorAdaptor)?.updateList(
+                            d.actors ?: emptyList()
+                        )
+                    }
+
+                    is Resource.Loading -> {
+
+                    }
+
+                    is Resource.Failure -> {
+                        resultErrorText.text =
+                            storedData.url.plus("\n") + data.errorString
+                    }
+                }
+
+                resultFinishLoading.isVisible = data is Resource.Success
+
+                resultLoading.isVisible = data is Resource.Loading
+
+                resultLoadingError.isVisible = data is Resource.Failure
+                //resultReloadConnectionOpenInBrowser.isVisible = data is Resource.Failure
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
index bf47209a..c30e70e5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
@@ -3,28 +3,22 @@ package com.lagradost.cloudstream3.ui.result
 import android.animation.ValueAnimator
 import android.content.Context
 import android.content.res.Configuration
-import android.graphics.Rect
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import com.discord.panels.PanelsChildGestureRegionObserver
+import com.lagradost.cloudstream3.CommonActivity.screenHeight
+import com.lagradost.cloudstream3.CommonActivity.screenWidth
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
+import com.lagradost.cloudstream3.ui.player.PlayerEventSource
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.utils.IOnBackPressed
-import kotlinx.android.synthetic.main.fragment_result.*
-import kotlinx.android.synthetic.main.fragment_result.result_smallscreen_holder
-import kotlinx.android.synthetic.main.fragment_result_swipe.*
-import kotlinx.android.synthetic.main.fragment_result_tv.*
-import kotlinx.android.synthetic.main.fragment_trailer.*
-import kotlinx.android.synthetic.main.trailer_custom_layout.*
 
 
-open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreenPlayer(),
-    PanelsChildGestureRegionObserver.GestureRegionsListener, IOnBackPressed {
+open class ResultTrailerPlayer : ResultFragmentPhone(), IOnBackPressed {
 
     override var lockRotation = false
     override var isFullScreenPlayer = false
@@ -40,7 +34,7 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
 
     override fun prevEpisode() {}
 
-    override fun playerPositionChanged(posDur: Pair<Long, Long>) {}
+    override fun playerPositionChanged(position: Long, duration : Long) {}
 
     override fun nextMirror() {}
 
@@ -52,6 +46,8 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
 
     private fun fixPlayerSize() {
         playerWidthHeight?.let { (w, h) ->
+            if(w <= 0 || h <= 0) return@let
+
             val orientation = context?.resources?.configuration?.orientation ?: return
 
             val sw = if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
@@ -60,13 +56,13 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
                 screenHeight
             }
 
-            result_trailer_loading?.isVisible = false
-            result_smallscreen_holder?.isVisible = !isFullScreenPlayer
-            result_fullscreen_holder?.isVisible = isFullScreenPlayer
+            //result_trailer_loading?.isVisible = false
+            resultBinding?.resultSmallscreenHolder?.isVisible = !isFullScreenPlayer
+            binding?.resultFullscreenHolder?.isVisible = isFullScreenPlayer
 
             val to = sw * h / w
 
-            player_background?.apply {
+            resultBinding?.fragmentTrailer?.playerBackground?.apply {
                 isVisible = true
                 layoutParams =
                     FrameLayout.LayoutParams(
@@ -75,16 +71,17 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
                     )
             }
 
-            player_intro_play?.apply {
+            playerBinding?.playerIntroPlay?.apply {
                 layoutParams =
                     FrameLayout.LayoutParams(
                         FrameLayout.LayoutParams.MATCH_PARENT,
-                        result_top_holder?.measuredHeight ?: FrameLayout.LayoutParams.MATCH_PARENT
+                        resultBinding?.resultTopHolder?.measuredHeight
+                            ?: FrameLayout.LayoutParams.MATCH_PARENT
                     )
             }
 
-            if (player_intro_play?.isGone == true) {
-                result_top_holder?.apply {
+            if (playerBinding?.playerIntroPlay?.isGone == true) {
+                resultBinding?.resultTopHolder?.apply {
 
                     val anim = ValueAnimator.ofInt(
                         measuredHeight,
@@ -104,8 +101,8 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
         }
     }
 
-    override fun playerDimensionsLoaded(widthHeight: Pair<Int, Int>) {
-        playerWidthHeight = widthHeight
+    override fun playerDimensionsLoaded(width: Int, height : Int) {
+        playerWidthHeight = width to height
         fixPlayerSize()
     }
 
@@ -125,29 +122,33 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
     override fun onTracksInfoChanged() {}
 
     override fun exitedPipMode() {}
-
-    override fun onGestureRegionsUpdate(gestureRegions: List<Rect>) {}
-
     private fun updateFullscreen(fullscreen: Boolean) {
         isFullScreenPlayer = fullscreen
         lockRotation = fullscreen
-        player_fullscreen?.setImageResource(if (fullscreen) R.drawable.baseline_fullscreen_exit_24 else R.drawable.baseline_fullscreen_24)
+
+        playerBinding?.playerFullscreen?.setImageResource(if (fullscreen) R.drawable.baseline_fullscreen_exit_24 else R.drawable.baseline_fullscreen_24)
         if (fullscreen) {
             enterFullscreen()
-            result_top_bar?.isVisible = false
-            result_fullscreen_holder?.isVisible = true
-            result_main_holder?.isVisible = false
-            player_background?.let { view ->
-                (view.parent as ViewGroup?)?.removeView(view)
-                result_fullscreen_holder?.addView(view)
+            binding?.apply {
+                resultTopBar.isVisible = false
+                resultFullscreenHolder.isVisible = true
+                resultMainHolder.isVisible = false
             }
-        } else {
-            result_top_bar?.isVisible = true
-            result_fullscreen_holder?.isVisible = false
-            result_main_holder?.isVisible = true
-            player_background?.let { view ->
+
+            resultBinding?.fragmentTrailer?.playerBackground?.let { view ->
                 (view.parent as ViewGroup?)?.removeView(view)
-                result_smallscreen_holder?.addView(view)
+                binding?.resultFullscreenHolder?.addView(view)
+            }
+
+        } else {
+            binding?.apply {
+                resultTopBar.isVisible = true
+                resultFullscreenHolder.isVisible = false
+                resultMainHolder.isVisible = true
+                resultBinding?.fragmentTrailer?.playerBackground?.let { view ->
+                    (view.parent as ViewGroup?)?.removeView(view)
+                    resultBinding?.resultSmallscreenHolder?.addView(view)
+                }
             }
             exitFullscreen()
         }
@@ -157,15 +158,15 @@ open class ResultTrailerPlayer : com.lagradost.cloudstream3.ui.player.FullScreen
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        player_fullscreen?.setOnClickListener {
+        playerBinding?.playerFullscreen?.setOnClickListener {
             updateFullscreen(!isFullScreenPlayer)
         }
         updateFullscreen(isFullScreenPlayer)
         uiReset()
 
-        player_intro_play?.setOnClickListener {
-            player_intro_play?.isGone = true
-            player.handleEvent(CSPlayerEvent.Play)
+        playerBinding?.playerIntroPlay?.setOnClickListener {
+            playerBinding?.playerIntroPlay?.isGone = true
+            player.handleEvent(CSPlayerEvent.Play, PlayerEventSource.UI)
             updateUIVisibility()
             fixPlayerSize()
         }
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 46a8c9f6..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
@@ -19,6 +19,7 @@ import com.lagradost.cloudstream3.APIHolder.getId
 import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.getCastSession
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
@@ -35,6 +36,7 @@ import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_NAVIGATE_TO
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
 import com.lagradost.cloudstream3.ui.player.IGenerator
+import com.lagradost.cloudstream3.ui.player.LoadType
 import com.lagradost.cloudstream3.ui.player.RepoLinkGenerator
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.result.EpisodeAdapter.Companion.getPlayerAction
@@ -145,15 +147,18 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData {
                         minute
                     )
                 }
+
                 hours > 0 -> txt(
                     R.string.next_episode_time_hour_format,
                     hours,
                     minute
                 )
+
                 minute > 0 -> txt(
                     R.string.next_episode_time_min_format,
                     minute
                 )
+
                 else -> null
             }?.also {
                 nextAiringEpisode = txt(R.string.next_episode_format, airing.episode)
@@ -305,6 +310,7 @@ fun SelectPopup.getOptions(context: Context): List<String> {
         is SelectPopup.SelectArray -> {
             this.options.map { it.first.asString(context) }
         }
+
         is SelectPopup.SelectText -> options.map { it.asString(context) }
     }
 }
@@ -316,7 +322,7 @@ data class ExtractedTrailerData(
 
 class ResultViewModel2 : ViewModel() {
     private var currentResponse: LoadResponse? = null
-
+    var EPISODE_RANGE_SIZE: Int = 20
     fun clear() {
         currentResponse = null
         _page.postValue(null)
@@ -337,7 +343,7 @@ class ResultViewModel2 : ViewModel() {
     private var currentIndex: EpisodeIndexer? = null
     private var currentRange: EpisodeRange? = null
     private var currentShowFillers: Boolean = false
-    private var currentRepo: APIRepository? = null
+    var currentRepo: APIRepository? = null
     private var currentId: Int? = null
     private var fillers: Map<Int, Boolean> = emptyMap()
     private var generator: IGenerator? = null
@@ -352,17 +358,17 @@ class ResultViewModel2 : ViewModel() {
         MutableLiveData(null)
     val page: LiveData<Resource<ResultData>?> = _page
 
-    private val _episodes: MutableLiveData<ResourceSome<List<ResultEpisode>>> =
-        MutableLiveData(ResourceSome.Loading())
-    val episodes: LiveData<ResourceSome<List<ResultEpisode>>> = _episodes
+    private val _episodes: MutableLiveData<Resource<List<ResultEpisode>>?> =
+        MutableLiveData(Resource.Loading())
+    val episodes: LiveData<Resource<List<ResultEpisode>>?> = _episodes
 
-    private val _movie: MutableLiveData<ResourceSome<Pair<UiText, ResultEpisode>>> =
-        MutableLiveData(ResourceSome.None)
-    val movie: LiveData<ResourceSome<Pair<UiText, ResultEpisode>>> = _movie
+    private val _movie: MutableLiveData<Resource<Pair<UiText, ResultEpisode>>?> =
+        MutableLiveData(null)
+    val movie: LiveData<Resource<Pair<UiText, ResultEpisode>>?> = _movie
 
-    private val _episodesCountText: MutableLiveData<Some<UiText>> =
-        MutableLiveData(Some.None)
-    val episodesCountText: LiveData<Some<UiText>> = _episodesCountText
+    private val _episodesCountText: MutableLiveData<UiText?> =
+        MutableLiveData(null)
+    val episodesCountText: LiveData<UiText?> = _episodesCountText
 
     private val _trailers: MutableLiveData<List<ExtractedTrailerData>> =
         MutableLiveData(mutableListOf())
@@ -384,16 +390,16 @@ class ResultViewModel2 : ViewModel() {
         MutableLiveData(emptyList())
     val recommendations: LiveData<List<SearchResponse>> = _recommendations
 
-    private val _selectedRange: MutableLiveData<Some<UiText>> =
-        MutableLiveData(Some.None)
-    val selectedRange: LiveData<Some<UiText>> = _selectedRange
+    private val _selectedRange: MutableLiveData<UiText?> =
+        MutableLiveData(null)
+    val selectedRange: LiveData<UiText?> = _selectedRange
 
-    private val _selectedSeason: MutableLiveData<Some<UiText>> =
-        MutableLiveData(Some.None)
-    val selectedSeason: LiveData<Some<UiText>> = _selectedSeason
+    private val _selectedSeason: MutableLiveData<UiText?> =
+        MutableLiveData(null)
+    val selectedSeason: LiveData<UiText?> = _selectedSeason
 
-    private val _selectedDubStatus: MutableLiveData<Some<UiText>> = MutableLiveData(Some.None)
-    val selectedDubStatus: LiveData<Some<UiText>> = _selectedDubStatus
+    private val _selectedDubStatus: MutableLiveData<UiText?> = MutableLiveData(null)
+    val selectedDubStatus: LiveData<UiText?> = _selectedDubStatus
 
     private val _selectedRangeIndex: MutableLiveData<Int> =
         MutableLiveData(-1)
@@ -406,12 +412,12 @@ class ResultViewModel2 : ViewModel() {
     private val _selectedDubStatusIndex: MutableLiveData<Int> = MutableLiveData(-1)
     val selectedDubStatusIndex: LiveData<Int> = _selectedDubStatusIndex
 
-    private val _loadedLinks: MutableLiveData<Some<LinkProgress>> = MutableLiveData(Some.None)
-    val loadedLinks: LiveData<Some<LinkProgress>> = _loadedLinks
+    private val _loadedLinks: MutableLiveData<LinkProgress?> = MutableLiveData(null)
+    val loadedLinks: LiveData<LinkProgress?> = _loadedLinks
 
-    private val _resumeWatching: MutableLiveData<Some<ResumeWatchingStatus>> =
-        MutableLiveData(Some.None)
-    val resumeWatching: LiveData<Some<ResumeWatchingStatus>> = _resumeWatching
+    private val _resumeWatching: MutableLiveData<ResumeWatchingStatus?> =
+        MutableLiveData(null)
+    val resumeWatching: LiveData<ResumeWatchingStatus?> = _resumeWatching
 
     private val _episodeSynopsis: MutableLiveData<String?> = MutableLiveData(null)
     val episodeSynopsis: LiveData<String?> = _episodeSynopsis
@@ -421,8 +427,8 @@ class ResultViewModel2 : ViewModel() {
 
     companion object {
         const val TAG = "RVM2"
-        private const val EPISODE_RANGE_SIZE = 20
-        private const val EPISODE_RANGE_OVERLOAD = 30
+        //private const val EPISODE_RANGE_SIZE = 20
+        //private const val EPISODE_RANGE_OVERLOAD = 30
 
         private fun List<SeasonData>?.getSeason(season: Int?): SeasonData? {
             if (season == null) return null
@@ -432,6 +438,8 @@ class ResultViewModel2 : ViewModel() {
         fun updateWatchStatus(currentResponse: LoadResponse, status: WatchType) {
             val currentId = currentResponse.getId()
 
+            val currentWatchType = getResultWatchState(currentId)
+
             DataStoreHelper.setResultWatchState(currentId, status.internalId)
             val current = DataStoreHelper.getBookmarkedData(currentId)
             val currentTime = System.currentTimeMillis()
@@ -449,6 +457,9 @@ class ResultViewModel2 : ViewModel() {
                     currentResponse.year
                 )
             )
+            if (currentWatchType != status) {
+                MainActivity.bookmarksUpdatedEvent(true)
+            }
         }
 
         private fun filterName(name: String?): String? {
@@ -467,12 +478,16 @@ class ResultViewModel2 : ViewModel() {
                 )
             )
 
-        private fun getRanges(allEpisodes: Map<EpisodeIndexer, List<ResultEpisode>>): Map<EpisodeIndexer, List<EpisodeRange>> {
+        private fun getRanges(
+            allEpisodes: Map<EpisodeIndexer, List<ResultEpisode>>,
+            EPISODE_RANGE_SIZE: Int
+        ): Map<EpisodeIndexer, List<EpisodeRange>> {
             return allEpisodes.keys.mapNotNull { index ->
                 val episodes =
                     allEpisodes[index] ?: return@mapNotNull null // this should never happened
 
                 // fast case
+                val EPISODE_RANGE_OVERLOAD = EPISODE_RANGE_SIZE + 10
                 if (episodes.size <= EPISODE_RANGE_OVERLOAD) {
                     return@mapNotNull index to listOf(
                         EpisodeRange(
@@ -503,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
@@ -577,12 +593,10 @@ class ResultViewModel2 : ViewModel() {
                     link,
                     "$fileName ${link.name}",
                     folder,
-                    if (link.url.contains(".srt")) ".srt" else "vtt",
+                    if (link.url.contains(".srt")) "srt" else "vtt",
                     false,
-                    null
-                ) {
-                    // no notification
-                }
+                    null, createNotificationCallback = {}
+                )
             }
         }
 
@@ -707,7 +721,7 @@ class ResultViewModel2 : ViewModel() {
                             )
                         )
                     }
-                        .map { ExtractorSubtitleLink(it.name, it.url, "") }
+                        .map { ExtractorSubtitleLink(it.name, it.url, "") }.take(3)
                         .forEach { link ->
                             val fileName = VideoDownloadManager.getFileName(context, meta)
                             downloadSubtitle(context, link, fileName, folder)
@@ -733,7 +747,7 @@ class ResultViewModel2 : ViewModel() {
                 val generator = RepoLinkGenerator(listOf(episode))
                 val currentLinks = mutableSetOf<ExtractorLink>()
                 val currentSubs = mutableSetOf<SubtitleData>()
-                generator.generateLinks(clearCache = false, isCasting = false, callback = {
+                generator.generateLinks(clearCache = false, LoadType.Chromecast, callback = {
                     it.first?.let { link ->
                         currentLinks.add(link)
                     }
@@ -744,7 +758,6 @@ class ResultViewModel2 : ViewModel() {
                 if (currentLinks.isEmpty()) {
                     main {
                         showToast(
-                            activity,
                             R.string.no_links_found_toast,
                             Toast.LENGTH_SHORT
                         )
@@ -753,7 +766,6 @@ class ResultViewModel2 : ViewModel() {
                 } else {
                     main {
                         showToast(
-                            activity,
                             R.string.download_started,
                             Toast.LENGTH_SHORT
                         )
@@ -800,8 +812,8 @@ class ResultViewModel2 : ViewModel() {
     private val _watchStatus: MutableLiveData<WatchType> = MutableLiveData(WatchType.NONE)
     val watchStatus: LiveData<WatchType> get() = _watchStatus
 
-    private val _selectPopup: MutableLiveData<Some<SelectPopup>> = MutableLiveData(Some.None)
-    val selectPopup: LiveData<Some<SelectPopup>> get() = _selectPopup
+    private val _selectPopup: MutableLiveData<SelectPopup?> = MutableLiveData(null)
+    val selectPopup: LiveData<SelectPopup?> = _selectPopup
 
 
     fun updateWatchStatus(status: WatchType) {
@@ -815,7 +827,7 @@ class ResultViewModel2 : ViewModel() {
         isVisible: Boolean = true
     ) {
         if (activity == null) return
-        loadLinks(result, isVisible = isVisible, isCasting = true) { data ->
+        loadLinks(result, isVisible = isVisible, LoadType.Chromecast) { data ->
             startChromecast(activity, result, data.links, data.subs, 0)
         }
     }
@@ -885,23 +897,22 @@ class ResultViewModel2 : ViewModel() {
     }
 
     fun cancelLinks() {
-        println("called::cancelLinks")
         currentLoadLinkJob?.cancel()
         currentLoadLinkJob = null
-        _loadedLinks.postValue(Some.None)
+        _loadedLinks.postValue(null)
     }
 
     private fun postPopup(text: UiText, options: List<UiText>, callback: suspend (Int?) -> Unit) {
         _selectPopup.postValue(
-            some(SelectPopup.SelectText(
+            SelectPopup.SelectText(
                 text,
                 options
             ) { value ->
                 viewModelScope.launchSafe {
-                    _selectPopup.postValue(Some.None)
+                    _selectPopup.postValue(null)
                     callback.invoke(value)
                 }
-            })
+            }
         )
     }
 
@@ -912,22 +923,22 @@ class ResultViewModel2 : ViewModel() {
         callback: suspend (Int?) -> Unit
     ) {
         _selectPopup.postValue(
-            some(SelectPopup.SelectArray(
+            SelectPopup.SelectArray(
                 text,
                 options,
             ) { value ->
                 viewModelScope.launchSafe {
-                    _selectPopup.value = Some.None
+                    _selectPopup.postValue(null)
                     callback.invoke(value)
                 }
-            })
+            }
         )
     }
 
     private fun loadLinks(
         result: ResultEpisode,
         isVisible: Boolean,
-        isCasting: Boolean,
+        type: LoadType,
         clearCache: Boolean = false,
         work: suspend (CoroutineScope.(LinkLoadingResult) -> Unit)
     ) {
@@ -936,7 +947,7 @@ class ResultViewModel2 : ViewModel() {
             val links = loadLinks(
                 result,
                 isVisible = isVisible,
-                isCasting = isCasting,
+                type = type,
                 clearCache = clearCache
             )
             if (!this.isActive) return@ioSafe
@@ -947,11 +958,11 @@ class ResultViewModel2 : ViewModel() {
     private var currentLoadLinkJob: Job? = null
     private fun acquireSingleLink(
         result: ResultEpisode,
-        isCasting: Boolean,
+        type: LoadType,
         text: UiText,
         callback: (Pair<LinkLoadingResult, Int>) -> Unit,
     ) {
-        loadLinks(result, isVisible = true, isCasting = isCasting) { links ->
+        loadLinks(result, isVisible = true, type) { links ->
             postPopup(
                 text,
                 links.links.map { txt("${it.name} ${Qualities.getStringByInt(it.quality)}") }) {
@@ -962,11 +973,10 @@ class ResultViewModel2 : ViewModel() {
 
     private fun acquireSingleSubtitle(
         result: ResultEpisode,
-        isCasting: Boolean,
         text: UiText,
         callback: (Pair<LinkLoadingResult, Int>) -> Unit,
     ) {
-        loadLinks(result, isVisible = true, isCasting = isCasting) { links ->
+        loadLinks(result, isVisible = true, type = LoadType.Unknown) { links ->
             postPopup(
                 text,
                 links.subs.map { txt(it.name) })
@@ -979,7 +989,7 @@ class ResultViewModel2 : ViewModel() {
     private suspend fun CoroutineScope.loadLinks(
         result: ResultEpisode,
         isVisible: Boolean,
-        isCasting: Boolean,
+        type: LoadType,
         clearCache: Boolean = false,
     ): LinkLoadingResult {
         val tempGenerator = RepoLinkGenerator(listOf(result))
@@ -988,12 +998,12 @@ class ResultViewModel2 : ViewModel() {
         val subs: MutableSet<SubtitleData> = mutableSetOf()
         fun updatePage() {
             if (isVisible && isActive) {
-                _loadedLinks.postValue(some(LinkProgress(links.size, subs.size)))
+                _loadedLinks.postValue(LinkProgress(links.size, subs.size))
             }
         }
         try {
             updatePage()
-            tempGenerator.generateLinks(clearCache, isCasting, { (link, _) ->
+            tempGenerator.generateLinks(clearCache, type, { (link, _) ->
                 if (link != null) {
                     links += link
                     updatePage()
@@ -1005,7 +1015,7 @@ class ResultViewModel2 : ViewModel() {
         } catch (e: Exception) {
             logError(e)
         } finally {
-            _loadedLinks.postValue(Some.None)
+            _loadedLinks.postValue(null)
         }
 
         return LinkLoadingResult(sortUrls(links), sortSubs(subs))
@@ -1027,9 +1037,9 @@ class ResultViewModel2 : ViewModel() {
                 logError(t)
                 main {
                     if (t is ActivityNotFoundException) {
-                        showToast(activity, txt(R.string.app_not_found_error), Toast.LENGTH_LONG)
+                        showToast(txt(R.string.app_not_found_error), Toast.LENGTH_LONG)
                     } else {
-                        showToast(activity, t.toString(), Toast.LENGTH_LONG)
+                        showToast(t.toString(), Toast.LENGTH_LONG)
                     }
                 }
             }
@@ -1138,9 +1148,9 @@ class ResultViewModel2 : ViewModel() {
     }
 
 
-    fun handleAction(activity: Activity?, click: EpisodeClickEvent) =
+    fun handleAction(click: EpisodeClickEvent) =
         viewModelScope.launchSafe {
-            handleEpisodeClickEvent(activity, click)
+            handleEpisodeClickEvent(click)
         }
 
     data class ExternalApp(
@@ -1170,7 +1180,7 @@ class ResultViewModel2 : ViewModel() {
         _episodeSynopsis.postValue(null)
     }
 
-    private suspend fun handleEpisodeClickEvent(activity: Activity?, click: EpisodeClickEvent) {
+    private suspend fun handleEpisodeClickEvent(click: EpisodeClickEvent) {
         when (click.action) {
             ACTION_SHOW_OPTIONS -> {
                 val options = mutableListOf<Pair<UiText, Int>>()
@@ -1228,27 +1238,26 @@ class ResultViewModel2 : ViewModel() {
                     options
                 ) { result ->
                     handleEpisodeClickEvent(
-                        activity,
                         click.copy(action = result ?: return@postPopup)
                     )
                 }
             }
+
             ACTION_CLICK_DEFAULT -> {
                 activity?.let { ctx ->
                     if (ctx.isConnectedToChromecast()) {
                         handleEpisodeClickEvent(
-                            activity,
                             click.copy(action = ACTION_CHROME_CAST_EPISODE)
                         )
                     } else {
                         val action = getPlayerAction(ctx)
                         handleEpisodeClickEvent(
-                            activity,
                             click.copy(action = action)
                         )
                     }
                 }
             }
+
             ACTION_SHOW_DESCRIPTION -> {
                 _episodeSynopsis.postValue(click.data.description)
             }
@@ -1264,7 +1273,6 @@ class ResultViewModel2 : ViewModel() {
 
                 acquireSingleSubtitle(
                     click.data,
-                    false,
                     txt(R.string.episode_action_download_subtitle)
                 ) { (links, index) ->
                     downloadSubtitle(
@@ -1280,15 +1288,16 @@ class ResultViewModel2 : ViewModel() {
                         )
                     )
                     showToast(
-                        activity,
                         R.string.download_started,
                         Toast.LENGTH_SHORT
                     )
                 }
             }
+
             ACTION_SHOW_TOAST -> {
-                showToast(activity, R.string.play_episode_toast, Toast.LENGTH_SHORT)
+                showToast(R.string.play_episode_toast, Toast.LENGTH_SHORT)
             }
+
             ACTION_DOWNLOAD_EPISODE -> {
                 val response = currentResponse ?: return
                 downloadEpisode(
@@ -1303,11 +1312,12 @@ class ResultViewModel2 : ViewModel() {
                     response.url
                 )
             }
+
             ACTION_DOWNLOAD_MIRROR -> {
                 val response = currentResponse ?: return
                 acquireSingleLink(
                     click.data,
-                    false,
+                    LoadType.InAppDownload,
                     txt(R.string.episode_action_download_mirror)
                 ) { (result, index) ->
                     ioSafe {
@@ -1326,34 +1336,36 @@ class ResultViewModel2 : ViewModel() {
                         )
                     }
                     showToast(
-                        activity,
                         R.string.download_started,
                         Toast.LENGTH_SHORT
                     )
                 }
             }
+
             ACTION_RELOAD_EPISODE -> {
                 ioSafe {
                     loadLinks(
                         click.data,
                         isVisible = false,
-                        isCasting = false,
+                        type = LoadType.InApp,
                         clearCache = true
                     )
                 }
             }
+
             ACTION_CHROME_CAST_MIRROR -> {
                 acquireSingleLink(
                     click.data,
-                    isCasting = true,
+                    LoadType.Chromecast,
                     txt(R.string.episode_action_chromecast_mirror)
                 ) { (result, index) ->
                     startChromecast(activity, click.data, result.links, result.subs, index)
                 }
             }
+
             ACTION_PLAY_EPISODE_IN_BROWSER -> acquireSingleLink(
                 click.data,
-                isCasting = true,
+                LoadType.Browser,
                 txt(R.string.episode_action_play_in_browser)
             ) { (result, index) ->
                 try {
@@ -1364,10 +1376,11 @@ class ResultViewModel2 : ViewModel() {
                     logError(e)
                 }
             }
+
             ACTION_COPY_LINK -> {
                 acquireSingleLink(
                     click.data,
-                    isCasting = true,
+                    LoadType.ExternalApp,
                     txt(R.string.episode_action_copy_link)
                 ) { (result, index) ->
                     val act = activity ?: return@acquireSingleLink
@@ -1377,16 +1390,18 @@ class ResultViewModel2 : ViewModel() {
                     val link = result.links[index]
                     val clip = ClipData.newPlainText(link.name, link.url)
                     serviceClipboard.setPrimaryClip(clip)
-                    showToast(act, R.string.copy_link_toast, Toast.LENGTH_SHORT)
+                    showToast(R.string.copy_link_toast, Toast.LENGTH_SHORT)
                 }
             }
+
             ACTION_CHROME_CAST_EPISODE -> {
                 startChromecast(activity, click.data)
             }
+
             ACTION_PLAY_EPISODE_IN_VLC_PLAYER -> {
-                loadLinks(click.data, isVisible = true, isCasting = true) { links ->
+                loadLinks(click.data, isVisible = true, LoadType.ExternalApp) { links ->
                     if (links.links.isEmpty()) {
-                        showToast(activity, R.string.no_links_found_toast, Toast.LENGTH_SHORT)
+                        showToast(R.string.no_links_found_toast, Toast.LENGTH_SHORT)
                         return@loadLinks
                     }
 
@@ -1397,9 +1412,10 @@ class ResultViewModel2 : ViewModel() {
                     )
                 }
             }
+
             ACTION_PLAY_EPISODE_IN_WEB_VIDEO -> acquireSingleLink(
                 click.data,
-                isCasting = true,
+                LoadType.Chromecast,
                 txt(
                     R.string.episode_action_play_in_format,
                     txt(R.string.player_settings_play_in_web)
@@ -1413,9 +1429,10 @@ class ResultViewModel2 : ViewModel() {
                     result.subs
                 )
             }
+
             ACTION_PLAY_EPISODE_IN_MPV -> acquireSingleLink(
                 click.data,
-                isCasting = true,
+                LoadType.Chromecast,
                 txt(
                     R.string.episode_action_play_in_format,
                     txt(R.string.player_settings_play_in_mpv)
@@ -1428,6 +1445,7 @@ class ResultViewModel2 : ViewModel() {
                     result.subs
                 )
             }
+
             ACTION_PLAY_EPISODE_IN_PLAYER -> {
                 val data = currentResponse?.syncData?.toList() ?: emptyList()
                 val list =
@@ -1443,11 +1461,11 @@ class ResultViewModel2 : ViewModel() {
                                     if (index >= 0)
                                         it.goto(index)
                                 }
-
                         } ?: return, list
                     )
                 )
             }
+
             ACTION_MARK_AS_WATCHED -> {
                 val isWatched =
                     DataStoreHelper.getVideoWatchState(click.data.id) == VideoWatchState.Watched
@@ -1487,13 +1505,14 @@ class ResultViewModel2 : ViewModel() {
                 }
 
                 val realRecommendations = ArrayList<SearchResponse>()
-                val apiNames = apis.filter {
-                    it.name.contains("gogoanime", true) ||
-                            it.name.contains("9anime", true)
-                }.map {
-                    it.name
+                val apiNames = synchronized(apis) {
+                    apis.filter {
+                        it.name.contains("gogoanime", true) ||
+                                it.name.contains("9anime", true)
+                    }.map {
+                        it.name
+                    }
                 }
-
                 meta.recommendations?.forEach { rec ->
                     apiNames.forEach { name ->
                         realRecommendations.add(rec.copy(apiName = name))
@@ -1520,7 +1539,11 @@ class ResultViewModel2 : ViewModel() {
                             this.name,
                             this.japName
                         ).filter { it.length > 2 }
-                            .distinct(), // the reason why we filter is due to not wanting smth like " " or "?"
+                            .distinct().map {
+                            // this actually would be nice if we improved a bit as 3rd season == season 3 == III ect
+                                // right now it just removes the dubbed status
+                                it.lowercase().replace(Regex("""\(?[ds]ub(bed)?\)?(\s|$)""") , "").trim()
+                                            },
                         TrackerType.getTypes(this.type),
                         this.year
                     )
@@ -1672,10 +1695,10 @@ class ResultViewModel2 : ViewModel() {
 
     private fun postMovie() {
         val response = currentResponse
-        _episodes.postValue(ResourceSome.None)
+        _episodes.postValue(null)
 
         if (response == null) {
-            _movie.postValue(ResourceSome.None)
+            _movie.postValue(null)
             return
         }
 
@@ -1685,18 +1708,18 @@ class ResultViewModel2 : ViewModel() {
                 else -> {
                     if (response.type.isLiveStream())
                         R.string.play_livestream_button
-                    else if (response.type.isMovieType()) // this wont break compatibility as you only need to override isMovieType
+                    else if (response.isMovie()) // this wont break compatibility as you only need to override isMovieType
                         R.string.play_movie_button
                     else null
                 }
             }
         )
         val data = getMovie()
-        _episodes.postValue(ResourceSome.None)
+        _episodes.postValue(null)
         if (text == null || data == null) {
-            _movie.postValue(ResourceSome.None)
+            _movie.postValue(null)
         } else {
-            _movie.postValue(ResourceSome.Success(text to data))
+            _movie.postValue(Resource.Success(text to data))
         }
     }
 
@@ -1705,14 +1728,14 @@ class ResultViewModel2 : ViewModel() {
             postMovie()
         } else {
             _episodes.postValue(
-                ResourceSome.Success(
+                Resource.Success(
                     getEpisodes(
                         currentIndex ?: return,
                         currentRange ?: return
                     )
                 )
             )
-            _movie.postValue(ResourceSome.None)
+            _movie.postValue(null)
         }
         postResume()
     }
@@ -1755,14 +1778,14 @@ class ResultViewModel2 : ViewModel() {
 
         val size = currentEpisodes[indexer]?.size
         _episodesCountText.postValue(
-            some(
-                if (isMovie) null else
-                    txt(
-                        R.string.episode_format,
-                        size,
-                        txt(if (size == 1) R.string.episode else R.string.episodes),
-                    )
-            )
+
+            if (isMovie) null else
+                txt(
+                    R.string.episode_format,
+                    size,
+                    txt(if (size == 1) R.string.episode else R.string.episodes),
+                )
+
         )
 
         _selectedSeasonIndex.postValue(
@@ -1770,29 +1793,29 @@ class ResultViewModel2 : ViewModel() {
         )
 
         _selectedSeason.postValue(
-            some(
-                if (isMovie || currentSeasons.size <= 1) null else
-                    when (indexer.season) {
-                        0 -> txt(R.string.no_season)
-                        else -> {
-                            val seasonNames = (currentResponse as? EpisodeResponse)?.seasonNames
-                            val seasonData = seasonNames.getSeason(indexer.season)
 
-                            // If displaySeason is null then only show the name!
-                            if (seasonData?.name != null && seasonData.displaySeason == null) {
-                                txt(seasonData.name)
-                            } else {
-                                val suffix = seasonData?.name?.let { " $it" } ?: ""
-                                txt(
-                                    R.string.season_format,
-                                    txt(R.string.season),
-                                    seasonData?.displaySeason ?: indexer.season,
-                                    suffix
-                                )
-                            }
+            if (isMovie || currentSeasons.size <= 1) null else
+                when (indexer.season) {
+                    0 -> txt(R.string.no_season)
+                    else -> {
+                        val seasonNames = (currentResponse as? EpisodeResponse)?.seasonNames
+                        val seasonData = seasonNames.getSeason(indexer.season)
+
+                        // If displaySeason is null then only show the name!
+                        if (seasonData?.name != null && seasonData.displaySeason == null) {
+                            txt(seasonData.name)
+                        } else {
+                            val suffix = seasonData?.name?.let { " $it" } ?: ""
+                            txt(
+                                R.string.season_format,
+                                txt(R.string.season),
+                                seasonData?.displaySeason ?: indexer.season,
+                                suffix
+                            )
                         }
                     }
-            )
+                }
+
         )
 
         _selectedRangeIndex.postValue(
@@ -1800,13 +1823,13 @@ class ResultViewModel2 : ViewModel() {
         )
 
         _selectedRange.postValue(
-            some(
-                if (isMovie) null else if ((currentRanges[indexer]?.size ?: 0) > 1) {
-                    txt(R.string.episodes_range, range.startEpisode, range.endEpisode)
-                } else {
-                    null
-                }
-            )
+
+            if (isMovie) null else if ((currentRanges[indexer]?.size ?: 0) > 1) {
+                txt(R.string.episodes_range, range.startEpisode, range.endEpisode)
+            } else {
+                null
+            }
+
         )
 
         _selectedDubStatusIndex.postValue(
@@ -1814,10 +1837,10 @@ class ResultViewModel2 : ViewModel() {
         )
 
         _selectedDubStatus.postValue(
-            some(
-                if (isMovie || currentDubStatus.size <= 1) null else
-                    txt(indexer.dubStatus)
-            )
+
+            if (isMovie || currentDubStatus.size <= 1) null else
+                txt(indexer.dubStatus)
+
         )
 
         currentId?.let { id ->
@@ -1851,7 +1874,7 @@ class ResultViewModel2 : ViewModel() {
 
                 }
             }*/
-            _episodes.postValue(ResourceSome.Success(ret))
+            _episodes.postValue(Resource.Success(ret))
         }
     }
 
@@ -1869,7 +1892,7 @@ class ResultViewModel2 : ViewModel() {
     }
 
     private suspend fun postEpisodes(loadResponse: LoadResponse, updateFillers: Boolean) {
-        _episodes.postValue(ResourceSome.Loading())
+        _episodes.postValue(Resource.Loading())
 
         val mainId = loadResponse.getId()
         currentId = mainId
@@ -1924,6 +1947,7 @@ class ResultViewModel2 : ViewModel() {
                 }
                 episodes
             }
+
             is TvSeriesLoadResponse -> {
                 val episodes: MutableMap<EpisodeIndexer, MutableList<ResultEpisode>> =
                     mutableMapOf()
@@ -1968,6 +1992,7 @@ class ResultViewModel2 : ViewModel() {
                 }
                 episodes
             }
+
             is MovieLoadResponse -> {
                 singleMap(
                     buildResultEpisode(
@@ -1989,6 +2014,7 @@ class ResultViewModel2 : ViewModel() {
                     )
                 )
             }
+
             is LiveStreamLoadResponse -> {
                 singleMap(
                     buildResultEpisode(
@@ -2010,6 +2036,7 @@ class ResultViewModel2 : ViewModel() {
                     )
                 )
             }
+
             is TorrentLoadResponse -> {
                 singleMap(
                     buildResultEpisode(
@@ -2031,6 +2058,7 @@ class ResultViewModel2 : ViewModel() {
                     )
                 )
             }
+
             else -> {
                 mapOf()
             }
@@ -2066,7 +2094,7 @@ class ResultViewModel2 : ViewModel() {
         }
 
         currentEpisodes = allEpisodes
-        val ranges = getRanges(allEpisodes)
+        val ranges = getRanges(allEpisodes, EPISODE_RANGE_SIZE)
         currentRanges = ranges
 
 
@@ -2088,7 +2116,7 @@ class ResultViewModel2 : ViewModel() {
     }
 
     fun postResume() {
-        _resumeWatching.postValue(some(resume()))
+        _resumeWatching.postValue(resume())
     }
 
     private fun resume(): ResumeWatchingStatus? {
@@ -2148,7 +2176,7 @@ class ResultViewModel2 : ViewModel() {
                                     trailerData.extractorUrl,
                                     trailerData.referer ?: "",
                                     Qualities.Unknown.value,
-                                    trailerData.extractorUrl.contains(".m3u8")
+                                    type = INFER_TYPE
                                 )
                             ) to arrayListOf()
                         } else {
@@ -2186,7 +2214,6 @@ class ResultViewModel2 : ViewModel() {
                         for (ep in currentRange) {
                             if (ep.getWatchProgress() > 0.9) continue
                             handleAction(
-                                activity,
                                 EpisodeClickEvent(
                                     getPlayerAction(activity),
                                     ep
@@ -2196,6 +2223,7 @@ class ResultViewModel2 : ViewModel() {
                         }
                     }
                 }
+
                 START_ACTION_LOAD_EP -> {
                     val all = currentEpisodes.values.flatten()
                     val episode =
@@ -2206,7 +2234,6 @@ class ResultViewModel2 : ViewModel() {
                             }
                             ?: return@launchSafe
                     handleAction(
-                        activity,
                         EpisodeClickEvent(
                             getPlayerAction(activity),
                             episode
@@ -2227,7 +2254,7 @@ class ResultViewModel2 : ViewModel() {
     ) =
         ioSafe {
             _page.postValue(Resource.Loading(url))
-            _episodes.postValue(ResourceSome.Loading())
+            _episodes.postValue(Resource.Loading())
 
             preferDubStatus = dubStatus
             currentShowFillers = showFillers
@@ -2271,6 +2298,7 @@ class ResultViewModel2 : ViewModel() {
                 is Resource.Failure -> {
                     _page.postValue(data)
                 }
+
                 is Resource.Success -> {
                     if (!isActive) return@ioSafe
                     val loadResponse = ioWork {
@@ -2307,9 +2335,10 @@ class ResultViewModel2 : ViewModel() {
                     if (!isActive) return@ioSafe
                     handleAutoStart(activity, autostart)
                 }
+
                 is Resource.Loading -> {
                     debugException { "Invalid load result" }
                 }
             }
         }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt
index 2e7ec529..6fe45730 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt
@@ -1,12 +1,11 @@
 package com.lagradost.cloudstream3.ui.result
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.button.MaterialButton
-import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.ResultSelectionBinding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 
 typealias SelectData = Pair<UiText?, Any>
@@ -17,7 +16,9 @@ class SelectAdaptor(val callback: (Any) -> Unit) : RecyclerView.Adapter<Recycler
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return SelectViewHolder(
-            LayoutInflater.from(parent.context).inflate(R.layout.result_selection, parent, false),
+            ResultSelectionBinding.inflate(LayoutInflater.from(parent.context), parent, false),
+
+                    //LayoutInflater.from(parent.context).inflate(R.layout.result_selection, parent, false),
         )
     }
 
@@ -44,19 +45,9 @@ class SelectAdaptor(val callback: (Any) -> Unit) : RecyclerView.Adapter<Recycler
         if(newIndex == selectedIndex) return
         val oldIndex = selectedIndex
         selectedIndex = newIndex
-        recyclerView.apply {
-            for (i in 0 until itemCount) {
-                val viewHolder = getChildViewHolder( getChildAt(i) ?: continue) ?: continue
-                val pos = viewHolder.absoluteAdapterPosition
-                if (viewHolder is SelectViewHolder) {
-                    if (pos == oldIndex) {
-                        viewHolder.update(false)
-                    } else if (pos == newIndex) {
-                        viewHolder.update(true)
-                    }
-                }
-            }
-        }
+
+        notifyItemChanged(selectedIndex)
+        notifyItemChanged(oldIndex)
     }
 
     fun updateSelectionList(newList: List<SelectData>) {
@@ -73,14 +64,10 @@ class SelectAdaptor(val callback: (Any) -> Unit) : RecyclerView.Adapter<Recycler
 
     private class SelectViewHolder
     constructor(
-        itemView: View,
+        binding: ResultSelectionBinding,
     ) :
-        RecyclerView.ViewHolder(itemView) {
-        private val item: MaterialButton = itemView as MaterialButton
-
-        fun update(isSelected: Boolean) {
-            item.isSelected = isSelected
-        }
+        RecyclerView.ViewHolder(binding.root) {
+        private val item: MaterialButton = binding.root
 
         fun bind(
             data: SelectData, isSelected: Boolean, callback: (Any) -> Unit
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt
index 91415d26..a3e2ed87 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt
@@ -36,18 +36,18 @@ class SyncViewModel : ViewModel() {
 
     val metadata: LiveData<Resource<SyncAPI.SyncResult>> get() = _metaResponse
 
-    private val _userDataResponse: MutableLiveData<Resource<SyncAPI.SyncStatus>?> =
+    private val _userDataResponse: MutableLiveData<Resource<SyncAPI.AbstractSyncStatus>?> =
         MutableLiveData(null)
 
-    val userData: LiveData<Resource<SyncAPI.SyncStatus>?> get() = _userDataResponse
+    val userData: LiveData<Resource<SyncAPI.AbstractSyncStatus>?> get() = _userDataResponse
 
     // prefix, id
-    private var syncs = mutableMapOf<String, String>()
+    private val syncs = mutableMapOf<String, String>()
     //private val _syncIds: MutableLiveData<MutableMap<String, String>> =
     //    MutableLiveData(mutableMapOf())
     //val syncIds: LiveData<MutableMap<String, String>> get() = _syncIds
 
-    fun getSyncs() : Map<String,String> {
+    fun getSyncs(): Map<String, String> {
         return syncs
     }
 
@@ -106,7 +106,7 @@ class SyncViewModel : ViewModel() {
         Log.i(TAG, "addFromUrl = $url")
 
         if (url == null || hasAddedFromUrl.contains(url)) return@ioSafe
-        if(!url.startsWith("http")) return@ioSafe
+        if (!url.startsWith("http")) return@ioSafe
 
         SyncUtil.getIdsFromUrl(url)?.let { (malId, aniListId) ->
             hasAddedFromUrl.add(url)
@@ -150,7 +150,8 @@ class SyncViewModel : ViewModel() {
 
         val user = userData.value
         if (user is Resource.Success) {
-            _userDataResponse.postValue(Resource.Success(user.value.copy(watchedEpisodes = episodes)))
+            user.value.watchedEpisodes = episodes
+            _userDataResponse.postValue(Resource.Success(user.value))
         }
     }
 
@@ -158,7 +159,8 @@ class SyncViewModel : ViewModel() {
         Log.i(TAG, "setScore = $score")
         val user = userData.value
         if (user is Resource.Success) {
-            _userDataResponse.postValue(Resource.Success(user.value.copy(score = score)))
+            user.value.score = score
+            _userDataResponse.postValue(Resource.Success(user.value))
         }
     }
 
@@ -167,7 +169,8 @@ class SyncViewModel : ViewModel() {
         if (which < -1 || which > 5) return // validate input
         val user = userData.value
         if (user is Resource.Success) {
-            _userDataResponse.postValue(Resource.Success(user.value.copy(status = which)))
+            user.value.status = which
+            _userDataResponse.postValue(Resource.Success(user.value))
         }
     }
 
@@ -185,17 +188,16 @@ class SyncViewModel : ViewModel() {
     fun modifyMaxEpisode(episodeNum: Int) {
         Log.i(TAG, "modifyMaxEpisode = $episodeNum")
         modifyData { status ->
-            status.copy(
-                watchedEpisodes = maxOf(
-                    episodeNum,
-                    status.watchedEpisodes ?: return@modifyData null
-                )
+            status.watchedEpisodes = maxOf(
+                episodeNum,
+                status.watchedEpisodes ?: return@modifyData null
             )
+            status
         }
     }
 
     /// modifies the current sync data, return null if you don't want to change it
-    private fun modifyData(update: ((SyncAPI.SyncStatus) -> (SyncAPI.SyncStatus?))) =
+    private fun modifyData(update: ((SyncAPI.AbstractSyncStatus) -> (SyncAPI.AbstractSyncStatus?))) =
         ioSafe {
             syncs.amap { (prefix, id) ->
                 repos.firstOrNull { it.idPrefix == prefix }?.let { repo ->
@@ -245,8 +247,12 @@ class SyncViewModel : ViewModel() {
         // shitty way to sort anilist first, as it has trailers while mal does not
         if (syncs.containsKey(aniListApi.idPrefix)) {
             try { // swap can throw error
-                Collections.swap(current, current.indexOfFirst { it.first == aniListApi.idPrefix }, 0)
-            } catch (t : Throwable) {
+                Collections.swap(
+                    current,
+                    current.indexOfFirst { it.first == aniListApi.idPrefix },
+                    0
+                )
+            } catch (t: Throwable) {
                 logError(t)
             }
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt
index f2eca5b8..24d56897 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt
@@ -8,7 +8,6 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import com.lagradost.cloudstream3.mvvm.Some
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.AppUtils.html
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
@@ -162,11 +161,3 @@ fun TextView?.setTextHtml(text: UiText?) {
         this.text = str.html()
     }
 }
-
-fun TextView?.setTextHtml(text: Some<UiText>?) {
-    setTextHtml(if (text is Some.Success) text.value else null)
-}
-
-fun TextView?.setText(text: Some<UiText>?) {
-    setText(if (text is Some.Success) text.value else null)
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
index 649641c8..b516348d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
@@ -4,16 +4,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.ImageView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.R
+import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.databinding.SearchResultGridBinding
+import com.lagradost.cloudstream3.databinding.SearchResultGridExpandedBinding
 import com.lagradost.cloudstream3.ui.AutofitRecyclerView
-import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.UIHelper.IsBottomLayout
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.search_result_compact.view.*
 import kotlin.math.roundToInt
 
 /** Click */
@@ -39,10 +38,23 @@ class SearchAdapter(
     var hasNext: Boolean = false
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
         val layout =
-            if (parent.context.IsBottomLayout()) R.layout.search_result_grid_expanded else R.layout.search_result_grid
+            if (parent.context.IsBottomLayout()) SearchResultGridExpandedBinding.inflate(
+                inflater,
+                parent,
+                false
+            ) else SearchResultGridBinding.inflate(
+                inflater,
+                parent,
+                false
+            ) //R.layout.search_result_grid_expanded else R.layout.search_result_grid
+
+
+
         return CardViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false),
+            layout,
             clickCallback,
             resView
         )
@@ -73,20 +85,25 @@ class SearchAdapter(
 
     class CardViewHolder
     constructor(
-        itemView: View,
+        val binding: ViewBinding,
         private val clickCallback: (SearchClickCallback) -> Unit,
         resView: AutofitRecyclerView
     ) :
-        RecyclerView.ViewHolder(itemView) {
-        val cardView: ImageView = itemView.imageView
+        RecyclerView.ViewHolder(binding.root) {
 
         private val compactView = false//itemView.context.getGridIsCompact()
         private val coverHeight: Int =
             if (compactView) 80.toPx else (resView.itemWidth / 0.68).roundToInt()
 
+        private val cardView = when(binding) {
+            is SearchResultGridExpandedBinding -> binding.imageView
+            is SearchResultGridBinding -> binding.imageView
+            else -> null
+        }
+
         fun bind(card: SearchResponse, position: Int) {
             if (!compactView) {
-                cardView.apply {
+                cardView?.apply {
                     layoutParams = FrameLayout.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT,
                         coverHeight
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 b4a38216..bdf82377 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
@@ -33,6 +33,8 @@ 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.MainActivity.Companion.afterPluginsLoadedEvent
+import com.lagradost.cloudstream3.databinding.FragmentSearchBinding
+import com.lagradost.cloudstream3.databinding.HomeSelectMainpageBinding
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
@@ -43,6 +45,8 @@ import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.currentSpan
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.loadHomepageList
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.updateChips
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
+import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
+import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.ownHide
@@ -56,8 +60,6 @@ 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.hideKeyboard
-import kotlinx.android.synthetic.main.fragment_search.*
-import kotlinx.android.synthetic.main.tvtypes_chips.*
 import java.util.concurrent.locks.ReentrantLock
 
 const val SEARCH_PREF_TAGS = "search_pref_tags"
@@ -82,13 +84,14 @@ class SearchFragment : Fragment() {
 
         fun newInstance(query: String): Bundle {
             return Bundle().apply {
-                putString(SEARCH_QUERY, query)
+                if(query.isNotBlank()) putString(SEARCH_QUERY, query)
             }
         }
     }
 
     private val searchViewModel: SearchViewModel by activityViewModels()
     private var bottomSheetDialog: BottomSheetDialog? = null
+    var binding: FragmentSearchBinding? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -99,18 +102,21 @@ class SearchFragment : Fragment() {
             WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
         )
         bottomSheetDialog?.ownShow()
-        return inflater.inflate(
-            if (isTvSettings()) R.layout.fragment_search_tv else R.layout.fragment_search,
-            container,
-            false
-        )
+
+        val layout = if (isTvSettings()) R.layout.fragment_search_tv else R.layout.fragment_search
+
+        val root = inflater.inflate(layout, container, false)
+        // TODO TRYCATCH
+        binding = FragmentSearchBinding.bind(root)
+
+        return root
     }
 
     private fun fixGrid() {
         activity?.getSpanCount()?.let {
             currentSpan = it
         }
-        search_autofit_results.spanCount = currentSpan
+        binding?.searchAutofitResults?.spanCount = currentSpan
         currentSpan = currentSpan
         HomeFragment.configEvent.invoke(currentSpan)
     }
@@ -123,6 +129,7 @@ class SearchFragment : Fragment() {
     override fun onDestroyView() {
         hideKeyboard()
         bottomSheetDialog?.ownHide()
+        binding = null
         super.onDestroyView()
     }
 
@@ -181,7 +188,7 @@ class SearchFragment : Fragment() {
         searchViewModel.reloadRepos()
         context?.filterProviderByPreferredMedia()?.let { validAPIs ->
             bindChips(
-                home_select_group,
+                binding?.tvtypesChipsScroll?.tvtypesChips,
                 selectedSearchTypes,
                 validAPIs.flatMap { api -> api.supportedTypes }.distinct()
             ) { list ->
@@ -189,7 +196,7 @@ class SearchFragment : Fragment() {
                     setKey(SEARCH_PREF_TAGS, selectedSearchTypes)
                     selectedSearchTypes.clear()
                     selectedSearchTypes.addAll(list)
-                    search(main_search?.query?.toString())
+                    search(binding?.mainSearch?.query?.toString())
                 }
             }
         }
@@ -199,24 +206,27 @@ class SearchFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        context?.fixPaddingStatusbar(searchRoot)
+        fixPaddingStatusbar(binding?.searchRoot)
         fixGrid()
         reloadRepos()
 
-        val adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>? = activity?.let {
-            SearchAdapter(
-                ArrayList(),
-                search_autofit_results,
-            ) { callback ->
-                SearchHelper.handleSearchClickCallback(activity, callback)
-            }
+        binding?.apply {
+            val adapter: RecyclerView.Adapter<RecyclerView.ViewHolder> =
+                SearchAdapter(
+                    ArrayList(),
+                    searchAutofitResults,
+                ) { callback ->
+                    SearchHelper.handleSearchClickCallback(callback)
+                }
+
+
+            searchAutofitResults.adapter = adapter
+            searchLoadingBar.alpha = 0f
         }
 
-        search_autofit_results.adapter = adapter
-        search_loading_bar.alpha = 0f
 
         val searchExitIcon =
-            main_search.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
+            binding?.mainSearch?.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
         // val searchMagIcon =
         //    main_search.findViewById<ImageView>(androidx.appcompat.R.id.search_mag_icon)
         //searchMagIcon.scaleX = 0.65f
@@ -230,7 +240,7 @@ class SearchFragment : Fragment() {
             )!!.toMutableSet()
         }
 
-        search_filter.setOnClickListener { searchView ->
+        binding?.searchFilter?.setOnClickListener { searchView ->
             searchView?.context?.let { ctx ->
                 val validAPIs = ctx.filterProviderByPreferredMedia(hasHomePageIsRequired = false)
                 var currentValidApis = listOf<MainAPI>()
@@ -241,7 +251,13 @@ class SearchFragment : Fragment() {
                     BottomSheetDialog(ctx)
 
                 builder.behavior.state = BottomSheetBehavior.STATE_EXPANDED
-                builder.setContentView(R.layout.home_select_mainpage)
+
+                val binding: HomeSelectMainpageBinding = HomeSelectMainpageBinding.inflate(
+                    builder.layoutInflater,
+                    null,
+                    false
+                )
+                builder.setContentView(binding.root)
                 builder.show()
                 builder.let { dialog ->
                     val isMultiLang = ctx.getApiProviderLangSettings().let { set ->
@@ -303,7 +319,7 @@ class SearchFragment : Fragment() {
                         ?: mutableListOf(TvType.Movie, TvType.TvSeries)
 
                     bindChips(
-                        dialog.home_select_group,
+                        binding.tvtypesChipsScroll.tvtypesChips,
                         selectedSearchTypes,
                         TvType.values().toList()
                     ) { list ->
@@ -343,15 +359,15 @@ class SearchFragment : Fragment() {
             ?: mutableListOf(TvType.Movie, TvType.TvSeries)
 
         if (isTrueTvSettings()) {
-            search_filter.isFocusable = true
-            search_filter.isFocusableInTouchMode = true
+            binding?.searchFilter?.isFocusable = true
+            binding?.searchFilter?.isFocusableInTouchMode = true
         }
 
-        main_search.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+        binding?.mainSearch?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
                 search(query)
 
-                main_search?.let {
+                binding?.mainSearch?.let {
                     hideKeyboard(it)
                 }
 
@@ -365,17 +381,17 @@ class SearchFragment : Fragment() {
                     searchViewModel.clearSearch()
                     searchViewModel.updateHistory()
                 }
-
-                search_history_holder?.isVisible = showHistory
-
-                search_master_recycler?.isVisible = !showHistory && isAdvancedSearch
-                search_autofit_results?.isVisible = !showHistory && !isAdvancedSearch
+                binding?.apply {
+                    searchHistoryHolder.isVisible = showHistory
+                    searchMasterRecycler.isVisible = !showHistory && isAdvancedSearch
+                    searchAutofitResults.isVisible = !showHistory && !isAdvancedSearch
+                }
 
                 return true
             }
         })
 
-        search_clear_call_history?.setOnClickListener {
+        binding?.searchClearCallHistory?.setOnClickListener {
             activity?.let { ctx ->
                 val builder: AlertDialog.Builder = AlertDialog.Builder(ctx)
                 val dialogClickListener =
@@ -409,8 +425,8 @@ class SearchFragment : Fragment() {
         }
 
         observe(searchViewModel.currentHistory) { list ->
-            search_clear_call_history?.isVisible = list.isNotEmpty()
-            (search_history_recycler.adapter as? SearchHistoryAdaptor?)?.updateList(list)
+            binding?.searchClearCallHistory?.isVisible = list.isNotEmpty()
+            (binding?.searchHistoryRecycler?.adapter as? SearchHistoryAdaptor?)?.updateList(list)
         }
 
         searchViewModel.updateHistory()
@@ -420,20 +436,20 @@ class SearchFragment : Fragment() {
                 is Resource.Success -> {
                     it.value.let { data ->
                         if (data.isNotEmpty()) {
-                            (search_autofit_results?.adapter as? SearchAdapter)?.updateList(data)
+                            (binding?.searchAutofitResults?.adapter as? SearchAdapter)?.updateList(data)
                         }
                     }
-                    searchExitIcon.alpha = 1f
-                    search_loading_bar.alpha = 0f
+                    searchExitIcon?.alpha = 1f
+                    binding?.searchLoadingBar?.alpha = 0f
                 }
                 is Resource.Failure -> {
                     // Toast.makeText(activity, "Server error", Toast.LENGTH_LONG).show()
-                    searchExitIcon.alpha = 1f
-                    search_loading_bar.alpha = 0f
+                    searchExitIcon?.alpha = 1f
+                    binding?.searchLoadingBar?.alpha = 0f
                 }
                 is Resource.Loading -> {
-                    searchExitIcon.alpha = 0f
-                    search_loading_bar.alpha = 1f
+                    searchExitIcon?.alpha = 0f
+                    binding?.searchLoadingBar?.alpha = 1f
                 }
             }
         }
@@ -443,7 +459,7 @@ class SearchFragment : Fragment() {
             try {
                 // https://stackoverflow.com/questions/6866238/concurrent-modification-exception-adding-to-an-arraylist
                 listLock.lock()
-                (search_master_recycler?.adapter as ParentItemAdapter?)?.apply {
+                (binding?.searchMasterRecycler?.adapter as ParentItemAdapter?)?.apply {
                     val newItems = list.map { ongoing ->
                         val dataList =
                             if (ongoing.data is Resource.Success) ongoing.data.value else ArrayList()
@@ -477,7 +493,7 @@ class SearchFragment : Fragment() {
 
         val masterAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder> =
             ParentItemAdapter(mutableListOf(), { callback ->
-                SearchHelper.handleSearchClickCallback(activity, callback)
+                SearchHelper.handleSearchClickCallback(callback)
             }, { item ->
                 bottomSheetDialog = activity?.loadHomepageList(item, dismissCallback = {
                     bottomSheetDialog = null
@@ -490,8 +506,8 @@ class SearchFragment : Fragment() {
                 SEARCH_HISTORY_OPEN -> {
                     searchViewModel.clearSearch()
                     if (searchItem.type.isNotEmpty())
-                        updateChips(home_select_group, searchItem.type.toMutableList())
-                    main_search?.setQuery(searchItem.searchText, true)
+                        updateChips(binding?.tvtypesChipsScroll?.tvtypesChips, searchItem.type.toMutableList())
+                    binding?.mainSearch?.setQuery(searchItem.searchText, true)
                 }
                 SEARCH_HISTORY_REMOVE -> {
                     removeKey(SEARCH_HISTORY_KEY, searchItem.key)
@@ -503,20 +519,33 @@ class SearchFragment : Fragment() {
             }
         }
 
-        search_history_recycler?.adapter = historyAdapter
-        search_history_recycler?.layoutManager = GridLayoutManager(context, 1)
+        binding?.apply {
+            searchHistoryRecycler.adapter = historyAdapter
+            searchHistoryRecycler.setLinearListLayout(isHorizontal = false, nextRight = FOCUS_SELF)
+            //searchHistoryRecycler.layoutManager = GridLayoutManager(context, 1)
 
-        search_master_recycler?.adapter = masterAdapter
-        search_master_recycler?.layoutManager = GridLayoutManager(context, 1)
+            searchMasterRecycler.adapter = masterAdapter
+            //searchMasterRecycler.setLinearListLayout(isHorizontal = false, nextRight = FOCUS_SELF)
 
-        // Automatically search the specified query, this allows the app search to launch from intent
-        arguments?.getString(SEARCH_QUERY)?.let { query ->
-            if (query.isBlank()) return@let
-            main_search?.setQuery(query, true)
-            // Clear the query as to not make it request the same query every time the page is opened
-            arguments?.putString(SEARCH_QUERY, null)
+            searchMasterRecycler.layoutManager = GridLayoutManager(context, 1)
+
+            // Automatically search the specified query, this allows the app search to launch from intent
+            var sq = arguments?.getString(SEARCH_QUERY) ?: savedInstanceState?.getString(SEARCH_QUERY)
+            if(sq.isNullOrBlank()) {
+                sq = MainActivity.nextSearchQuery
+            }
+
+            sq?.let { query ->
+                if (query.isBlank()) return@let
+                mainSearch.setQuery(query, true)
+                // Clear the query as to not make it request the same query every time the page is opened
+                arguments?.remove(SEARCH_QUERY)
+                savedInstanceState?.remove(SEARCH_QUERY)
+                MainActivity.nextSearchQuery = null
+            }
         }
 
+
         // SubtitlesFragment.push(activity)
         //searchViewModel.search("iron man")
         //(activity as AppCompatActivity).loadResult("https://shiro.is/overlord-dubbed", "overlord-dubbed", "Shiro")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt
index 45336d5b..3e33e01a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.ui.search
 
 import android.app.Activity
 import android.widget.Toast
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
@@ -15,21 +16,21 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 
 object SearchHelper {
-    fun handleSearchClickCallback(activity: Activity?, callback: SearchClickCallback) {
+    fun handleSearchClickCallback(callback: SearchClickCallback) {
         val card = callback.card
         when (callback.action) {
             SEARCH_ACTION_LOAD -> {
-                activity.loadSearchResult(card)
+                loadSearchResult(card)
             }
             SEARCH_ACTION_PLAY_FILE -> {
                 if (card is DataStoreHelper.ResumeWatchingResult) {
                     val id = card.id
                     if(id == null) {
-                        showToast(activity, R.string.error_invalid_id, Toast.LENGTH_SHORT)
+                        showToast(R.string.error_invalid_id, Toast.LENGTH_SHORT)
                     } else {
                         if (card.isFromDownload) {
                             handleDownloadClick(
-                                activity, DownloadClickEvent(
+                                DownloadClickEvent(
                                     DOWNLOAD_ACTION_PLAY_FILE,
                                     VideoDownloadHelper.DownloadEpisodeCached(
                                         card.name,
@@ -45,12 +46,11 @@ object SearchHelper {
                                 )
                             )
                         } else {
-                            activity.loadSearchResult(card, START_ACTION_LOAD_EP, id)
+                            loadSearchResult(card, START_ACTION_LOAD_EP, id)
                         }
                     }
                 } else {
                     handleSearchClickCallback(
-                        activity,
                         SearchClickCallback(SEARCH_ACTION_LOAD, callback.view, -1, callback.card)
                     )
                 }
@@ -60,10 +60,10 @@ object SearchHelper {
                     (activity as? MainActivity?)?.apply {
                         loadPopup(callback.card)
                     } ?: kotlin.run {
-                        showToast(activity, callback.card.name, Toast.LENGTH_SHORT)
+                        showToast(callback.card.name, Toast.LENGTH_SHORT)
                     }
                 } else {
-                    showToast(activity, callback.card.name, Toast.LENGTH_SHORT)
+                    showToast(callback.card.name, Toast.LENGTH_SHORT)
                 }
             }
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHistoryAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHistoryAdaptor.kt
index 8132301b..0a2ecb81 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHistoryAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHistoryAdaptor.kt
@@ -10,7 +10,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
-import kotlinx.android.synthetic.main.search_history_item.view.*
+import com.lagradost.cloudstream3.databinding.AccountSingleBinding
+import com.lagradost.cloudstream3.databinding.SearchHistoryItemBinding
 
 data class SearchHistoryItem(
     @JsonProperty("searchedAt") val searchedAt: Long,
@@ -34,8 +35,7 @@ class SearchHistoryAdaptor(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return CardViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(R.layout.search_history_item, parent, false),
+            SearchHistoryItemBinding.inflate(LayoutInflater.from(parent.context), parent, false),
             clickCallback,
         )
     }
@@ -65,22 +65,24 @@ class SearchHistoryAdaptor(
 
     class CardViewHolder
     constructor(
-        itemView: View,
+        val binding: SearchHistoryItemBinding,
         private val clickCallback: (SearchHistoryCallback) -> Unit,
     ) :
-        RecyclerView.ViewHolder(itemView) {
-        private val removeButton: ImageView = itemView.home_history_remove
-        private val openButton: View = itemView.home_history_tab
-        private val title: TextView = itemView.home_history_title
+        RecyclerView.ViewHolder(binding.root) {
+        //  private val removeButton: ImageView = itemView.home_history_remove
+        //  private val openButton: View = itemView.home_history_tab
+        // private val title: TextView = itemView.home_history_title
 
         fun bind(card: SearchHistoryItem) {
-            title.text = card.searchText
+            binding.apply {
+                homeHistoryTitle.text = card.searchText
 
-            removeButton.setOnClickListener {
-                clickCallback.invoke(SearchHistoryCallback(card, SEARCH_HISTORY_REMOVE))
-            }
-            openButton.setOnClickListener {
-                clickCallback.invoke(SearchHistoryCallback(card, SEARCH_HISTORY_OPEN))
+                homeHistoryRemove.setOnClickListener {
+                    clickCallback.invoke(SearchHistoryCallback(card, SEARCH_HISTORY_REMOVE))
+                }
+                homeHistoryTab.setOnClickListener {
+                    clickCallback.invoke(SearchHistoryCallback(card, SEARCH_HISTORY_OPEN))
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
index 3447ee32..e1b72b30 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.ui.search
 
 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
@@ -10,14 +9,20 @@ import androidx.cardview.widget.CardView
 import androidx.core.view.isVisible
 import androidx.palette.graphics.Palette
 import androidx.preference.PreferenceManager
-import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.AnimeSearchResponse
+import com.lagradost.cloudstream3.DubStatus
+import com.lagradost.cloudstream3.LiveSearchResponse
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.SearchQuality
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.isMovieType
+import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.utils.AppUtils.getNameFull
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.fixVisual
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.home_result_grid.view.*
 
 object SearchResultBuilder {
     private val showCache: MutableMap<String, Boolean> = mutableMapOf()
@@ -45,19 +50,21 @@ object SearchResultBuilder {
         nextFocusDown: Int? = null,
         colorCallback : ((Palette) -> Unit)? = null
     ) {
-        val cardView: ImageView = itemView.imageView
-        val cardText: TextView? = itemView.imageText
+        val cardView: ImageView = itemView.findViewById(R.id.imageView)
+        val cardText: TextView? = itemView.findViewById(R.id.imageText)
 
-        val textIsDub: TextView? = itemView.text_is_dub
-        val textIsSub: TextView? = itemView.text_is_sub
-        val textFlag: TextView? = itemView.text_flag
-        val textQuality: TextView? = itemView.text_quality
-        val shadow: View? = itemView.title_shadow
+        val textIsDub: TextView? = itemView.findViewById(R.id.text_is_dub)
+        val textIsSub: TextView? = itemView.findViewById(R.id.text_is_sub)
+        val textFlag: TextView? = itemView.findViewById(R.id.text_flag)
+        val rating: TextView? = itemView.findViewById(R.id.text_rating)
 
-        val bg: CardView = itemView.background_card
+        val textQuality: TextView? = itemView.findViewById(R.id.text_quality)
+        val shadow: View? = itemView.findViewById(R.id.title_shadow)
 
-        val bar: ProgressBar? = itemView.watchProgress
-        val playImg: ImageView? = itemView.search_item_download_play
+        val bg: CardView = itemView.findViewById(R.id.background_card)
+
+        val bar: ProgressBar? = itemView.findViewById(R.id.watchProgress)
+        val playImg: ImageView? = itemView.findViewById(R.id.search_item_download_play)
 
         // Do logic
 
@@ -66,12 +73,25 @@ object SearchResultBuilder {
         textIsDub?.isVisible = false
         textIsSub?.isVisible = false
         textFlag?.isVisible = false
+        rating?.isVisible = false
 
         val showSub = showCache[textIsDub?.context?.getString(R.string.show_sub_key)] ?: false
         val showDub = showCache[textIsDub?.context?.getString(R.string.show_dub_key)] ?: false
         val showTitle = showCache[cardText?.context?.getString(R.string.show_title_key)] ?: false
         val showHd = showCache[textQuality?.context?.getString(R.string.show_hd_key)] ?: false
 
+        if(card is SyncAPI.LibraryItem) {
+            val showRating = (card.personalRating ?: 0) != 0
+            rating?.isVisible = showRating
+            if (showRating) {
+                // We want to show 8.5 but not 8.0 hence the replace
+                val ratingText = ((card.personalRating ?: 0).toDouble() / 10).toString()
+                    .replace(".0", "")
+
+                rating?.text = ratingText
+            }
+        }
+
         shadow?.isVisible = showTitle
 
         when (card.quality) {
@@ -142,15 +162,42 @@ object SearchResultBuilder {
             }
         }
 
-        bg.setOnClickListener {
-            click(it)
+        bg.isFocusable = false
+        bg.isFocusableInTouchMode = false
+        if(!isTrueTvSettings()) {
+            bg.setOnClickListener {
+                click(it)
+            }
+            bg.setOnLongClickListener {
+                longClick(it)
+                return@setOnLongClickListener true
+            }
         }
+        //
+       //
+        //
 
         itemView.setOnClickListener {
             click(it)
         }
-
         if (nextFocusUp != null) {
+            itemView.nextFocusUpId = nextFocusUp
+        }
+
+        if (nextFocusDown != null) {
+            itemView.nextFocusDownId = nextFocusDown
+        }
+
+        /*when (nextFocusBehavior) {
+            true -> itemView.nextFocusLeftId = bg.id
+            false -> itemView.nextFocusRightId = bg.id
+            null -> {
+                bg.nextFocusRightId = -1
+                bg.nextFocusLeftId = -1
+            }
+        }*/
+
+        /*if (nextFocusUp != null) {
             bg.nextFocusUpId = nextFocusUp
         }
 
@@ -158,36 +205,26 @@ object SearchResultBuilder {
             bg.nextFocusDownId = nextFocusDown
         }
 
-        when (nextFocusBehavior) {
-            true -> bg.nextFocusLeftId = bg.id
-            false -> bg.nextFocusRightId = bg.id
-            null -> {
-                bg.nextFocusRightId = -1
-                bg.nextFocusLeftId = -1
-            }
-        }
+        */
 
         if (isTrueTvSettings()) {
-            bg.isFocusable = true
-            bg.isFocusableInTouchMode = true
-            bg.touchscreenBlocksFocus = false
+           // bg.isFocusable = true
+           // bg.isFocusableInTouchMode = true
+           // bg.touchscreenBlocksFocus = false
             itemView.isFocusableInTouchMode = true
             itemView.isFocusable = true
         }
 
-        bg.setOnLongClickListener {
-            longClick(it)
-            return@setOnLongClickListener true
-        }
+        /**/
 
         itemView.setOnLongClickListener {
             longClick(it)
             return@setOnLongClickListener true
         }
 
-        bg.setOnFocusChangeListener { view, b ->
+        /*bg.setOnFocusChangeListener { view, b ->
             focus(view, b)
-        }
+        }*/
 
         itemView.setOnFocusChangeListener { view, b ->
             focus(view, b)
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 aceda644..320687f8 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
@@ -37,7 +37,7 @@ class SearchViewModel : ViewModel() {
     private val _currentHistory: MutableLiveData<List<SearchHistoryItem>> = MutableLiveData()
     val currentHistory: LiveData<List<SearchHistoryItem>> get() = _currentHistory
 
-    private var repos = apis.map { APIRepository(it) }
+    private var repos = synchronized(apis) { apis.map { APIRepository(it) } }
 
     fun clearSearch() {
         _searchResponse.postValue(Resource.Success(ArrayList()))
@@ -48,7 +48,7 @@ class SearchViewModel : ViewModel() {
     private var onGoingSearch: Job? = null
 
     fun reloadRepos() {
-        repos = apis.map { APIRepository(it) }
+        repos = synchronized(apis) { apis.map { APIRepository(it) } }
     }
 
     fun searchAndCancel(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/AccountAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/AccountAdapter.kt
index e879f0df..1dc79dc0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/AccountAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/AccountAdapter.kt
@@ -3,11 +3,10 @@ package com.lagradost.cloudstream3.ui.settings
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.AccountSingleBinding
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
 
@@ -15,14 +14,15 @@ class AccountClickCallback(val action: Int, val view: View, val card: AuthAPI.Lo
 
 class AccountAdapter(
     val cardList: List<AuthAPI.LoginInfo>,
-    val layout: Int = R.layout.account_single,
     private val clickCallback: (AccountClickCallback) -> Unit
 ) :
     RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return CardViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false), clickCallback
+            AccountSingleBinding.inflate(LayoutInflater.from(parent.context), parent, false), //LayoutInflater.from(parent.context).inflate(layout, parent, false),
+
+            clickCallback
         )
     }
 
@@ -43,18 +43,18 @@ class AccountAdapter(
     }
 
     class CardViewHolder
-    constructor(itemView: View, private val clickCallback: (AccountClickCallback) -> Unit) :
-        RecyclerView.ViewHolder(itemView) {
-        private val pfp: ImageView = itemView.findViewById(R.id.account_profile_picture)!!
-        private val accountName: TextView = itemView.findViewById(R.id.account_name)!!
+    constructor(val binding: AccountSingleBinding, private val clickCallback: (AccountClickCallback) -> Unit) :
+        RecyclerView.ViewHolder(binding.root) {
+      //  private val pfp: ImageView = itemView.findViewById(R.id.account_profile_picture)!!
+       // private val accountName: TextView = itemView.findViewById(R.id.account_name)!!
 
         fun bind(card: AuthAPI.LoginInfo) {
             // just in case name is null account index will show, should never happened
-            accountName.text = card.name ?: "%s %d".format(
-                accountName.context.getString(R.string.account),
+            binding.accountName.text = card.name ?: "%s %d".format(
+                binding.accountName.context.getString(R.string.account),
                 card.accountIndex
             )
-            pfp.isVisible = pfp.setImage(card.profilePicture)
+            binding.accountProfilePicture.isVisible = binding.accountProfilePicture.setImage(card.profilePicture)
 
             itemView.setOnClickListener {
                 clickCallback.invoke(AccountClickCallback(0, itemView, card))
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
index b6d33f81..49dadce4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
@@ -10,12 +10,19 @@ import androidx.fragment.app.FragmentActivity
 import androidx.preference.PreferenceFragmentCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.AccountManagmentBinding
+import com.lagradost.cloudstream3.databinding.AccountSwitchBinding
+import com.lagradost.cloudstream3.databinding.AddAccountInputBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.*
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.googleDriveApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.openSubtitlesApi
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi
+import com.lagradost.cloudstream3.syncproviders.AuthAPI
+import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI
+import com.lagradost.cloudstream3.syncproviders.OAuth2API
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
@@ -25,8 +32,6 @@ import com.lagradost.cloudstream3.ui.settings.helpers.settings.account.InAppOAut
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.account_managment.*
-import kotlinx.android.synthetic.main.account_switch.*
 
 class SettingsAccount : PreferenceFragmentCompat() {
     companion object {
@@ -36,15 +41,18 @@ class SettingsAccount : PreferenceFragmentCompat() {
             api: AccountManager,
             info: AuthAPI.LoginInfo
         ) {
+            if (activity == null) return
+            val binding: AccountManagmentBinding =
+                AccountManagmentBinding.inflate(activity.layoutInflater, null, false)
             val builder =
-                AlertDialog.Builder(activity ?: return, R.style.AlertDialogCustom)
-                    .setView(R.layout.account_managment)
+                AlertDialog.Builder(activity, R.style.AlertDialogCustom)
+                    .setView(binding.root)
             val dialog = builder.show()
 
-            dialog.account_main_profile_picture_holder?.isVisible =
-                dialog.account_main_profile_picture?.setImage(info.profilePicture) == true
+            binding.accountMainProfilePictureHolder.isVisible =
+                binding.accountMainProfilePicture.setImage(info.profilePicture)
 
-            dialog.account_logout?.setOnClickListener {
+            binding.accountLogout.setOnClickListener {
                 api.logOut()
                 dialog.dismissSafe(activity)
             }
@@ -53,26 +61,28 @@ class SettingsAccount : PreferenceFragmentCompat() {
                 dialog.findViewById<TextView>(R.id.account_name)?.text = it
             }
 
-            dialog.account_site?.text = api.name
-            dialog.account_switch_account?.setOnClickListener {
+            binding.accountSite.text = api.name
+            binding.accountSwitchAccount.setOnClickListener {
                 dialog.dismissSafe(activity)
                 showAccountSwitch(activity, api)
             }
 
             if (isTvSettings()) {
-                dialog.account_switch_account?.requestFocus()
+                binding.accountSwitchAccount.requestFocus()
             }
         }
 
-        fun showAccountSwitch(activity: FragmentActivity, api: AccountManager) {
+        private fun showAccountSwitch(activity: FragmentActivity, api: AccountManager) {
             val accounts = api.getAccounts() ?: return
+            val binding: AccountSwitchBinding =
+                AccountSwitchBinding.inflate(activity.layoutInflater, null, false)
 
             val builder =
                 AlertDialog.Builder(activity, R.style.AlertDialogCustom)
-                    .setView(R.layout.account_switch)
+                    .setView(binding.root)
             val dialog = builder.show()
 
-            dialog.account_add?.setOnClickListener {
+            binding.accountAdd.setOnClickListener {
                 addAccount(activity, api)
                 dialog?.dismissSafe(activity)
             }
@@ -89,7 +99,7 @@ class SettingsAccount : PreferenceFragmentCompat() {
                 }
             }
             api.accountIndex = ogIndex
-            val adapter = AccountAdapter(items, R.layout.account_single) {
+            val adapter = AccountAdapter(items) {
                 dialog?.dismissSafe(activity)
                 api.changeAccount(it.card.accountIndex)
             }
@@ -101,9 +111,126 @@ class SettingsAccount : PreferenceFragmentCompat() {
         fun addAccount(activity: FragmentActivity?, api: AccountManager) {
             try {
                 when (api) {
-                    is InAppOAuth2API -> InAppOAuth2DialogBuilder(api, activity).open()
-                    is OAuth2API -> api.authenticate(activity)
-                    is InAppAuthAPI -> InAppAuthDialogBuilder(api, activity).open()
+                    is OAuth2API -> {
+                        api.authenticate(activity)
+                    }
+
+                    is InAppAuthAPI -> {
+                        if (activity == null) return
+                        val binding: AddAccountInputBinding =
+                            AddAccountInputBinding.inflate(activity.layoutInflater, null, false)
+                        val builder =
+                            AlertDialog.Builder(activity, R.style.AlertDialogCustom)
+                                .setView(binding.root)
+                        val dialog = builder.show()
+
+                        val visibilityMap = listOf(
+                            binding.loginEmailInput to api.requiresEmail,
+                            binding.loginPasswordInput to api.requiresPassword,
+                            binding.loginServerInput to api.requiresServer,
+                            binding.loginUsernameInput to api.requiresUsername
+                        )
+
+                        if (isTvSettings()) {
+                            visibilityMap.forEach { (input, isVisible) ->
+                                input.isVisible = isVisible
+
+                                // Band-aid for weird FireTV behavior causing crashes because keyboard covers the screen
+                                input.setOnEditorActionListener { textView, actionId, _ ->
+                                    if (actionId == EditorInfo.IME_ACTION_NEXT) {
+                                        val view = textView.focusSearch(FOCUS_DOWN)
+                                        return@setOnEditorActionListener view?.requestFocus(
+                                            FOCUS_DOWN
+                                        ) == true
+                                    }
+                                    return@setOnEditorActionListener true
+                                }
+                            }
+                        } else {
+                            visibilityMap.forEach { (input, isVisible) ->
+                                input.isVisible = isVisible
+                            }
+                        }
+
+                        binding.loginEmailInput.isVisible = api.requiresEmail
+                        binding.loginPasswordInput.isVisible = api.requiresPassword
+                        binding.loginServerInput.isVisible = api.requiresServer
+                        binding.loginUsernameInput.isVisible = api.requiresUsername
+                        binding.createAccount.isGone = api.createAccountUrl.isNullOrBlank()
+                        binding.createAccount.setOnClickListener {
+                            openBrowser(
+                                api.createAccountUrl ?: return@setOnClickListener,
+                                activity
+                            )
+                            dialog.dismissSafe()
+                        }
+
+                        val displayedItems = listOf(
+                            binding.loginUsernameInput,
+                            binding.loginEmailInput,
+                            binding.loginServerInput,
+                            binding.loginPasswordInput
+                        ).filter { it.isVisible }
+
+                        displayedItems.foldRight(displayedItems.firstOrNull()) { item, previous ->
+                            item.id.let { previous?.nextFocusDownId = it }
+                            previous?.id?.let { item.nextFocusUpId = it }
+                            item
+                        }
+
+                        displayedItems.firstOrNull()?.let {
+                            binding.createAccount.nextFocusDownId = it.id
+                            it.nextFocusUpId = binding.createAccount.id
+                        }
+                        binding.applyBtt.id.let {
+                            displayedItems.lastOrNull()?.nextFocusDownId = it
+                        }
+
+                        binding.text1.text = api.name
+
+                        if (api.storesPasswordInPlainText) {
+                            api.getLatestLoginData()?.let { data ->
+                                binding.loginEmailInput.setText(data.email ?: "")
+                                binding.loginServerInput.setText(data.server ?: "")
+                                binding.loginUsernameInput.setText(data.username ?: "")
+                                binding.loginPasswordInput.setText(data.password ?: "")
+                            }
+                        }
+
+                        binding.applyBtt.setOnClickListener {
+                            val loginData = InAppAuthAPI.LoginData(
+                                username = if (api.requiresUsername) binding.loginUsernameInput.text?.toString() else null,
+                                password = if (api.requiresPassword) binding.loginPasswordInput.text?.toString() else null,
+                                email = if (api.requiresEmail) binding.loginEmailInput.text?.toString() else null,
+                                server = if (api.requiresServer) binding.loginServerInput.text?.toString() else null,
+                            )
+                            ioSafe {
+                                val isSuccessful = try {
+                                    api.login(loginData)
+                                } catch (e: Exception) {
+                                    logError(e)
+                                    false
+                                }
+                                activity.runOnUiThread {
+                                    try {
+                                        showToast(
+                                            activity.getString(if (isSuccessful) R.string.authenticated_user else R.string.authenticated_user_fail)
+                                                .format(
+                                                    api.name
+                                                )
+                                        )
+                                    } catch (e: Exception) {
+                                        logError(e) // format might fail
+                                    }
+                                }
+                            }
+                            dialog.dismissSafe(activity)
+                        }
+                        binding.cancelBtt.setOnClickListener {
+                            dialog.dismissSafe(activity)
+                        }
+                    }
+
                     else -> {
                         throw NotImplementedError("You are trying to add an account that has an unknown login method")
                     }
@@ -128,6 +255,7 @@ class SettingsAccount : PreferenceFragmentCompat() {
             listOf(
                 R.string.mal_key to malApi,
                 R.string.anilist_key to aniListApi,
+                R.string.simkl_key to simklApi,
                 R.string.opensubtitles_key to openSubtitlesApi,
                 R.string.gdrive_key to googleDriveApi
             )
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 40c996cc..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
@@ -8,13 +8,17 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import androidx.annotation.StringRes
+import androidx.core.view.children
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
+import com.google.android.material.appbar.MaterialToolbar
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.MainSettingsBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.accountManagers
 import com.lagradost.cloudstream3.ui.home.HomeFragment
@@ -22,16 +26,14 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.main_settings.*
-import kotlinx.android.synthetic.main.standard_toolbar.*
 import java.io.File
 
 class SettingsFragment : Fragment() {
     companion object {
         var beneneCount = 0
 
-        private var isTv : Boolean = false
-        private var isTrueTv : Boolean = false
+        private var isTv: Boolean = false
+        private var isTrueTv: Boolean = false
 
         fun PreferenceFragmentCompat?.getPref(id: Int): Preference? {
             if (this == null) return null
@@ -55,26 +57,31 @@ class SettingsFragment : Fragment() {
 
         fun Fragment?.setUpToolbar(title: String) {
             if (this == null) return
-            settings_toolbar?.apply {
+            val settingsToolbar = view?.findViewById<MaterialToolbar>(R.id.settings_toolbar) ?: return
+
+            settingsToolbar.apply {
                 setTitle(title)
                 setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
                 setNavigationOnClickListener {
                     activity?.onBackPressed()
                 }
             }
-            context.fixPaddingStatusbar(settings_toolbar)
+            fixPaddingStatusbar(settingsToolbar)
         }
 
         fun Fragment?.setUpToolbar(@StringRes title: Int) {
             if (this == null) return
-            settings_toolbar?.apply {
+            val settingsToolbar = view?.findViewById<MaterialToolbar>(R.id.settings_toolbar) ?: return
+
+            settingsToolbar.apply {
                 setTitle(title)
                 setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
+                children.firstOrNull { it is ImageView }?.tag = getString(R.string.tv_no_focus_tag)
                 setNavigationOnClickListener {
                     activity?.onBackPressed()
                 }
             }
-            context.fixPaddingStatusbar(settings_toolbar)
+            fixPaddingStatusbar(settingsToolbar)
         }
 
         fun getFolderSize(dir: File): Long {
@@ -139,12 +146,21 @@ class SettingsFragment : Fragment() {
         }
     }
 
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
+    var binding: MainSettingsBinding? = null
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
-        return inflater.inflate(R.layout.main_settings, container, false)
+    ): View {
+        val localBinding = MainSettingsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.main_settings, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -152,42 +168,47 @@ class SettingsFragment : Fragment() {
             activity?.navigate(id, Bundle())
         }
 
+        // used to debug leaks showToast(activity,"${VideoDownloadManager.downloadStatusEvent.size} : ${VideoDownloadManager.downloadProgressEvent.size}")
+
         val isTrueTv = isTrueTvSettings()
 
         for (syncApi in accountManagers) {
             val login = syncApi.loginInfo()
             val pic = login?.profilePicture ?: continue
-            if (settings_profile_pic?.setImage(
+            if (binding?.settingsProfilePic?.setImage(
                     pic,
                     errorImageDrawable = HomeFragment.errorProfilePic
                 ) == true
             ) {
-                settings_profile_text?.text = login.name
-                settings_profile?.isVisible = true
+                binding?.settingsProfileText?.text = login.name
+                binding?.settingsProfile?.isVisible = true
                 break
             }
         }
+        binding?.apply {
+            listOf(
+                settingsGeneral to R.id.action_navigation_settings_to_navigation_settings_general,
+                settingsPlayer to R.id.action_navigation_settings_to_navigation_settings_player,
+                settingsCredits to R.id.action_navigation_settings_to_navigation_settings_account,
+                settingsUi to R.id.action_navigation_settings_to_navigation_settings_ui,
+                settingsProviders to R.id.action_navigation_settings_to_navigation_settings_providers,
+                settingsUpdates to R.id.action_navigation_settings_to_navigation_settings_updates,
+                settingsExtensions to R.id.action_navigation_settings_to_navigation_settings_extensions,
+            ).forEach { (view, navigationId) ->
+                view.apply {
+                    setOnClickListener {
+                        navigate(navigationId)
+                    }
+                    if (isTrueTv) {
+                        isFocusable = true
+                        isFocusableInTouchMode = true
+                    }
+                }
+            }
 
-        listOf(
-            Pair(settings_general, R.id.action_navigation_settings_to_navigation_settings_general),
-            Pair(settings_player, R.id.action_navigation_settings_to_navigation_settings_player),
-            Pair(settings_credits, R.id.action_navigation_settings_to_navigation_settings_account),
-            Pair(settings_ui, R.id.action_navigation_settings_to_navigation_settings_ui),
-            Pair(settings_providers, R.id.action_navigation_settings_to_navigation_settings_providers),
-            Pair(settings_updates, R.id.action_navigation_settings_to_navigation_settings_updates),
-            Pair(
-                settings_extensions,
-                R.id.action_navigation_settings_to_navigation_settings_extensions
-            ),
-        ).forEach { (view, navigationId) ->
-            view?.apply {
-                setOnClickListener {
-                    navigate(navigationId)
-                }
-                if (isTrueTv) {
-                    isFocusable = true
-                    isFocusableInTouchMode = true
-                }
+            // Default focus on TV
+            if (isTrueTv) {
+                settingsGeneral.requestFocus()
             }
         }
     }
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 2a3e2497..6ab21c7d 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
@@ -3,9 +3,7 @@ package com.lagradost.cloudstream3.ui.settings
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
-import android.os.Environment
 import android.view.View
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
@@ -13,15 +11,17 @@ import androidx.appcompat.app.AlertDialog
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.hippo.unifile.UniFile
 import com.lagradost.cloudstream3.APIHolder.allProviders
 import com.lagradost.cloudstream3.AcraApplication
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.databinding.AddRemoveSitesBinding
+import com.lagradost.cloudstream3.databinding.AddSiteInputBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.network.initClient
@@ -40,9 +40,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
 import com.lagradost.cloudstream3.utils.VideoDownloadManager.getBasePath
-import kotlinx.android.synthetic.main.add_remove_sites.*
-import kotlinx.android.synthetic.main.add_site_input.*
-import java.io.File
+import com.lagradost.safefile.SafeFile
 
 fun getCurrentLocale(context: Context): String {
     val res = context.resources
@@ -58,6 +56,8 @@ fun getCurrentLocale(context: Context): String {
 // https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes leave blank for auto
 val appLanguages = arrayListOf(
     /* begin language list */
+    Triple("", "ajp", "ajp"),
+    Triple("", "አማርኛ", "am"),
     Triple("", "العربية", "ar"),
     Triple("", "ars", "ars"),
     Triple("", "български", "bg"),
@@ -70,7 +70,9 @@ val appLanguages = arrayListOf(
     Triple("", "Esperanto", "eo"),
     Triple("", "español", "es"),
     Triple("", "فارسی", "fa"),
+    Triple("", "fil", "fil"),
     Triple("", "français", "fr"),
+    Triple("", "galego", "gl"),
     Triple("", "हिन्दी", "hi"),
     Triple("", "hrvatski", "hr"),
     Triple("", "magyar", "hu"),
@@ -84,6 +86,7 @@ val appLanguages = arrayListOf(
     Triple("", "македонски", "mk"),
     Triple("", "മലയാളം", "ml"),
     Triple("", "bahasa Melayu", "ms"),
+    Triple("", "ဗမာစာ", "my"),
     Triple("", "Nederlands", "nl"),
     Triple("", "norsk nynorsk", "nn"),
     Triple("", "norsk bokmål", "no"),
@@ -97,6 +100,7 @@ val appLanguages = arrayListOf(
     Triple("", "Soomaaliga", "so"),
     Triple("", "svenska", "sv"),
     Triple("", "தமிழ்", "ta"),
+    Triple("", "ትግርኛ", "ti"),
     Triple("", "Tagalog", "tl"),
     Triple("", "Türkçe", "tr"),
     Triple("", "українська", "uk"),
@@ -137,8 +141,9 @@ class SettingsGeneral : PreferenceFragmentCompat() {
 
             context.contentResolver.takePersistableUriPermission(uri, flags)
 
-            val file = UniFile.fromUri(context, uri)
-            println("Selected URI path: $uri - Full path: ${file.filePath}")
+            val file = SafeFile.fromUri(context, uri)
+            val filePath = file?.filePath()
+            println("Selected URI path: $uri - Full path: $filePath")
 
             // Stores the real URI using download_path_key
             // Important that the URI is stored instead of filepath due to permissions.
@@ -150,7 +155,7 @@ class SettingsGeneral : PreferenceFragmentCompat() {
 
             // From URI -> File path
             // File path here is purely for cosmetic purposes in settings
-            (file.filePath ?: uri.toString()).let {
+            (filePath ?: uri.toString()).let {
                 PreferenceManager.getDefaultSharedPreferences(context)
                     .attachBackupListener(context.getSyncPrefs()).self
                     .edit()
@@ -197,7 +202,7 @@ class SettingsGeneral : PreferenceFragmentCompat() {
 
 
         fun showAdd() {
-            val providers = allProviders.distinctBy { it.javaClass }.sortedBy { it.name }
+            val providers = synchronized(allProviders) { allProviders.distinctBy { it.javaClass }.sortedBy { it.name } }
             activity?.showDialog(
                 providers.map { "${it.name} (${it.mainUrl})" },
                 -1,
@@ -206,21 +211,23 @@ class SettingsGeneral : PreferenceFragmentCompat() {
                 {}) { selection ->
                 val provider = providers.getOrNull(selection) ?: return@showDialog
 
+                val binding : AddSiteInputBinding = AddSiteInputBinding.inflate(layoutInflater,null,false)
+
                 val builder =
                     AlertDialog.Builder(context ?: return@showDialog, R.style.AlertDialogCustom)
-                        .setView(R.layout.add_site_input)
+                        .setView(binding.root)
 
                 val dialog = builder.create()
                 dialog.show()
 
-                dialog.text2?.text = provider.name
-                dialog.apply_btt?.setOnClickListener {
-                    val name = dialog.site_name_input?.text?.toString()
-                    val url = dialog.site_url_input?.text?.toString()
-                    val lang = dialog.site_lang_input?.text?.toString()
+                binding.text2.text = provider.name
+                binding.applyBtt.setOnClickListener {
+                    val name = binding.siteNameInput.text?.toString()
+                    val url = binding.siteUrlInput.text?.toString()
+                    val lang = binding.siteLangInput.text?.toString()
                     val realLang = if (lang.isNullOrBlank()) provider.lang else lang
                     if (url.isNullOrBlank() || name.isNullOrBlank() || realLang.length != 2) {
-                        showToast(activity, R.string.error_invalid_data, Toast.LENGTH_SHORT)
+                        showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
                         return@setOnClickListener
                     }
 
@@ -228,10 +235,12 @@ class SettingsGeneral : PreferenceFragmentCompat() {
                     val newSite = CustomSite(provider.javaClass.simpleName, name, url, realLang)
                     current.add(newSite)
                     setKey(USER_PROVIDER_API, current.toTypedArray())
+                    // reload apis
+                    MainActivity.afterPluginsLoadedEvent.invoke(false)
 
                     dialog.dismissSafe(activity)
                 }
-                dialog.cancel_btt?.setOnClickListener {
+                binding.cancelBtt.setOnClickListener {
                     dialog.dismissSafe(activity)
                 }
             }
@@ -251,18 +260,19 @@ class SettingsGeneral : PreferenceFragmentCompat() {
         }
 
         fun showAddOrDelete() {
+            val binding : AddRemoveSitesBinding = AddRemoveSitesBinding.inflate(layoutInflater,null,false)
             val builder =
                 AlertDialog.Builder(context ?: return, R.style.AlertDialogCustom)
-                    .setView(R.layout.add_remove_sites)
+                    .setView(binding.root)
 
             val dialog = builder.create()
             dialog.show()
 
-            dialog.add_site?.setOnClickListener {
+            binding.addSite.setOnClickListener {
                 showAdd()
                 dialog.dismissSafe(activity)
             }
-            dialog.remove_site?.setOnClickListener {
+            binding.removeSite.setOnClickListener {
                 showDelete()
                 dialog.dismissSafe(activity)
             }
@@ -306,25 +316,23 @@ class SettingsGeneral : PreferenceFragmentCompat() {
             }
             return@setOnPreferenceClickListener true
         }
+
         fun getDownloadDirs(): List<String> {
             return normalSafeApiCall {
-                val defaultDir = VideoDownloadManager.getDownloadDir()?.filePath
+                context?.let { ctx ->
+                    val defaultDir = VideoDownloadManager.getDefaultDir(ctx)?.filePath()
 
-                // app_name_download_path = Cloudstream and does not change depending on release.
-                // DOES NOT WORK ON SCOPED STORAGE.
-                val secondaryDir =
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) null else Environment.getExternalStorageDirectory().absolutePath +
-                            File.separator + resources.getString(R.string.app_name_download_path)
-                val first = listOf(defaultDir, secondaryDir)
-                (try {
-                    val currentDir = context?.getBasePath()?.let { it.first?.filePath ?: it.second }
+                    val first = listOf(defaultDir)
+                    (try {
+                        val currentDir = ctx.getBasePath().let { it.first?.filePath() ?: it.second }
 
-                    (first +
-                            requireContext().getExternalFilesDirs("").mapNotNull { it.path } +
-                            currentDir)
-                } catch (e: Exception) {
-                    first
-                }).filterNotNull().distinct()
+                        (first +
+                                ctx.getExternalFilesDirs("").mapNotNull { it.path } +
+                                currentDir)
+                    } catch (e: Exception) {
+                        first
+                    }).filterNotNull().distinct()
+                }
             } ?: emptyList()
         }
 
@@ -339,7 +347,7 @@ class SettingsGeneral : PreferenceFragmentCompat() {
 
             val currentDir =
                 settingsManager.getString(getString(R.string.download_path_pref), null)
-                    ?: VideoDownloadManager.getDownloadDir().toString()
+                    ?: context?.let { ctx -> VideoDownloadManager.getDefaultDir(ctx)?.filePath() }
 
             activity?.showBottomDialog(
                 dirs + listOf("Custom"),
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 0f48143d..5cf31b51 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
@@ -19,6 +19,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.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStore.getSyncPrefs
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.SubtitleHelper
@@ -102,7 +103,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) }
             }
 
@@ -111,8 +112,10 @@ class SettingsProviders : PreferenceFragmentCompat() {
 
         getPref(R.string.provider_lang_key)?.setOnPreferenceClickListener {
             activity?.getApiProviderLangSettings()?.let { current ->
-                val languages = APIHolder.apis.map { it.lang }.toSet()
-                    .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } + AllLanguagesName
+                val languages = synchronized(APIHolder.apis) {
+                    APIHolder.apis.map { it.lang }.toSet()
+                        .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } + AllLanguagesName
+                }
 
                 val currentList = current.map {
                     languages.indexOf(it)
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 61b3b5b5..91adfde0 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
@@ -11,9 +11,14 @@ import androidx.appcompat.app.AlertDialog
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
+import com.lagradost.cloudstream3.AcraApplication
+import com.lagradost.cloudstream3.AutoDownloadMode
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
+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.utils.Scheduler.Companion.attachBackupListener
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
@@ -27,11 +32,6 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
-import kotlinx.android.synthetic.main.logcat.clear_btt
-import kotlinx.android.synthetic.main.logcat.close_btt
-import kotlinx.android.synthetic.main.logcat.copy_btt
-import kotlinx.android.synthetic.main.logcat.save_btt
-import kotlinx.android.synthetic.main.logcat.text1
 import okhttp3.internal.closeQuietly
 import java.io.BufferedReader
 import java.io.InputStreamReader
@@ -66,7 +66,9 @@ class SettingsUpdates : PreferenceFragmentCompat() {
         getPref(R.string.show_logcat_key)?.setOnPreferenceClickListener { pref ->
             val builder =
                 AlertDialog.Builder(pref.context, R.style.AlertDialogCustom)
-                    .setView(R.layout.logcat)
+
+            val binding = LogcatBinding.inflate(layoutInflater,null,false )
+            builder.setView(binding.root)
 
             val dialog = builder.create()
             dialog.show()
@@ -87,9 +89,9 @@ class SettingsUpdates : PreferenceFragmentCompat() {
             }
 
             val text = log.toString()
-            dialog.text1?.text = text
+            binding.text1.text = text
 
-            dialog.copy_btt?.setOnClickListener {
+            binding.copyBtt.setOnClickListener {
                 // Can crash on too much text
                 try {
                     val serviceClipboard =
@@ -99,14 +101,14 @@ class SettingsUpdates : PreferenceFragmentCompat() {
                     serviceClipboard.setPrimaryClip(clip)
                     dialog.dismissSafe(activity)
                 } catch (e: TransactionTooLargeException) {
-                    showToast(activity, R.string.clipboard_too_large)
+                    showToast(R.string.clipboard_too_large)
                 }
             }
-            dialog.clear_btt?.setOnClickListener {
+            binding.clearBtt.setOnClickListener {
                 Runtime.getRuntime().exec("logcat -c")
                 dialog.dismissSafe(activity)
             }
-            dialog.save_btt?.setOnClickListener {
+            binding.saveBtt.setOnClickListener {
                 var fileStream: OutputStream? = null
                 try {
                     fileStream =
@@ -116,16 +118,17 @@ class SettingsUpdates : PreferenceFragmentCompat() {
                             null,
                             "txt",
                             false
-                        ).fileStream
-                    fileStream?.writer()?.write(text)
-                } catch (e: Exception) {
-                    logError(e)
+                        ).openNew()
+                    fileStream.writer().write(text)
+                    dialog.dismissSafe(activity)
+                } catch (t: Throwable) {
+                    logError(t)
+                    showToast(t.message)
                 } finally {
                     fileStream?.closeQuietly()
-                    dialog.dismissSafe(activity)
                 }
             }
-            dialog.close_btt?.setOnClickListener {
+            binding.closeBtt.setOnClickListener {
                 dialog.dismissSafe(activity)
             }
             return@setOnPreferenceClickListener true
@@ -163,7 +166,6 @@ class SettingsUpdates : PreferenceFragmentCompat() {
                 if (activity?.runAutoUpdate(false) == false) {
                     activity?.runOnUiThread {
                         showToast(
-                            activity,
                             R.string.no_update_found,
                             Toast.LENGTH_SHORT
                         )
@@ -172,5 +174,25 @@ class SettingsUpdates : PreferenceFragmentCompat() {
             }
             return@setOnPreferenceClickListener true
         }
+
+        getPref(R.string.auto_download_plugins_key)?.setOnPreferenceClickListener {
+            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 current = settingsManager.getInt(getString(R.string.auto_download_plugins_key), 0)
+
+            activity?.showBottomDialog(
+                prefNames.toList(),
+                prefValues.indexOf(current),
+                getString(R.string.automatic_plugin_download_mode_title),
+                true,
+                {}) {
+                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/settings/extensions/ExtensionsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
index 045ed92d..553e7675 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.ui.settings.extensions
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.DialogInterface
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -12,15 +13,21 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.core.view.marginBottom
+import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEvent
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.mvvm.Some
+import com.lagradost.cloudstream3.databinding.AddRepoInputBinding
+import com.lagradost.cloudstream3.databinding.FragmentExtensionsBinding
 import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.plugins.RepositoryManager
+import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
+import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.result.setText
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
@@ -29,17 +36,22 @@ import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.widget.LinearRecycleViewLayoutManager
-import kotlinx.android.synthetic.main.add_repo_input.*
-import kotlinx.android.synthetic.main.fragment_extensions.*
 
 class ExtensionsFragment : Fragment() {
+    var binding: FragmentExtensionsBinding? = null
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
-        return inflater.inflate(R.layout.fragment_extensions, container, false)
+    ): View {
+        val localBinding = FragmentExtensionsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root//inflater.inflate(R.layout.fragment_extensions, container, false)
     }
 
     private fun View.setLayoutWidth(weight: Int) {
@@ -74,54 +86,88 @@ class ExtensionsFragment : Fragment() {
 
         setUpToolbar(R.string.extensions)
 
-        repo_recycler_view?.adapter = RepoAdapter(false, {
-            findNavController().navigate(
-                R.id.navigation_settings_extensions_to_navigation_settings_plugins,
-                PluginsFragment.newInstance(
-                    it.name,
-                    it.url,
-                    false
-                )
+
+        binding?.repoRecyclerView?.apply {
+            setLinearListLayout(
+                isHorizontal = false,
+                nextUp = R.id.settings_toolbar, //FOCUS_SELF, // back has no id so we cant :pensive:
+                nextDown = R.id.plugin_storage_appbar,
+                nextRight = FOCUS_SELF,
+                nextLeft = R.id.nav_rail_view
             )
-        }, { repo ->
-            // Prompt user before deleting repo
-            main {
-                val builder = AlertDialog.Builder(context ?: view.context)
-                val dialogClickListener =
-                    DialogInterface.OnClickListener { _, which ->
-                        when (which) {
-                            DialogInterface.BUTTON_POSITIVE -> {
-                                ioSafe {
-                                    RepositoryManager.removeRepository(view.context, repo)
-                                    extensionViewModel.loadStats()
-                                    extensionViewModel.loadRepositories()
-                                }
-                            }
-                            DialogInterface.BUTTON_NEGATIVE -> {}
-                        }
+
+            if (!isTrueTvSettings())
+                binding?.addRepoButton?.let { button ->
+                    button.post {
+                        setPadding(
+                            paddingLeft,
+                            paddingTop,
+                            paddingRight,
+                            button.measuredHeight + button.marginTop + button.marginBottom
+                        )
                     }
+                }
 
-                builder.setTitle(R.string.delete_repository)
-                    .setMessage(
-                        context?.getString(R.string.delete_repository_plugins)
-                    )
-                    .setPositiveButton(R.string.delete, dialogClickListener)
-                    .setNegativeButton(R.string.cancel, dialogClickListener)
-                    .show().setDefaultFocus()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+                    val dy = scrollY - oldScrollY
+                    if (dy > 0) { //check for scroll down
+                        binding?.addRepoButton?.shrink() // hide
+                    } else if (dy < -5) {
+                        binding?.addRepoButton?.extend() // show
+                    }
+                }
             }
-        })
+            adapter = RepoAdapter(false, {
+                findNavController().navigate(
+                    R.id.navigation_settings_extensions_to_navigation_settings_plugins,
+                    PluginsFragment.newInstance(
+                        it.name,
+                        it.url,
+                        false
+                    )
+                )
+            }, { repo ->
+                // Prompt user before deleting repo
+                main {
+                    val builder = AlertDialog.Builder(context ?: view.context)
+                    val dialogClickListener =
+                        DialogInterface.OnClickListener { _, which ->
+                            when (which) {
+                                DialogInterface.BUTTON_POSITIVE -> {
+                                    ioSafe {
+                                        RepositoryManager.removeRepository(view.context, repo)
+                                        extensionViewModel.loadStats()
+                                        extensionViewModel.loadRepositories()
+                                    }
+                                }
 
-        observe(extensionViewModel.repositories) {
-            repo_recycler_view?.isVisible = it.isNotEmpty()
-            blank_repo_screen?.isVisible = it.isEmpty()
-            (repo_recycler_view?.adapter as? RepoAdapter)?.updateList(it)
+                                DialogInterface.BUTTON_NEGATIVE -> {}
+                            }
+                        }
+
+                    builder.setTitle(R.string.delete_repository)
+                        .setMessage(
+                            context?.getString(R.string.delete_repository_plugins)
+                        )
+                        .setPositiveButton(R.string.delete, dialogClickListener)
+                        .setNegativeButton(R.string.cancel, dialogClickListener)
+                        .show().setDefaultFocus()
+                }
+            })
         }
 
-        repo_recycler_view?.apply {
+        observe(extensionViewModel.repositories) {
+            binding?.repoRecyclerView?.isVisible = it.isNotEmpty()
+            binding?.blankRepoScreen?.isVisible = it.isEmpty()
+            (binding?.repoRecyclerView?.adapter as? RepoAdapter)?.updateList(it)
+        }
+
+        /*binding?.repoRecyclerView?.apply {
             context?.let { ctx ->
                 layoutManager = LinearRecycleViewLayoutManager(ctx, nextFocusUpId, nextFocusDownId)
             }
-        }
+        }*/
 
 //        list_repositories?.setOnClickListener {
 //            // Open webview on tv if browser fails
@@ -138,32 +184,31 @@ class ExtensionsFragment : Fragment() {
 //            }
 //        }
 
-        observe(extensionViewModel.pluginStats) {
-            when (it) {
-                is Some.Success -> {
-                    val value = it.value
+        observeNullable(extensionViewModel.pluginStats) { value ->
+            binding?.apply {
+                if (value == null) {
+                    pluginStorageAppbar.isVisible = false
 
-                    plugin_storage_appbar?.isVisible = true
-                    if (value.total == 0) {
-                        plugin_download?.setLayoutWidth(1)
-                        plugin_disabled?.setLayoutWidth(0)
-                        plugin_not_downloaded?.setLayoutWidth(0)
-                    } else {
-                        plugin_download?.setLayoutWidth(value.downloaded)
-                        plugin_disabled?.setLayoutWidth(value.disabled)
-                        plugin_not_downloaded?.setLayoutWidth(value.notDownloaded)
-                    }
-                    plugin_not_downloaded_txt.setText(value.notDownloadedText)
-                    plugin_disabled_txt.setText(value.disabledText)
-                    plugin_download_txt.setText(value.downloadedText)
+                    return@observeNullable
                 }
-                is Some.None -> {
-                    plugin_storage_appbar?.isVisible = false
+
+                pluginStorageAppbar.isVisible = true
+                if (value.total == 0) {
+                    pluginDownload.setLayoutWidth(1)
+                    pluginDisabled.setLayoutWidth(0)
+                    pluginNotDownloaded.setLayoutWidth(0)
+                } else {
+                    pluginDownload.setLayoutWidth(value.downloaded)
+                    pluginDisabled.setLayoutWidth(value.disabled)
+                    pluginNotDownloaded.setLayoutWidth(value.notDownloaded)
                 }
+                pluginNotDownloadedTxt.setText(value.notDownloadedText)
+                pluginDisabledTxt.setText(value.disabledText)
+                pluginDownloadTxt.setText(value.downloadedText)
             }
         }
 
-        plugin_storage_appbar?.setOnClickListener {
+        binding?.pluginStorageAppbar?.setOnClickListener {
             findNavController().navigate(
                 R.id.navigation_settings_extensions_to_navigation_settings_plugins,
                 PluginsFragment.newInstance(
@@ -175,16 +220,18 @@ class ExtensionsFragment : Fragment() {
         }
 
         val addRepositoryClick = View.OnClickListener {
+            val ctx = context ?: return@OnClickListener
+            val binding = AddRepoInputBinding.inflate(LayoutInflater.from(ctx), null, false)
             val builder =
-                AlertDialog.Builder(context ?: return@OnClickListener, R.style.AlertDialogCustom)
-                    .setView(R.layout.add_repo_input)
+                AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
+                    .setView(binding.root)
 
             val dialog = builder.create()
             dialog.show()
             (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager?)?.primaryClip?.getItemAt(
                 0
             )?.text?.toString()?.let { copy ->
-                dialog.repo_url_input?.setText(copy)
+                binding.repoUrlInput.setText(copy)
             }
 
 //            dialog.list_repositories?.setOnClickListener {
@@ -194,44 +241,62 @@ class ExtensionsFragment : Fragment() {
 //            }
 
 //            dialog.text2?.text = provider.name
-            dialog.apply_btt?.setOnClickListener secondListener@{
-                val name = dialog.repo_name_input?.text?.toString()
+            binding.applyBtt.setOnClickListener secondListener@{
+                val name = binding.repoNameInput.text?.toString()
                 ioSafe {
-                    val url = dialog.repo_url_input?.text?.toString()
+                    val url = binding.repoUrlInput.text?.toString()
                         ?.let { it1 -> RepositoryManager.parseRepoUrl(it1) }
                     if (url.isNullOrBlank()) {
                         main {
-                            showToast(activity, R.string.error_invalid_data, Toast.LENGTH_SHORT)
+                            showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
                         }
                     } else {
+                        val repository = RepositoryManager.parseRepository(url)
+
+                        // Exit if wrong repository
+                        if (repository == null) {
+                            showToast(R.string.no_repository_found_error, Toast.LENGTH_LONG)
+                            return@ioSafe
+                        }
+
                         val fixedName = if (!name.isNullOrBlank()) name
-                        else RepositoryManager.parseRepository(url)?.name ?: "No name"
+                        else repository.name
 
                         val newRepo = RepositoryData(fixedName, url)
                         RepositoryManager.addRepository(newRepo)
                         extensionViewModel.loadStats()
                         extensionViewModel.loadRepositories()
-                        this@ExtensionsFragment.activity?.downloadAllPluginsDialog(url, fixedName)
+
+                        val plugins = RepositoryManager.getRepoPlugins(url)
+                        if (plugins.isNullOrEmpty()) {
+                            showToast(R.string.no_plugins_found_error, Toast.LENGTH_LONG)
+                        } else {
+                            this@ExtensionsFragment.activity?.downloadAllPluginsDialog(
+                                url,
+                                fixedName
+                            )
+                        }
                     }
                 }
                 dialog.dismissSafe(activity)
             }
-            dialog.cancel_btt?.setOnClickListener {
+            binding.cancelBtt.setOnClickListener {
                 dialog.dismissSafe(activity)
             }
         }
 
         val isTv = isTrueTvSettings()
-        add_repo_button?.isGone = isTv
-        add_repo_button_imageview_holder?.isVisible = isTv
+        binding?.apply {
+            addRepoButton.isGone = isTv
+            addRepoButtonImageviewHolder.isVisible = isTv
 
-        // Band-aid for Fire TV
-        plugin_storage_appbar?.isFocusableInTouchMode = isTv
-        add_repo_button_imageview?.isFocusableInTouchMode = isTv
-
-        add_repo_button?.setOnClickListener(addRepositoryClick)
-        add_repo_button_imageview?.setOnClickListener(addRepositoryClick)
+            // Band-aid for Fire TV
+            pluginStorageAppbar.isFocusableInTouchMode = isTv
+            addRepoButtonImageview.isFocusableInTouchMode = isTv
 
+            addRepoButton.setOnClickListener(addRepositoryClick)
+            addRepoButtonImageview.setOnClickListener(addRepositoryClick)
+        }
         reloadRepositories()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt
index 63ed5357..866d167c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt
@@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.amap
-import com.lagradost.cloudstream3.mvvm.Some
 import com.lagradost.cloudstream3.mvvm.debugAssert
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.PluginManager.getPluginsOnline
@@ -40,8 +39,8 @@ class ExtensionsViewModel : ViewModel() {
     private val _repositories = MutableLiveData<Array<RepositoryData>>()
     val repositories: LiveData<Array<RepositoryData>> = _repositories
 
-    private val _pluginStats: MutableLiveData<Some<PluginStats>> = MutableLiveData(Some.None)
-    val pluginStats: LiveData<Some<PluginStats>> = _pluginStats
+    private val _pluginStats: MutableLiveData<PluginStats?> = MutableLiveData(null)
+    val pluginStats: LiveData<PluginStats?> = _pluginStats
 
     //TODO CACHE GET REQUESTS
     // DO not use viewModelScope.launchSafe, it will ANR on slow internet
@@ -78,7 +77,7 @@ class ExtensionsViewModel : ViewModel() {
         debugAssert({ stats.downloaded + stats.notDownloaded + stats.disabled != stats.total }) {
             "downloaded(${stats.downloaded}) + notDownloaded(${stats.notDownloaded}) + disabled(${stats.disabled}) != total(${stats.total})"
         }
-        _pluginStats.postValue(Some.Success(stats))
+        _pluginStats.postValue(stats)
     }
 
     private fun repos() = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
index 0c3d481b..eb0082b8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
@@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.ui.settings.extensions
 import android.text.format.Formatter.formatShortFileSize
 import android.util.Log
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isGone
@@ -13,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
 import com.lagradost.cloudstream3.PROVIDER_STATUS_DOWN
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.RepositoryItemBinding
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.VotingApi.getVotes
 import com.lagradost.cloudstream3.ui.result.setText
@@ -26,10 +26,11 @@ import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.repository_item.view.*
 import org.junit.Assert
 import org.junit.Test
 import java.text.DecimalFormat
+import kotlin.math.floor
+import kotlin.math.log10
 
 
 data class PluginViewData(
@@ -45,8 +46,10 @@ class PluginAdapter(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val layout = if(isTrueTvSettings()) R.layout.repository_item_tv else R.layout.repository_item
+        val inflated = LayoutInflater.from(parent.context).inflate(layout, parent, false)
+
         return PluginViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false)
+            RepositoryItemBinding.bind(inflated) // may crash
         )
     }
 
@@ -82,8 +85,10 @@ class PluginAdapter(
 
     // Clear glide image because setImageResource doesn't override
     override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
-        holder.itemView.entry_icon?.let { pluginIcon ->
-            GlideApp.with(pluginIcon).clear(pluginIcon)
+        if (holder is PluginViewHolder) {
+            holder.binding.entryIcon.let { pluginIcon ->
+                GlideApp.with(pluginIcon).clear(pluginIcon)
+            }
         }
         super.onViewRecycled(holder)
     }
@@ -112,7 +117,7 @@ class PluginAdapter(
         fun prettyCount(number: Number): String? {
             val suffix = charArrayOf(' ', 'k', 'M', 'B', 'T', 'P', 'E')
             val numValue = number.toLong()
-            val value = Math.floor(Math.log10(numValue.toDouble())).toInt()
+            val value = floor(log10(numValue.toDouble())).toInt()
             val base = value / 3
             return if (value >= 3 && base < suffix.size) {
                 DecimalFormat("#0.00").format(
@@ -127,8 +132,8 @@ class PluginAdapter(
         }
     }
 
-    inner class PluginViewHolder(itemView: View) :
-        RecyclerView.ViewHolder(itemView) {
+    inner class PluginViewHolder(val binding: RepositoryItemBinding) :
+        RecyclerView.ViewHolder(binding.root) {
 
         fun bind(
             data: PluginViewData,
@@ -138,17 +143,17 @@ class PluginAdapter(
             val name = metadata.name.removeSuffix("Provider")
             val alpha = if (disabled) 0.6f else 1f
             val isLocal = !data.plugin.second.url.startsWith("http")
-            itemView.main_text?.alpha = alpha
-            itemView.sub_text?.alpha = alpha
+            binding.mainText.alpha = alpha
+            binding.subText.alpha = alpha
 
             val drawableInt = if (data.isDownloaded)
                 R.drawable.ic_baseline_delete_outline_24
             else R.drawable.netflix_download
 
-            itemView.nsfw_marker?.isVisible = metadata.tvTypes?.contains("NSFW") ?: false
-            itemView.action_button?.setImageResource(drawableInt)
+            binding.nsfwMarker.isVisible = metadata.tvTypes?.contains("NSFW") ?: false
+            binding.actionButton.setImageResource(drawableInt)
 
-            itemView.action_button?.setOnClickListener {
+            binding.actionButton.setOnClickListener {
                 iconClickCallback.invoke(data.plugin)
             }
             itemView.setOnClickListener {
@@ -169,10 +174,11 @@ class PluginAdapter(
 
             if (data.isDownloaded) {
                 // On local plugins page the filepath is provided instead of url.
-                val plugin = PluginManager.urlPlugins[metadata.url] ?: PluginManager.plugins[metadata.url]
+                val plugin =
+                    PluginManager.urlPlugins[metadata.url] ?: PluginManager.plugins[metadata.url]
                 if (plugin?.openSettings != null) {
-                    itemView.action_settings?.isVisible = true
-                    itemView.action_settings.setOnClickListener {
+                    binding.actionSettings.isVisible = true
+                    binding.actionSettings.setOnClickListener {
                         try {
                             plugin.openSettings!!.invoke(itemView.context)
                         } catch (e: Throwable) {
@@ -185,13 +191,13 @@ class PluginAdapter(
                         }
                     }
                 } else {
-                    itemView.action_settings?.isVisible = false
+                    binding.actionSettings.isVisible = false
                 }
             } else {
-                itemView.action_settings?.isVisible = false
+                binding.actionSettings.isVisible = false
             }
 
-            if (itemView.entry_icon?.setImage(//itemView.entry_icon?.height ?:
+            if (!binding.entryIcon.setImage(//itemView.entry_icon?.height ?:
                     metadata.iconUrl?.replace(
                         "%size%",
                         "$iconSize"
@@ -201,41 +207,47 @@ class PluginAdapter(
                     ),
                     null,
                     errorImageDrawable = R.drawable.ic_baseline_extension_24
-                ) != true
+                )
             ) {
-                itemView.entry_icon?.setImageResource(R.drawable.ic_baseline_extension_24)
+                binding.entryIcon.setImageResource(R.drawable.ic_baseline_extension_24)
             }
 
-            itemView.ext_version?.isVisible = true
-            itemView.ext_version?.text = "v${metadata.version}"
+            binding.extVersion.isVisible = true
+            binding.extVersion.text = "v${metadata.version}"
 
             if (metadata.language.isNullOrBlank()) {
-                itemView.lang_icon?.isVisible = false
+                binding.langIcon.isVisible = false
             } else {
-                itemView.lang_icon?.isVisible = true
-                itemView.lang_icon.text = "${getFlagFromIso(metadata.language)} ${fromTwoLettersToLanguage(metadata.language)}"
+                binding.langIcon.isVisible = true
+                binding.langIcon.text =
+                    "${getFlagFromIso(metadata.language)} ${fromTwoLettersToLanguage(metadata.language)}"
             }
 
-            itemView.ext_votes?.isVisible = false
+            binding.extVotes.isVisible = false
             if (!isLocal) {
                 ioSafe {
                     metadata.getVotes().main {
-                        itemView.ext_votes?.setText(txt(R.string.extension_rating, prettyCount(it)))
-                        itemView.ext_votes?.isVisible = true
+                        binding.extVotes.setText(txt(R.string.extension_rating, prettyCount(it)))
+                        binding.extVotes.isVisible = true
                     }
                 }
             }
 
 
             if (metadata.fileSize != null) {
-                itemView.ext_filesize?.isVisible = true
-                itemView.ext_filesize?.text = formatShortFileSize(itemView.context, metadata.fileSize)
+                binding.extFilesize.isVisible = true
+                binding.extFilesize.text = formatShortFileSize(itemView.context, metadata.fileSize)
             } else {
-                itemView.ext_filesize?.isVisible = false
+                binding.extFilesize.isVisible = false
             }
-            itemView.main_text.setText(if(disabled) txt(R.string.single_plugin_disabled, name) else txt(name))
-            itemView.sub_text?.isGone = metadata.description.isNullOrBlank()
-            itemView.sub_text?.text = metadata.description.html()
+            binding.mainText.setText(
+                if (disabled) txt(
+                    R.string.single_plugin_disabled,
+                    name
+                ) else txt(name)
+            )
+            binding.subText.isGone = metadata.description.isNullOrBlank()
+            binding.subText.text = metadata.description.html()
         }
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt
index 9729b4de..7d733be0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt
@@ -2,30 +2,28 @@ package com.lagradost.cloudstream3.ui.settings.extensions
 
 import android.content.res.ColorStateList
 import android.os.Bundle
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import android.text.format.Formatter.formatFileSize
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.fragment_plugin_details.*
-import android.text.format.Formatter.formatFileSize
-import android.util.Log
 import androidx.core.view.isVisible
-import com.lagradost.cloudstream3.plugins.VotingApi
-import com.lagradost.cloudstream3.plugins.VotingApi.getVoteType
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentPluginDetailsBinding
+import com.lagradost.cloudstream3.plugins.PluginManager
+import com.lagradost.cloudstream3.plugins.VotingApi.canVote
 import com.lagradost.cloudstream3.plugins.VotingApi.getVotes
+import com.lagradost.cloudstream3.plugins.VotingApi.hasVoted
 import com.lagradost.cloudstream3.plugins.VotingApi.vote
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
-import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
-import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
-import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.plugins.VotingApi.canVote
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
-import kotlinx.android.synthetic.main.repository_item.view.*
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import com.lagradost.cloudstream3.utils.UIHelper.toPx
 
 
 class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragment() {
@@ -43,116 +41,126 @@ class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragmen
         }
     }
 
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
+    var binding: FragmentPluginDetailsBinding? = null
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_plugin_details, container, false)
-
+    ): View {
+        val localBinding = FragmentPluginDetailsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.fragment_plugin_details, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val metadata = data.plugin.second
-        if (plugin_icon?.setImage(//plugin_icon?.height ?:
-                metadata.iconUrl?.replace(
-                    "%size%",
-                    "$iconSize"
-                )?.replace(
-                    "%exact_size%",
-                    "$iconSizeExact"
-                ),
-                null,
-                errorImageDrawable = R.drawable.ic_baseline_extension_24
-            ) != true
-        ) {
-            plugin_icon?.setImageResource(R.drawable.ic_baseline_extension_24)
-        }
-        plugin_name?.text = metadata.name.removeSuffix("Provider")
-        plugin_version?.text = metadata.version.toString()
-        plugin_description?.text = metadata.description ?: getString(R.string.no_data)
-        plugin_size?.text = if (metadata.fileSize == null) getString(R.string.no_data) else formatFileSize(context, metadata.fileSize)
-        plugin_author?.text = if (metadata.authors.isEmpty()) getString(R.string.no_data) else metadata.authors.joinToString(", ")
-        plugin_status?.text = resources.getStringArray(R.array.extension_statuses)[metadata.status]
-        plugin_types?.text = if ((metadata.tvTypes == null) || metadata.tvTypes.isEmpty()) getString(R.string.no_data) else metadata.tvTypes.joinToString(", ")
-        plugin_lang?.text = if (metadata.language == null)
+        binding?.apply {
+            if (!pluginIcon.setImage(//plugin_icon?.height ?:
+                    metadata.iconUrl?.replace(
+                        "%size%",
+                        "$iconSize"
+                    )?.replace(
+                        "%exact_size%",
+                        "$iconSizeExact"
+                    ),
+                    null,
+                    errorImageDrawable = R.drawable.ic_baseline_extension_24
+                )
+            ) {
+                pluginIcon.setImageResource(R.drawable.ic_baseline_extension_24)
+            }
+            pluginName.text = metadata.name.removeSuffix("Provider")
+            pluginVersion.text = metadata.version.toString()
+            pluginDescription.text = metadata.description ?: getString(R.string.no_data)
+            pluginSize.text =
+                if (metadata.fileSize == null) getString(R.string.no_data) else formatFileSize(
+                    context,
+                    metadata.fileSize
+                )
+            pluginAuthor.text =
+                if (metadata.authors.isEmpty()) getString(R.string.no_data) else metadata.authors.joinToString(
+                    ", "
+                )
+            pluginStatus.text =
+                resources.getStringArray(R.array.extension_statuses)[metadata.status]
+            pluginTypes.text =
+                if (metadata.tvTypes.isNullOrEmpty()) getString(R.string.no_data) else metadata.tvTypes.joinToString(
+                    ", "
+                )
+            pluginLang.text = if (metadata.language == null)
                 getString(R.string.no_data)
-        else
+            else
                 "${getFlagFromIso(metadata.language)} ${fromTwoLettersToLanguage(metadata.language)}"
 
-        github_btn.setOnClickListener {
-            if (metadata.repositoryUrl != null) {
-                openBrowser(metadata.repositoryUrl)
+            githubBtn.setOnClickListener {
+                if (metadata.repositoryUrl != null) {
+                    openBrowser(metadata.repositoryUrl)
+                }
             }
-        }
 
-        if (!metadata.canVote()) {
-            downvote.alpha = .6f
-            upvote.alpha = .6f
-        }
+            if (!metadata.canVote()) {
+                upvote.alpha = .6f
+            }
 
-        if (data.isDownloaded) {
-            // On local plugins page the filepath is provided instead of url.
-            val plugin = PluginManager.urlPlugins[metadata.url] ?: PluginManager.plugins[metadata.url]
-            if (plugin?.openSettings != null && context != null) {
-                action_settings?.isVisible = true
-                action_settings.setOnClickListener {
-                    try {
-                        plugin.openSettings!!.invoke(requireContext())
-                    } catch (e: Throwable) {
-                        Log.e(
-                            "PluginAdapter",
-                            "Failed to open ${metadata.name} settings: ${
-                                Log.getStackTraceString(e)
-                            }"
-                        )
+            if (data.isDownloaded) {
+                // On local plugins page the filepath is provided instead of url.
+                val plugin =
+                    PluginManager.urlPlugins[metadata.url] ?: PluginManager.plugins[metadata.url]
+                if (plugin?.openSettings != null && context != null) {
+                    actionSettings.isVisible = true
+                    actionSettings.setOnClickListener {
+                        try {
+                            plugin.openSettings!!.invoke(requireContext())
+                        } catch (e: Throwable) {
+                            Log.e(
+                                "PluginAdapter",
+                                "Failed to open ${metadata.name} settings: ${
+                                    Log.getStackTraceString(e)
+                                }"
+                            )
+                        }
                     }
+                } else {
+                    actionSettings.isVisible = false
                 }
             } else {
-                action_settings?.isVisible = false
+                actionSettings.isVisible = false
             }
-        } else {
-            action_settings?.isVisible = false
-        }
 
-        upvote.setOnClickListener {
-            ioSafe {
-                metadata.vote(VotingApi.VoteType.UPVOTE).main {
-                    updateVoting(it)
+            upvote.setOnClickListener {
+                ioSafe {
+                    metadata.vote().main {
+                        updateVoting(it)
+                    }
                 }
             }
-        }
-        downvote.setOnClickListener {
+
             ioSafe {
-                metadata.vote(VotingApi.VoteType.DOWNVOTE).main {
+                metadata.getVotes().main {
                     updateVoting(it)
                 }
-
-            }
-        }
-
-        ioSafe {
-            metadata.getVotes().main {
-                updateVoting(it)
             }
         }
     }
 
     private fun updateVoting(value: Int) {
         val metadata = data.plugin.second
-        plugin_votes.text = value.toString()
-        when (metadata.getVoteType()) {
-            VotingApi.VoteType.UPVOTE -> {
-                upvote.imageTintList =  ColorStateList.valueOf(context?.colorFromAttribute(R.attr.colorPrimary) ?: R.color.colorPrimary)
-                downvote.imageTintList = ColorStateList.valueOf(context?.colorFromAttribute(R.attr.white) ?: R.color.white)
-            }
-            VotingApi.VoteType.DOWNVOTE -> {
-                downvote.imageTintList =  ColorStateList.valueOf(context?.colorFromAttribute(R.attr.colorPrimary) ?: R.color.colorPrimary)
-                upvote.imageTintList = ColorStateList.valueOf(context?.colorFromAttribute(R.attr.white) ?: R.color.white)
-            }
-            VotingApi.VoteType.NONE -> {
-                upvote.imageTintList =  ColorStateList.valueOf(context?.colorFromAttribute(R.attr.white) ?: R.color.white)
-                downvote.imageTintList = ColorStateList.valueOf(context?.colorFromAttribute(R.attr.white) ?: R.color.white)
+        binding?.apply {
+            pluginVotes.text = value.toString()
+            if (metadata.hasVoted()) {
+                upvote.imageTintList = ColorStateList.valueOf(
+                    context?.colorFromAttribute(R.attr.colorPrimary) ?: R.color.colorPrimary
+                )
+            } else {
+                upvote.imageTintList = ColorStateList.valueOf(
+                    context?.colorFromAttribute(R.attr.colorOnSurface) ?: R.color.white
+                )
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
index d328d226..172ea659 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
@@ -12,17 +12,17 @@ import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
 import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.databinding.FragmentPluginsBinding
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
+import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
+import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.ui.settings.appLanguages
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.android.synthetic.main.fragment_plugins.*
-import kotlinx.android.synthetic.main.tvtypes_chips.*
-import kotlinx.android.synthetic.main.tvtypes_chips_scroll.*
 
 const val PLUGINS_BUNDLE_NAME = "name"
 const val PLUGINS_BUNDLE_URL = "url"
@@ -33,11 +33,19 @@ class PluginsFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
-        return inflater.inflate(R.layout.fragment_plugins, container, false)
+    ): View {
+        val localBinding = FragmentPluginsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root//inflater.inflate(R.layout.fragment_plugins, container, false)
+    }
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
     private val pluginViewModel: PluginsViewModel by activityViewModels()
+    var binding: FragmentPluginsBinding? = null
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -66,104 +74,120 @@ class PluginsFragment : Fragment() {
         }
 
         setUpToolbar(name)
-
-        settings_toolbar?.setOnMenuItemClickListener { menuItem ->
-            when (menuItem?.itemId) {
-                R.id.download_all -> {
-                    PluginsViewModel.downloadAll(activity, url, pluginViewModel)
-                }
-                R.id.lang_filter -> {
-                    val tempLangs = appLanguages.toMutableList()
-                    val languageCodes = mutableListOf("none") + tempLangs.map { (_, _, iso) -> iso }
-                    val languageNames =
-                        mutableListOf(getString(R.string.no_data)) + tempLangs.map { (emoji, name, iso) ->
-                            val flag =
-                                emoji.ifBlank { SubtitleHelper.getFlagFromIso(iso) ?: "ERROR" }
-                            "$flag $name"
-                        }
-                    val selectedList =
-                        pluginViewModel.languages.map { it -> languageCodes.indexOf(it) }
-
-                    activity?.showMultiDialog(
-                        languageNames,
-                        selectedList,
-                        getString(R.string.provider_lang_settings),
-                        {}) { newList ->
-                        pluginViewModel.languages = newList.map { it -> languageCodes[it] }
-                        pluginViewModel.updateFilteredPlugins()
+        binding?.settingsToolbar?.apply {
+            setOnMenuItemClickListener { menuItem ->
+                when (menuItem?.itemId) {
+                    R.id.download_all -> {
+                        PluginsViewModel.downloadAll(activity, url, pluginViewModel)
                     }
+
+                    R.id.lang_filter -> {
+                        val tempLangs = appLanguages.toMutableList()
+                        val languageCodes =
+                            mutableListOf("none") + tempLangs.map { (_, _, iso) -> iso }
+                        val languageNames =
+                            mutableListOf(getString(R.string.no_data)) + tempLangs.map { (emoji, name, iso) ->
+                                val flag =
+                                    emoji.ifBlank { SubtitleHelper.getFlagFromIso(iso) ?: "ERROR" }
+                                "$flag $name"
+                            }
+                        val selectedList =
+                            pluginViewModel.languages.map { languageCodes.indexOf(it) }
+
+                        activity?.showMultiDialog(
+                            languageNames,
+                            selectedList,
+                            getString(R.string.provider_lang_settings),
+                            {}) { newList ->
+                            pluginViewModel.languages = newList.map { languageCodes[it] }
+                            pluginViewModel.updateFilteredPlugins()
+                        }
+                    }
+
+                    else -> {}
                 }
-                else -> {}
+                return@setOnMenuItemClickListener true
             }
-            return@setOnMenuItemClickListener true
-        }
 
-        val searchView =
-            settings_toolbar?.menu?.findItem(R.id.search_button)?.actionView as? SearchView
+            val searchView =
+                menu?.findItem(R.id.search_button)?.actionView as? SearchView
 
-        // Don't go back if active query
-        settings_toolbar?.setNavigationOnClickListener {
-            if (searchView?.isIconified == false) {
-                searchView.isIconified = true
-            } else {
-                activity?.onBackPressed()
+            // Don't go back if active query
+            setNavigationOnClickListener {
+                if (searchView?.isIconified == false) {
+                    searchView.isIconified = true
+                } else {
+                    activity?.onBackPressed()
+                }
+            }
+            searchView?.setOnQueryTextFocusChangeListener { _, hasFocus ->
+                if (!hasFocus) pluginViewModel.search(null)
             }
-        }
 
+            searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String?): Boolean {
+                    pluginViewModel.search(query)
+                    return true
+                }
+
+                override fun onQueryTextChange(newText: String?): Boolean {
+                    pluginViewModel.search(newText)
+                    return true
+                }
+            })
+        }
 //        searchView?.onActionViewCollapsed = {
 //            pluginViewModel.search(null)
 //        }
 
         // Because onActionViewCollapsed doesn't wanna work we need this workaround :(
-        searchView?.setOnQueryTextFocusChangeListener { _, hasFocus ->
-            if (!hasFocus) pluginViewModel.search(null)
-        }
 
-        searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-            override fun onQueryTextSubmit(query: String?): Boolean {
-                pluginViewModel.search(query)
-                return true
-            }
+        binding?.pluginRecyclerView?.setLinearListLayout(
+            isHorizontal = false,
+            nextDown = FOCUS_SELF,
+            nextRight = FOCUS_SELF,
+        )
 
-            override fun onQueryTextChange(newText: String?): Boolean {
-                pluginViewModel.search(newText)
-                return true
-            }
-        })
-
-
-        plugin_recycler_view?.adapter =
+        binding?.pluginRecyclerView?.adapter =
             PluginAdapter {
                 pluginViewModel.handlePluginAction(activity, url, it, isLocal)
             }
 
         if (isTvSettings()) {
             // Scrolling down does not reveal the whole RecyclerView on TV, add to bypass that.
-            plugin_recycler_view?.setPadding(0, 0, 0, 200.toPx)
+            binding?.pluginRecyclerView?.setPadding(0, 0, 0, 200.toPx)
         }
 
         observe(pluginViewModel.filteredPlugins) { (scrollToTop, list) ->
-            (plugin_recycler_view?.adapter as? PluginAdapter)?.updateList(list)
+            (binding?.pluginRecyclerView?.adapter as? PluginAdapter)?.updateList(list)
 
             if (scrollToTop)
-                plugin_recycler_view?.scrollToPosition(0)
+                binding?.pluginRecyclerView?.scrollToPosition(0)
         }
 
         if (isLocal) {
             // No download button and no categories on local
-            settings_toolbar?.menu?.findItem(R.id.download_all)?.isVisible = false
-            settings_toolbar?.menu?.findItem(R.id.lang_filter)?.isVisible = false
+            binding?.settingsToolbar?.menu?.findItem(R.id.download_all)?.isVisible = false
+            binding?.settingsToolbar?.menu?.findItem(R.id.lang_filter)?.isVisible = false
             pluginViewModel.updatePluginListLocal()
-            tv_types_scroll_view?.isVisible = false
+
+            binding?.tvtypesChipsScroll?.root?.isVisible = false
         } else {
             pluginViewModel.updatePluginList(context, url)
-            tv_types_scroll_view?.isVisible = true
+            binding?.tvtypesChipsScroll?.root?.isVisible = true
 
-            bindChips(home_select_group, emptyList(), TvType.values().toList()) { list ->
-                pluginViewModel.tvTypes.clear()
-                pluginViewModel.tvTypes.addAll(list.map { it.name })
-                pluginViewModel.updateFilteredPlugins()
-            }
+            bindChips(
+                binding?.tvtypesChipsScroll?.tvtypesChips,
+                emptyList(),
+                TvType.values().toList(),
+                callback = { list ->
+                    pluginViewModel.tvTypes.clear()
+                    pluginViewModel.tvTypes.addAll(list.map { it.name })
+                    pluginViewModel.updateFilteredPlugins()
+                },
+                nextFocusDown = R.id.plugin_recycler_view,
+                nextFocusUp = null,
+            )
         }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
index 934f65bb..471105be 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
@@ -86,14 +86,17 @@ class PluginsViewModel : ViewModel() {
                 }.also { list ->
                     main {
                         showToast(
-                            activity,
-                            if (list.isEmpty()) {
-                                txt(
+                            when {
+                                // No plugins at all
+                                plugins.isEmpty() -> txt(
+                                    R.string.no_plugins_found_error,
+                                )
+                                // All plugins downloaded
+                                list.isEmpty() -> txt(
                                     R.string.batch_download_nothing_to_download_format,
                                     txt(R.string.plugin)
                                 )
-                            } else {
-                                txt(
+                                else -> txt(
                                     R.string.batch_download_start_format,
                                     list.size,
                                     txt(if (list.size == 1) R.string.plugin_singular else R.string.plugin)
@@ -113,7 +116,6 @@ class PluginsViewModel : ViewModel() {
                 }.main { list ->
                     if (list.any { it }) {
                         showToast(
-                            activity,
                             txt(
                                 R.string.batch_download_finish_format,
                                 list.count { it },
@@ -123,7 +125,7 @@ class PluginsViewModel : ViewModel() {
                         )
                         viewModel?.updatePluginListPrivate(activity, repositoryUrl)
                     } else if (list.isNotEmpty()) {
-                        showToast(activity, R.string.download_failed, Toast.LENGTH_SHORT)
+                        showToast(R.string.download_failed, Toast.LENGTH_SHORT)
                     }
                 }
             }
@@ -166,9 +168,9 @@ class PluginsViewModel : ViewModel() {
 
         runOnMainThread {
             if (success)
-                showToast(activity, message, Toast.LENGTH_SHORT)
+                showToast(message, Toast.LENGTH_SHORT)
             else
-                showToast(activity, R.string.error, Toast.LENGTH_SHORT)
+                showToast(R.string.error, Toast.LENGTH_SHORT)
         }
 
         if (success)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt
index e90166a8..602b45e4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt
@@ -1,14 +1,15 @@
 package com.lagradost.cloudstream3.ui.settings.extensions
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.RepositoryItemBinding
+import com.lagradost.cloudstream3.databinding.RepositoryItemTvBinding
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
-import kotlinx.android.synthetic.main.repository_item.view.*
 
 class RepoAdapter(
     val isSetup: Boolean,
@@ -20,9 +21,17 @@ class RepoAdapter(
     private val repositories: MutableList<RepositoryData> = mutableListOf()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val layout = if(isTrueTvSettings()) R.layout.repository_item_tv else R.layout.repository_item
+        val layout = if (isTrueTvSettings()) RepositoryItemTvBinding.inflate(
+            LayoutInflater.from(parent.context),
+            parent,
+            false
+        ) else RepositoryItemBinding.inflate(
+            LayoutInflater.from(parent.context),
+            parent,
+            false
+        )  //R.layout.repository_item_tv else R.layout.repository_item
         return RepoViewHolder(
-            LayoutInflater.from(parent.context).inflate(layout, parent, false)
+            layout
         )
     }
 
@@ -57,30 +66,57 @@ class RepoAdapter(
         diffResult.dispatchUpdatesTo(this)
     }
 
-    inner class RepoViewHolder(itemView: View) :
-        RecyclerView.ViewHolder(itemView) {
+    inner class RepoViewHolder(
+        val binding: ViewBinding
+    ) :
+        RecyclerView.ViewHolder(binding.root) {
         fun bind(
             repositoryData: RepositoryData
         ) {
             val isPrebuilt = PREBUILT_REPOSITORIES.contains(repositoryData)
             val drawable =
                 if (isSetup) R.drawable.netflix_download else R.drawable.ic_baseline_delete_outline_24
+            when (binding) {
+                is RepositoryItemTvBinding -> {
+                    binding.apply {
+                        // Only shows icon if on setup or if it isn't a prebuilt repo.
+                        // No delete buttons on prebuilt repos.
+                        if (!isPrebuilt || isSetup) {
+                            actionButton.setImageResource(drawable)
+                        }
 
-            // Only shows icon if on setup or if it isn't a prebuilt repo.
-            // No delete buttons on prebuilt repos.
-            if (!isPrebuilt || isSetup) {
-                itemView.action_button?.setImageResource(drawable)
-            }
+                        actionButton.setOnClickListener {
+                            imageClickCallback(repositoryData)
+                        }
 
-            itemView.action_button?.setOnClickListener {
-                imageClickCallback(repositoryData)
-            }
+                        repositoryItemRoot.setOnClickListener {
+                            clickCallback(repositoryData)
+                        }
+                        mainText.text = repositoryData.name
+                        subText.text = repositoryData.url
+                    }
+                }
 
-            itemView.repository_item_root?.setOnClickListener {
-                clickCallback(repositoryData)
+                is RepositoryItemBinding -> {
+                    binding.apply {
+                        // Only shows icon if on setup or if it isn't a prebuilt repo.
+                        // No delete buttons on prebuilt repos.
+                        if (!isPrebuilt || isSetup) {
+                            actionButton.setImageResource(drawable)
+                        }
+
+                        actionButton.setOnClickListener {
+                            imageClickCallback(repositoryData)
+                        }
+
+                        repositoryItemRoot.setOnClickListener {
+                            clickCallback(repositoryData)
+                        }
+                        mainText.text = repositoryData.name
+                        subText.text = repositoryData.url
+                    }
+                }
             }
-            itemView.main_text?.text = repositoryData.name
-            itemView.sub_text?.text = repositoryData.url
         }
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
index 34cd67cd..59b1b856 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
@@ -1,97 +1,105 @@
 package com.lagradost.cloudstream3.ui.settings.testing
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentTestingBinding
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
-import kotlinx.android.synthetic.main.fragment_testing.*
-import kotlinx.android.synthetic.main.view_test.*
 
 
 class TestFragment : Fragment() {
 
     private val testViewModel: TestViewModel by activityViewModels()
+    var binding: FragmentTestingBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         setUpToolbar(R.string.category_provider_test)
         super.onViewCreated(view, savedInstanceState)
 
-        provider_test_recycler_view?.adapter = TestResultAdapter(
-            mutableListOf()
-        )
+        binding?.apply {
+            providerTestRecyclerView.adapter = TestResultAdapter(
+                mutableListOf()
+            )
 
-        testViewModel.init()
-        if (testViewModel.isRunningTest) {
-            provider_test?.setState(TestView.TestState.Running)
-        }
-
-        observe(testViewModel.providerProgress) { (passed, failed, total) ->
-            provider_test?.setProgress(passed, failed, total)
-        }
-
-        observeNullable(testViewModel.providerResults) {
-            normalSafeApiCall {
-                val newItems = it.sortedBy { api -> api.first.name }
-                (provider_test_recycler_view?.adapter as? TestResultAdapter)?.updateList(
-                    newItems
-                )
+            testViewModel.init()
+            if (testViewModel.isRunningTest) {
+                providerTest.setState(TestView.TestState.Running)
             }
-        }
 
-        provider_test?.setOnPlayButtonListener { state ->
-            when (state) {
-                TestView.TestState.Stopped -> testViewModel.stopTest()
-                TestView.TestState.Running -> testViewModel.startTest()
-                TestView.TestState.None -> testViewModel.startTest()
+            observe(testViewModel.providerProgress) { (passed, failed, total) ->
+                providerTest.setProgress(passed, failed, total)
             }
-        }
 
-        if (isTrueTvSettings()) {
-            tests_play_pause?.isFocusableInTouchMode = true
-            tests_play_pause?.requestFocus()
-        }
-
-        provider_test?.playPauseButton?.setOnFocusChangeListener { _, hasFocus ->
-            if (hasFocus) {
-                provider_test_appbar?.setExpanded(true, true)
+            observeNullable(testViewModel.providerResults) {
+                normalSafeApiCall {
+                    val newItems = it.sortedBy { api -> api.first.name }
+                    (providerTestRecyclerView.adapter as? TestResultAdapter)?.updateList(
+                        newItems
+                    )
+                }
+            }
+
+            providerTest.setOnPlayButtonListener { state ->
+                when (state) {
+                    TestView.TestState.Stopped -> testViewModel.stopTest()
+                    TestView.TestState.Running -> testViewModel.startTest()
+                    TestView.TestState.None -> testViewModel.startTest()
+                }
             }
-        }
 
-        fun focusRecyclerView() {
-            // Hack to make it possible to focus the recyclerview.
             if (isTrueTvSettings()) {
-                provider_test_recycler_view?.requestFocus()
-                provider_test_appbar?.setExpanded(false, true)
+                providerTest.playPauseButton?.isFocusableInTouchMode = true
+                providerTest.playPauseButton?.requestFocus()
             }
-        }
 
-        provider_test?.setOnMainClick {
-            testViewModel.setFilterMethod(TestViewModel.ProviderFilter.All)
-            focusRecyclerView()
-        }
-        provider_test?.setOnFailedClick {
-            testViewModel.setFilterMethod(TestViewModel.ProviderFilter.Failed)
-            focusRecyclerView()
-        }
-        provider_test?.setOnPassedClick {
-            testViewModel.setFilterMethod(TestViewModel.ProviderFilter.Passed)
-            focusRecyclerView()
+            providerTest.playPauseButton?.setOnFocusChangeListener { _, hasFocus ->
+                if (hasFocus) {
+                    providerTestAppbar.setExpanded(true, true)
+                }
+            }
+
+            fun focusRecyclerView() {
+                // Hack to make it possible to focus the recyclerview.
+                if (isTrueTvSettings()) {
+                    providerTestRecyclerView.requestFocus()
+                    providerTestAppbar.setExpanded(false, true)
+                }
+            }
+
+            providerTest.setOnMainClick {
+                testViewModel.setFilterMethod(TestViewModel.ProviderFilter.All)
+                focusRecyclerView()
+            }
+            providerTest.setOnFailedClick {
+                testViewModel.setFilterMethod(TestViewModel.ProviderFilter.Failed)
+                focusRecyclerView()
+            }
+            providerTest.setOnPassedClick {
+                testViewModel.setFilterMethod(TestViewModel.ProviderFilter.Passed)
+                focusRecyclerView()
+            }
         }
     }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_testing, container, false)
+    ): View {
+        val localBinding = FragmentTestingBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root//inflater.inflate(R.layout.fragment_testing, container, false)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt
index d04e2379..83480542 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt
@@ -10,19 +10,20 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.ProviderTestItemBinding
 import com.lagradost.cloudstream3.mvvm.getAllMessages
 import com.lagradost.cloudstream3.mvvm.getStackTracePretty
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.TestingUtils
-import kotlinx.android.synthetic.main.provider_test_item.view.*
 
 class TestResultAdapter(override val items: MutableList<Pair<MainAPI, TestingUtils.TestResultProvider>>) :
     AppUtils.DiffAdapter<Pair<MainAPI, TestingUtils.TestResultProvider>>(items) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return ProviderTestViewHolder(
-            LayoutInflater.from(parent.context)
-                .inflate(R.layout.provider_test_item, parent, false),
+            ProviderTestItemBinding.inflate(LayoutInflater.from(parent.context), parent,false)
+            //LayoutInflater.from(parent.context)
+            //    .inflate(R.layout.provider_test_item, parent, false),
         )
     }
 
@@ -35,12 +36,12 @@ class TestResultAdapter(override val items: MutableList<Pair<MainAPI, TestingUti
         }
     }
 
-    inner class ProviderTestViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        private val languageText: TextView = itemView.lang_icon
-        private val providerTitle: TextView = itemView.main_text
-        private val statusText: TextView = itemView.passed_failed_marker
-        private val failDescription: TextView = itemView.fail_description
-        private val logButton: ImageView = itemView.action_button
+    inner class ProviderTestViewHolder(binding: ProviderTestItemBinding) : RecyclerView.ViewHolder(binding.root) {
+        private val languageText: TextView = binding.langIcon
+        private val providerTitle: TextView = binding.mainText
+        private val statusText: TextView = binding.passedFailedMarker
+        private val failDescription: TextView = binding.failDescription
+        private val logButton: ImageView = binding.actionButton
 
         private fun String.lastLine(): String? {
             return this.lines().lastOrNull { it.isNotBlank() }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
index 2e05baff..4fd24afe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
@@ -10,6 +10,7 @@ import com.lagradost.cloudstream3.utils.TestingUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
+import okhttp3.internal.toImmutableList
 
 class TestViewModel : ViewModel() {
     data class TestProgress(
@@ -81,15 +82,14 @@ class TestViewModel : ViewModel() {
     }
 
     fun init() {
-        val apis = APIHolder.allProviders
-        total = apis.size
+        total = synchronized(APIHolder.allProviders) { APIHolder.allProviders.size }
         updateProgress()
     }
 
     fun startTest() {
         scope = CoroutineScope(Dispatchers.Default)
 
-        val apis = APIHolder.allProviders
+        val apis = synchronized(APIHolder.allProviders) { APIHolder.allProviders.toTypedArray() }
         total = apis.size
         failed = 0
         passed = 0
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
index b7d2fff6..4369b22f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
@@ -8,21 +8,16 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import com.lagradost.cloudstream3.APIHolder.apis
-import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
-import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEvent
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentSetupExtensionsBinding
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.plugins.RepositoryManager
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
 import com.lagradost.cloudstream3.ui.settings.extensions.PluginsViewModel
 import com.lagradost.cloudstream3.ui.settings.extensions.RepoAdapter
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import kotlinx.android.synthetic.main.fragment_extensions.blank_repo_screen
-import kotlinx.android.synthetic.main.fragment_extensions.repo_recycler_view
-import kotlinx.android.synthetic.main.fragment_setup_media.next_btt
-import kotlinx.android.synthetic.main.fragment_setup_media.prev_btt
-import kotlinx.android.synthetic.main.fragment_setup_media.setup_root
 
 
 class SetupFragmentExtensions : Fragment() {
@@ -39,13 +34,24 @@ class SetupFragmentExtensions : Fragment() {
         }
     }
 
+    var binding: FragmentSetupExtensionsBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_setup_extensions, container, false)
+    ): View {
+        val localBinding = FragmentSetupExtensionsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.fragment_setup_extensions, container, false)
     }
 
+
     override fun onResume() {
         super.onResume()
         afterRepositoryLoadedEvent += ::setRepositories
@@ -60,12 +66,12 @@ class SetupFragmentExtensions : Fragment() {
         main {
             val repositories = RepositoryManager.getRepositories() + PREBUILT_REPOSITORIES
             val hasRepos = repositories.isNotEmpty()
-            repo_recycler_view?.isVisible = hasRepos
-            blank_repo_screen?.isVisible = !hasRepos
+            binding?.repoRecyclerView?.isVisible = hasRepos
+            binding?.blankRepoScreen?.isVisible = !hasRepos
 //            view_public_repositories_button?.isVisible = hasRepos
 
             if (hasRepos) {
-                repo_recycler_view?.adapter = RepoAdapter(true, {}, {
+                binding?.repoRecyclerView?.adapter = RepoAdapter(true, {}, {
                     PluginsViewModel.downloadAll(activity, it.url, null)
                 }).apply { updateList(repositories) }
             }
@@ -80,39 +86,40 @@ class SetupFragmentExtensions : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(setup_root)
+        fixPaddingStatusbar(binding?.setupRoot)
         val isSetup = arguments?.getBoolean(SETUP_EXTENSION_BUNDLE_IS_SETUP) ?: false
 
 //        view_public_repositories_button?.setOnClickListener {
 //            openBrowser(PUBLIC_REPOSITORIES_LIST, isTvSettings(), this)
 //        }
 
-        with(context) {
-            if (this == null) return
+        normalSafeApiCall {
+           // val ctx = context ?: return@normalSafeApiCall
             setRepositories()
+            binding?.apply {
+                if (!isSetup) {
+                    nextBtt.setText(R.string.setup_done)
+                }
+                prevBtt.isVisible = isSetup
 
-            if (!isSetup) {
-                next_btt.setText(R.string.setup_done)
-            }
-            prev_btt?.isVisible = isSetup
+                nextBtt.setOnClickListener {
+                    // Continue setup
+                    if (isSetup)
+                        if (
+                        // If any available languages
+                            synchronized(apis) { apis.distinctBy { it.lang }.size > 1 }
+                        ) {
+                            findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_provider_languages)
+                        } else {
+                            findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_media)
+                        }
+                    else
+                        findNavController().navigate(R.id.navigation_home)
+                }
 
-            next_btt?.setOnClickListener {
-                // Continue setup
-                if (isSetup)
-                    if (
-                    // If any available languages
-                        apis.distinctBy { it.lang }.size > 1
-                    ) {
-                        findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_provider_languages)
-                    } else {
-                        findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_media)
-                    }
-                else
-                    findNavController().navigate(R.id.navigation_home)
-            }
-
-            prev_btt?.setOnClickListener {
-                findNavController().navigate(R.id.navigation_setup_language)
+                prevBtt.setOnClickListener {
+                    findNavController().navigate(R.id.navigation_setup_language)
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
index f205fa3a..35bf7ba9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
@@ -13,6 +13,7 @@ import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentSetupLanguageBinding
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.utils.Scheduler.Companion.attachBackupListener
@@ -21,37 +22,43 @@ import com.lagradost.cloudstream3.ui.settings.getCurrentLocale
 import com.lagradost.cloudstream3.utils.DataStore.getSyncPrefs
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import kotlinx.android.synthetic.main.fragment_setup_language.app_icon_image
-import kotlinx.android.synthetic.main.fragment_setup_language.setup_root
-import kotlinx.android.synthetic.main.fragment_setup_language.skip_btt
-import kotlinx.android.synthetic.main.fragment_setup_media.listview1
-import kotlinx.android.synthetic.main.fragment_setup_media.next_btt
 
 const val HAS_DONE_SETUP_KEY = "HAS_DONE_SETUP"
 
 class SetupFragmentLanguage : Fragment() {
+    var binding: FragmentSetupLanguageBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_setup_language, container, false)
+    ): View {
+        val localBinding = FragmentSetupLanguageBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.fragment_setup_language, container, false)
     }
 
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(setup_root)
 
         // We don't want a crash for all users
         normalSafeApiCall {
-            with(context) {
-                if (this == null) return@normalSafeApiCall
-                val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
-                    .attachBackupListener(getSyncPrefs()).self
+            fixPaddingStatusbar(binding?.setupRoot)
 
-                val arrayAdapter =
-                    ArrayAdapter<String>(this, R.layout.sort_bottom_single_choice)
+            val ctx = context ?: return@normalSafeApiCall
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
+                 .attachBackupListener(getSyncPrefs()).self
 
+            val arrayAdapter =
+                ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
+
+            binding?.apply {
                 // Icons may crash on some weird android versions?
                 normalSafeApiCall {
                     val drawable = when {
@@ -59,10 +66,10 @@ class SetupFragmentLanguage : Fragment() {
                         BuildConfig.BUILD_TYPE == "prerelease" -> R.drawable.cloud_2_gradient_beta
                         else -> R.drawable.cloud_2_gradient
                     }
-                    app_icon_image?.setImageDrawable(ContextCompat.getDrawable(this, drawable))
+                    appIconImage.setImageDrawable(ContextCompat.getDrawable(ctx, drawable))
                 }
 
-                val current = getCurrentLocale(this)
+                val current = getCurrentLocale(ctx)
                 val languageCodes = appLanguages.map { it.third }
                 val languageNames = appLanguages.map { (emoji, name, iso) ->
                     val flag = emoji.ifBlank { SubtitleHelper.getFlagFromIso(iso) ?: "ERROR" }
@@ -71,18 +78,19 @@ class SetupFragmentLanguage : Fragment() {
                 val index = languageCodes.indexOf(current)
 
                 arrayAdapter.addAll(languageNames)
-                listview1?.adapter = arrayAdapter
-                listview1?.choiceMode = AbsListView.CHOICE_MODE_SINGLE
-                listview1?.setItemChecked(index, true)
+                listview1.adapter = arrayAdapter
+                listview1.choiceMode = AbsListView.CHOICE_MODE_SINGLE
+                listview1.setItemChecked(index, true)
 
-                listview1?.setOnItemClickListener { _, _, position, _ ->
+                listview1.setOnItemClickListener { _, _, position, _ ->
                     val code = languageCodes[position]
                     CommonActivity.setLocale(activity, code)
-                    settingsManager.edit().putString(getString(R.string.locale_key), code).apply()
+                    settingsManager.edit().putString(getString(R.string.locale_key), code)
+                        .apply()
                     activity?.recreate()
                 }
 
-                next_btt?.setOnClickListener {
+                nextBtt.setOnClickListener {
                     // If no plugins go to plugins page
                     val nextDestination = if (
                         PluginManager.getPluginsOnline().isEmpty()
@@ -97,10 +105,11 @@ class SetupFragmentLanguage : Fragment() {
                     )
                 }
 
-                skip_btt?.setOnClickListener {
+                skipBtt.setOnClickListener {
                     findNavController().navigate(R.id.navigation_home)
                 }
             }
+
         }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt
index 05b4aa8e..90cce5f1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt
@@ -10,34 +10,42 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentSetupLayoutBinding
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.Scheduler.Companion.attachBackupListener
 import com.lagradost.cloudstream3.utils.DataStore.getSyncPrefs
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import kotlinx.android.synthetic.main.fragment_setup_layout.acra_switch
-import kotlinx.android.synthetic.main.fragment_setup_layout.crash_reporting_text
-import kotlinx.android.synthetic.main.fragment_setup_media.listview1
-import kotlinx.android.synthetic.main.fragment_setup_media.next_btt
-import kotlinx.android.synthetic.main.fragment_setup_media.prev_btt
-import kotlinx.android.synthetic.main.fragment_setup_media.setup_root
 import org.acra.ACRA
 
 
 class SetupFragmentLayout : Fragment() {
+
+    var binding: FragmentSetupLayoutBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_setup_layout, container, false)
+    ): View {
+        val localBinding = FragmentSetupLayoutBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.fragment_setup_layout, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(setup_root)
+        fixPaddingStatusbar(binding?.setupRoot)
 
-        with(context) {
-            if (this == null) return
-            val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
-                .attachBackupListener(getSyncPrefs()).self
+        normalSafeApiCall {
+            val ctx = context ?: return@normalSafeApiCall
+
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
+                 .attachBackupListener(getSyncPrefs()).self
 
             val prefNames = resources.getStringArray(R.array.app_layout)
             val prefValues = resources.getIntArray(R.array.app_layout_values)
@@ -46,48 +54,48 @@ class SetupFragmentLayout : Fragment() {
                 settingsManager.getInt(getString(R.string.app_layout_key), -1)
 
             val arrayAdapter =
-                ArrayAdapter<String>(this, R.layout.sort_bottom_single_choice)
+                ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
             arrayAdapter.addAll(prefNames.toList())
-            listview1?.adapter = arrayAdapter
-            listview1?.choiceMode = AbsListView.CHOICE_MODE_SINGLE
-            listview1?.setItemChecked(
-                prefValues.indexOf(currentLayout), true
-            )
-
-            listview1?.setOnItemClickListener { _, _, position, _ ->
-                settingsManager.edit()
-                    .putInt(getString(R.string.app_layout_key), prefValues[position])
-                    .apply()
-                activity?.recreate()
-            }
-
-            acra_switch?.setOnCheckedChangeListener { _, enableCrashReporting ->
-                // Use same pref as in settings
-                settingsManager.edit().putBoolean(ACRA.PREF_DISABLE_ACRA, !enableCrashReporting)
-                    .apply()
-                val text =
-                    if (enableCrashReporting) R.string.bug_report_settings_off else R.string.bug_report_settings_on
-                crash_reporting_text?.text = getText(text)
-            }
-
-            val enableCrashReporting = !settingsManager.getBoolean(ACRA.PREF_DISABLE_ACRA, true)
-            acra_switch.isChecked = enableCrashReporting
-            crash_reporting_text.text =
-                getText(
-                    if (enableCrashReporting) R.string.bug_report_settings_off else R.string.bug_report_settings_on
+            binding?.apply {
+                listview1.adapter = arrayAdapter
+                listview1.choiceMode = AbsListView.CHOICE_MODE_SINGLE
+                listview1.setItemChecked(
+                    prefValues.indexOf(currentLayout), true
                 )
 
+                listview1.setOnItemClickListener { _, _, position, _ ->
+                    settingsManager.edit()
+                        .putInt(getString(R.string.app_layout_key), prefValues[position])
+                        .apply()
+                    activity?.recreate()
+                }
+                acraSwitch.setOnCheckedChangeListener { _, enableCrashReporting ->
+                    // Use same pref as in settings
+                    settingsManager.edit().putBoolean(ACRA.PREF_DISABLE_ACRA, !enableCrashReporting)
+                        .apply()
+                    val text =
+                        if (enableCrashReporting) R.string.bug_report_settings_off else R.string.bug_report_settings_on
+                    crashReportingText.text = getText(text)
+                }
 
-            next_btt?.setOnClickListener {
-                findNavController().navigate(R.id.navigation_home)
-            }
+                val enableCrashReporting = !settingsManager.getBoolean(ACRA.PREF_DISABLE_ACRA, true)
 
-            prev_btt?.setOnClickListener {
-                findNavController().popBackStack()
+                acraSwitch.isChecked = enableCrashReporting
+                crashReportingText.text =
+                    getText(
+                        if (enableCrashReporting) R.string.bug_report_settings_off else R.string.bug_report_settings_on
+                    )
+
+
+                nextBtt.setOnClickListener {
+                    findNavController().navigate(R.id.navigation_home)
+                }
+
+                prevBtt.setOnClickListener {
+                    findNavController().popBackStack()
+                }
             }
         }
     }
-
-
 }
\ No newline at end of file
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 cfaa4c76..df750d22 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
@@ -10,78 +10,90 @@ import androidx.core.util.forEach
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
+import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 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.Scheduler.Companion.attachBackupListener
 import com.lagradost.cloudstream3.utils.DataStore.getSyncPrefs
 import com.lagradost.cloudstream3.utils.DataStore.removeKey
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
-import kotlinx.android.synthetic.main.fragment_setup_media.listview1
-import kotlinx.android.synthetic.main.fragment_setup_media.next_btt
-import kotlinx.android.synthetic.main.fragment_setup_media.prev_btt
-import kotlinx.android.synthetic.main.fragment_setup_media.setup_root
 
 
 class SetupFragmentMedia : Fragment() {
+    var binding: FragmentSetupMediaBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_setup_media, container, false)
+    ): View {
+        val localBinding = FragmentSetupMediaBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.fragment_setup_media, container, false)
     }
 
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(setup_root)
+        normalSafeApiCall {
+            fixPaddingStatusbar(binding?.setupRoot)
 
-        with(context) {
-            if (this == null) return
-            val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
-                .attachBackupListener(getSyncPrefs()).self
+            val ctx = context ?: return@normalSafeApiCall
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
+                 .attachBackupListener(getSyncPrefs()).self
 
             val arrayAdapter =
-                ArrayAdapter<String>(this, R.layout.sort_bottom_single_choice)
+                ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
             val names = enumValues<TvType>().sorted().map { it.name }
             val selected = mutableListOf<Int>()
 
             arrayAdapter.addAll(names)
-            listview1?.let {
-                it.adapter = arrayAdapter
-                it.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
+            binding?.apply {
+                listview1.let {
+                    it.adapter = arrayAdapter
+                    it.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
 
-                it.setOnItemClickListener { _, _, _, _ ->
-                    it.checkedItemPositions?.forEach { key, value ->
-                        if (value) {
-                            selected.add(key)
-                        } else {
-                            selected.remove(key)
+                    it.setOnItemClickListener { _, _, _, _ ->
+                        it.checkedItemPositions?.forEach { key, value ->
+                            if (value) {
+                                selected.add(key)
+                            } else {
+                                selected.remove(key)
+                            }
                         }
+                        val prefValues = selected.mapNotNull { pos ->
+                            val item =
+                                it.getItemAtPosition(pos)?.toString() ?: return@mapNotNull null
+                            val itemVal = TvType.valueOf(item)
+                            itemVal.ordinal.toString()
+                        }.toSet()
+                        settingsManager.edit()
+                            .putStringSet(getString(R.string.prefer_media_type_key), prefValues)
+                            .apply()
+
+                        // Regenerate set homepage
+                        DataStoreHelper.currentHomePage = null
                     }
-                    val prefValues = selected.mapNotNull { pos ->
-                        val item = it.getItemAtPosition(pos)?.toString() ?: return@mapNotNull null
-                        val itemVal = TvType.valueOf(item)
-                        itemVal.ordinal.toString()
-                    }.toSet()
-                    settingsManager.edit()
-                        .putStringSet(getString(R.string.prefer_media_type_key), prefValues)
-                        .apply()
-
-                    // Regenerate set homepage
-                    removeKey(USER_SELECTED_HOMEPAGE_API)
                 }
-            }
 
-            next_btt?.setOnClickListener {
-                findNavController().navigate(R.id.navigation_setup_media_to_navigation_setup_layout)
-            }
+                nextBtt.setOnClickListener {
+                    findNavController().navigate(R.id.navigation_setup_media_to_navigation_setup_layout)
+                }
 
-            prev_btt?.setOnClickListener {
-                findNavController().popBackStack()
+                prevBtt.setOnClickListener {
+                    findNavController().popBackStack()
+                }
             }
         }
     }
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
index cdd769df..d41f3eb6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
@@ -14,39 +14,48 @@ import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings
 import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.utils.Scheduler.Companion.attachBackupListener
-import com.lagradost.cloudstream3.utils.DataStore.getSyncPrefs
+import com.lagradost.cloudstream3.databinding.FragmentSetupProviderLanguagesBinding
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import kotlinx.android.synthetic.main.fragment_setup_media.listview1
-import kotlinx.android.synthetic.main.fragment_setup_media.next_btt
-import kotlinx.android.synthetic.main.fragment_setup_media.prev_btt
-import kotlinx.android.synthetic.main.fragment_setup_media.setup_root
+import com.lagradost.cloudstream3.utils.Scheduler.Companion.attachBackupListener
+import com.lagradost.cloudstream3.utils.DataStore.getSyncPrefs
 
 class SetupFragmentProviderLanguage : Fragment() {
+    var binding: FragmentSetupProviderLanguagesBinding? = null
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_setup_provider_languages, container, false)
+    ): View {
+        val localBinding = FragmentSetupProviderLanguagesBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.fragment_setup_provider_languages, container, false)
     }
 
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        context?.fixPaddingStatusbar(setup_root)
+        fixPaddingStatusbar(binding?.setupRoot)
 
-        with(context) {
-            if (this == null) return
-            val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+        normalSafeApiCall {
+            val ctx = context ?: return@normalSafeApiCall
+
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
                 .attachBackupListener(getSyncPrefs()).self
 
             val arrayAdapter =
-                ArrayAdapter<String>(this, R.layout.sort_bottom_single_choice)
+                ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
-            val current = this.getApiProviderLangSettings()
-            val langs = APIHolder.apis.map { it.lang }.toSet()
-                .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } + AllLanguagesName
+            val current = ctx.getApiProviderLangSettings()
+            val langs = synchronized(APIHolder.apis) { APIHolder.apis.map { it.lang }.toSet()
+                .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } + AllLanguagesName}
 
             val currentList =
                 current.map { langs.indexOf(it) }.filter { it != -1 } // TODO LOOK INTO
@@ -62,31 +71,31 @@ class SetupFragmentProviderLanguage : Fragment() {
             }
 
             arrayAdapter.addAll(languageNames)
-
-            listview1?.adapter = arrayAdapter
-            listview1?.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
+            binding?.apply {
+            listview1.adapter = arrayAdapter
+            listview1.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
             currentList.forEach {
                 listview1.setItemChecked(it, true)
             }
 
-            listview1?.setOnItemClickListener { _, _, _, _ ->
+            listview1.setOnItemClickListener { _, _, _, _ ->
                 val currentLanguages = mutableListOf<String>()
-                listview1?.checkedItemPositions?.forEach { key, value ->
+                listview1.checkedItemPositions?.forEach { key, value ->
                     if (value) currentLanguages.add(langs[key])
                 }
                 settingsManager.edit().putStringSet(
-                    this.getString(R.string.provider_lang_key),
+                    ctx.getString(R.string.provider_lang_key),
                     currentLanguages.toSet()
                 ).apply()
             }
 
-            next_btt?.setOnClickListener {
+            nextBtt.setOnClickListener {
                 findNavController().navigate(R.id.navigation_setup_provider_languages_to_navigation_setup_media)
             }
 
-            prev_btt?.setOnClickListener {
+            prevBtt.setOnClickListener {
                 findNavController().popBackStack()
-            }
+            } }
         }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt
index 83d134cb..ffb593a0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt
@@ -14,7 +14,7 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.google.android.exoplayer2.text.Cue
+import androidx.media3.common.text.Cue
 import com.google.android.gms.cast.TextTrackStyle
 import com.google.android.gms.cast.TextTrackStyle.*
 import com.jaredrummler.android.colorpicker.ColorPickerDialog
@@ -23,6 +23,7 @@ import com.lagradost.cloudstream3.CommonActivity.onColorSelectedEvent
 import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.ChromecastSubtitleSettingsBinding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.Event
@@ -31,7 +32,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import kotlinx.android.synthetic.main.subtitle_settings.*
 
 const val CHROME_SUBTITLE_KEY = "chome_subtitle_settings"
 
@@ -137,12 +137,21 @@ class ChromecastSubtitlesFragment : Fragment() {
         //subtitle_text?.setStyle(fromSaveToStyle(state))
     }
 
+    var binding : ChromecastSubtitleSettingsBinding? = null
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
-        return inflater.inflate(R.layout.chromecast_subtitle_settings, container, false)
+    ): View {
+        val localBinding = ChromecastSubtitleSettingsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root//inflater.inflate(R.layout.chromecast_subtitle_settings, container, false)
+    }
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
     private lateinit var state: SaveChromeCaptionStyle
@@ -159,7 +168,7 @@ class ChromecastSubtitlesFragment : Fragment() {
         onColorSelectedEvent += ::onColorSelected
         onDialogDismissedEvent += ::onDialogDismissed
 
-        context?.fixPaddingStatusbar(subs_root)
+        fixPaddingStatusbar(binding?.subsRoot)
 
         state = getCurrentSavedStyle()
         context?.updateState()
@@ -185,22 +194,25 @@ class ChromecastSubtitlesFragment : Fragment() {
 
             this.setOnLongClickListener {
                 it.context.setColor(id, null)
-                showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
                 return@setOnLongClickListener true
             }
         }
 
-        subs_text_color.setup(0)
-        subs_outline_color.setup(1)
-        subs_background_color.setup(2)
+        binding?.apply {
+            subsTextColor.setup(0)
+            subsOutlineColor.setup(1)
+            subsBackgroundColor.setup(2)
+        }
+
 
         val dismissCallback = {
             if (hide)
                 activity?.hideSystemUI()
         }
 
-        subs_edge_type.setFocusableInTv()
-        subs_edge_type.setOnClickListener { textView ->
+        binding?.subsEdgeType?.setFocusableInTv()
+        binding?.subsEdgeType?.setOnClickListener { textView ->
             val edgeTypes = listOf(
                 Pair(
                     EDGE_TYPE_NONE,
@@ -237,15 +249,15 @@ class ChromecastSubtitlesFragment : Fragment() {
             }
         }
 
-        subs_edge_type.setOnLongClickListener {
+        binding?.subsEdgeType?.setOnLongClickListener {
             state.edgeType = defaultState.edgeType
             it.context.updateState()
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+            showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
         }
 
-        subs_font_size.setFocusableInTv()
-        subs_font_size.setOnClickListener { textView ->
+        binding?.subsFontSize?.setFocusableInTv()
+        binding?.subsFontSize?.setOnClickListener { textView ->
             val fontSizes = listOf(
                 Pair(0.75f, "75%"),
                 Pair(0.80f, "80%"),
@@ -278,24 +290,26 @@ class ChromecastSubtitlesFragment : Fragment() {
             }
         }
 
-        subs_font_size.setOnLongClickListener { _ ->
+        binding?.subsFontSize?.setOnLongClickListener { _ ->
             state.fontScale = defaultState.fontScale
             //textView.context.updateState() // font size not changed
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+            showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
         }
 
-        subs_font.setFocusableInTv()
-        subs_font.setOnClickListener { textView ->
+
+
+        binding?.subsFont?.setFocusableInTv()
+        binding?.subsFont?.setOnClickListener { textView ->
             val fontTypes = listOf(
-                Pair(null, textView.context.getString(R.string.normal)),
-                Pair("Droid Sans", "Droid Sans"),
-                Pair("Droid Sans Mono", "Droid Sans Mono"),
-                Pair("Droid Serif Regular", "Droid Serif Regular"),
-                Pair("Cutive Mono", "Cutive Mono"),
-                Pair("Short Stack", "Short Stack"),
-                Pair("Quintessential", "Quintessential"),
-                Pair("Alegreya Sans SC", "Alegreya Sans SC"),
+                null to textView.context.getString(R.string.normal),
+                "Droid Sans" to "Droid Sans",
+                "Droid Sans Mono" to "Droid Sans Mono",
+                "Droid Serif Regular" to "Droid Serif Regular",
+                "Cutive Mono" to "Cutive Mono",
+                "Short Stack" to "Short Stack",
+                "Quintessential" to "Quintessential",
+                "Alegreya Sans SC" to "Alegreya Sans SC",
             )
 
             //showBottomDialog
@@ -310,35 +324,35 @@ class ChromecastSubtitlesFragment : Fragment() {
                 textView.context.updateState()
             }
         }
-
-        subs_font.setOnLongClickListener { textView ->
+        binding?.subsFont?.setOnLongClickListener { textView ->
             state.fontFamily = defaultState.fontFamily
             textView.context.updateState()
             showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
         }
 
-        cancel_btt.setOnClickListener {
+        binding?.cancelBtt?.setOnClickListener {
             activity?.popCurrentPage()
         }
 
-        apply_btt.setOnClickListener {
+        binding?.applyBtt?.setOnClickListener {
             it.context.saveStyle(state)
             applyStyleEvent.invoke(state)
             //it.context.fromSaveToStyle(state)
             activity?.popCurrentPage()
         }
-
-        subtitle_text.setCues(
-            listOf(
-                Cue.Builder()
-                    .setTextSize(
-                        getPixels(TypedValue.COMPLEX_UNIT_SP, 25.0f).toFloat(),
-                        Cue.TEXT_SIZE_TYPE_ABSOLUTE
-                    )
-                    .setText(subtitle_text.context.getString(R.string.subtitles_example_text))
-                    .build()
+        binding?.subtitleText?.apply {
+            setCues(
+                listOf(
+                    Cue.Builder()
+                        .setTextSize(
+                            getPixels(TypedValue.COMPLEX_UNIT_SP, 25.0f).toFloat(),
+                            Cue.TEXT_SIZE_TYPE_ABSOLUTE
+                        )
+                        .setText(context.getString(R.string.subtitles_example_text))
+                        .build()
+                )
             )
-        )
+        }
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
index e7319d50..ad3d4b62 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
@@ -18,8 +18,8 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.google.android.exoplayer2.text.Cue
-import com.google.android.exoplayer2.ui.CaptionStyleCompat
+import androidx.media3.common.text.Cue
+import androidx.media3.ui.CaptionStyleCompat
 import com.jaredrummler.android.colorpicker.ColorPickerDialog
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
@@ -27,6 +27,7 @@ import com.lagradost.cloudstream3.CommonActivity.onColorSelectedEvent
 import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.SubtitleSettingsBinding
 import com.lagradost.cloudstream3.utils.Scheduler.Companion.attachBackupListener
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.utils.DataStore.getSyncPrefs
@@ -39,8 +40,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import kotlinx.android.synthetic.main.subtitle_settings.*
-import kotlinx.android.synthetic.main.toast.view.*
 import java.io.File
 
 const val SUBTITLE_KEY = "subtitle_settings"
@@ -186,10 +185,10 @@ class SubtitlesFragment : Fragment() {
     }
 
     private fun Context.updateState() {
-        subtitle_text?.setStyle(fromSaveToStyle(state))
-        val text = subtitle_text.context.getString(R.string.subtitles_example_text)
+        binding?.subtitleText?.setStyle(fromSaveToStyle(state))
+        val text = getString(R.string.subtitles_example_text)
         val fixedText = if (state.upperCase) text.uppercase() else text
-        subtitle_text?.setCues(
+        binding?.subtitleText?.setCues(
             listOf(
                 Cue.Builder()
                     .setTextSize(
@@ -215,12 +214,21 @@ class SubtitlesFragment : Fragment() {
         return if (color == Color.TRANSPARENT) Color.BLACK else color
     }
 
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
+    var binding: SubtitleSettingsBinding? = null
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View? {
-        return inflater.inflate(R.layout.subtitle_settings, container, false)
+        savedInstanceState: Bundle?
+    ): View {
+        val localBinding = SubtitleSettingsBinding.inflate(inflater, container, false)
+        binding = localBinding
+        return localBinding.root
+        //return inflater.inflate(R.layout.subtitle_settings, container, false)
     }
 
     private lateinit var state: SaveCaptionStyle
@@ -236,11 +244,11 @@ class SubtitlesFragment : Fragment() {
         hide = arguments?.getBoolean("hide") ?: true
         onColorSelectedEvent += ::onColorSelected
         onDialogDismissedEvent += ::onDialogDismissed
-        subs_import_text?.text = getString(R.string.subs_import_text).format(
+        binding?.subsImportText?.text = getString(R.string.subs_import_text).format(
             context?.getExternalFilesDir(null)?.absolutePath.toString() + "/Fonts"
         )
 
-        context?.fixPaddingStatusbar(subs_root)
+        fixPaddingStatusbar(binding?.subsRoot)
 
         state = getCurrentSavedStyle()
         context?.updateState()
@@ -266,318 +274,319 @@ class SubtitlesFragment : Fragment() {
 
             this.setOnLongClickListener {
                 it.context.setColor(id, null)
-                showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
                 return@setOnLongClickListener true
             }
         }
+        binding?.apply {
+            subsTextColor.setup(0)
+            subsOutlineColor.setup(1)
+            subsBackgroundColor.setup(2)
+            subsWindowColor.setup(3)
 
-        subs_text_color.setup(0)
-        subs_outline_color.setup(1)
-        subs_background_color.setup(2)
-        subs_window_color.setup(3)
-
-        val dismissCallback = {
-            if (hide)
-                activity?.hideSystemUI()
-        }
-
-        subs_subtitle_elevation.setFocusableInTv()
-        subs_subtitle_elevation.setOnClickListener { textView ->
-            val suffix = "dp"
-            val elevationTypes = listOf(
-                Pair(0, textView.context.getString(R.string.none)),
-                Pair(10, "10$suffix"),
-                Pair(20, "20$suffix"),
-                Pair(30, "30$suffix"),
-                Pair(40, "40$suffix"),
-                Pair(50, "50$suffix"),
-                Pair(60, "60$suffix"),
-                Pair(70, "70$suffix"),
-                Pair(80, "80$suffix"),
-                Pair(90, "90$suffix"),
-                Pair(100, "100$suffix"),
-            )
-
-            //showBottomDialog
-            activity?.showDialog(
-                elevationTypes.map { it.second },
-                elevationTypes.map { it.first }.indexOf(state.elevation),
-                (textView as TextView).text.toString(),
-                false,
-                dismissCallback
-            ) { index ->
-                state.elevation = elevationTypes.map { it.first }[index]
-                textView.context.updateState()
+            val dismissCallback = {
                 if (hide)
                     activity?.hideSystemUI()
             }
-        }
 
-        subs_subtitle_elevation.setOnLongClickListener {
-            state.elevation = DEF_SUBS_ELEVATION
-            it.context.updateState()
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
-            return@setOnLongClickListener true
-        }
+            subsSubtitleElevation.setFocusableInTv()
+            subsSubtitleElevation.setOnClickListener { textView ->
+                val suffix = "dp"
+                val elevationTypes = listOf(
+                    Pair(0, textView.context.getString(R.string.none)),
+                    Pair(10, "10$suffix"),
+                    Pair(20, "20$suffix"),
+                    Pair(30, "30$suffix"),
+                    Pair(40, "40$suffix"),
+                    Pair(50, "50$suffix"),
+                    Pair(60, "60$suffix"),
+                    Pair(70, "70$suffix"),
+                    Pair(80, "80$suffix"),
+                    Pair(90, "90$suffix"),
+                    Pair(100, "100$suffix"),
+                )
 
-        subs_edge_type.setFocusableInTv()
-        subs_edge_type.setOnClickListener { textView ->
-            val edgeTypes = listOf(
-                Pair(
-                    CaptionStyleCompat.EDGE_TYPE_NONE,
-                    textView.context.getString(R.string.subtitles_none)
-                ),
-                Pair(
-                    CaptionStyleCompat.EDGE_TYPE_OUTLINE,
-                    textView.context.getString(R.string.subtitles_outline)
-                ),
-                Pair(
-                    CaptionStyleCompat.EDGE_TYPE_DEPRESSED,
-                    textView.context.getString(R.string.subtitles_depressed)
-                ),
-                Pair(
-                    CaptionStyleCompat.EDGE_TYPE_DROP_SHADOW,
-                    textView.context.getString(R.string.subtitles_shadow)
-                ),
-                Pair(
-                    CaptionStyleCompat.EDGE_TYPE_RAISED,
-                    textView.context.getString(R.string.subtitles_raised)
-                ),
-            )
-
-            //showBottomDialog
-            activity?.showDialog(
-                edgeTypes.map { it.second },
-                edgeTypes.map { it.first }.indexOf(state.edgeType),
-                (textView as TextView).text.toString(),
-                false,
-                dismissCallback
-            ) { index ->
-                state.edgeType = edgeTypes.map { it.first }[index]
-                textView.context.updateState()
-            }
-        }
-
-        subs_edge_type.setOnLongClickListener {
-            state.edgeType = CaptionStyleCompat.EDGE_TYPE_OUTLINE
-            it.context.updateState()
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
-            return@setOnLongClickListener true
-        }
-
-        subs_font_size.setFocusableInTv()
-        subs_font_size.setOnClickListener { textView ->
-            val suffix = "sp"
-            val fontSizes = listOf(
-                Pair(null, textView.context.getString(R.string.normal)),
-                Pair(6f, "6$suffix"),
-                Pair(7f, "7$suffix"),
-                Pair(8f, "8$suffix"),
-                Pair(9f, "9$suffix"),
-                Pair(10f, "10$suffix"),
-                Pair(11f, "11$suffix"),
-                Pair(12f, "12$suffix"),
-                Pair(13f, "13$suffix"),
-                Pair(14f, "14$suffix"),
-                Pair(15f, "15$suffix"),
-                Pair(16f, "16$suffix"),
-                Pair(17f, "17$suffix"),
-                Pair(18f, "18$suffix"),
-                Pair(19f, "19$suffix"),
-                Pair(20f, "20$suffix"),
-                Pair(21f, "21$suffix"),
-                Pair(22f, "22$suffix"),
-                Pair(23f, "23$suffix"),
-                Pair(24f, "24$suffix"),
-                Pair(25f, "25$suffix"),
-                Pair(26f, "26$suffix"),
-                Pair(28f, "28$suffix"),
-                Pair(30f, "30$suffix"),
-                Pair(32f, "32$suffix"),
-                Pair(34f, "34$suffix"),
-                Pair(36f, "36$suffix"),
-                Pair(38f, "38$suffix"),
-                Pair(40f, "40$suffix"),
-                Pair(42f, "42$suffix"),
-                Pair(44f, "44$suffix"),
-                Pair(48f, "48$suffix"),
-                Pair(60f, "60$suffix"),
-            )
-
-            //showBottomDialog
-            activity?.showDialog(
-                fontSizes.map { it.second },
-                fontSizes.map { it.first }.indexOf(state.fixedTextSize),
-                (textView as TextView).text.toString(),
-                false,
-                dismissCallback
-            ) { index ->
-                state.fixedTextSize = fontSizes.map { it.first }[index]
-                //textView.context.updateState() // font size not changed
-            }
-        }
-
-        subtitles_remove_bloat?.isChecked = state.removeBloat
-        subtitles_remove_bloat?.setOnCheckedChangeListener { _, b ->
-            state.removeBloat = b
-        }
-        subtitles_uppercase?.isChecked = state.upperCase
-        subtitles_uppercase?.setOnCheckedChangeListener { _, b ->
-            state.upperCase = b
-            context?.updateState()
-        }
-
-        subtitles_remove_captions?.isChecked = state.removeCaptions
-        subtitles_remove_captions?.setOnCheckedChangeListener { _, b ->
-            state.removeCaptions = b
-        }
-
-        subs_font_size.setOnLongClickListener { _ ->
-            state.fixedTextSize = null
-            //textView.context.updateState() // font size not changed
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
-            return@setOnLongClickListener true
-        }
-
-        //Fetch current value from preference
-        context?.let { ctx ->
-            subtitles_filter_sub_lang?.isChecked =
-                PreferenceManager.getDefaultSharedPreferences(ctx)
-                    .getBoolean(getString(R.string.filter_sub_lang_key), false)
-        }
-
-        subtitles_filter_sub_lang?.setOnCheckedChangeListener { _, b ->
-            context?.let { ctx ->
-                PreferenceManager.getDefaultSharedPreferences(ctx)
-                    .attachBackupListener(ctx.getSyncPrefs()).self
-                    .edit()
-                    .putBoolean(getString(R.string.filter_sub_lang_key), b)
-                    .apply()
-            }
-        }
-
-        subs_font.setFocusableInTv()
-        subs_font.setOnClickListener { textView ->
-            val fontTypes = listOf(
-                Pair(null, textView.context.getString(R.string.normal)),
-                Pair(R.font.trebuchet_ms, "Trebuchet MS"),
-                Pair(R.font.netflix_sans, "Netflix Sans"),
-                Pair(R.font.google_sans, "Google Sans"),
-                Pair(R.font.open_sans, "Open Sans"),
-                Pair(R.font.futura, "Futura"),
-                Pair(R.font.consola, "Consola"),
-                Pair(R.font.gotham, "Gotham"),
-                Pair(R.font.lucida_grande, "Lucida Grande"),
-                Pair(R.font.stix_general, "STIX General"),
-                Pair(R.font.times_new_roman, "Times New Roman"),
-                Pair(R.font.verdana, "Verdana"),
-                Pair(R.font.ubuntu_regular, "Ubuntu"),
-                Pair(R.font.comic_sans, "Comic Sans"),
-                Pair(R.font.poppins_regular, "Poppins"),
-            )
-            val savedFontTypes = textView.context.getSavedFonts()
-
-            val currentIndex =
-                savedFontTypes.indexOfFirst { it.absolutePath == state.typefaceFilePath }
-                    .let { index ->
-                        if (index == -1)
-                            fontTypes.indexOfFirst { it.first == state.typeface }
-                        else index + fontTypes.size
-                    }
-
-            //showBottomDialog
-            activity?.showDialog(
-                fontTypes.map { it.second } + savedFontTypes.map { it.name },
-                currentIndex,
-                (textView as TextView).text.toString(),
-                false,
-                dismissCallback
-            ) { index ->
-                if (index < fontTypes.size) {
-                    state.typeface = fontTypes[index].first
-                    state.typefaceFilePath = null
-                } else {
-                    state.typefaceFilePath = savedFontTypes[index - fontTypes.size].absolutePath
-                    state.typeface = null
+                //showBottomDialog
+                activity?.showDialog(
+                    elevationTypes.map { it.second },
+                    elevationTypes.map { it.first }.indexOf(state.elevation),
+                    (textView as TextView).text.toString(),
+                    false,
+                    dismissCallback
+                ) { index ->
+                    state.elevation = elevationTypes.map { it.first }[index]
+                    textView.context.updateState()
+                    if (hide)
+                        activity?.hideSystemUI()
                 }
+            }
+
+            subsSubtitleElevation.setOnLongClickListener {
+                state.elevation = DEF_SUBS_ELEVATION
+                it.context.updateState()
+                showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                return@setOnLongClickListener true
+            }
+
+            subsEdgeType.setFocusableInTv()
+            subsEdgeType.setOnClickListener { textView ->
+                val edgeTypes = listOf(
+                    Pair(
+                        CaptionStyleCompat.EDGE_TYPE_NONE,
+                        textView.context.getString(R.string.subtitles_none)
+                    ),
+                    Pair(
+                        CaptionStyleCompat.EDGE_TYPE_OUTLINE,
+                        textView.context.getString(R.string.subtitles_outline)
+                    ),
+                    Pair(
+                        CaptionStyleCompat.EDGE_TYPE_DEPRESSED,
+                        textView.context.getString(R.string.subtitles_depressed)
+                    ),
+                    Pair(
+                        CaptionStyleCompat.EDGE_TYPE_DROP_SHADOW,
+                        textView.context.getString(R.string.subtitles_shadow)
+                    ),
+                    Pair(
+                        CaptionStyleCompat.EDGE_TYPE_RAISED,
+                        textView.context.getString(R.string.subtitles_raised)
+                    ),
+                )
+
+                //showBottomDialog
+                activity?.showDialog(
+                    edgeTypes.map { it.second },
+                    edgeTypes.map { it.first }.indexOf(state.edgeType),
+                    (textView as TextView).text.toString(),
+                    false,
+                    dismissCallback
+                ) { index ->
+                    state.edgeType = edgeTypes.map { it.first }[index]
+                    textView.context.updateState()
+                }
+            }
+
+            subsEdgeType.setOnLongClickListener {
+                state.edgeType = CaptionStyleCompat.EDGE_TYPE_OUTLINE
+                it.context.updateState()
+                showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                return@setOnLongClickListener true
+            }
+
+            subsFontSize.setFocusableInTv()
+            subsFontSize.setOnClickListener { textView ->
+                val suffix = "sp"
+                val fontSizes = listOf(
+                    Pair(null, textView.context.getString(R.string.normal)),
+                    Pair(6f, "6$suffix"),
+                    Pair(7f, "7$suffix"),
+                    Pair(8f, "8$suffix"),
+                    Pair(9f, "9$suffix"),
+                    Pair(10f, "10$suffix"),
+                    Pair(11f, "11$suffix"),
+                    Pair(12f, "12$suffix"),
+                    Pair(13f, "13$suffix"),
+                    Pair(14f, "14$suffix"),
+                    Pair(15f, "15$suffix"),
+                    Pair(16f, "16$suffix"),
+                    Pair(17f, "17$suffix"),
+                    Pair(18f, "18$suffix"),
+                    Pair(19f, "19$suffix"),
+                    Pair(20f, "20$suffix"),
+                    Pair(21f, "21$suffix"),
+                    Pair(22f, "22$suffix"),
+                    Pair(23f, "23$suffix"),
+                    Pair(24f, "24$suffix"),
+                    Pair(25f, "25$suffix"),
+                    Pair(26f, "26$suffix"),
+                    Pair(28f, "28$suffix"),
+                    Pair(30f, "30$suffix"),
+                    Pair(32f, "32$suffix"),
+                    Pair(34f, "34$suffix"),
+                    Pair(36f, "36$suffix"),
+                    Pair(38f, "38$suffix"),
+                    Pair(40f, "40$suffix"),
+                    Pair(42f, "42$suffix"),
+                    Pair(44f, "44$suffix"),
+                    Pair(48f, "48$suffix"),
+                    Pair(60f, "60$suffix"),
+                )
+
+                //showBottomDialog
+                activity?.showDialog(
+                    fontSizes.map { it.second },
+                    fontSizes.map { it.first }.indexOf(state.fixedTextSize),
+                    (textView as TextView).text.toString(),
+                    false,
+                    dismissCallback
+                ) { index ->
+                    state.fixedTextSize = fontSizes.map { it.first }[index]
+                    //textView.context.updateState() // font size not changed
+                }
+            }
+
+            subtitlesRemoveBloat.isChecked = state.removeBloat
+            subtitlesRemoveBloat.setOnCheckedChangeListener { _, b ->
+                state.removeBloat = b
+            }
+            subtitlesUppercase.isChecked = state.upperCase
+            subtitlesUppercase.setOnCheckedChangeListener { _, b ->
+                state.upperCase = b
+                context?.updateState()
+            }
+
+            subtitlesRemoveCaptions.isChecked = state.removeCaptions
+            subtitlesRemoveCaptions.setOnCheckedChangeListener { _, b ->
+                state.removeCaptions = b
+            }
+
+            subsFontSize.setOnLongClickListener { _ ->
+                state.fixedTextSize = null
+                //textView.context.updateState() // font size not changed
+                showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                return@setOnLongClickListener true
+            }
+
+            //Fetch current value from preference
+            context?.let { ctx ->
+                subtitlesFilterSubLang.isChecked =
+                    PreferenceManager.getDefaultSharedPreferences(ctx)
+                        .getBoolean(getString(R.string.filter_sub_lang_key), false)
+            }
+
+            subtitlesFilterSubLang.setOnCheckedChangeListener { _, b ->
+                context?.let { ctx ->
+                    PreferenceManager.getDefaultSharedPreferences(ctx)
+                        .attachBackupListener(ctx.getSyncPrefs()).self
+                        .edit()
+                        .putBoolean(getString(R.string.filter_sub_lang_key), b)
+                        .apply()
+                }
+            }
+
+            subsFont.setFocusableInTv()
+            subsFont.setOnClickListener { textView ->
+                val fontTypes = listOf(
+                    Pair(null, textView.context.getString(R.string.normal)),
+                    Pair(R.font.trebuchet_ms, "Trebuchet MS"),
+                    Pair(R.font.netflix_sans, "Netflix Sans"),
+                    Pair(R.font.google_sans, "Google Sans"),
+                    Pair(R.font.open_sans, "Open Sans"),
+                    Pair(R.font.futura, "Futura"),
+                    Pair(R.font.consola, "Consola"),
+                    Pair(R.font.gotham, "Gotham"),
+                    Pair(R.font.lucida_grande, "Lucida Grande"),
+                    Pair(R.font.stix_general, "STIX General"),
+                    Pair(R.font.times_new_roman, "Times New Roman"),
+                    Pair(R.font.verdana, "Verdana"),
+                    Pair(R.font.ubuntu_regular, "Ubuntu"),
+                    Pair(R.font.comic_sans, "Comic Sans"),
+                    Pair(R.font.poppins_regular, "Poppins"),
+                )
+                val savedFontTypes = textView.context.getSavedFonts()
+
+                val currentIndex =
+                    savedFontTypes.indexOfFirst { it.absolutePath == state.typefaceFilePath }
+                        .let { index ->
+                            if (index == -1)
+                                fontTypes.indexOfFirst { it.first == state.typeface }
+                            else index + fontTypes.size
+                        }
+
+                //showBottomDialog
+                activity?.showDialog(
+                    fontTypes.map { it.second } + savedFontTypes.map { it.name },
+                    currentIndex,
+                    (textView as TextView).text.toString(),
+                    false,
+                    dismissCallback
+                ) { index ->
+                    if (index < fontTypes.size) {
+                        state.typeface = fontTypes[index].first
+                        state.typefaceFilePath = null
+                    } else {
+                        state.typefaceFilePath = savedFontTypes[index - fontTypes.size].absolutePath
+                        state.typeface = null
+                    }
+                    textView.context.updateState()
+                }
+            }
+
+            subsFont.setOnLongClickListener { textView ->
+                state.typeface = null
+                state.typefaceFilePath = null
                 textView.context.updateState()
+                showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                return@setOnLongClickListener true
             }
-        }
 
-        subs_font.setOnLongClickListener { textView ->
-            state.typeface = null
-            state.typefaceFilePath = null
-            textView.context.updateState()
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
-            return@setOnLongClickListener true
-        }
+            subsAutoSelectLanguage.setFocusableInTv()
+            subsAutoSelectLanguage.setOnClickListener { textView ->
+                val langMap = arrayListOf(
+                    SubtitleHelper.Language639(
+                        textView.context.getString(R.string.none),
+                        textView.context.getString(R.string.none),
+                        "",
+                        "",
+                        "",
+                        "",
+                        ""
+                    ),
+                )
+                langMap.addAll(SubtitleHelper.languages)
 
-        subs_auto_select_language.setFocusableInTv()
-        subs_auto_select_language.setOnClickListener { textView ->
-            val langMap = arrayListOf(
-                SubtitleHelper.Language639(
-                    textView.context.getString(R.string.none),
-                    textView.context.getString(R.string.none),
-                    "",
-                    "",
-                    "",
-                    "",
-                    ""
-                ),
-            )
-            langMap.addAll(SubtitleHelper.languages)
-
-            val lang639_1 = langMap.map { it.ISO_639_1 }
-            activity?.showDialog(
-                langMap.map { it.languageName },
-                lang639_1.indexOf(getAutoSelectLanguageISO639_1()),
-                (textView as TextView).text.toString(),
-                true,
-                dismissCallback
-            ) { index ->
-                setKey(SUBTITLE_AUTO_SELECT_KEY, lang639_1[index])
+                val lang639_1 = langMap.map { it.ISO_639_1 }
+                activity?.showDialog(
+                    langMap.map { it.languageName },
+                    lang639_1.indexOf(getAutoSelectLanguageISO639_1()),
+                    (textView as TextView).text.toString(),
+                    true,
+                    dismissCallback
+                ) { index ->
+                    setKey(SUBTITLE_AUTO_SELECT_KEY, lang639_1[index])
+                }
             }
-        }
 
-        subs_auto_select_language.setOnLongClickListener {
-            setKey(SUBTITLE_AUTO_SELECT_KEY, "en")
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
-            return@setOnLongClickListener true
-        }
-
-        subs_download_languages.setFocusableInTv()
-        subs_download_languages.setOnClickListener { textView ->
-            val langMap = SubtitleHelper.languages
-            val lang639_1 = langMap.map { it.ISO_639_1 }
-            val keys = getDownloadSubsLanguageISO639_1()
-            val keyMap = keys.map { lang639_1.indexOf(it) }.filter { it >= 0 }
-
-            activity?.showMultiDialog(
-                langMap.map { it.languageName },
-                keyMap,
-                (textView as TextView).text.toString(),
-                dismissCallback
-            ) { indexList ->
-                setKey(SUBTITLE_DOWNLOAD_KEY, indexList.map { lang639_1[it] }.toList())
+            subsAutoSelectLanguage.setOnLongClickListener {
+                setKey(SUBTITLE_AUTO_SELECT_KEY, "en")
+                showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                return@setOnLongClickListener true
             }
-        }
 
-        subs_download_languages.setOnLongClickListener {
-            setKey(SUBTITLE_DOWNLOAD_KEY, listOf("en"))
+            subsDownloadLanguages.setFocusableInTv()
+            subsDownloadLanguages.setOnClickListener { textView ->
+                val langMap = SubtitleHelper.languages
+                val lang639_1 = langMap.map { it.ISO_639_1 }
+                val keys = getDownloadSubsLanguageISO639_1()
+                val keyMap = keys.map { lang639_1.indexOf(it) }.filter { it >= 0 }
 
-            showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
-            return@setOnLongClickListener true
-        }
+                activity?.showMultiDialog(
+                    langMap.map { it.languageName },
+                    keyMap,
+                    (textView as TextView).text.toString(),
+                    dismissCallback
+                ) { indexList ->
+                    setKey(SUBTITLE_DOWNLOAD_KEY, indexList.map { lang639_1[it] }.toList())
+                }
+            }
 
-        cancel_btt.setOnClickListener {
-            activity?.popCurrentPage()
-        }
+            subsDownloadLanguages.setOnLongClickListener {
+                setKey(SUBTITLE_DOWNLOAD_KEY, listOf("en"))
 
-        apply_btt.setOnClickListener {
-            it.context.saveStyle(state)
-            applyStyleEvent.invoke(state)
-            it.context.fromSaveToStyle(state)
-            activity?.popCurrentPage()
+                showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                return@setOnLongClickListener true
+            }
+
+            cancelBtt.setOnClickListener {
+                activity?.popCurrentPage()
+            }
+
+            applyBtt.setOnClickListener {
+                it.context.saveStyle(state)
+                applyStyleEvent.invoke(state)
+                it.context.fromSaveToStyle(state)
+                activity?.popCurrentPage()
+            }
         }
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
index a76b62fd..48917889 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -20,6 +20,9 @@ import android.os.*
 import android.provider.MediaStore
 import android.text.Spanned
 import android.util.Log
+import android.view.View
+import android.view.View.LAYOUT_DIRECTION_LTR
+import android.view.View.LAYOUT_DIRECTION_RTL
 import android.view.animation.DecelerateInterpolator
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
@@ -33,6 +36,7 @@ import androidx.core.widget.ContentLoadingProgressBar
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.findNavController
+import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -47,12 +51,14 @@ import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.gms.common.wrappers.Wrappers
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEvent
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.plugins.RepositoryManager
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringResumeWatching
+import com.lagradost.cloudstream3.syncproviders.providers.Kitsu
 import com.lagradost.cloudstream3.ui.WebviewFragment
 import com.lagradost.cloudstream3.ui.result.ResultFragment
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
@@ -87,6 +93,9 @@ object AppUtils {
         return if (layoutManager == null || adapter == null) false else layoutManager.findLastCompletelyVisibleItemPosition() < adapter.itemCount - 7 // bit more than 1 to make it more seamless
     }
 
+    fun View.isLtr() = this.layoutDirection == LAYOUT_DIRECTION_LTR
+    fun View.isRtl() = this.layoutDirection == LAYOUT_DIRECTION_RTL
+
     fun BottomSheetDialog?.ownHide() {
         this?.hide()
     }
@@ -198,7 +207,11 @@ object AppUtils {
         animation.start()
     }
 
-    fun Context.createNotificationChannel(channelId: String, channelName: String, description: String) {
+    fun Context.createNotificationChannel(
+        channelId: String,
+        channelName: String,
+        description: String
+    ) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val importance = NotificationManager.IMPORTANCE_DEFAULT
             val channel =
@@ -288,6 +301,7 @@ object AppUtils {
 
     // https://github.com/googlearchive/leanback-homescreen-channels/blob/master/app/src/main/java/com/google/android/tvhomescreenchannels/SampleTvProvider.java
     @SuppressLint("RestrictedApi")
+    @Throws
     @WorkerThread
     suspend fun Context.addProgramsToContinueWatching(data: List<DataStoreHelper.ResumeWatchingResult>) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
@@ -369,7 +383,6 @@ object AppUtils {
             )
             main {
                 showToast(
-                    this@loadRepository,
                     getString(R.string.player_loaded_subtitles, repo.name),
                     Toast.LENGTH_LONG
                 )
@@ -577,12 +590,29 @@ object AppUtils {
         }
     }
 
+    fun loadResult(
+        url: String,
+        apiName: String,
+        startAction: Int = 0,
+        startValue: Int = 0
+    ) {
+        (activity as FragmentActivity?)?.loadResult(url, apiName, startAction, startValue)
+    }
+
     fun FragmentActivity.loadResult(
         url: String,
         apiName: String,
         startAction: Int = 0,
         startValue: Int = 0
     ) {
+        try {
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+            Kitsu.isEnabled =
+                settingsManager.getBoolean(this.getString(R.string.show_kitsu_posters_key), true)
+        }catch (t : Throwable) {
+            logError(t)
+        }
+
         this.runOnUiThread {
             // viewModelStore.clear()
             this.navigate(
@@ -592,6 +622,14 @@ object AppUtils {
         }
     }
 
+    fun loadSearchResult(
+        card: SearchResponse,
+        startAction: Int = 0,
+        startValue: Int? = null,
+    ) {
+        activity?.loadSearchResult(card, startAction, startValue)
+    }
+
     fun Activity?.loadSearchResult(
         card: SearchResponse,
         startAction: Int = 0,
@@ -776,12 +814,12 @@ object AppUtils {
         return networkInfo.any {
             conManager.getNetworkCapabilities(it)
                 ?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) == true
-                    } &&
+        } &&
                 !networkInfo.any {
                     conManager.getNetworkCapabilities(it)
                         ?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true
                 }
-        }
+    }
 
 
     private fun Activity?.cacheClass(clazz: String?) {
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 14447113..4e54095e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.utils
 
 import android.annotation.SuppressLint
-import android.content.ContentValues
 import android.content.Context
 import android.net.Uri
 import android.os.Build
@@ -32,6 +31,7 @@ import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_T
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_UNIXTIME_KEY
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_USER_KEY
 import com.lagradost.cloudstream3.syncproviders.providers.OpenSubtitlesApi.Companion.OPEN_SUBTITLES_USER_KEY
+import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getDefaultSharedPrefs
@@ -42,9 +42,9 @@ import com.lagradost.cloudstream3.utils.DataStore.removeKeyRaw
 import com.lagradost.cloudstream3.utils.DataStore.setKeyRaw
 import com.lagradost.cloudstream3.utils.UIHelper.checkWrite
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.getBasePath
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.isDownloadDir
-import java.io.IOException
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.setupStream
+import okhttp3.internal.closeQuietly
+import java.io.OutputStream
 import java.io.PrintWriter
 import java.lang.System.currentTimeMillis
 import java.text.SimpleDateFormat
@@ -226,62 +226,27 @@ object BackupUtils {
     }
 
     @SuppressLint("SimpleDateFormat")
-    fun FragmentActivity.backup() {
+    fun FragmentActivity.backup() = ioSafe {
+        var fileStream: OutputStream? = null
+        var printStream: PrintWriter? = null
         try {
             if (!checkWrite()) {
-                showToast(this, getString(R.string.backup_failed), Toast.LENGTH_LONG)
+                showToast(R.string.backup_failed, Toast.LENGTH_LONG)
                 requestRW()
-                return
+                return@ioSafe
             }
 
-            val subDir = getBasePath().first
             val date = SimpleDateFormat("yyyy_MM_dd_HH_mm").format(Date(currentTimeMillis()))
-            val ext = "json"
+            val ext = "txt"
             val displayName = "CS3_Backup_${date}"
             val backupFile = getBackup()
+            val stream = setupStream(this@backup, displayName, null, ext, false)
 
-            val steam = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
-                && subDir?.isDownloadDir() == true
-            ) {
-                val cr = this.contentResolver
-                val contentUri =
-                    MediaStore.Downloads.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY) // USE INSTEAD OF MediaStore.Downloads.EXTERNAL_CONTENT_URI
-                //val currentMimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-
-                val newFile = ContentValues().apply {
-                    put(MediaStore.MediaColumns.DISPLAY_NAME, displayName)
-                    put(MediaStore.MediaColumns.TITLE, displayName)
-                    // While it a json file we store as txt because not
-                    // all file managers support mimetype json
-                    put(MediaStore.MediaColumns.MIME_TYPE, "text/plain")
-                    //put(MediaStore.MediaColumns.RELATIVE_PATH, folder)
-                }
-
-                val newFileUri = cr.insert(
-                    contentUri,
-                    newFile
-                ) ?: throw IOException("Error creating file uri")
-                cr.openOutputStream(newFileUri, "w")
-                    ?: throw IOException("Error opening stream")
-            } else {
-                val fileName = "$displayName.$ext"
-                val rFile = subDir?.findFile(fileName)
-                if (rFile?.exists() == true) {
-                    rFile.delete()
-                }
-                val file =
-                    subDir?.createFile(fileName)
-                        ?: throw IOException("Error creating file")
-                if (!file.exists()) throw IOException("File does not exist")
-                file.openOutputStream()
-            }
-
-            val printStream = PrintWriter(steam)
+            fileStream = stream.openNew()
+            printStream = PrintWriter(fileStream)
             printStream.print(mapper.writeValueAsString(backupFile))
-            printStream.close()
 
             showToast(
-                this,
                 R.string.backup_success,
                 Toast.LENGTH_LONG
             )
@@ -289,13 +254,15 @@ object BackupUtils {
             logError(e)
             try {
                 showToast(
-                    this,
-                    getString(R.string.backup_failed_error_format).format(e.toString()),
+                    txt(R.string.backup_failed_error_format, e.toString()),
                     Toast.LENGTH_LONG
                 )
             } catch (e: Exception) {
                 logError(e)
             }
+        } finally {
+            printStream?.closeQuietly()
+            fileStream?.closeQuietly()
         }
     }
 
@@ -316,7 +283,6 @@ object BackupUtils {
                             logError(e)
                             main { // smth can fail in .format
                                 showToast(
-                                    activity,
                                     getString(R.string.restore_failed_format).format(e.toString())
                                 )
                             }
@@ -343,7 +309,7 @@ object BackupUtils {
                     )
                 )
             } catch (e: Exception) {
-                showToast(this, e.message)
+                showToast(e.message)
                 logError(e)
             }
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt
index 9e8cc1d4..d8373165 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt
@@ -1,7 +1,7 @@
 package com.lagradost.cloudstream3.utils
 
 import android.net.Uri
-import com.google.android.exoplayer2.util.MimeTypes
+import androidx.media3.common.MimeTypes
 import com.google.android.gms.cast.*
 import com.google.android.gms.cast.framework.CastSession
 import com.google.android.gms.cast.framework.media.RemoteMediaClient
@@ -55,7 +55,11 @@ object CastHelper {
 
         val builder = MediaInfo.Builder(link.url)
             .setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
-            .setContentType(if (link.isM3u8) MimeTypes.APPLICATION_M3U8 else MimeTypes.VIDEO_MP4)
+            .setContentType(when(link.type) {
+                ExtractorLinkType.M3U8 -> MimeTypes.APPLICATION_M3U8
+                ExtractorLinkType.DASH -> MimeTypes.APPLICATION_MPD
+                else -> MimeTypes.VIDEO_MP4
+            })
             .setMetadata(movieMetadata)
             .setMediaTracks(tracks)
         data?.let {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
index 096f76b4..dc9f1835 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
@@ -6,7 +6,12 @@ import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.json.JsonMapper
 import com.fasterxml.jackson.module.kotlin.KotlinModule
+import com.lagradost.cloudstream3.AcraApplication.Companion.getKeyClass
+import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.setKeyClass
 import com.lagradost.cloudstream3.mvvm.logError
+import kotlin.reflect.KClass
+import kotlin.reflect.KProperty
 import com.lagradost.cloudstream3.syncproviders.BackupAPI
 
 const val DOWNLOAD_HEADER_CACHE = "download_header_cache"
@@ -20,6 +25,33 @@ const val USER_PROVIDER_API = "user_custom_sites"
 const val PREFERENCES_NAME = "rebuild_preference"
 const val SYNC_PREFERENCES_NAME = "rebuild_sync_preference"
 
+// TODO degelgate by value for get & set
+
+class PreferenceDelegate<T : Any>(
+    val key: String, val default: T //, private val klass: KClass<T>
+) {
+    private val klass: KClass<out T> = default::class
+    // simple cache to make it not get the key every time it is accessed, however this requires
+    // that ONLY this changes the key
+    private var cache: T? = null
+
+    operator fun getValue(self: Any?, property: KProperty<*>) =
+        cache ?: getKeyClass(key, klass.java).also { newCache -> cache = newCache } ?: default
+
+    operator fun setValue(
+        self: Any?,
+        property: KProperty<*>,
+        t: T?
+    ) {
+        cache = t
+        if (t == null) {
+            removeKey(key)
+        } else {
+            setKeyClass(key, t)
+        }
+    }
+}
+
 object DataStore {
     val mapper: JsonMapper = JsonMapper.builder().addModule(KotlinModule())
         .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
@@ -127,7 +159,7 @@ object DataStore {
     }
 
     fun Context.removeKeys(folder: String): Int {
-        val keys = getKeys(folder)
+        val keys = getKeys("$folder/")
         keys.forEach { value ->
             removeKey(value)
         }
@@ -158,6 +190,15 @@ object DataStore {
         }
     }
 
+    fun <T> Context.getKey(path: String, valueType: Class<T>): T? {
+        try {
+            val json: String = getSharedPrefs().getString(path, null) ?: return null
+            return json.toKotlinObject(valueType)
+        } catch (e: Exception) {
+            return null
+        }
+    }
+
     fun <T> Context.setKey(folder: String, path: String, value: T) {
         setKey(getFolderName(folder, path), value)
     }
@@ -167,6 +208,10 @@ object DataStore {
         return mapper.readValue(this, T::class.java)
     }
 
+    fun <T> String.toKotlinObject(valueType: Class<T>): T {
+        return mapper.readValue(this, valueType)
+    }
+
     // GET KEY GIVEN PATH AND DEFAULT VALUE, NULL IF ERROR
     inline fun <reified T : Any> Context.getKey(path: String, defVal: T?): T? {
         try {
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 3bdb64e1..7bce1b6c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
@@ -1,6 +1,14 @@
 package com.lagradost.cloudstream3.utils
 
+import android.content.Context
+import android.content.DialogInterface
+import android.text.Editable
+import android.view.LayoutInflater
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isGone
+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.unixTimeMS
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
@@ -8,10 +16,21 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys
 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.CommonActivity.showToast
+import com.lagradost.cloudstream3.databinding.WhoIsWatchingAccountEditBinding
+import com.lagradost.cloudstream3.databinding.WhoIsWatchingBinding
+import com.lagradost.cloudstream3.mvvm.logError
 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.result.FOCUS_SELF
+import com.lagradost.cloudstream3.ui.result.UiImage
 import com.lagradost.cloudstream3.ui.result.VideoWatchState
+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
 
 const val VIDEO_POS_DUR = "video_pos_dur"
 const val VIDEO_WATCH_STATE = "video_watch_state"
@@ -26,6 +45,226 @@ const val RESULT_SEASON = "result_season"
 const val RESULT_DUB = "result_dub"
 
 object DataStoreHelper {
+    // be aware, don't change the index of these as Account uses the index for the art
+    private val profileImages = arrayOf(
+        R.drawable.profile_bg_dark_blue,
+        R.drawable.profile_bg_blue,
+        R.drawable.profile_bg_orange,
+        R.drawable.profile_bg_pink,
+        R.drawable.profile_bg_purple,
+        R.drawable.profile_bg_red,
+        R.drawable.profile_bg_teal
+    )
+
+    data class Account(
+        @JsonProperty("keyIndex")
+        val keyIndex: Int,
+        @JsonProperty("name")
+        val name: String,
+        @JsonProperty("customImage")
+        val customImage: String? = null,
+        @JsonProperty("defaultImageIndex")
+        val defaultImageIndex: Int,
+    ) {
+        val image: UiImage
+            get() = customImage?.let { UiImage.Image(it) } ?: UiImage.Drawable(
+                profileImages.getOrNull(defaultImageIndex) ?: profileImages.first()
+            )
+    }
+
+    const val TAG = "data_store_helper"
+    private var accounts by PreferenceDelegate("$TAG/account", arrayOf<Account>())
+    var selectedKeyIndex by PreferenceDelegate("$TAG/account_key_index", 0)
+    val currentAccount: String get() = selectedKeyIndex.toString()
+
+    /**
+     * 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) {
+        val binding =
+            WhoIsWatchingAccountEditBinding.inflate(LayoutInflater.from(context), null, false)
+        val builder =
+            AlertDialog.Builder(context, R.style.AlertDialogCustom)
+                .setView(binding.root)
+
+        var currentEditAccount = account
+        val dialog = builder.show()
+        binding.accountName.text = Editable.Factory.getInstance()?.newEditable(account.name)
+        binding.accountName.doOnTextChanged { text, _, _, _ ->
+            currentEditAccount = currentEditAccount.copy(name = text?.toString() ?: "")
+        }
+
+        binding.deleteBtt.isGone = isNewAccount
+        binding.deleteBtt.setOnClickListener {
+            val dialogClickListener =
+                DialogInterface.OnClickListener { _, which ->
+                    when (which) {
+                        DialogInterface.BUTTON_POSITIVE -> {
+                            // remove all keys as well as the account, note that default wont get
+                            // deleted from currentAccounts, as it is not part of "accounts",
+                            // but the watch keys will
+                            removeKeys(account.keyIndex.toString())
+                            val currentAccounts = accounts.toMutableList()
+                            currentAccounts.removeIf { it.keyIndex == account.keyIndex }
+                            accounts = currentAccounts.toTypedArray()
+
+                            // update UI
+                            setAccount(getDefaultAccount(context), true)
+                            MainActivity.bookmarksUpdatedEvent(true)
+                            dialog?.dismissSafe()
+                        }
+
+                        DialogInterface.BUTTON_NEGATIVE -> {}
+                    }
+                }
+
+            try {
+                AlertDialog.Builder(context).setTitle(R.string.delete).setMessage(
+                    context.getString(R.string.delete_message).format(
+                        currentEditAccount.name
+                    )
+                )
+                    .setPositiveButton(R.string.delete, dialogClickListener)
+                    .setNegativeButton(R.string.cancel, dialogClickListener)
+                    .show().setDefaultFocus()
+            } catch (t: Throwable) {
+                logError(t)
+                // ye you somehow fucked up formatting did you?
+            }
+        }
+
+        binding.cancelBtt.setOnClickListener {
+            dialog?.dismissSafe()
+        }
+
+        binding.profilePic.setImage(account.image)
+        binding.profilePic.setOnClickListener {
+            // rolls the image forwards once
+            currentEditAccount =
+                currentEditAccount.copy(defaultImageIndex = (currentEditAccount.defaultImageIndex + 1) % profileImages.size)
+            binding.profilePic.setImage(currentEditAccount.image)
+        }
+
+        binding.applyBtt.setOnClickListener {
+            val currentAccounts = accounts.toMutableList()
+
+            val overrideIndex =
+                currentAccounts.indexOfFirst { it.keyIndex == currentEditAccount.keyIndex }
+
+            // if an account is found that has the same keyIndex then override that one, if not then append it
+            if (overrideIndex != -1) {
+                currentAccounts[overrideIndex] = currentEditAccount
+            } else {
+                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, false)
+            DataStoreHelper.currentHomePage = currentHomePage
+
+            accounts = currentAccounts.toTypedArray()
+
+            dialog.dismissSafe()
+        }
+    }
+
+    private fun getDefaultAccount(context: Context): Account {
+        return accounts.let { currentAccounts ->
+            currentAccounts.getOrNull(currentAccounts.indexOfFirst { it.keyIndex == 0 }) ?: Account(
+                keyIndex = 0,
+                name = context.getString(R.string.default_account),
+                defaultImageIndex = 0
+            )
+        }
+    }
+
+    fun showWhoIsWatching(context: Context) {
+        val binding: WhoIsWatchingBinding = WhoIsWatchingBinding.inflate(
+            LayoutInflater.from(context)
+        )
+
+        val showAccount = accounts.toMutableList().apply {
+            val item = getDefaultAccount(context)
+            remove(item)
+            add(0, item)
+        }
+
+        val builder =
+            BottomSheetDialog(context)
+        builder.setContentView(binding.root)
+        val accountName = context.getString(R.string.account)
+
+        binding.profilesRecyclerview.setLinearListLayout(
+            isHorizontal = true,
+            nextUp = FOCUS_SELF,
+            nextDown = FOCUS_SELF,
+            nextLeft = FOCUS_SELF,
+            nextRight = FOCUS_SELF
+        )
+        binding.profilesRecyclerview.adapter = WhoIsWatchingAdapter(
+            selectCallBack = { account ->
+                setAccount(account, true)
+                builder.dismissSafe()
+            },
+            addAccountCallback = {
+                val currentAccounts = accounts
+                val remainingImages =
+                    profileImages.toSet() - currentAccounts.filter { it.customImage == null }
+                        .mapNotNull { profileImages.getOrNull(it.defaultImageIndex) }.toSet()
+                val image =
+                    profileImages.indexOf(remainingImages.randomOrNull() ?: profileImages.random())
+                val keyIndex = (currentAccounts.maxOfOrNull { it.keyIndex } ?: 0) + 1
+
+                // create a new dummy account
+                editAccount(
+                    context,
+                    Account(
+                        keyIndex = keyIndex,
+                        name = "$accountName $keyIndex",
+                        customImage = null,
+                        defaultImageIndex = image
+                    ), isNewAccount = true
+                )
+                builder.dismissSafe()
+            },
+            editCallBack = { account ->
+                editAccount(
+                    context, account, isNewAccount = false
+                )
+                builder.dismissSafe()
+            }
+        ).apply {
+            submitList(showAccount)
+        }
+
+        builder.show()
+    }
+
+
     data class PosDur(
         @JsonProperty("position") val position: Long,
         @JsonProperty("duration") val duration: Long
@@ -117,7 +356,6 @@ object DataStoreHelper {
     /**
      * A datastore wide account for future implementations of a multiple account system
      **/
-    var currentAccount: String = "0" //TODO ACCOUNT IMPLEMENTATION
 
     fun getAllWatchStateIds(): List<Int>? {
         val folder = "$currentAccount/$RESULT_WATCH_STATE"
@@ -138,6 +376,12 @@ object DataStoreHelper {
         removeKeys(folder2)
     }
 
+    fun deleteBookmarkedData(id: Int?) {
+        if (id == null) return
+        removeKey("$currentAccount/$RESULT_WATCH_STATE", id.toString())
+        removeKey("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString())
+    }
+
     fun getAllResumeStateIds(): List<Int>? {
         val folder = "$currentAccount/$RESULT_RESUME_WATCHING"
         return getKeys(folder)?.mapNotNull {
@@ -304,12 +548,10 @@ object DataStoreHelper {
 
     fun setResultWatchState(id: Int?, status: Int) {
         if (id == null) return
-        val folder = "$currentAccount/$RESULT_WATCH_STATE"
         if (status == WatchType.NONE.internalId) {
-            removeKey(folder, id.toString())
-            removeKey("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString())
+            deleteBookmarkedData(id)
         } else {
-            setKey(folder, id.toString(), status)
+            setKey("$currentAccount/$RESULT_WATCH_STATE", id.toString(), status)
         }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt
index c1eb649b..421e4420 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt
@@ -7,6 +7,7 @@ import androidx.work.ForegroundInfo
 import androidx.work.WorkerParameters
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 import com.lagradost.cloudstream3.mvvm.logError
+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.VideoDownloadManager.WORK_KEY_INFO
@@ -15,6 +16,7 @@ import com.lagradost.cloudstream3.utils.VideoDownloadManager.downloadCheck
 import com.lagradost.cloudstream3.utils.VideoDownloadManager.downloadEpisode
 import com.lagradost.cloudstream3.utils.VideoDownloadManager.downloadFromResume
 import com.lagradost.cloudstream3.utils.VideoDownloadManager.downloadStatusEvent
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.getDownloadResumePackage
 import kotlinx.coroutines.delay
 
 const val DOWNLOAD_CHECK = "DownloadCheck"
@@ -25,28 +27,32 @@ class DownloadFileWorkManager(val context: Context, private val workerParams: Wo
     override suspend fun doWork(): Result {
         val key = workerParams.inputData.getString("key")
         try {
-            println("KEY $key")
             if (key == DOWNLOAD_CHECK) {
-                downloadCheck(applicationContext, ::handleNotification)?.let {
-                    awaitDownload(it)
-                }
+                downloadCheck(applicationContext, ::handleNotification)
             } else if (key != null) {
-                val info = applicationContext.getKey<VideoDownloadManager.DownloadInfo>(WORK_KEY_INFO, key)
+                val info =
+                    applicationContext.getKey<VideoDownloadManager.DownloadInfo>(WORK_KEY_INFO, key)
                 val pkg =
-                    applicationContext.getKey<VideoDownloadManager.DownloadResumePackage>(WORK_KEY_PACKAGE, key)
-                if (info != null) {
-                    downloadEpisode(
-                        applicationContext,
-                        info.source,
-                        info.folder,
-                        info.ep,
-                        info.links,
-                        ::handleNotification
+                    applicationContext.getKey<VideoDownloadManager.DownloadResumePackage>(
+                        WORK_KEY_PACKAGE,
+                        key
                     )
-                    awaitDownload(info.ep.id)
+
+                if (info != null) {
+                    getDownloadResumePackage(applicationContext, info.ep.id)?.let { dpkg ->
+                        downloadFromResume(applicationContext, dpkg, ::handleNotification)
+                    } ?: run {
+                        downloadEpisode(
+                            applicationContext,
+                            info.source,
+                            info.folder,
+                            info.ep,
+                            info.links,
+                            ::handleNotification
+                        )
+                    }
                 } else if (pkg != null) {
                     downloadFromResume(applicationContext, pkg, ::handleNotification)
-                    awaitDownload(pkg.item.ep.id)
                 }
                 removeKeys(key)
             }
@@ -73,6 +79,7 @@ class DownloadFileWorkManager(val context: Context, private val workerParams: Wo
                     VideoDownloadManager.DownloadType.IsDone, VideoDownloadManager.DownloadType.IsFailed, VideoDownloadManager.DownloadType.IsStopped -> {
                         isDone = true
                     }
+
                     else -> Unit
                 }
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt
index 26f83d1e..57a5f8e4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt
@@ -3,6 +3,8 @@ package com.lagradost.cloudstream3.utils
 class Event<T> {
     private val observers = mutableSetOf<(T) -> Unit>()
 
+    val size : Int get() = observers.size
+
     operator fun plusAssign(observer: (T) -> Unit) {
         observers.add(observer)
     }
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 f6373dce..5edff7a1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -1,12 +1,204 @@
 package com.lagradost.cloudstream3.utils
 
 import android.net.Uri
-import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.AStreamHub
+import com.lagradost.cloudstream3.extractors.Acefile
+import com.lagradost.cloudstream3.extractors.Ahvsh
+import com.lagradost.cloudstream3.extractors.Aico
+import com.lagradost.cloudstream3.extractors.AsianLoad
+import com.lagradost.cloudstream3.extractors.Bestx
+import com.lagradost.cloudstream3.extractors.Blogger
+import com.lagradost.cloudstream3.extractors.BullStream
+import com.lagradost.cloudstream3.extractors.ByteShare
+import com.lagradost.cloudstream3.extractors.Cda
+import com.lagradost.cloudstream3.extractors.Cdnplayer
+import com.lagradost.cloudstream3.extractors.Chillx
+import com.lagradost.cloudstream3.extractors.CineGrabber
+import com.lagradost.cloudstream3.extractors.Cinestart
+import com.lagradost.cloudstream3.extractors.DBfilm
+import com.lagradost.cloudstream3.extractors.Dailymotion
+import com.lagradost.cloudstream3.extractors.DatabaseGdrive
+import com.lagradost.cloudstream3.extractors.DatabaseGdrive2
+import com.lagradost.cloudstream3.extractors.DesuArcg
+import com.lagradost.cloudstream3.extractors.DesuDrive
+import com.lagradost.cloudstream3.extractors.DesuOdchan
+import com.lagradost.cloudstream3.extractors.DesuOdvip
+import com.lagradost.cloudstream3.extractors.Dokicloud
+import com.lagradost.cloudstream3.extractors.DoodCxExtractor
+import com.lagradost.cloudstream3.extractors.DoodLaExtractor
+import com.lagradost.cloudstream3.extractors.DoodPmExtractor
+import com.lagradost.cloudstream3.extractors.DoodShExtractor
+import com.lagradost.cloudstream3.extractors.DoodSoExtractor
+import com.lagradost.cloudstream3.extractors.DoodToExtractor
+import com.lagradost.cloudstream3.extractors.DoodWatchExtractor
+import com.lagradost.cloudstream3.extractors.DoodWfExtractor
+import com.lagradost.cloudstream3.extractors.DoodWsExtractor
+import com.lagradost.cloudstream3.extractors.DoodYtExtractor
+import com.lagradost.cloudstream3.extractors.Dooood
+import com.lagradost.cloudstream3.extractors.Embedgram
+import com.lagradost.cloudstream3.extractors.Evoload
+import com.lagradost.cloudstream3.extractors.Evoload1
+import com.lagradost.cloudstream3.extractors.FEmbed
+import com.lagradost.cloudstream3.extractors.FEnet
+import com.lagradost.cloudstream3.extractors.Fastream
+import com.lagradost.cloudstream3.extractors.FeHD
+import com.lagradost.cloudstream3.extractors.Fembed9hd
+import com.lagradost.cloudstream3.extractors.FileMoon
+import com.lagradost.cloudstream3.extractors.FileMoonIn
+import com.lagradost.cloudstream3.extractors.FileMoonSx
+import com.lagradost.cloudstream3.extractors.Filesim
+import com.lagradost.cloudstream3.extractors.Fplayer
+import com.lagradost.cloudstream3.extractors.GMPlayer
+import com.lagradost.cloudstream3.extractors.Gdriveplayer
+import com.lagradost.cloudstream3.extractors.Gdriveplayerapi
+import com.lagradost.cloudstream3.extractors.Gdriveplayerapp
+import com.lagradost.cloudstream3.extractors.Gdriveplayerbiz
+import com.lagradost.cloudstream3.extractors.Gdriveplayerco
+import com.lagradost.cloudstream3.extractors.Gdriveplayerfun
+import com.lagradost.cloudstream3.extractors.Gdriveplayerio
+import com.lagradost.cloudstream3.extractors.Gdriveplayerme
+import com.lagradost.cloudstream3.extractors.Gdriveplayerorg
+import com.lagradost.cloudstream3.extractors.Gdriveplayerus
+import com.lagradost.cloudstream3.extractors.Gofile
+import com.lagradost.cloudstream3.extractors.GuardareStream
+import com.lagradost.cloudstream3.extractors.Guccihide
+import com.lagradost.cloudstream3.extractors.Hxfile
+import com.lagradost.cloudstream3.extractors.JWPlayer
+import com.lagradost.cloudstream3.extractors.Jawcloud
+import com.lagradost.cloudstream3.extractors.Jeniusplay
+import com.lagradost.cloudstream3.extractors.Keephealth
+import com.lagradost.cloudstream3.extractors.KotakAnimeid
+import com.lagradost.cloudstream3.extractors.Kotakajair
+import com.lagradost.cloudstream3.extractors.Krakenfiles
+import com.lagradost.cloudstream3.extractors.LayarKaca
+import com.lagradost.cloudstream3.extractors.Linkbox
+import com.lagradost.cloudstream3.extractors.Luxubu
+import com.lagradost.cloudstream3.extractors.Lvturbo
+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.MixDrop
+import com.lagradost.cloudstream3.extractors.MixDropBz
+import com.lagradost.cloudstream3.extractors.MixDropCh
+import com.lagradost.cloudstream3.extractors.MixDropTo
+import com.lagradost.cloudstream3.extractors.Movhide
+import com.lagradost.cloudstream3.extractors.Moviehab
+import com.lagradost.cloudstream3.extractors.MoviehabNet
+import com.lagradost.cloudstream3.extractors.Moviesapi
+import com.lagradost.cloudstream3.extractors.Moviesm4u
+import com.lagradost.cloudstream3.extractors.Mp4Upload
+import com.lagradost.cloudstream3.extractors.Mvidoo
+import com.lagradost.cloudstream3.extractors.MwvnVizcloudInfo
+import com.lagradost.cloudstream3.extractors.Neonime7n
+import com.lagradost.cloudstream3.extractors.Neonime8n
+import com.lagradost.cloudstream3.extractors.OkRu
+import com.lagradost.cloudstream3.extractors.OkRuHttps
+import com.lagradost.cloudstream3.extractors.Okrulink
+import com.lagradost.cloudstream3.extractors.Pixeldrain
+import com.lagradost.cloudstream3.extractors.PlayLtXyz
+import com.lagradost.cloudstream3.extractors.PlayerVoxzer
+import com.lagradost.cloudstream3.extractors.Rabbitstream
+import com.lagradost.cloudstream3.extractors.Rasacintaku
+import com.lagradost.cloudstream3.extractors.SBfull
+import com.lagradost.cloudstream3.extractors.Sbasian
+import com.lagradost.cloudstream3.extractors.Sbface
+import com.lagradost.cloudstream3.extractors.Sbflix
+import com.lagradost.cloudstream3.extractors.Sblona
+import com.lagradost.cloudstream3.extractors.Sblongvu
+import com.lagradost.cloudstream3.extractors.Sbnet
+import com.lagradost.cloudstream3.extractors.Sbrapid
+import com.lagradost.cloudstream3.extractors.Sbsonic
+import com.lagradost.cloudstream3.extractors.Sbspeed
+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
+import com.lagradost.cloudstream3.extractors.StreamSB1
+import com.lagradost.cloudstream3.extractors.StreamSB10
+import com.lagradost.cloudstream3.extractors.StreamSB11
+import com.lagradost.cloudstream3.extractors.StreamSB2
+import com.lagradost.cloudstream3.extractors.StreamSB3
+import com.lagradost.cloudstream3.extractors.StreamSB4
+import com.lagradost.cloudstream3.extractors.StreamSB5
+import com.lagradost.cloudstream3.extractors.StreamSB6
+import com.lagradost.cloudstream3.extractors.StreamSB7
+import com.lagradost.cloudstream3.extractors.StreamSB8
+import com.lagradost.cloudstream3.extractors.StreamSB9
+import com.lagradost.cloudstream3.extractors.StreamTape
+import com.lagradost.cloudstream3.extractors.StreamTapeNet
+import com.lagradost.cloudstream3.extractors.StreamhideCom
+import com.lagradost.cloudstream3.extractors.StreamhideTo
+import com.lagradost.cloudstream3.extractors.Streamhub2
+import com.lagradost.cloudstream3.extractors.Streamlare
+import com.lagradost.cloudstream3.extractors.StreamoUpload
+import com.lagradost.cloudstream3.extractors.Streamplay
+import com.lagradost.cloudstream3.extractors.Streamsss
+import com.lagradost.cloudstream3.extractors.Supervideo
+import com.lagradost.cloudstream3.extractors.Tantifilm
+import com.lagradost.cloudstream3.extractors.Tomatomatela
+import com.lagradost.cloudstream3.extractors.TomatomatelalClub
+import com.lagradost.cloudstream3.extractors.Tubeless
+import com.lagradost.cloudstream3.extractors.Upstream
+import com.lagradost.cloudstream3.extractors.UpstreamExtractor
+import com.lagradost.cloudstream3.extractors.Uqload
+import com.lagradost.cloudstream3.extractors.Uqload1
+import com.lagradost.cloudstream3.extractors.Uqload2
+import com.lagradost.cloudstream3.extractors.Userload
+import com.lagradost.cloudstream3.extractors.Userscloud
+import com.lagradost.cloudstream3.extractors.Uservideo
+import com.lagradost.cloudstream3.extractors.Vanfem
+import com.lagradost.cloudstream3.extractors.Vicloud
+import com.lagradost.cloudstream3.extractors.VidSrcExtractor
+import com.lagradost.cloudstream3.extractors.VidSrcExtractor2
+import com.lagradost.cloudstream3.extractors.VideoVard
+import com.lagradost.cloudstream3.extractors.VideovardSX
+import com.lagradost.cloudstream3.extractors.Vidgomunime
+import com.lagradost.cloudstream3.extractors.Vidgomunimesb
+import com.lagradost.cloudstream3.extractors.Vidmoly
+import com.lagradost.cloudstream3.extractors.Vidmolyme
+import com.lagradost.cloudstream3.extractors.Vido
+import com.lagradost.cloudstream3.extractors.Vidstreamz
+import com.lagradost.cloudstream3.extractors.Vizcloud
+import com.lagradost.cloudstream3.extractors.Vizcloud2
+import com.lagradost.cloudstream3.extractors.VizcloudCloud
+import com.lagradost.cloudstream3.extractors.VizcloudDigital
+import com.lagradost.cloudstream3.extractors.VizcloudInfo
+import com.lagradost.cloudstream3.extractors.VizcloudLive
+import com.lagradost.cloudstream3.extractors.VizcloudOnline
+import com.lagradost.cloudstream3.extractors.VizcloudSite
+import com.lagradost.cloudstream3.extractors.VizcloudXyz
+import com.lagradost.cloudstream3.extractors.Voe
+import com.lagradost.cloudstream3.extractors.Watchx
+import com.lagradost.cloudstream3.extractors.WcoStream
+import com.lagradost.cloudstream3.extractors.Wibufile
+import com.lagradost.cloudstream3.extractors.XStreamCdn
+import com.lagradost.cloudstream3.extractors.YourUpload
+import com.lagradost.cloudstream3.extractors.YoutubeExtractor
+import com.lagradost.cloudstream3.extractors.YoutubeMobileExtractor
+import com.lagradost.cloudstream3.extractors.YoutubeNoCookieExtractor
+import com.lagradost.cloudstream3.extractors.YoutubeShortLinkExtractor
+import com.lagradost.cloudstream3.extractors.Yufiles
+import com.lagradost.cloudstream3.extractors.Zorofile
+import com.lagradost.cloudstream3.extractors.Zplayer
+import com.lagradost.cloudstream3.extractors.ZplayerV2
+import com.lagradost.cloudstream3.extractors.Ztreamhub
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.extractors.*
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import kotlinx.coroutines.delay
 import org.jsoup.Jsoup
-import kotlin.collections.MutableList
+import java.net.URL
+import java.util.UUID
 
 /**
  * For use in the ConcatenatingMediaSource.
@@ -35,22 +227,144 @@ data class ExtractorLinkPlayList(
     val playlist: List<PlayListItem>,
     override val referer: String,
     override val quality: Int,
-    override val isM3u8: Boolean = false,
     override val headers: Map<String, String> = mapOf(),
     /** Used for getExtractorVerifierJob() */
     override val extractorData: String? = null,
+    override val type: ExtractorLinkType,
 ) : ExtractorLink(
-    source,
-    name,
-    // Blank as un-used
-    "",
-    referer,
-    quality,
-    isM3u8,
-    headers,
-    extractorData
-)
+    source = source,
+    name = name,
+    url = "",
+    referer = referer,
+    quality = quality,
+    headers = headers,
+    extractorData = extractorData,
+    type = type
+) {
+    constructor(
+        source: String,
+        name: String,
+        playlist: List<PlayListItem>,
+        referer: String,
+        quality: Int,
+        isM3u8: Boolean = false,
+        headers: Map<String, String> = mapOf(),
+        extractorData: String? = null,
+    ) : this(
+        source = source,
+        name = name,
+        playlist = playlist,
+        referer = referer,
+        quality = quality,
+        type = if (isM3u8) ExtractorLinkType.M3U8 else ExtractorLinkType.VIDEO,
+        headers = headers,
+        extractorData = extractorData,
+    )
+}
 
+/** Metadata about the file type used for downloads and exoplayer hint,
+ * if you respond with the wrong one the file will fail to download or be played */
+enum class ExtractorLinkType {
+    /** Single stream of bytes no matter the actual file type */
+    VIDEO,
+    /** Split into several .ts files, has support for encrypted m3u8s */
+    M3U8,
+    /** Like m3u8 but uses xml, currently no download support */
+    DASH,
+    /** No support at the moment */
+    TORRENT,
+    /** No support at the moment */
+    MAGNET,
+}
+
+private fun inferTypeFromUrl(url: String): ExtractorLinkType {
+    val path = normalSafeApiCall { URL(url).path }
+    return when {
+        path?.endsWith(".m3u8") == true -> ExtractorLinkType.M3U8
+        path?.endsWith(".mpd") == true -> ExtractorLinkType.DASH
+        path?.endsWith(".torrent") == true -> ExtractorLinkType.TORRENT
+        url.startsWith("magnet:") -> ExtractorLinkType.MAGNET
+        else -> ExtractorLinkType.VIDEO
+    }
+}
+val INFER_TYPE : ExtractorLinkType? = null
+
+/**
+ * UUID for the ClearKey DRM scheme.
+ *
+ *
+ * ClearKey is supported on Android devices running Android 5.0 (API Level 21) and up.
+ */
+val CLEARKEY_UUID = UUID(-0x1d8e62a7567a4c37L, 0x781AB030AF78D30EL)
+
+/**
+ * UUID for the Widevine DRM scheme.
+ *
+ *
+ * Widevine is supported on Android devices running Android 4.3 (API Level 18) and up.
+ */
+val WIDEVINE_UUID = UUID(-0x121074568629b532L, -0x5c37d8232ae2de13L)
+
+/**
+ * UUID for the PlayReady DRM scheme.
+ *
+ *
+ * PlayReady is supported on all AndroidTV devices. Note that most other Android devices do not
+ * provide PlayReady support.
+ */
+val PLAYREADY_UUID = UUID(-0x65fb0f8667bfbd7aL, -0x546d19a41f77a06bL)
+
+open class DrmExtractorLink private constructor(
+    override val source: String,
+    override val name: String,
+    override val url: String,
+    override val referer: String,
+    override val quality: Int,
+    override val headers: Map<String, String> = mapOf(),
+    /** Used for getExtractorVerifierJob() */
+    override val extractorData: String? = null,
+    override val type: ExtractorLinkType,
+    open val kid : String,
+    open val key : String,
+    open val uuid : UUID,
+    open val kty : String,
+
+    open val keyRequestParameters : HashMap<String, String>
+) : ExtractorLink(
+    source, name, url, referer, quality, type, headers, extractorData
+) {
+    constructor(
+        source: String,
+        name: String,
+        url: String,
+        referer: String,
+        quality: Int,
+        /** the type of the media, use INFER_TYPE if you want to auto infer the type from the url */
+        type: ExtractorLinkType?,
+        headers: Map<String, String> = mapOf(),
+        /** Used for getExtractorVerifierJob() */
+        extractorData: String? = null,
+        kid : String,
+        key : String,
+        uuid : UUID = CLEARKEY_UUID,
+        kty : String = "oct",
+        keyRequestParameters : HashMap<String, String> = hashMapOf(),
+    ) : this(
+        source = source,
+        name = name,
+        url = url,
+        referer = referer,
+        quality = quality,
+        headers = headers,
+        extractorData = extractorData,
+        type = type ?: inferTypeFromUrl(url),
+        kid = kid,
+        key = key,
+        uuid = uuid,
+        keyRequestParameters = keyRequestParameters,
+        kty = kty,
+    )
+}
 
 open class ExtractorLink constructor(
     open val source: String,
@@ -58,12 +372,36 @@ open class ExtractorLink constructor(
     override val url: String,
     override val referer: String,
     open val quality: Int,
-    open val isM3u8: Boolean = false,
     override val headers: Map<String, String> = mapOf(),
     /** Used for getExtractorVerifierJob() */
     open val extractorData: String? = null,
-    open val isDash: Boolean = false,
+    open val type: ExtractorLinkType,
 ) : VideoDownloadManager.IDownloadableMinimum {
+    val isM3u8 : Boolean get() = type == ExtractorLinkType.M3U8
+    val isDash : Boolean get() = type == ExtractorLinkType.DASH
+
+    constructor(
+        source: String,
+        name: String,
+        url: String,
+        referer: String,
+        quality: Int,
+        /** the type of the media, use INFER_TYPE if you want to auto infer the type from the url */
+        type: ExtractorLinkType?,
+        headers: Map<String, String> = mapOf(),
+        /** Used for getExtractorVerifierJob() */
+        extractorData: String? = null,
+    ) : this(
+        source = source,
+        name = name,
+        url = url,
+        referer = referer,
+        quality = quality,
+        headers = headers,
+        extractorData = extractorData,
+        type = type ?: inferTypeFromUrl(url)
+    )
+
     /**
      * Old constructor without isDash, allows for backwards compatibility with extensions.
      * Should be removed after all extensions have updated their cloudstream.jar
@@ -80,8 +418,30 @@ open class ExtractorLink constructor(
         extractorData: String? = null
     ) : this(source, name, url, referer, quality, isM3u8, headers, extractorData, false)
 
+    constructor(
+        source: String,
+        name: String,
+        url: String,
+        referer: String,
+        quality: Int,
+        isM3u8: Boolean = false,
+        headers: Map<String, String> = mapOf(),
+        /** Used for getExtractorVerifierJob() */
+        extractorData: String? = null,
+        isDash: Boolean,
+    ) : this(
+        source = source,
+        name = name,
+        url = url,
+        referer = referer,
+        quality = quality,
+        headers = headers,
+        extractorData = extractorData,
+        type = if (isDash) ExtractorLinkType.DASH else if (isM3u8) ExtractorLinkType.M3U8 else ExtractorLinkType.VIDEO
+    )
+
     override fun toString(): String {
-        return "ExtractorLink(name=$name, url=$url, referer=$referer, isM3u8=$isM3u8)"
+        return "ExtractorLink(name=$name, url=$url, referer=$referer, type=$type)"
     }
 }
 
@@ -135,6 +495,7 @@ enum class Qualities(var value: Int, val defaultPriority: Int) {
                 else -> "${qual}p"
             }
         }
+
         fun getStringByIntFull(quality: Int): String {
             return when (quality) {
                 0 -> "Auto"
@@ -244,6 +605,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     XStreamCdn(),
 
     StreamSB(),
+    Sblona(),
     Vidgomunimesb(),
     StreamSB1(),
     StreamSB2(),
@@ -265,6 +627,10 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Sbflix(),
     Streamsss(),
     Sbspeed(),
+    Sbsonic(),
+    Sbface(),
+    Sbrapid(),
+    Lvturbo(),
 
     Fastream(),
 
@@ -300,6 +666,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     DoodToExtractor(),
     DoodSoExtractor(),
     DoodLaExtractor(),
+    Dooood(),
     DoodWsExtractor(),
     DoodShExtractor(),
     DoodWatchExtractor(),
@@ -351,6 +718,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     DesuDrive(),
 
     Chillx(),
+    Moviesapi(),
     Watchx(),
     Bestx(),
     Keephealth(),
@@ -363,12 +731,18 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Gofile(),
     Vicloud(),
     Uservideo(),
+    Userscloud(),
 
     Movhide(),
     StreamhideCom(),
+    StreamhideTo(),
+    Pixeldrain(),
+    Wibufile(),
     FileMoonIn(),
     Moviesm4u(),
     Filesim(),
+    Ahvsh(),
+    Guccihide(),
     FileMoon(),
     FileMoonSx(),
     Vido(),
@@ -376,6 +750,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Acefile(),
     SpeedoStream(),
     SpeedoStream1(),
+    SpeedoStream2(),
     Zorofile(),
     Embedgram(),
     Mvidoo(),
@@ -387,6 +762,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Moviehab(),
     MoviehabNet(),
     Jeniusplay(),
+    StreamoUpload(),
 
     Gdriveplayerapi(),
     Gdriveplayerapp(),
@@ -414,7 +790,10 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Cda(),
     Dailymotion(),
     ByteShare(),
-    Ztreamhub()
+    Ztreamhub(),
+    Rabbitstream(),
+    Dokicloud(),
+    Megacloud(),
 )
 
 
@@ -536,4 +915,4 @@ abstract class ExtractorApi {
     open fun getExtractorUrl(id: String): String {
         return id
     }
-}
+}
\ No newline at end of file
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 dcb2be5b..c381d6c7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -112,18 +112,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(
@@ -306,7 +307,7 @@ class InAppUpdater {
                                     // Forcefully start any delayed installations
                                     if (ApkInstaller.delayedInstaller?.startInstallation() == true) return@setPositiveButton
 
-                                    showToast(context, R.string.download_started, Toast.LENGTH_LONG)
+                                    showToast(R.string.download_started, Toast.LENGTH_LONG)
 
                                     // Check if the setting hasn't been changed
                                     if (settingsManager.getInt(
@@ -341,7 +342,6 @@ class InAppUpdater {
                                                 if (!downloadUpdate(update.updateURL))
                                                     runOnUiThread {
                                                         showToast(
-                                                            context,
                                                             R.string.download_failed,
                                                             Toast.LENGTH_LONG
                                                         )
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 6c5117b4..11dfa441 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/M3u8Helper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/M3u8Helper.kt
@@ -1,17 +1,17 @@
 package com.lagradost.cloudstream3.utils
 
+import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.mvvm.logError
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.delay
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
 import kotlin.math.pow
 
-
+/** backwards api surface */
 class M3u8Helper {
     companion object {
-        private val generator = M3u8Helper()
         suspend fun generateM3u8(
             source: String,
             streamUrl: String,
@@ -20,34 +20,59 @@ class M3u8Helper {
             headers: Map<String, String> = mapOf(),
             name: String = source
         ): List<ExtractorLink> {
-            return generator.m3u8Generation(
-                M3u8Stream(
-                    streamUrl = streamUrl,
-                    quality = quality,
-                    headers = headers,
-                ), null
-            )
-                .map { stream ->
-                    ExtractorLink(
-                        source,
-                        name = name,
-                        stream.streamUrl,
-                        referer,
-                        stream.quality ?: Qualities.Unknown.value,
-                        true,
-                        stream.headers,
-                    )
-                }
+            return M3u8Helper2.generateM3u8(source, streamUrl, referer, quality, headers, name)
         }
     }
 
+
+    data class M3u8Stream(
+        val streamUrl: String,
+        val quality: Int? = null,
+        val headers: Map<String, String> = mapOf()
+    )
+
+    suspend fun m3u8Generation(m3u8: M3u8Stream, returnThis: Boolean? = true): List<M3u8Stream> {
+        return M3u8Helper2.m3u8Generation(m3u8, returnThis)
+    }
+}
+
+object M3u8Helper2 {
+    suspend fun generateM3u8(
+        source: String,
+        streamUrl: String,
+        referer: String,
+        quality: Int? = null,
+        headers: Map<String, String> = mapOf(),
+        name: String = source
+    ): List<ExtractorLink> {
+        return m3u8Generation(
+            M3u8Helper.M3u8Stream(
+                streamUrl = streamUrl,
+                quality = quality,
+                headers = headers,
+            ), null
+        )
+            .map { stream ->
+                ExtractorLink(
+                    source,
+                    name = name,
+                    stream.streamUrl,
+                    referer,
+                    stream.quality ?: Qualities.Unknown.value,
+                    true,
+                    stream.headers,
+                )
+            }
+    }
+
     private val ENCRYPTION_DETECTION_REGEX = Regex("#EXT-X-KEY:METHOD=([^,]+),")
     private val ENCRYPTION_URL_IV_REGEX =
         Regex("#EXT-X-KEY:METHOD=([^,]+),URI=\"([^\"]+)\"(?:,IV=(.*))?")
     private val QUALITY_REGEX =
         Regex("""#EXT-X-STREAM-INF:(?:(?:.*?(?:RESOLUTION=\d+x(\d+)).*?\s+(.*))|(?:.*?\s+(.*)))""")
     private val TS_EXTENSION_REGEX =
-        Regex("""(.*\.ts.*|.*\.jpg.*)""") //.jpg here 'case vizcloud uses .jpg instead of .ts
+        Regex("""#EXTINF:.*\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? {
         val split = url.split("/")
@@ -64,21 +89,17 @@ class M3u8Helper {
         }
     }
 
-    private val defaultIvGen = sequence {
-        var initial = 1
+    private fun defaultIv(index: Int) : ByteArray {
+        return toBytes16Big(index+1)
+    }
 
-        while (true) {
-            yield(toBytes16Big(initial))
-            ++initial
-        }
-    }.iterator()
-
-    private fun getDecrypter(
+    fun getDecrypted(
         secretKey: ByteArray,
         data: ByteArray,
-        iv: ByteArray = "".toByteArray()
+        iv: ByteArray = byteArrayOf(),
+        index : Int,
     ): ByteArray {
-        val ivKey = if (iv.isEmpty()) defaultIvGen.next() else iv
+        val ivKey = if (iv.isEmpty()) defaultIv(index) else iv
         val c = Cipher.getInstance("AES/CBC/PKCS5Padding")
         val skSpec = SecretKeySpec(secretKey, "AES")
         val ivSpec = IvParameterSpec(ivKey)
@@ -91,13 +112,8 @@ class M3u8Helper {
         return st != null && (st.value.isNotEmpty() || st.destructured.component1() != "NONE")
     }
 
-    data class M3u8Stream(
-        val streamUrl: String,
-        val quality: Int? = null,
-        val headers: Map<String, String> = mapOf()
-    )
 
-    private fun selectBest(qualities: List<M3u8Stream>): M3u8Stream? {
+    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 {
@@ -113,19 +129,16 @@ class M3u8Helper {
     }
 
     private fun isNotCompleteUrl(url: String): Boolean {
-        return !url.contains("https://") && !url.contains("http://")
+        return !url.startsWith("https://") && !url.startsWith("http://")
     }
 
-    suspend fun m3u8Generation(m3u8: M3u8Stream, returnThis: Boolean? = true): List<M3u8Stream> {
-//        return listOf(m3u8)
-        val list = mutableListOf<M3u8Stream>()
+    suspend fun m3u8Generation(m3u8: M3u8Helper.M3u8Stream, returnThis: Boolean? = true): List<M3u8Helper.M3u8Stream> {
+        val list = mutableListOf<M3u8Helper.M3u8Stream>()
 
         val m3u8Parent = getParentLink(m3u8.streamUrl)
         val response = app.get(m3u8.streamUrl, headers = m3u8.headers, verify = false).text
 
-//        var hasAnyContent = false
         for (match in QUALITY_REGEX.findAll(response)) {
-//            hasAnyContent = true
             var (quality, m3u8Link, m3u8Link2) = match.destructured
             if (m3u8Link.isEmpty()) m3u8Link = m3u8Link2
             if (absoluteExtensionDetermination(m3u8Link) == "m3u8") {
@@ -136,21 +149,21 @@ class M3u8Helper {
                     println(m3u8.streamUrl)
                 }
                 list += m3u8Generation(
-                    M3u8Stream(
+                    M3u8Helper.M3u8Stream(
                         m3u8Link,
                         quality.toIntOrNull(),
                         m3u8.headers
                     ), false
                 )
             }
-            list += M3u8Stream(
+            list += M3u8Helper.M3u8Stream(
                 m3u8Link,
                 quality.toIntOrNull(),
                 m3u8.headers
             )
         }
         if (returnThis != false) {
-            list += M3u8Stream(
+            list += M3u8Helper.M3u8Stream(
                 m3u8.streamUrl,
                 Qualities.Unknown.value,
                 m3u8.headers
@@ -160,113 +173,134 @@ class M3u8Helper {
         return list
     }
 
+    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 size get() = allTsLinks.size
 
-    data class HlsDownloadData(
-        val bytes: ByteArray,
-        val currentIndex: Int,
-        val totalTs: Int,
-        val errored: Boolean = false
-    )
+        suspend fun resolveLinkWhileSafe(
+            index: Int,
+            tries: Int = 3,
+            failDelay: Long = 3000,
+            condition : (() -> Boolean)
+        ): ByteArray? {
+            for (i in 0 until tries) {
+                if(!condition()) return null
 
-    suspend fun hlsYield(
-        qualities: List<M3u8Stream>,
-        startIndex: Int = 0
-    ): Iterator<HlsDownloadData> {
-        if (qualities.isEmpty()) return listOf(
-            HlsDownloadData(
-                byteArrayOf(),
-                1,
-                1,
-                true
-            )
-        ).iterator()
-
-        var selected = selectBest(qualities)
-        if (selected == null) {
-            selected = qualities[0]
+                try {
+                    val out = resolveLink(index)
+                    return if(condition()) out else null
+                } catch (e: IllegalArgumentException) {
+                    return null
+                } catch (e : CancellationException) {
+                    return null
+                } catch (t: Throwable) {
+                    delay(failDelay)
+                }
+            }
+            return null
         }
+
+        suspend fun resolveLinkSafe(
+            index: Int,
+            tries: Int = 3,
+            failDelay: Long = 3000
+        ): ByteArray? {
+            for (i in 0 until tries) {
+                try {
+                    return resolveLink(index)
+                } catch (e: IllegalArgumentException) {
+                    return null
+                } catch (e : CancellationException) {
+                    return null
+                } catch (t: Throwable) {
+                    delay(failDelay)
+                }
+            }
+            return null
+        }
+
+        @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 tsResponse = app.get(url, headers = headers, verify = false)
+            val tsData = tsResponse.body.bytes()
+            if (tsData.isEmpty()) throw ErrorLoadingException("no data")
+
+            return if (isEncrypted) {
+                getDecrypted(encryptionData, tsData, encryptionIv, index)
+            } else {
+                tsData
+            }
+        }
+    }
+
+    @Throws
+    suspend fun hslLazy(
+        qualities: List<M3u8Helper.M3u8Stream>
+    ): LazyHlsDownloadData {
+        if (qualities.isEmpty()) throw IllegalArgumentException("qualities must be non empty")
+        val selected = selectBest(qualities) ?: qualities.first()
         val headers = selected.headers
-
         val streams = qualities.map { m3u8Generation(it, false) }.flatten()
-        //val sslVerification = if (headers.containsKey("ssl_verification")) headers["ssl_verification"].toBoolean() else true
-
+        // 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) })
-        if (secondSelection != null) {
-            val m3u8Response =
-                runBlocking {
-                    app.get(
-                        secondSelection.streamUrl,
-                        headers = headers,
-                        verify = false
-                    ).text
-                }
+            ?: throw IllegalArgumentException("qualities has no streams")
 
-            var encryptionUri: String?
-            var encryptionIv = byteArrayOf()
-            var encryptionData = byteArrayOf()
+        val m3u8Response =
+            app.get(
+                secondSelection.streamUrl,
+                headers = headers,
+                verify = false
+            ).text
 
-            val encryptionState = isEncrypted(m3u8Response)
+        // encryption, this is because crunchy uses it
+        var encryptionIv = byteArrayOf()
+        var encryptionData = byteArrayOf()
 
-            if (encryptionState) {
-                val match =
-                    ENCRYPTION_URL_IV_REGEX.find(m3u8Response)!!.destructured  // its safe to assume that its not going to be null
-                encryptionUri = match.component2()
+        val encryptionState = isEncrypted(m3u8Response)
 
-                if (isNotCompleteUrl(encryptionUri)) {
-                    encryptionUri = "${getParentLink(secondSelection.streamUrl)}/$encryptionUri"
-                }
+        if (encryptionState) {
+            // its safe to assume that its not going to be null
+            val match =
+                ENCRYPTION_URL_IV_REGEX.find(m3u8Response)!!.groupValues
 
-                encryptionIv = match.component3().toByteArray()
-                val encryptionKeyResponse =
-                    runBlocking { app.get(encryptionUri, headers = headers, verify = false) }
-                encryptionData = encryptionKeyResponse.body?.bytes() ?: byteArrayOf()
+            var encryptionUri = match[2]
+
+            if (isNotCompleteUrl(encryptionUri)) {
+                encryptionUri = "${getParentLink(secondSelection.streamUrl)}/$encryptionUri"
             }
 
-            val allTs = TS_EXTENSION_REGEX.findAll(m3u8Response)
-            val allTsList = allTs.toList()
-            val totalTs = allTsList.size
-            if (totalTs == 0) {
-                return listOf(HlsDownloadData(byteArrayOf(), 1, 1, true)).iterator()
-            }
-            var lastYield = 0
-
-            val relativeUrl = getParentLink(secondSelection.streamUrl)
-            var retries = 0
-            val tsByteGen = sequence {
-                loop@ for ((index, ts) in allTs.withIndex()) {
-                    val url = if (
-                        isNotCompleteUrl(ts.destructured.component1())
-                    ) "$relativeUrl/${ts.destructured.component1()}" else ts.destructured.component1()
-                    val c = index + 1 + startIndex
-
-                    while (lastYield != c) {
-                        try {
-                            val tsResponse =
-                                runBlocking { app.get(url, headers = headers, verify = false) }
-                            var tsData = tsResponse.body?.bytes() ?: byteArrayOf()
-
-                            if (encryptionState) {
-                                tsData = getDecrypter(encryptionData, tsData, encryptionIv)
-                                yield(HlsDownloadData(tsData, c, totalTs))
-                                lastYield = c
-                                break
-                            }
-                            yield(HlsDownloadData(tsData, c, totalTs))
-                            lastYield = c
-                        } catch (e: Exception) {
-                            logError(e)
-                            if (retries == 3) {
-                                yield(HlsDownloadData(byteArrayOf(), c, totalTs, true))
-                                break@loop
-                            }
-                            ++retries
-                            Thread.sleep(2_000)
-                        }
-                    }
-                }
-            }
-            return tsByteGen.iterator()
+            encryptionIv = match[3].toByteArray()
+            val encryptionKeyResponse = app.get(encryptionUri, headers = headers, verify = false)
+            encryptionData = encryptionKeyResponse.body.bytes()
         }
-        return listOf(HlsDownloadData(byteArrayOf(), 1, 1, true)).iterator()
+        val relativeUrl = getParentLink(secondSelection.streamUrl)
+        val allTsList = TS_EXTENSION_REGEX.findAll(m3u8Response + "\n").map { ts ->
+            val value = ts.groupValues[1]
+            if (isNotCompleteUrl(value)) {
+                "$relativeUrl/${value}"
+            } else {
+                value
+            }
+        }.toList()
+        if (allTsList.isEmpty()) throw IllegalArgumentException("ts must be non empty")
+
+        return LazyHlsDownloadData(
+            encryptionData = encryptionData,
+            encryptionIv = encryptionIv,
+            isEncrypted = encryptionState,
+            allTsLinks = allTsList,
+            relativeUrl = relativeUrl,
+            headers = headers
+        )
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt
index 1f6d726d..8285b8ab 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt
@@ -2,19 +2,28 @@ package com.lagradost.cloudstream3.utils
 
 import android.app.Activity
 import android.app.Dialog
+import android.view.LayoutInflater
 import android.view.View
-import android.widget.*
+import android.widget.AbsListView
+import android.widget.ArrayAdapter
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.ListView
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import androidx.core.view.*
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import androidx.core.view.marginLeft
+import androidx.core.view.marginRight
+import androidx.core.view.marginTop
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.BottomSelectionDialogBinding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
 import com.lagradost.cloudstream3.utils.UIHelper.setImage
-import kotlinx.android.synthetic.main.add_account_input.*
-import kotlinx.android.synthetic.main.add_account_input.text1
-import kotlinx.android.synthetic.main.bottom_selection_dialog_direct.*
 
 object SingleSelectionHelper {
     fun Activity?.showOptionSelectStringRes(
@@ -82,6 +91,7 @@ object SingleSelectionHelper {
     }
 
     fun Activity?.showDialog(
+        binding: BottomSelectionDialogBinding,
         dialog: Dialog,
         items: List<String>,
         selectedIndex: List<Int>,
@@ -95,39 +105,39 @@ object SingleSelectionHelper {
         if (this == null) return
 
         val realShowApply = showApply || isMultiSelect
-        val listView = dialog.listview1//.findViewById<ListView>(R.id.listview1)!!
-        val textView = dialog.text1//.findViewById<TextView>(R.id.text1)!!
-        val applyButton = dialog.apply_btt//.findViewById<TextView>(R.id.apply_btt)
-        val cancelButton = dialog.cancel_btt//findViewById<TextView>(R.id.cancel_btt)
+        val listView = binding.listview1//.findViewById<ListView>(R.id.listview1)!!
+        val textView = binding.text1//.findViewById<TextView>(R.id.text1)!!
+        val applyButton = binding.applyBtt//.findViewById<TextView>(R.id.apply_btt)
+        val cancelButton = binding.cancelBtt//findViewById<TextView>(R.id.cancel_btt)
         val applyHolder =
-            dialog.apply_btt_holder//.findViewById<LinearLayout>(R.id.apply_btt_holder)
+            binding.applyBttHolder//.findViewById<LinearLayout>(R.id.apply_btt_holder)
 
-        applyHolder?.isVisible = realShowApply
+        applyHolder.isVisible = realShowApply
         if (!realShowApply) {
             val params = listView.layoutParams as LinearLayout.LayoutParams
             params.setMargins(listView.marginLeft, listView.marginTop, listView.marginRight, 0)
             listView.layoutParams = params
         }
 
-        textView?.text = name
-        textView?.isGone = name.isBlank()
+        textView.text = name
+        textView.isGone = name.isBlank()
 
         val arrayAdapter = ArrayAdapter<String>(this, itemLayout)
         arrayAdapter.addAll(items)
 
-        listView?.adapter = arrayAdapter
+        listView.adapter = arrayAdapter
         if (isMultiSelect) {
-            listView?.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
+            listView.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
         } else {
-            listView?.choiceMode = AbsListView.CHOICE_MODE_SINGLE
+            listView.choiceMode = AbsListView.CHOICE_MODE_SINGLE
         }
 
         for (select in selectedIndex) {
-            listView?.setItemChecked(select, true)
+            listView.setItemChecked(select, true)
         }
 
         selectedIndex.minOrNull()?.let {
-            listView?.setSelection(it)
+            listView.setSelection(it)
         }
 
         //  var lastSelectedIndex = if(selectedIndex.isNotEmpty()) selectedIndex.first() else -1
@@ -136,7 +146,7 @@ object SingleSelectionHelper {
             dismissCallback.invoke()
         }
 
-        listView?.setOnItemClickListener { _, _, which, _ ->
+        listView.setOnItemClickListener { _, _, which, _ ->
             //  lastSelectedIndex = which
             if (realShowApply) {
                 if (!isMultiSelect) {
@@ -148,7 +158,7 @@ object SingleSelectionHelper {
             }
         }
         if (realShowApply) {
-            applyButton?.setOnClickListener {
+            applyButton.setOnClickListener {
                 val list = ArrayList<Int>()
                 for (index in 0 until listView.count) {
                     if (listView.checkedItemPositions[index])
@@ -157,7 +167,7 @@ object SingleSelectionHelper {
                 callback.invoke(list)
                 dialog.dismissSafe(this)
             }
-            cancelButton?.setOnClickListener {
+            cancelButton.setOnClickListener {
                 dialog.dismissSafe(this)
             }
         }
@@ -213,13 +223,26 @@ object SingleSelectionHelper {
     ) {
         if (this == null) return
 
+        val binding: BottomSelectionDialogBinding = BottomSelectionDialogBinding.inflate(
+            LayoutInflater.from(this)
+        )
         val builder =
             AlertDialog.Builder(this, R.style.AlertDialogCustom)
-                .setView(R.layout.bottom_selection_dialog)
+                .setView(binding.root)
 
         val dialog = builder.create()
         dialog.show()
-        showDialog(dialog, items, selectedIndex, name, true, true, callback, dismissCallback)
+        showDialog(
+            binding,
+            dialog,
+            items,
+            selectedIndex,
+            name,
+            showApply = true,
+            isMultiSelect = true,
+            callback,
+            dismissCallback
+        )
     }
 
     fun Activity?.showDialog(
@@ -232,13 +255,19 @@ object SingleSelectionHelper {
     ) {
         if (this == null) return
 
+        val binding: BottomSelectionDialogBinding = BottomSelectionDialogBinding.inflate(
+            LayoutInflater.from(this)
+        )
         val builder =
             AlertDialog.Builder(this, R.style.AlertDialogCustom)
-                .setView(R.layout.bottom_selection_dialog)
+                .setView(binding.root)
 
         val dialog = builder.create()
         dialog.show()
+
+
         showDialog(
+            binding,
             dialog,
             items,
             listOf(selectedIndex),
@@ -260,12 +289,18 @@ object SingleSelectionHelper {
         callback: (Int) -> Unit,
     ) {
         if (this == null) return
+
+        val binding: BottomSelectionDialogBinding = BottomSelectionDialogBinding.inflate(
+            LayoutInflater.from(this)
+        )
+
         val builder =
             BottomSheetDialog(this)
-        builder.setContentView(R.layout.bottom_selection_dialog)
+        builder.setContentView(binding.root)
 
         builder.show()
         showDialog(
+            binding,
             builder,
             items,
             listOf(selectedIndex),
@@ -285,13 +320,19 @@ object SingleSelectionHelper {
     ): BottomSheetDialog {
         val builder =
             BottomSheetDialog(this)
-        builder.setContentView(R.layout.bottom_selection_dialog_direct)
 
+        val binding: BottomSelectionDialogBinding = BottomSelectionDialogBinding.inflate(
+            LayoutInflater.from(this)
+        )
+
+        //builder.setContentView(R.layout.bottom_selection_dialog_direct)
+        builder.setContentView(binding.root)
         builder.show()
         showDialog(
+            binding,
             builder,
             items,
-            listOf(),
+            emptyList(),
             name,
             showApply = false,
             isMultiSelect = false,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
index e5f2f2dc..71d3a1ef 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
@@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit
 
 object SyncUtil {
     private val regexs = listOf(
-        Regex("""(9anime)\.(?:to|center|id)/watch/(?:.*?)\.([^/?]*)"""),
+        Regex("""(9anime)\.(?:to|center|id)/watch/.*?\.([^/?]*)"""),
         Regex("""(gogoanime|gogoanimes)\..*?/category/([^/?]*)"""),
         Regex("""(twist\.moe)/a/([^/?]*)"""),
     )
@@ -44,6 +44,13 @@ object SyncUtil {
                     matchList[site]?.let { realSite ->
                         getIdsFromSlug(slug, realSite)?.let {
                             return it
+                        } ?: kotlin.run {
+                            if (slug.endsWith("-dub")) {
+                                println("testing non -dub slug $slug")
+                                getIdsFromSlug(slug.removeSuffix("-dub"), realSite)?.let {
+                                    return it
+                                }
+                            }
                         }
                     }
                 }
@@ -89,8 +96,10 @@ object SyncUtil {
                 .mapNotNull { it.url }.toMutableList()
 
         if (type == "anilist") { // TODO MAKE BETTER
-            apis.filter { it.name.contains("Aniflix", ignoreCase = true) }.forEach {
-                current.add("${it.mainUrl}/anime/$id")
+            synchronized(apis) {
+                apis.filter { it.name.contains("Aniflix", ignoreCase = true) }.forEach {
+                    current.add("${it.mainUrl}/anime/$id")
+                }
             }
         }
         return current
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
index 66e1e504..dd973538 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
@@ -211,7 +211,7 @@ object TestingUtils {
 
     fun getDeferredProviderTests(
         scope: CoroutineScope,
-        providers: List<MainAPI>,
+        providers: Array<MainAPI>,
         logger: (String) -> Unit,
         callback: (MainAPI, TestResultProvider) -> Unit
     ) {
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 7d798204..038a2f11 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
@@ -15,6 +15,7 @@ import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
 import android.view.*
+import android.view.ViewGroup.MarginLayoutParams
 import android.view.inputmethod.InputMethodManager
 import android.widget.ImageView
 import android.widget.ListAdapter
@@ -23,6 +24,7 @@ import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
 import androidx.annotation.IdRes
+import androidx.annotation.StyleRes
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.appcompat.view.menu.MenuBuilder
 import androidx.appcompat.widget.PopupMenu
@@ -33,6 +35,10 @@ import androidx.core.graphics.blue
 import androidx.core.graphics.drawable.toBitmapOrNull
 import androidx.core.graphics.green
 import androidx.core.graphics.red
+import androidx.core.view.marginBottom
+import androidx.core.view.marginLeft
+import androidx.core.view.marginRight
+import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.NavHostFragment
@@ -46,6 +52,10 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.RequestOptions.bitmapTransform
 import com.bumptech.glide.request.target.Target
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipDrawable
+import com.google.android.material.chip.ChipGroup
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.result.UiImage
@@ -72,6 +82,30 @@ object UIHelper {
                 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
     }
 
+    fun populateChips(view: ChipGroup?, tags: List<String>, @StyleRes style : Int = R.style.ChipFilled) {
+        if (view == null) return
+        view.removeAllViews()
+        val context = view.context ?: return
+
+        tags.forEach { tag ->
+            val chip = Chip(context)
+            val chipDrawable = ChipDrawable.createFromAttributes(
+                context,
+                null,
+                0,
+                style
+            )
+            chip.setChipDrawable(chipDrawable)
+            chip.text = tag
+            chip.isChecked = false
+            chip.isCheckable = false
+            chip.isFocusable = false
+            chip.isClickable = false
+            chip.setTextColor(context.colorFromAttribute(R.attr.white))
+            view.addView(chip)
+        }
+    }
+
     fun Activity.requestRW() {
         ActivityCompat.requestPermissions(
             this,
@@ -181,16 +215,69 @@ object UIHelper {
         }
     }
 
+    /*inline fun <reified T : ViewBinding> bindViewBinding(
+        inflater: LayoutInflater?,
+        container: ViewGroup?,
+        layout: Int
+    ): Pair<T?, UiText?> {
+        return try {
+            val localInflater = inflater ?: container?.context?.let { LayoutInflater.from(it) }
+            ?: return null to txt(
+                R.string.unable_to_inflate,
+                "Requires inflater OR container"
+            )//throw IllegalArgumentException("Requires inflater OR container"))
+
+            //println("methods: ${T::class.java.methods.map { it.name }}")
+            val bind = T::class.java.methods.first { it.name == "bind" }
+            //val inflate = T::class.java.methods.first { it.name == "inflate" }
+            val root = localInflater.inflate(layout, container, false)
+            bind.invoke(null, root) as T to null
+        } catch (t: Throwable) {
+            logError(t)
+            val message = txt(R.string.unable_to_inflate, t.message ?: "Primary constructor")
+            // if the desired layout is not found then we inflate the casted layout
+            /*try {
+                val localInflater = inflater ?: container?.context?.let { LayoutInflater.from(it) }
+                ?: return null to txt(
+                    R.string.unable_to_inflate,
+                    "Requires inflater OR container"
+                )//throw IllegalArgumentException("Requires inflater OR container"))
+
+                // we don't know what method to use as there are 2, but first *should* always be true
+                return try {
+                    val inflate = T::class.java.methods.first { it.name == "inflate" }
+                    inflate.invoke(null, localInflater, container, false) as T
+                } catch (_: Throwable) {
+                    val inflate = T::class.java.methods.last { it.name == "inflate" }
+                    inflate.invoke(null, localInflater, container, false) as T
+                } to message
+            } catch (t: Throwable) {
+                logError(t)
+            }*/
+
+            null to message
+        }
+    }*/
+
     fun ImageView?.setImage(
         url: String?,
         headers: Map<String, String>? = null,
         @DrawableRes
         errorImageDrawable: Int? = null,
         fadeIn: Boolean = true,
+        radius: Int = 0,
+        sample: Int = 3,
         colorCallback: ((Palette) -> Unit)? = null
     ): Boolean {
         if (url.isNullOrBlank()) return false
-        this.setImage(UiImage.Image(url, headers, errorImageDrawable), errorImageDrawable, fadeIn, colorCallback)
+        this.setImage(
+            UiImage.Image(url, headers, errorImageDrawable),
+            errorImageDrawable,
+            fadeIn,
+            radius,
+            sample,
+            colorCallback
+        )
         return true
     }
 
@@ -199,7 +286,9 @@ object UIHelper {
         @DrawableRes
         errorImageDrawable: Int? = null,
         fadeIn: Boolean = true,
-        colorCallback: ((Palette) -> Unit)? = null
+        radius: Int = 0,
+        sample: Int = 3,
+        colorCallback: ((Palette) -> Unit)? = null,
     ): Boolean {
         if (this == null || uiImage == null) return false
 
@@ -211,7 +300,7 @@ object UIHelper {
             } ?: return false
 
         return try {
-            val builder = GlideApp.with(this)
+            var builder = GlideApp.with(this)
                 .load(glideImage)
                 .skipMemoryCache(true)
                 .diskCacheStrategy(DiskCacheStrategy.ALL).let { req ->
@@ -220,8 +309,12 @@ object UIHelper {
                     else req
                 }
 
+            if (radius > 0) {
+                builder = builder.apply(bitmapTransform(BlurTransformation(radius, sample)))
+            }
+
             if (colorCallback != null) {
-                builder.listener(object : RequestListener<Drawable> {
+                builder = builder.listener(object : RequestListener<Drawable> {
                     @SuppressLint("CheckResult")
                     override fun onResourceReady(
                         resource: Drawable?,
@@ -397,21 +490,38 @@ object UIHelper {
         return result
     }
 
-    fun Context?.fixPaddingStatusbar(v: View?) {
-        if (v == null || this == null) return
+    fun fixPaddingStatusbar(v: View?) {
+        if (v == null) return
+        val ctx = v.context ?: return
         v.setPadding(
             v.paddingLeft,
-            v.paddingTop + getStatusBarHeight(),
+            v.paddingTop + ctx.getStatusBarHeight(),
             v.paddingRight,
             v.paddingBottom
         )
     }
 
-    fun Context.fixPaddingStatusbarView(v: View?) {
+    fun fixPaddingStatusbarMargin(v: View?) {
         if (v == null) return
+        val ctx = v.context ?: return
 
+        v.layoutParams = v.layoutParams.apply {
+            if (this is MarginLayoutParams) {
+                setMargins(
+                    v.marginLeft,
+                    v.marginTop + ctx.getStatusBarHeight(),
+                    v.marginRight,
+                    v.marginBottom
+                )
+            }
+        }
+    }
+
+    fun fixPaddingStatusbarView(v: View?) {
+        if (v == null) return
+        val ctx = v.context ?: return
         val params = v.layoutParams
-        params.height = getStatusBarHeight()
+        params.height = ctx.getStatusBarHeight()
         v.layoutParams = params
     }
 
@@ -504,7 +614,7 @@ object UIHelper {
     }
 
     fun Dialog?.dismissSafe() {
-        if (this?.isShowing == true) {
+        if (this?.isShowing == true && activity?.isFinishing != true) {
             this.dismiss()
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt
index a76cc115..d1614bc1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt
@@ -2,20 +2,18 @@ package com.lagradost.cloudstream3.utils
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.ui.download.EasyDownloadButton
-
 object VideoDownloadHelper {
     data class DownloadEpisodeCached(
         @JsonProperty("name") val name: String?,
         @JsonProperty("poster") val poster: String?,
         @JsonProperty("episode") val episode: Int,
         @JsonProperty("season") val season: Int?,
-        @JsonProperty("id") override val id: Int,
+        @JsonProperty("id") val id: Int,
         @JsonProperty("parentId") val parentId: Int,
         @JsonProperty("rating") val rating: Int?,
         @JsonProperty("description") val description: String?,
         @JsonProperty("cacheTime") val cacheTime: Long,
-    ) : EasyDownloadButton.IMinimumData
+    )
 
     data class DownloadHeaderCached(
         @JsonProperty("apiName") val apiName: String,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
index c18ff48f..d108daed 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
@@ -8,10 +8,7 @@ import android.content.*
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Build
-import android.os.Environment
-import android.provider.MediaStore
 import androidx.annotation.DrawableRes
-import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.toUri
@@ -22,13 +19,14 @@ import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkManager
 import com.bumptech.glide.load.model.GlideUrl
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.hippo.unifile.UniFile
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.services.VideoDownloadService
@@ -37,21 +35,26 @@ import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.removeKey
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.safefile.MediaFileContentType
+import com.lagradost.safefile.SafeFile
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import okhttp3.internal.closeQuietly
-import java.io.BufferedInputStream
+import java.io.Closeable
 import java.io.File
-import java.io.InputStream
+import java.io.IOException
 import java.io.OutputStream
-import java.lang.Thread.sleep
-import java.net.URI
-import java.net.URL
-import java.net.URLConnection
+import java.lang.IllegalArgumentException
 import java.util.*
-import kotlin.math.roundToInt
 
 const val DOWNLOAD_CHANNEL_ID = "cloudstream3.general"
 const val DOWNLOAD_CHANNEL_NAME = "Downloads"
@@ -59,34 +62,35 @@ const val DOWNLOAD_CHANNEL_DESCRIPT = "The download notification channel"
 
 object VideoDownloadManager {
     var maxConcurrentDownloads = 3
+    var maxConcurrentConnections = 3
     private var currentDownloads = mutableListOf<Int>()
 
     private const val USER_AGENT =
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
 
-    @DrawableRes
-    const val imgDone = R.drawable.rddone
+    @get:DrawableRes
+    val imgDone get() = R.drawable.rddone
 
-    @DrawableRes
-    const val imgDownloading = R.drawable.rdload
+    @get:DrawableRes
+    val imgDownloading get() = R.drawable.rdload
 
-    @DrawableRes
-    const val imgPaused = R.drawable.rdpause
+    @get:DrawableRes
+    val imgPaused get() = R.drawable.rdpause
 
-    @DrawableRes
-    const val imgStopped = R.drawable.rderror
+    @get:DrawableRes
+    val imgStopped get() = R.drawable.rderror
 
-    @DrawableRes
-    const val imgError = R.drawable.rderror
+    @get:DrawableRes
+    val imgError get() = R.drawable.rderror
 
-    @DrawableRes
-    const val pressToPauseIcon = R.drawable.ic_baseline_pause_24
+    @get:DrawableRes
+    val pressToPauseIcon get() = R.drawable.ic_baseline_pause_24
 
-    @DrawableRes
-    const val pressToResumeIcon = R.drawable.ic_baseline_play_arrow_24
+    @get:DrawableRes
+    val pressToResumeIcon get() = R.drawable.ic_baseline_play_arrow_24
 
-    @DrawableRes
-    const val pressToStopIcon = R.drawable.exo_icon_stop
+    @get:DrawableRes
+    val pressToStopIcon get() = R.drawable.baseline_stop_24
 
     enum class DownloadType {
         IsPaused,
@@ -94,6 +98,7 @@ object VideoDownloadManager {
         IsDone,
         IsFailed,
         IsStopped,
+        IsPending
     }
 
     enum class DownloadActionType {
@@ -154,24 +159,33 @@ object VideoDownloadManager {
         @JsonProperty("pkg") val pkg: DownloadResumePackage,
     )
 
-    private const val SUCCESS_DOWNLOAD_DONE = 1
-    private const val SUCCESS_STREAM = 3
-    private const val SUCCESS_STOPPED = 2
+    data class DownloadStatus(
+        /** if you should retry with the same args and hope for a better result */
+        val retrySame: Boolean,
+        /** if you should try the next mirror */
+        val tryNext: Boolean,
+        /** if the result is what the user intended */
+        val success: Boolean,
+    )
 
-    // will not download the next one, but is still classified as an error
-    private const val ERROR_DELETING_FILE = 3
-    private const val ERROR_CREATE_FILE = -2
-    private const val ERROR_UNKNOWN = -10
+    /** Invalid input, just skip to the next one as the same args will give the same error */
+    private val DOWNLOAD_INVALID_INPUT =
+        DownloadStatus(retrySame = false, tryNext = true, success = false)
 
-    //private const val ERROR_OPEN_FILE = -3
-    private const val ERROR_TOO_SMALL_CONNECTION = -4
+    /** no need to try any other mirror as we have downloaded the file */
+    private val DOWNLOAD_SUCCESS =
+        DownloadStatus(retrySame = false, tryNext = false, success = true)
 
-    //private const val ERROR_WRONG_CONTENT = -5
-    private const val ERROR_CONNECTION_ERROR = -6
+    /** the user pressed stop, so no need to download anything else */
+    private val DOWNLOAD_STOPPED =
+        DownloadStatus(retrySame = false, tryNext = false, success = true)
 
-    //private const val ERROR_MEDIA_STORE_URI_CANT_BE_CREATED = -7
-    //private const val ERROR_CONTENT_RESOLVER_CANT_OPEN_STREAM = -8
-    private const val ERROR_CONTENT_RESOLVER_NOT_FOUND = -9
+    /** the process failed due to some reason, so we retry and also try the next mirror */
+    private val DOWNLOAD_FAILED = DownloadStatus(retrySame = true, tryNext = true, success = false)
+
+    /** bad config, skip all mirrors as every call to download will have the same bad config */
+    private val DOWNLOAD_BAD_CONFIG =
+        DownloadStatus(retrySame = false, tryNext = false, success = false)
 
     private const val KEY_RESUME_PACKAGES = "download_resume"
     const val KEY_DOWNLOAD_INFO = "download_info"
@@ -203,15 +217,15 @@ object VideoDownloadManager {
         }
     }
 
-    /** Will return IsDone if not found or error */
-    fun getDownloadState(id: Int): DownloadType {
-        return try {
-            downloadStatus[id] ?: DownloadType.IsDone
-        } catch (e: Exception) {
-            logError(e)
-            DownloadType.IsDone
-        }
-    }
+    ///** Will return IsDone if not found or error */
+    //fun getDownloadState(id: Int): DownloadType {
+    //    return try {
+    //        downloadStatus[id] ?: DownloadType.IsDone
+    //    } catch (e: Exception) {
+    //        logError(e)
+    //        DownloadType.IsDone
+    //    }
+    //}
 
     private val cachedBitmaps = hashMapOf<String, Bitmap>()
     fun Context.getImageBitmapFromUrl(url: String, headers: Map<String, String>? = null): Bitmap? {
@@ -250,8 +264,8 @@ object VideoDownloadManager {
         notificationCallback: (Int, Notification) -> Unit,
         hlsProgress: Long? = null,
         hlsTotal: Long? = null,
-
-        ): Notification? {
+        bytesPerSecond: Long
+    ): Notification? {
         try {
             if (total <= 0) return null// crash, invalid data
 
@@ -271,6 +285,7 @@ object VideoDownloadManager {
                         DownloadType.IsPaused -> imgPaused
                         DownloadType.IsFailed -> imgError
                         DownloadType.IsStopped -> imgStopped
+                        DownloadType.IsPending -> imgDownloading
                     }
                 )
 
@@ -294,6 +309,8 @@ object VideoDownloadManager {
 
             if (state == DownloadType.IsDownloading || state == DownloadType.IsPaused) {
                 builder.setProgress((total / 1000).toInt(), (progress / 1000).toInt(), false)
+            } else if (state == DownloadType.IsPending) {
+                builder.setProgress(0, 0, true)
             }
 
             val rowTwoExtra = if (ep.name != null) " - ${ep.name}\n" else ""
@@ -320,27 +337,52 @@ object VideoDownloadManager {
                 val totalMbString: String
                 val suffix: String
 
+                val mbFormat = "%.1f MB"
+
                 if (hlsProgress != null && hlsTotal != null) {
                     progressPercentage = hlsProgress.toLong() * 100 / hlsTotal
                     progressMbString = hlsProgress.toString()
                     totalMbString = hlsTotal.toString()
-                    suffix = " - %.1f MB".format(progress / 1000000f)
+                    suffix = " - $mbFormat".format(progress / 1000000f)
                 } else {
                     progressPercentage = progress * 100 / total
-                    progressMbString = "%.1f MB".format(progress / 1000000f)
-                    totalMbString = "%.1f MB".format(total / 1000000f)
+                    progressMbString = mbFormat.format(progress / 1000000f)
+                    totalMbString = mbFormat.format(total / 1000000f)
                     suffix = ""
                 }
 
+                val mbPerSecondString =
+                    if (state == DownloadType.IsDownloading) {
+                        " ($mbFormat/s)".format(bytesPerSecond.toFloat() / 1000000f)
+                    } else ""
+
                 val bigText =
-                    if (state == DownloadType.IsDownloading || state == DownloadType.IsPaused) {
-                        (if (linkName == null) "" else "$linkName\n") + "$rowTwo\n$progressPercentage % ($progressMbString/$totalMbString)$suffix"
-                    } else if (state == DownloadType.IsFailed) {
-                        downloadFormat.format(context.getString(R.string.download_failed), rowTwo)
-                    } else if (state == DownloadType.IsDone) {
-                        downloadFormat.format(context.getString(R.string.download_done), rowTwo)
-                    } else {
-                        downloadFormat.format(context.getString(R.string.download_canceled), rowTwo)
+                    when (state) {
+                        DownloadType.IsDownloading, DownloadType.IsPaused -> {
+                            (if (linkName == null) "" else "$linkName\n") + "$rowTwo\n$progressPercentage % ($progressMbString/$totalMbString)$suffix$mbPerSecondString"
+                        }
+
+                        DownloadType.IsPending -> {
+                            (if (linkName == null) "" else "$linkName\n") + rowTwo
+                        }
+
+                        DownloadType.IsFailed -> {
+                            downloadFormat.format(
+                                context.getString(R.string.download_failed),
+                                rowTwo
+                            )
+                        }
+
+                        DownloadType.IsDone -> {
+                            downloadFormat.format(context.getString(R.string.download_done), rowTwo)
+                        }
+
+                        DownloadType.IsStopped -> {
+                            downloadFormat.format(
+                                context.getString(R.string.download_canceled),
+                                rowTwo
+                            )
+                        }
                     }
 
                 val bodyStyle = NotificationCompat.BigTextStyle()
@@ -348,14 +390,28 @@ object VideoDownloadManager {
                 builder.setStyle(bodyStyle)
             } else {
                 val txt =
-                    if (state == DownloadType.IsDownloading || state == DownloadType.IsPaused) {
-                        rowTwo
-                    } else if (state == DownloadType.IsFailed) {
-                        downloadFormat.format(context.getString(R.string.download_failed), rowTwo)
-                    } else if (state == DownloadType.IsDone) {
-                        downloadFormat.format(context.getString(R.string.download_done), rowTwo)
-                    } else {
-                        downloadFormat.format(context.getString(R.string.download_canceled), rowTwo)
+                    when (state) {
+                        DownloadType.IsDownloading, DownloadType.IsPaused, DownloadType.IsPending -> {
+                            rowTwo
+                        }
+
+                        DownloadType.IsFailed -> {
+                            downloadFormat.format(
+                                context.getString(R.string.download_failed),
+                                rowTwo
+                            )
+                        }
+
+                        DownloadType.IsDone -> {
+                            downloadFormat.format(context.getString(R.string.download_done), rowTwo)
+                        }
+
+                        DownloadType.IsStopped -> {
+                            downloadFormat.format(
+                                context.getString(R.string.download_canceled),
+                                rowTwo
+                            )
+                        }
                     }
 
                 builder.setContentText(txt)
@@ -438,54 +494,6 @@ object VideoDownloadManager {
         return tempName.replace("  ", " ").trim(' ')
     }
 
-    @RequiresApi(Build.VERSION_CODES.Q)
-    private fun ContentResolver.getExistingFolderStartName(relativePath: String): List<Pair<String, Uri>>? {
-        try {
-            val projection = arrayOf(
-                MediaStore.MediaColumns._ID,
-                MediaStore.MediaColumns.DISPLAY_NAME,   // unused (for verification use only)
-                //MediaStore.MediaColumns.RELATIVE_PATH,  // unused (for verification use only)
-            )
-
-            val selection =
-                "${MediaStore.MediaColumns.RELATIVE_PATH}='$relativePath'"
-
-            val result = this.query(
-                MediaStore.Downloads.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY),
-                projection, selection, null, null
-            )
-            val list = ArrayList<Pair<String, Uri>>()
-
-            result.use { c ->
-                if (c != null && c.count >= 1) {
-                    c.moveToFirst()
-                    while (true) {
-                        val id = c.getLong(c.getColumnIndexOrThrow(MediaStore.MediaColumns._ID))
-                        val name =
-                            c.getString(c.getColumnIndexOrThrow(MediaStore.MediaColumns.DISPLAY_NAME))
-                        val uri = ContentUris.withAppendedId(
-                            MediaStore.Downloads.EXTERNAL_CONTENT_URI, id
-                        )
-                        list.add(Pair(name, uri))
-                        if (c.isLast) {
-                            break
-                        }
-                        c.moveToNext()
-                    }
-
-                    /*
-                    val cDisplayName = c.getString(c.getColumnIndexOrThrow(MediaStore.MediaColumns.DISPLAY_NAME))
-                    val cRelativePath = c.getString(c.getColumnIndexOrThrow(MediaStore.MediaColumns.RELATIVE_PATH))*/
-
-                }
-            }
-            return list
-        } catch (e: Exception) {
-            logError(e)
-            return null
-        }
-    }
-
     /**
      * Used for getting video player subs.
      * @return List of pairs for the files in this format: <Name, Uri>
@@ -496,76 +504,13 @@ object VideoDownloadManager {
         basePath: String?
     ): List<Pair<String, Uri>>? {
         val base = basePathToFile(context, basePath)
-        val folder = base?.gotoDir(relativePath, false)
+        val folder = base?.gotoDirectory(relativePath, false) ?: return null
+        //if (folder.isDirectory() != false) return null
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && base.isDownloadDir()) {
-            return context.contentResolver?.getExistingFolderStartName(relativePath)
-        } else {
-//            val normalPath =
-//                "${Environment.getExternalStorageDirectory()}${File.separatorChar}${relativePath}".replace(
-//                    '/',
-//                    File.separatorChar
-//                )
-//            val folder = File(normalPath)
-            if (folder?.isDirectory == true) {
-                return folder.listFiles()?.map { Pair(it.name ?: "", it.uri) }
-            }
-        }
-        return null
-//        }
+        return folder.listFiles()
+            ?.mapNotNull { (it.name() ?: "") to (it.uri() ?: return@mapNotNull null) }
     }
 
-    @RequiresApi(Build.VERSION_CODES.Q)
-    private fun ContentResolver.getExistingDownloadUriOrNullQ(
-        relativePath: String,
-        displayName: String
-    ): Uri? {
-        try {
-            val projection = arrayOf(
-                MediaStore.MediaColumns._ID,
-                //MediaStore.MediaColumns.DISPLAY_NAME,   // unused (for verification use only)
-                //MediaStore.MediaColumns.RELATIVE_PATH,  // unused (for verification use only)
-            )
-
-            val selection =
-                "${MediaStore.MediaColumns.RELATIVE_PATH}='$relativePath' AND " + "${MediaStore.MediaColumns.DISPLAY_NAME}='$displayName'"
-
-            val result = this.query(
-                MediaStore.Downloads.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY),
-                projection, selection, null, null
-            )
-
-            result.use { c ->
-                if (c != null && c.count >= 1) {
-                    c.moveToFirst().let {
-                        val id = c.getLong(c.getColumnIndexOrThrow(MediaStore.MediaColumns._ID))
-                        /*
-                        val cDisplayName = c.getString(c.getColumnIndexOrThrow(MediaStore.MediaColumns.DISPLAY_NAME))
-                        val cRelativePath = c.getString(c.getColumnIndexOrThrow(MediaStore.MediaColumns.RELATIVE_PATH))*/
-
-                        return ContentUris.withAppendedId(
-                            MediaStore.Downloads.EXTERNAL_CONTENT_URI, id
-                        )
-                    }
-                }
-            }
-            return null
-        } catch (e: Exception) {
-            logError(e)
-            return null
-        }
-    }
-
-    @RequiresApi(Build.VERSION_CODES.Q)
-    fun ContentResolver.getFileLength(fileUri: Uri): Long? {
-        return try {
-            this.openFileDescriptor(fileUri, "r")
-                .use { it?.statSize ?: 0 }
-        } catch (e: Exception) {
-            logError(e)
-            null
-        }
-    }
 
     data class CreateNotificationMetadata(
         val type: DownloadType,
@@ -573,19 +518,35 @@ object VideoDownloadManager {
         val bytesTotal: Long,
         val hlsProgress: Long? = null,
         val hlsTotal: Long? = null,
+        val bytesPerSecond: Long
     )
 
     data class StreamData(
-        val errorCode: Int,
-        val resume: Boolean? = null,
-        val fileLength: Long? = null,
-        val fileStream: OutputStream? = null,
-    )
+        private val fileLength: Long,
+        val file: SafeFile,
+        //val fileStream: OutputStream,
+    ) {
+        @Throws(IOException::class)
+        fun open(): OutputStream {
+            return file.openOutputStreamOrThrow(resume)
+        }
 
-    /**
-     * Sets up the appropriate file and creates a data stream from the file.
-     * Used for initializing downloads.
-     * */
+        @Throws(IOException::class)
+        fun openNew(): OutputStream {
+            return file.openOutputStreamOrThrow(false)
+        }
+
+        fun delete(): Boolean {
+            return file.delete()
+        }
+
+        val resume: Boolean get() = fileLength > 0L
+        val startAt: Long get() = if (resume) fileLength else 0L
+        val exists: Boolean get() = file.exists() == true
+    }
+
+
+    @Throws(IOException::class)
     fun setupStream(
         context: Context,
         name: String,
@@ -593,408 +554,899 @@ object VideoDownloadManager {
         extension: String,
         tryResume: Boolean,
     ): StreamData {
-        val displayName = getDisplayName(name, extension)
-        val fileStream: OutputStream
-        val fileLength: Long
-        var resume = tryResume
-        val baseFile = context.getBasePath()
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && baseFile.first?.isDownloadDir() == true) {
-            val cr = context.contentResolver ?: return StreamData(ERROR_CONTENT_RESOLVER_NOT_FOUND)
-
-            val currentExistingFile =
-                cr.getExistingDownloadUriOrNullQ(
-                    folder ?: "",
-                    displayName
-                ) // CURRENT FILE WITH THE SAME PATH
-
-            fileLength =
-                if (currentExistingFile == null || !resume) 0 else (cr.getFileLength(
-                    currentExistingFile
-                )
-                    ?: 0)// IF NOT RESUME THEN 0, OTHERWISE THE CURRENT FILE SIZE
-
-            if (!resume && currentExistingFile != null) { // DELETE FILE IF FILE EXITS AND NOT RESUME
-                val rowsDeleted = context.contentResolver.delete(currentExistingFile, null, null)
-                if (rowsDeleted < 1) {
-                    println("ERROR DELETING FILE!!!")
-                }
-            }
-
-            var appendFile = false
-            val newFileUri = if (resume && currentExistingFile != null) {
-                appendFile = true
-                currentExistingFile
-            } else {
-                val contentUri =
-                    MediaStore.Downloads.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY) // USE INSTEAD OF MediaStore.Downloads.EXTERNAL_CONTENT_URI
-                //val currentMimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-                val currentMimeType = when (extension) {
-
-                    // Absolutely ridiculous, if text/vtt is used as mimetype scoped storage prevents
-                    // downloading to /Downloads yet it works with null
-
-                    "vtt" -> null // "text/vtt"
-                    "mp4" -> "video/mp4"
-                    "srt" -> null // "application/x-subrip"//"text/plain"
-                    else -> null
-                }
-                val newFile = ContentValues().apply {
-                    put(MediaStore.MediaColumns.DISPLAY_NAME, displayName)
-                    put(MediaStore.MediaColumns.TITLE, name)
-                    if (currentMimeType != null)
-                        put(MediaStore.MediaColumns.MIME_TYPE, currentMimeType)
-                    put(MediaStore.MediaColumns.RELATIVE_PATH, folder)
-                }
-
-                cr.insert(
-                    contentUri,
-                    newFile
-                ) ?: return StreamData(ERROR_CONTENT_RESOLVER_NOT_FOUND)
-            }
-
-            fileStream = cr.openOutputStream(newFileUri, "w" + (if (appendFile) "a" else ""))
-                ?: return StreamData(ERROR_CONTENT_RESOLVER_NOT_FOUND)
-        } else {
-            val subDir = baseFile.first?.gotoDir(folder)
-            val rFile = subDir?.findFile(displayName)
-            if (rFile?.exists() != true) {
-                fileLength = 0
-                if (subDir?.createFile(displayName) == null) return StreamData(ERROR_CREATE_FILE)
-            } else {
-                if (resume) {
-                    fileLength = rFile.size()
-                } else {
-                    fileLength = 0
-                    if (!rFile.delete()) return StreamData(ERROR_DELETING_FILE)
-                    if (subDir.createFile(displayName) == null) return StreamData(ERROR_CREATE_FILE)
-                }
-            }
-            fileStream = (subDir.findFile(displayName)
-                ?: subDir.createFile(displayName))!!.openOutputStream()
-//          fileStream = FileOutputStream(rFile, false)
-            if (fileLength == 0L) resume = false
-        }
-        return StreamData(SUCCESS_STREAM, resume, fileLength, fileStream)
+        return setupStream(
+            context.getBasePath().first ?: getDefaultDir(context) ?: throw IOException("Bad config"),
+            name,
+            folder,
+            extension,
+            tryResume
+        )
     }
 
-    fun downloadThing(
-        context: Context,
-        link: IDownloadableMinimum,
+    /**
+     * Sets up the appropriate file and creates a data stream from the file.
+     * Used for initializing downloads.
+     * */
+    @Throws(IOException::class)
+    fun setupStream(
+        baseFile: SafeFile,
         name: String,
         folder: String?,
         extension: String,
         tryResume: Boolean,
-        parentId: Int?,
-        createNotificationCallback: (CreateNotificationMetadata) -> Unit,
-    ): Int {
-        if (link.url.startsWith("magnet") || link.url.endsWith(".torrent")) {
-            return ERROR_UNKNOWN
-        }
-
-        val basePath = context.getBasePath()
-
+    ): StreamData {
         val displayName = getDisplayName(name, extension)
-        val relativePath =
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && basePath.first.isDownloadDir()) getRelativePath(
-                folder
-            ) else folder
 
-        fun deleteFile(): Int {
-            return delete(context, name, relativePath, extension, parentId, basePath.first)
-        }
+        val subDir = baseFile.gotoDirectoryOrThrow(folder)
+        val foundFile = subDir.findFile(displayName)
 
-        val stream = setupStream(context, name, relativePath, extension, tryResume)
-        if (stream.errorCode != SUCCESS_STREAM) return stream.errorCode
-
-        val resume = stream.resume!!
-        val fileStream = stream.fileStream!!
-        val fileLength = stream.fileLength!!
-
-        // CONNECT
-        val connection: URLConnection =
-            URL(link.url.replace(" ", "%20")).openConnection() // IDK OLD PHONES BE WACK
-
-        // SET CONNECTION SETTINGS
-        connection.connectTimeout = 10000
-        connection.setRequestProperty("Accept-Encoding", "identity")
-        connection.setRequestProperty("user-agent", USER_AGENT)
-        if (link.referer.isNotEmpty()) connection.setRequestProperty("referer", link.referer)
-
-        // extra stuff
-        connection.setRequestProperty(
-            "sec-ch-ua",
-            "\"Chromium\";v=\"91\", \" Not;A Brand\";v=\"99\""
-        )
-
-        connection.setRequestProperty("sec-ch-ua-mobile", "?0")
-        connection.setRequestProperty("accept", "*/*")
-        //   dataSource.setRequestProperty("Sec-Fetch-Site", "none") //same-site
-        connection.setRequestProperty("sec-fetch-user", "?1")
-        connection.setRequestProperty("sec-fetch-mode", "navigate")
-        connection.setRequestProperty("sec-fetch-dest", "video")
-        link.headers.entries.forEach {
-            connection.setRequestProperty(it.key, it.value)
-        }
-
-        if (resume)
-            connection.setRequestProperty("Range", "bytes=${fileLength}-")
-        val resumeLength = (if (resume) fileLength else 0)
-
-        // ON CONNECTION
-        connection.connect()
-
-        val contentLength = try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { // fuck android
-                connection.contentLengthLong
+        val (file, fileLength) = if (foundFile == null || foundFile.exists() != true) {
+            subDir.createFileOrThrow(displayName) to 0L
+        } else {
+            if (tryResume) {
+                foundFile to foundFile.lengthOrThrow()
             } else {
-                connection.getHeaderField("content-length").toLongOrNull()
-                    ?: connection.contentLength.toLong()
+                foundFile.deleteOrThrow()
+                subDir.createFileOrThrow(displayName) to 0L
             }
-        } catch (e: Exception) {
-            logError(e)
-            0L
-        }
-        val bytesTotal = contentLength + resumeLength
-
-        if (extension == "mp4" && bytesTotal < 5000000) return ERROR_TOO_SMALL_CONNECTION // DATA IS LESS THAN 5MB, SOMETHING IS WRONG
-
-        parentId?.let {
-            setKey(
-                KEY_DOWNLOAD_INFO,
-                it.toString(),
-                DownloadedFileInfo(
-                    bytesTotal,
-                    relativePath ?: "",
-                    displayName,
-                    basePath = basePath.second
-                )
-            )
         }
 
-        // Could use connection.contentType for mime types when creating the file,
-        // however file is already created and players don't go of file type
+        return StreamData(fileLength, file)
+    }
 
-        // https://stackoverflow.com/questions/23714383/what-are-all-the-possible-values-for-http-content-type-header
-        // might receive application/octet-stream
-        /*if (!connection.contentType.isNullOrEmpty() && !connection.contentType.startsWith("video")) {
-            return ERROR_WRONG_CONTENT // CONTENT IS NOT VIDEO, SHOULD NEVER HAPPENED, BUT JUST IN CASE
-        }*/
+    /** This class handles the notifications, as well as the relevant key */
+    data class DownloadMetaData(
+        private val id: Int?,
+        var bytesDownloaded: Long = 0,
+        var bytesWritten: Long = 0,
 
-        // READ DATA FROM CONNECTION
-        val connectionInputStream: InputStream = BufferedInputStream(connection.inputStream)
-        val buffer = ByteArray(1024)
-        var count: Int
-        var bytesDownloaded = resumeLength
+        var totalBytes: Long? = null,
 
-        var isPaused = false
-        var isStopped = false
-        var isDone = false
-        var isFailed = false
+        // notification metadata
+        private var lastUpdatedMs: Long = 0,
+        private var lastDownloadedBytes: Long = 0,
+        private val createNotificationCallback: (CreateNotificationMetadata) -> Unit,
 
-        // TO NOT REUSE CODE
-        fun updateNotification() {
-            val type = when {
-                isDone -> DownloadType.IsDone
-                isStopped -> DownloadType.IsStopped
-                isFailed -> DownloadType.IsFailed
-                isPaused -> DownloadType.IsPaused
-                else -> DownloadType.IsDownloading
-            }
+        private var internalType: DownloadType = DownloadType.IsPending,
 
-            parentId?.let { id ->
-                try {
-                    downloadStatus[id] = type
-                    downloadStatusEvent.invoke(Pair(id, type))
-                    downloadProgressEvent.invoke(Triple(id, bytesDownloaded, bytesTotal))
-                } catch (e: Exception) {
-                    // IDK MIGHT ERROR
-                }
-            }
+        // how many segments that we have downloaded
+        var hlsProgress: Int = 0,
+        // how many segments that exist
+        var hlsTotal: Int? = null,
+        // this is how many segments that has been written to the file
+        // will always be <= hlsProgress as we may keep some in a buffer
+        var hlsWrittenProgress: Int = 0,
 
-            createNotificationCallback.invoke(
-                CreateNotificationMetadata(
-                    type,
-                    bytesDownloaded,
-                    bytesTotal
-                )
-            )
-            /*createNotification(
-                context,
-                source,
-                link.name,
-                ep,
-                type,
-                bytesDownloaded,
-                bytesTotal
-            )*/
+        // this is used for copy with metadata on how much we have downloaded for setKey
+        private var downloadFileInfoTemplate: DownloadedFileInfo? = null
+    ) : Closeable {
+        fun setResumeLength(length: Long) {
+            bytesDownloaded = length
+            bytesWritten = length
+            lastDownloadedBytes = length
         }
 
-        val downloadEventListener = { event: Pair<Int, DownloadActionType> ->
-            if (event.first == parentId) {
+        val approxTotalBytes: Long
+            get() = totalBytes ?: hlsTotal?.let { total ->
+                (bytesDownloaded * (total / hlsProgress.toFloat())).toLong()
+            } ?: bytesDownloaded
+
+        private val isHLS get() = hlsTotal != null
+
+        private var stopListener: (() -> Unit)? = null
+
+        /** on cancel button pressed or failed invoke this once and only once */
+        fun setOnStop(callback: (() -> Unit)) {
+            stopListener = callback
+        }
+
+        fun removeStopListener() {
+            stopListener = null
+        }
+
+        private val downloadEventListener = { event: Pair<Int, DownloadActionType> ->
+            if (event.first == id) {
                 when (event.second) {
                     DownloadActionType.Pause -> {
-                        isPaused = true; updateNotification()
+                        type = DownloadType.IsPaused
                     }
+
                     DownloadActionType.Stop -> {
-                        isStopped = true; updateNotification()
+                        type = DownloadType.IsStopped
                         removeKey(KEY_RESUME_PACKAGES, event.first.toString())
                         saveQueue()
+                        stopListener?.invoke()
+                        stopListener = null
                     }
+
                     DownloadActionType.Resume -> {
-                        isPaused = false; updateNotification()
+                        type = DownloadType.IsDownloading
                     }
                 }
             }
         }
 
-        if (parentId != null)
-            downloadEvent += downloadEventListener
-
-        // UPDATE DOWNLOAD NOTIFICATION
-        val notificationCoroutine = main {
-            while (true) {
-                if (!isPaused) {
-                    updateNotification()
-                }
-                for (i in 1..10) {
-                    delay(100)
-                }
+        private fun updateFileInfo() {
+            if (id == null) return
+            downloadFileInfoTemplate?.let { template ->
+                setKey(
+                    KEY_DOWNLOAD_INFO,
+                    id.toString(),
+                    template.copy(
+                        totalBytes = approxTotalBytes,
+                        extraInfo = if (isHLS) hlsWrittenProgress.toString() else null
+                    )
+                )
             }
         }
 
-        // THE REAL READ
-        try {
-            while (true) {
-                count = connectionInputStream.read(buffer)
-                if (count < 0) break
-                bytesDownloaded += count
-                // downloadProgressEvent.invoke(Pair(id, bytesDownloaded)) // Updates too much for any UI to keep up with
-                while (isPaused) {
-                    sleep(100)
-                    if (isStopped) {
-                        break
-                    }
-                }
-                if (isStopped) {
-                    break
-                }
-                fileStream.write(buffer, 0, count)
-            }
-        } catch (e: Exception) {
-            logError(e)
-            isFailed = true
-            updateNotification()
+        fun setDownloadFileInfoTemplate(template: DownloadedFileInfo) {
+            downloadFileInfoTemplate = template
+            updateFileInfo()
         }
 
-        // REMOVE AND EXIT ALL
-        fileStream.close()
-        connectionInputStream.close()
-        notificationCoroutine.cancel()
+        init {
+            if (id != null) {
+                downloadEvent += downloadEventListener
+            }
+        }
 
-        try {
-            if (parentId != null)
+        override fun close() {
+            // as we may need to resume hls downloads, we save the current written index
+            if (isHLS || totalBytes == null) {
+                updateFileInfo()
+            }
+            if (id != null) {
                 downloadEvent -= downloadEventListener
-        } catch (e: Exception) {
-            logError(e)
+                downloadStatus -= id
+            }
+            stopListener = null
         }
 
-        try {
-            parentId?.let {
-                downloadStatus.remove(it)
+        var type
+            get() = internalType
+            set(value) {
+                internalType = value
+                notify()
             }
-        } catch (e: Exception) {
-            // IDK MIGHT ERROR
+
+        fun onDelete() {
+            bytesDownloaded = 0
+            hlsWrittenProgress = 0
+            hlsProgress = 0
+            if (id != null)
+                downloadDeleteEvent(id)
+
+            //internalType = DownloadType.IsStopped
+            notify()
         }
 
-        // RETURN MESSAGE
-        return when {
-            isFailed -> {
-                parentId?.let { id -> downloadProgressEvent.invoke(Triple(id, 0, 0)) }
-                ERROR_CONNECTION_ERROR
-            }
-            isStopped -> {
-                parentId?.let { id -> downloadProgressEvent.invoke(Triple(id, 0, 0)) }
-                deleteFile()
-            }
-            else -> {
-                parentId?.let { id ->
-                    downloadProgressEvent.invoke(
-                        Triple(
-                            id,
+        companion object {
+            const val UPDATE_RATE_MS: Long = 1000L
+        }
+
+        @JvmName("DownloadMetaDataNotify")
+        private fun notify() {
+            // max 10 sec between notifications, min 0.1s, this is to stop div by zero
+            val dt = (System.currentTimeMillis() - lastUpdatedMs).coerceIn(100, 10000)
+
+            val bytesPerSecond =
+                ((bytesDownloaded - lastDownloadedBytes) * 1000L) / dt
+
+            lastDownloadedBytes = bytesDownloaded
+            lastUpdatedMs = System.currentTimeMillis()
+            try {
+                val bytes = approxTotalBytes
+
+                // notification creation
+                if (isHLS) {
+                    createNotificationCallback(
+                        CreateNotificationMetadata(
+                            internalType,
                             bytesDownloaded,
-                            bytesTotal
+                            bytes,
+                            hlsTotal = hlsTotal?.toLong(),
+                            hlsProgress = hlsProgress.toLong(),
+                            bytesPerSecond = bytesPerSecond
+                        )
+                    )
+                } else {
+                    createNotificationCallback(
+                        CreateNotificationMetadata(
+                            internalType,
+                            bytesDownloaded,
+                            bytes,
+                            bytesPerSecond = bytesPerSecond
                         )
                     )
                 }
-                isDone = true
-                updateNotification()
-                SUCCESS_DOWNLOAD_DONE
+
+                // as hls has an approx file size we want to update this metadata
+                if (isHLS) {
+                    updateFileInfo()
+                }
+
+                if (internalType == DownloadType.IsStopped || internalType == DownloadType.IsFailed) {
+                    stopListener?.invoke()
+                    stopListener = null
+                }
+
+                // push all events, this *should* not crash, TODO MUTEX?
+                if (id != null) {
+                    downloadStatus[id] = type
+                    downloadProgressEvent(Triple(id, bytesDownloaded, bytes))
+                    downloadStatusEvent(id to type)
+                }
+            } catch (t: Throwable) {
+                logError(t)
+                if (BuildConfig.DEBUG) {
+                    throw t
+                }
+            }
+        }
+
+        private fun checkNotification() {
+            if (lastUpdatedMs + UPDATE_RATE_MS > System.currentTimeMillis()) return
+            notify()
+        }
+
+
+        /** adds the length and pushes a notification if necessary */
+        fun addBytes(length: Long) {
+            bytesDownloaded += length
+            // we don't want to update the notification after it is paused,
+            // download progress may not stop directly when we "pause" it
+            if (type == DownloadType.IsDownloading) checkNotification()
+        }
+
+        fun addBytesWritten(length: Long) {
+            bytesWritten += length
+        }
+
+        /** adds the length + hsl progress and pushes a notification if necessary */
+        fun addSegment(length: Long) {
+            hlsProgress += 1
+            addBytes(length)
+        }
+
+        fun setWrittenSegment(segmentIndex: Int) {
+            hlsWrittenProgress = segmentIndex + 1
+            // in case of abort we need to save every written progress
+            updateFileInfo()
+        }
+    }
+
+    /** bytes have the size end-start where the byte range is [start,end)
+     * note that ByteArray is a pointer and therefore cant be stored without cloning it */
+    data class LazyStreamDownloadResponse(
+        val bytes: ByteArray,
+        val startByte: Long,
+        val endByte: Long,
+    ) {
+        val size get() = endByte - startByte
+
+        override fun toString(): String {
+            return "$startByte->$endByte"
+        }
+
+        override fun equals(other: Any?): Boolean {
+            if (other !is LazyStreamDownloadResponse) return false
+            return other.startByte == startByte && other.endByte == endByte
+        }
+
+        override fun hashCode(): Int {
+            return Objects.hash(startByte, endByte)
+        }
+    }
+
+    data class LazyStreamDownloadData(
+        private val url: String,
+        private val headers: Map<String, String>,
+        private val referer: String,
+        /** This specifies where chunck i starts and ends,
+         * bytes=${chuckStartByte[ i ]}-${chuckStartByte[ i+1 ] -1}
+         * where out of bounds => bytes=${chuckStartByte[ i ]}- */
+        private val chuckStartByte: LongArray,
+        val totalLength: Long?,
+        val downloadLength: Long?,
+        val chuckSize: Long,
+        val bufferSize: Int,
+    ) {
+        val size get() = chuckStartByte.size
+
+        /** returns what byte it has downloaded,
+         * so start at 10 and download 4 bytes = return 14
+         *
+         * the range is [startByte, endByte) to be able to do [a, b) [b, c) ect
+         *
+         * [a, null) will return inclusive to eof = [a, eof]
+         *
+         * throws an error if initial get request fails, can be specified as return startByte
+         * */
+        @Throws
+        private suspend fun resolve(
+            startByte: Long,
+            endByte: Long?,
+            callback: (suspend CoroutineScope.(LazyStreamDownloadResponse) -> Unit)
+        ): Long = withContext(Dispatchers.IO) {
+            var currentByte: Long = startByte
+            val stopAt = endByte ?: Long.MAX_VALUE
+            if (currentByte >= stopAt) return@withContext currentByte
+
+            val request = app.get(
+                url,
+                headers = headers + mapOf(
+                    // range header is inclusive so [startByte, endByte-1] = [startByte, endByte)
+                    // if nothing at end the server will continue until eof
+                    "Range" to "bytes=$startByte-" // ${endByte?.minus(1)?.toString() ?: "" }
+                ),
+                referer = referer,
+                verify = false
+            )
+            val requestStream = request.body.byteStream()
+
+            val buffer = ByteArray(bufferSize)
+            var read: Int
+
+            try {
+                while (requestStream.read(buffer, 0, bufferSize).also { read = it } >= 0) {
+                    val start = currentByte
+                    currentByte += read.toLong()
+
+                    // this stops overflow
+                    if (currentByte >= stopAt) {
+                        callback(LazyStreamDownloadResponse(buffer, start, stopAt))
+                        break
+                    } else {
+                        callback(LazyStreamDownloadResponse(buffer, start, currentByte))
+                    }
+                }
+            } catch (e: CancellationException) {
+                throw e
+            } catch (t: Throwable) {
+                logError(t)
+            } finally {
+                requestStream.closeQuietly()
+            }
+
+            return@withContext currentByte
+        }
+
+        /** retries the resolve n times and returns true if successful */
+        suspend fun resolveSafe(
+            index: Int,
+            retries: Int = 3,
+            callback: (suspend CoroutineScope.(LazyStreamDownloadResponse) -> Unit)
+        ): Boolean {
+            var start = chuckStartByte.getOrNull(index) ?: return false
+            val end = chuckStartByte.getOrNull(index + 1)
+
+            for (i in 0 until retries) {
+                try {
+                    // in case
+                    start = resolve(start, end, callback)
+                    // no end defined, so we don't care exactly where it ended
+                    if (end == null) return true
+                    // we have download more or exactly what we needed
+                    if (start >= end) return true
+                } catch (e: IllegalStateException) {
+                    return false
+                } catch (e: CancellationException) {
+                    return false
+                } catch (t: Throwable) {
+                    continue
+                }
+            }
+            return false
+        }
+
+    }
+
+    @Throws
+    suspend fun streamLazy(
+        url: String,
+        headers: Map<String, String>,
+        referer: String,
+        startByte: Long,
+        /** how many bytes every connection should be, by default it is 10 MiB */
+        chuckSize: Long = (1 shl 20) * 10,
+        /** maximum bytes in the buffer that responds */
+        bufferSize: Int = DEFAULT_BUFFER_SIZE,
+        /** how many bytes bytes it should require to use the parallel downloader instead,
+         * if we download a very small file we don't want it parallel */
+        maximumSmallSize : Long = chuckSize * 2
+    ): LazyStreamDownloadData {
+        // we don't want to make a separate connection for every 1kb
+        require(chuckSize > 1000)
+
+        var contentLength =
+            app.head(url = url, headers = headers, referer = referer, verify = false).size
+        if (contentLength != null && contentLength <= 0) contentLength = null
+
+        var downloadLength: Long? = null
+        var totalLength: Long? = null
+
+        val ranges = if (contentLength == null || contentLength < maximumSmallSize) {
+            // is the equivalent of [startByte..EOF] as we don't know the size we can only do one
+            // connection
+            LongArray(1) { startByte }
+        } else {
+            downloadLength = contentLength - startByte
+            totalLength = contentLength
+            // div with ceiling as
+            // this makes the last part "unknown ending" and it will break at EOF
+            // so eg startByte = 0, downloadLength = 13, chuckSize = 10
+            // = LongArray(2) { 0, 10 } = [0,10) + [10..EOF]
+            LongArray(((downloadLength + chuckSize - 1) / chuckSize).toInt()) { idx ->
+                startByte + idx * chuckSize
+            }
+        }
+
+        return LazyStreamDownloadData(
+            url = url,
+            headers = headers,
+            referer = referer,
+            chuckStartByte = ranges,
+            downloadLength = downloadLength,
+            totalLength = totalLength,
+            chuckSize = chuckSize,
+            bufferSize = bufferSize
+        )
+    }
+
+    /** Helper function to make sure duplicate attributes don't get overriden or inserted without lowercase cmp
+     * example: map("a" to 1) appendAndDontOverride map("A" to 2, "a" to 3, "c" to 4) = map("a" to 1, "c" to 4)
+     * */
+    private fun <V> Map<String, V>.appendAndDontOverride(rhs: Map<String, V>): Map<String, V> {
+        val out = this.toMutableMap()
+        val current = this.keys.map { it.lowercase() }
+        for ((key, value) in rhs) {
+            if (current.contains(key.lowercase())) continue
+            out[key] = value
+        }
+        return out
+    }
+
+    private fun List<Job>.cancel() {
+        forEach { job ->
+            try {
+                job.cancel()
+            } catch (t: Throwable) {
+                logError(t)
             }
         }
     }
 
+    private suspend fun List<Job>.join() {
+        forEach { job ->
+            try {
+                job.join()
+            } catch (t: Throwable) {
+                logError(t)
+            }
+        }
+    }
 
-    /**
-     * Guarantees a directory is present with the dir name (if createMissingDirectories is true).
-     * Works recursively when '/' is present.
-     * Will remove any file with the dir name if present and add directory.
-     * Will not work if the parent directory does not exist.
-     *
-     * @param directoryName if null will use the current path.
-     * @return UniFile / null if createMissingDirectories = false and folder is not found.
-     * */
-    private fun UniFile.gotoDir(
-        directoryName: String?,
-        createMissingDirectories: Boolean = true
-    ): UniFile? {
-
-        // May give this error on scoped storage.
-        // W/DocumentsContract: Failed to create document
-        // java.lang.IllegalArgumentException: Parent document isn't a directory
-
-        // Not present in latest testing.
-
-//        println("Going to dir $directoryName from ${this.uri} ---- ${this.filePath}")
+    /** download a file that consist of a single stream of data*/
+    suspend fun downloadThing(
+        context: Context,
+        link: IDownloadableMinimum,
+        name: String,
+        folder: String,
+        extension: String,
+        tryResume: Boolean,
+        parentId: Int?,
+        createNotificationCallback: (CreateNotificationMetadata) -> Unit,
+        parallelConnections: Int = 3
+    ): DownloadStatus = withContext(Dispatchers.IO) {
+        if (parallelConnections < 1) {
+            return@withContext DOWNLOAD_INVALID_INPUT
+        }
 
+        var fileStream: OutputStream? = null
+        //var requestStream: InputStream? = null
+        val metadata = DownloadMetaData(
+            totalBytes = 0,
+            bytesDownloaded = 0,
+            createNotificationCallback = createNotificationCallback,
+            id = parentId,
+        )
         try {
-            // Creates itself from parent if doesn't exist.
-            if (!this.exists() && createMissingDirectories && !this.name.isNullOrBlank()) {
-                if (this.parentFile != null) {
-                    this.parentFile?.createDirectory(this.name)
-                } else if (this.filePath != null) {
-                    UniFile.fromFile(File(this.filePath!!).parentFile)?.createDirectory(this.name)
-                }
-            }
+            // get the file path
+            val (baseFile, basePath) = context.getBasePath()
+            val displayName = getDisplayName(name, extension)
+            if (baseFile == null) return@withContext DOWNLOAD_BAD_CONFIG
 
-            val allDirectories = directoryName?.split("/")
-            return if (allDirectories?.size == 1 || allDirectories == null) {
-                val found = this.findFile(directoryName)
-                when {
-                    directoryName.isNullOrBlank() -> this
-                    found?.isDirectory == true -> found
+            // set up the download file
+            val stream = setupStream(baseFile, name, folder, extension, tryResume)
 
-                    !createMissingDirectories -> null
-                    // Below creates directories
-                    found?.isFile == true -> {
-                        found.delete()
-                        this.createDirectory(directoryName)
+            fileStream = stream.open()
+
+            metadata.setResumeLength(stream.startAt)
+            metadata.type = DownloadType.IsPending
+
+            val items = streamLazy(
+                url = link.url.replace(" ", "%20"),
+                referer = link.referer,
+                startByte = stream.startAt,
+                headers = link.headers.appendAndDontOverride(
+                    mapOf(
+                        "Accept-Encoding" to "identity",
+                        "accept" to "*/*",
+                        "user-agent" to USER_AGENT,
+                        "sec-ch-ua" to "\"Chromium\";v=\"91\", \" Not;A Brand\";v=\"99\"",
+                        "sec-fetch-mode" to "navigate",
+                        "sec-fetch-dest" to "video",
+                        "sec-fetch-user" to "?1",
+                        "sec-ch-ua-mobile" to "?0",
+                    )
+                )
+            )
+
+            metadata.totalBytes = items.totalLength
+            metadata.type = DownloadType.IsDownloading
+            metadata.setDownloadFileInfoTemplate(
+                DownloadedFileInfo(
+                    totalBytes = metadata.approxTotalBytes,
+                    relativePath = folder,
+                    displayName = displayName,
+                    basePath = basePath
+                )
+            )
+
+            val currentMutex = Mutex()
+            val current = (0 until items.size).iterator()
+
+            val fileMutex = Mutex()
+            // start to data
+            val pendingData: HashMap<Long, LazyStreamDownloadResponse> =
+                hashMapOf()
+
+            val fileChecker = launch(Dispatchers.IO) {
+                while (isActive) {
+                    if (stream.exists) {
+                        delay(5000)
+                        continue
                     }
-                    this.isDirectory -> this.createDirectory(directoryName)
-                    else -> this.parentFile?.createDirectory(directoryName)
+                    fileMutex.withLock {
+                        metadata.type = DownloadType.IsStopped
+                    }
+                    break
                 }
-            } else {
-                var currentDirectory = this
-                allDirectories.forEach {
-                    // If the next directory is not found it returns the deepest directory possible.
-                    val nextDir = currentDirectory.gotoDir(it, createMissingDirectories)
-                    currentDirectory = nextDir ?: return null
-                }
-                currentDirectory
             }
-        } catch (e: Exception) {
+
+            val jobs = (0 until parallelConnections).map {
+                launch(Dispatchers.IO) {
+
+                    // @downloadexplanation
+                    // this may seem a bit complex but it more or less acts as a queue system
+                    // imagine we do the downloading [0,3] and it response in the order 0,2,3,1
+                    // file: [_,_,_,_] queue: [_,_,_,_] Initial condition
+                    // file: [X,_,_,_] queue: [_,_,_,_] + added 0 directly to file
+                    // file: [X,_,_,_] queue: [_,_,X,_] + added 2 to queue
+                    // file: [X,_,_,_] queue: [_,_,X,X] + added 3 to queue
+                    // file: [X,X,_,_] queue: [_,_,X,X] + added 1 directly to file
+                    // file: [X,X,X,X] queue: [_,_,_,_] write the queue and remove from it
+
+                    // note that this is a bit more complex compared to hsl as ever segment
+                    // will return several bytearrays, and is therefore chained by the byte
+                    // so every request has a front and back byte instead of an index
+                    // this *requires* that no gap exist due because of resolve
+                    val callback: (suspend CoroutineScope.(LazyStreamDownloadResponse) -> Unit) =
+                        callback@{ response ->
+                            if (!isActive) return@callback
+                            fileMutex.withLock {
+                                // wait until not paused
+                                while (metadata.type == DownloadType.IsPaused) delay(100)
+                                // if stopped then throw
+                                if (metadata.type == DownloadType.IsStopped || metadata.type == DownloadType.IsFailed) {
+                                    this.cancel()
+                                    return@callback
+                                }
+
+                                val responseSize = response.size
+                                metadata.addBytes(response.size)
+
+                                if (response.startByte == metadata.bytesWritten) {
+                                    // if we are first in the queue then write it directly
+                                    fileStream.write(
+                                        response.bytes,
+                                        0,
+                                        responseSize.toInt()
+                                    )
+                                    metadata.addBytesWritten(responseSize)
+                                } else {
+                                    // otherwise append to queue, we need to clone the bytes as they will be overridden otherwise
+                                    pendingData[response.startByte] =
+                                        response.copy(bytes = response.bytes.clone())
+                                }
+
+                                while (true) {
+                                    // remove the current queue start, so no possibility of
+                                    // while(true) { continue } in case size = 0, and removed extra
+                                    // garbage
+                                    val pending = pendingData.remove(metadata.bytesWritten) ?: break
+
+                                    val size = pending.size
+
+                                    fileStream.write(
+                                        pending.bytes,
+                                        0,
+                                        size.toInt()
+                                    )
+                                    metadata.addBytesWritten(size)
+                                }
+                            }
+                        }
+
+                    // this will take up the first available job and resolve
+                    while (true) {
+                        if (!isActive) return@launch
+                        fileMutex.withLock {
+                            if (metadata.type == DownloadType.IsStopped
+                                || metadata.type == DownloadType.IsFailed
+                            ) return@launch
+                        }
+
+                        // mutex just in case, we never want this to fail due to multithreading
+                        val index = currentMutex.withLock {
+                            if (!current.hasNext()) return@launch
+                            current.nextInt()
+                        }
+
+                        // in case something has gone wrong set to failed if the fail is not caused by
+                        // user cancellation
+                        if (!items.resolveSafe(index, callback = callback)) {
+                            fileMutex.withLock {
+                                if (metadata.type != DownloadType.IsStopped) {
+                                    metadata.type = DownloadType.IsFailed
+                                }
+                            }
+                            return@launch
+                        }
+                    }
+                }
+            }
+
+            // fast stop as the jobs may be in a slow request
+            metadata.setOnStop {
+                jobs.cancel()
+            }
+
+            jobs.join()
+            fileChecker.cancel()
+
+            // jobs are finished so we don't want to stop them anymore
+            metadata.removeStopListener()
+            if (!stream.exists) metadata.type = DownloadType.IsStopped
+
+            if (metadata.type == DownloadType.IsFailed) {
+                return@withContext DOWNLOAD_FAILED
+            }
+
+            if (metadata.type == DownloadType.IsStopped) {
+                // we need to close before delete
+                fileStream.closeQuietly()
+                metadata.onDelete()
+                stream.delete()
+                return@withContext DOWNLOAD_STOPPED
+            }
+
+            metadata.type = DownloadType.IsDone
+            return@withContext DOWNLOAD_SUCCESS
+        } catch (e: IOException) {
+            // some sort of IO error, this should not happened
+            // we just rethrow it
             logError(e)
-            return null
+            throw e
+        } catch (t: Throwable) {
+            // some sort of network error, will error
+
+            // note that when failing we don't want to delete the file,
+            // only user interaction has that power
+            metadata.type = DownloadType.IsFailed
+            return@withContext DOWNLOAD_FAILED
+        } finally {
+            fileStream?.closeQuietly()
+            //requestStream?.closeQuietly()
+            metadata.close()
+        }
+    }
+
+    private suspend fun downloadHLS(
+        context: Context,
+        link: ExtractorLink,
+        name: String,
+        folder: String,
+        parentId: Int?,
+        startIndex: Int?,
+        createNotificationCallback: (CreateNotificationMetadata) -> Unit,
+        parallelConnections: Int = 3
+    ): DownloadStatus = withContext(Dispatchers.IO) {
+        if (parallelConnections < 1) return@withContext DOWNLOAD_INVALID_INPUT
+
+        val metadata = DownloadMetaData(
+            createNotificationCallback = createNotificationCallback,
+            id = parentId
+        )
+        var fileStream: OutputStream? = null
+        try {
+            val extension = "mp4"
+
+            // the start .ts index
+            var startAt = startIndex ?: 0
+
+            // set up the file data
+            val (baseFile, basePath) = context.getBasePath()
+            if (baseFile == null) return@withContext DOWNLOAD_BAD_CONFIG
+
+            val displayName = getDisplayName(name, extension)
+            val stream =
+                setupStream(baseFile, name, folder, extension, startAt > 0)
+            if (!stream.resume) startAt = 0
+            fileStream = stream.open()
+
+            // push the metadata
+            metadata.setResumeLength(stream.startAt)
+            metadata.hlsProgress = startAt
+            metadata.type = DownloadType.IsPending
+            metadata.setDownloadFileInfoTemplate(
+                DownloadedFileInfo(
+                    totalBytes = 0,
+                    relativePath = folder,
+                    displayName = displayName,
+                    basePath = basePath
+                )
+            )
+
+            // do the initial get request to fetch the segments
+            val m3u8 = M3u8Helper.M3u8Stream(
+                link.url, link.quality, link.headers.appendAndDontOverride(
+                    mapOf(
+                        "Accept-Encoding" to "identity",
+                        "accept" to "*/*",
+                        "user-agent" to USER_AGENT,
+                    ) + if (link.referer.isNotBlank()) mapOf("referer" to link.referer) else emptyMap()
+                )
+            )
+            val items = M3u8Helper2.hslLazy(listOf(m3u8))
+
+            metadata.hlsTotal = items.size
+            metadata.type = DownloadType.IsDownloading
+
+            val currentMutex = Mutex()
+            val current = (startAt until items.size).iterator()
+
+            val fileMutex = Mutex()
+            val pendingData: HashMap<Int, ByteArray> = hashMapOf()
+
+            val fileChecker = launch(Dispatchers.IO) {
+                while (isActive) {
+                    if (stream.exists) {
+                        delay(5000)
+                        continue
+                    }
+                    fileMutex.withLock {
+                        metadata.type = DownloadType.IsStopped
+                    }
+                    break
+                }
+            }
+
+            // see @downloadexplanation for explanation of this download strategy,
+            // this keeps all jobs working at all times,
+            // does several connections in parallel instead of a regular for loop to improve
+            // download speed
+            val jobs = (0 until parallelConnections).map {
+                launch(Dispatchers.IO) {
+                    while (true) {
+                        if (!isActive) return@launch
+                        fileMutex.withLock {
+                            if (metadata.type == DownloadType.IsStopped
+                                || metadata.type == DownloadType.IsFailed
+                            ) return@launch
+                        }
+
+                        // mutex just in case, we never want this to fail due to multithreading
+                        val index = currentMutex.withLock {
+                            if (!current.hasNext()) return@launch
+                            current.nextInt()
+                        }
+
+                        // in case something has gone wrong set to failed if the fail is not caused by
+                        // user cancellation
+                        val bytes = items.resolveLinkSafe(index) ?: run {
+                            fileMutex.withLock {
+                                if (metadata.type != DownloadType.IsStopped) {
+                                    metadata.type = DownloadType.IsFailed
+                                }
+                            }
+                            return@launch
+                        }
+
+                        try {
+                            fileMutex.lock()
+                            // user pause
+                            while (metadata.type == DownloadType.IsPaused) delay(100)
+                            // if stopped then break to delete
+                            if (metadata.type == DownloadType.IsStopped || metadata.type == DownloadType.IsFailed || !isActive) return@launch
+
+                            val segmentLength = bytes.size.toLong()
+                            // send notification, no matter the actual write order
+                            metadata.addSegment(segmentLength)
+
+                            // directly write the bytes if you are first
+                            if (metadata.hlsWrittenProgress == index) {
+                                fileStream.write(bytes)
+
+                                metadata.addBytesWritten(segmentLength)
+                                metadata.setWrittenSegment(index)
+                            } else {
+                                // no need to clone as there will be no modification of this bytearray
+                                pendingData[index] = bytes
+                            }
+
+                            // write the cached bytes submitted by other threads
+                            while (true) {
+                                val cache = pendingData.remove(metadata.hlsWrittenProgress) ?: break
+                                val cacheLength = cache.size.toLong()
+
+                                fileStream.write(cache)
+
+                                metadata.addBytesWritten(cacheLength)
+                                metadata.setWrittenSegment(metadata.hlsWrittenProgress)
+                            }
+                        } catch (t: Throwable) {
+                            // this is in case of write fail
+                            logError(t)
+                            if (metadata.type != DownloadType.IsStopped) {
+                                metadata.type = DownloadType.IsFailed
+                            }
+                        } finally {
+                            try {
+                                // may cause java.lang.IllegalStateException: Mutex is not locked because of cancelling
+                                fileMutex.unlock()
+                            } catch (t : Throwable) {
+                                logError(t)
+                            }
+                        }
+                    }
+                }
+            }
+
+            // fast stop as the jobs may be in a slow request
+            metadata.setOnStop {
+                jobs.cancel()
+            }
+
+            jobs.join()
+            fileChecker.cancel()
+
+            metadata.removeStopListener()
+
+            if (!stream.exists) metadata.type = DownloadType.IsStopped
+
+            if (metadata.type == DownloadType.IsFailed) {
+                return@withContext DOWNLOAD_FAILED
+            }
+
+            if (metadata.type == DownloadType.IsStopped) {
+                // we need to close before delete
+                fileStream.closeQuietly()
+                metadata.onDelete()
+                stream.delete()
+                return@withContext DOWNLOAD_STOPPED
+            }
+
+            metadata.type = DownloadType.IsDone
+            return@withContext DOWNLOAD_SUCCESS
+        } catch (t: Throwable) {
+            logError(t)
+            metadata.type = DownloadType.IsFailed
+            return@withContext DOWNLOAD_FAILED
+        } finally {
+            fileStream?.closeQuietly()
+            metadata.close()
         }
     }
 
@@ -1009,21 +1461,10 @@ object VideoDownloadManager {
      * As of writing UniFile is used for everything but download directory on scoped storage.
      * Special ContentResolver fuckery is needed for that as UniFile doesn't work.
      * */
-    fun getDownloadDir(): UniFile? {
+    fun getDefaultDir(context: Context): SafeFile? {
         // See https://www.py4u.net/discuss/614761
-        return UniFile.fromFile(
-            File(
-                Environment.getExternalStorageDirectory().absolutePath + File.separatorChar +
-                        Environment.DIRECTORY_DOWNLOADS
-            )
-        )
-    }
-
-    @Deprecated("TODO fix UniFile to work with download directory.")
-    private fun getRelativePath(folder: String?): String {
-        return (Environment.DIRECTORY_DOWNLOADS + '/' + folder + '/').replace(
-            '/',
-            File.separatorChar
+        return SafeFile.fromMedia(
+            context, MediaFileContentType.Downloads
         )
     }
 
@@ -1031,11 +1472,11 @@ object VideoDownloadManager {
      * Turns a string to an UniFile. Used for stored string paths such as settings.
      * Should only be used to get a download path.
      * */
-    private fun basePathToFile(context: Context, path: String?): UniFile? {
+    private fun basePathToFile(context: Context, path: String?): SafeFile? {
         return when {
-            path.isNullOrBlank() -> getDownloadDir()
-            path.startsWith("content://") -> UniFile.fromUri(context, path.toUri())
-            else -> UniFile.fromFile(File(path))
+            path.isNullOrBlank() -> getDefaultDir(context)
+            path.startsWith("content://") -> SafeFile.fromUri(context, path.toUri())
+            else -> SafeFile.fromFile(context, File(path))
         }
     }
 
@@ -1044,300 +1485,12 @@ object VideoDownloadManager {
      * Returns the file and a string to be stored for future file retrieval.
      * UniFile.filePath is not sufficient for storage.
      * */
-    fun Context.getBasePath(): Pair<UniFile?, String?> {
+    fun Context.getBasePath(): Pair<SafeFile?, String?> {
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
         val basePathSetting = settingsManager.getString(getString(R.string.download_path_key), null)
         return basePathToFile(this, basePathSetting) to basePathSetting
     }
 
-    fun UniFile?.isDownloadDir(): Boolean {
-        return this != null && this.filePath == getDownloadDir()?.filePath
-    }
-
-    private fun delete(
-        context: Context,
-        name: String,
-        folder: String?,
-        extension: String,
-        parentId: Int?,
-        basePath: UniFile?
-    ): Int {
-        val displayName = getDisplayName(name, extension)
-
-        // delete all subtitle files
-        if (extension == "mp4") {
-            try {
-                delete(context, name, folder, "vtt", parentId, basePath)
-                delete(context, name, folder, "srt", parentId, basePath)
-            } catch (e: Exception) {
-                logError(e)
-            }
-        }
-
-        // If scoped storage and using download dir (not accessible with UniFile)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && basePath.isDownloadDir()) {
-            val relativePath = getRelativePath(folder)
-            val lastContent =
-                context.contentResolver.getExistingDownloadUriOrNullQ(relativePath, displayName)
-            if (lastContent != null) {
-                context.contentResolver.delete(lastContent, null, null)
-            }
-        } else {
-            val dir = basePath?.gotoDir(folder)
-            val file = dir?.findFile(displayName)
-            val success = file?.delete()
-            if (success != true) return ERROR_DELETING_FILE else {
-                // Cleans up empty directory
-                if (dir.listFiles()?.isEmpty() == true) dir.delete()
-            }
-//        }
-            parentId?.let {
-                downloadDeleteEvent.invoke(parentId)
-            }
-        }
-        return SUCCESS_STOPPED
-    }
-
-    private fun downloadHLS(
-        context: Context,
-        link: ExtractorLink,
-        name: String,
-        folder: String?,
-        parentId: Int?,
-        startIndex: Int?,
-        createNotificationCallback: (CreateNotificationMetadata) -> Unit
-    ): Int {
-        val extension = "mp4"
-        fun logcatPrint(vararg items: Any?) {
-            items.forEach {
-                println("[HLS]: $it")
-            }
-        }
-
-        val m3u8Helper = M3u8Helper()
-        logcatPrint("initialised the HLS downloader.")
-
-        val m3u8 = M3u8Helper.M3u8Stream(
-            link.url, link.quality, mapOf("referer" to link.referer)
-        )
-
-        var realIndex = startIndex ?: 0
-        val basePath = context.getBasePath()
-
-        val relativePath =
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && basePath.first.isDownloadDir()) getRelativePath(
-                folder
-            ) else folder
-
-        val stream = setupStream(context, name, relativePath, extension, realIndex > 0)
-        if (stream.errorCode != SUCCESS_STREAM) return stream.errorCode
-
-        if (!stream.resume!!) realIndex = 0
-        val fileLengthAdd = stream.fileLength!!
-        val tsIterator = runBlocking {
-            m3u8Helper.hlsYield(listOf(m3u8), realIndex)
-        }
-
-        val displayName = getDisplayName(name, extension)
-
-        val fileStream = stream.fileStream!!
-
-        val firstTs = tsIterator.next()
-
-        var isDone = false
-        var isFailed = false
-        var isPaused = false
-        var bytesDownloaded = firstTs.bytes.size.toLong() + fileLengthAdd
-        var tsProgress = 1L + realIndex
-        val totalTs = firstTs.totalTs.toLong()
-
-        fun deleteFile(): Int {
-            return delete(context, name, relativePath, extension, parentId, basePath.first)
-        }
-        /*
-            Most of the auto generated m3u8 out there have TS of the same size.
-            And only the last TS might have a different size.
-
-            But oh well, in cases of handmade m3u8 streams this will go all over the place ¯\_(ツ)_/¯
-            So ya, this calculates an estimate of how many bytes the file is going to be.
-
-            > (bytesDownloaded/tsProgress)*totalTs
-         */
-
-        fun updateInfo() {
-            parentId?.let {
-                setKey(
-                    KEY_DOWNLOAD_INFO,
-                    it.toString(),
-                    DownloadedFileInfo(
-                        (bytesDownloaded * (totalTs / tsProgress.toFloat())).toLong(),
-                        relativePath ?: "",
-                        displayName,
-                        tsProgress.toString(),
-                        basePath = basePath.second
-                    )
-                )
-            }
-        }
-
-        updateInfo()
-
-        fun updateNotification() {
-            val type = when {
-                isDone -> DownloadType.IsDone
-                isFailed -> DownloadType.IsFailed
-                isPaused -> DownloadType.IsPaused
-                else -> DownloadType.IsDownloading
-            }
-
-            parentId?.let { id ->
-                try {
-                    downloadStatus[id] = type
-                    downloadStatusEvent.invoke(Pair(id, type))
-                    downloadProgressEvent.invoke(
-                        Triple(
-                            id,
-                            bytesDownloaded,
-                            (bytesDownloaded * (totalTs / tsProgress.toFloat())).toLong(),
-                        )
-                    )
-                } catch (e: Exception) {
-                    // IDK MIGHT ERROR
-                }
-            }
-
-            createNotificationCallback.invoke(
-                CreateNotificationMetadata(
-                    type,
-                    bytesDownloaded,
-                    (bytesDownloaded * (totalTs / tsProgress.toFloat())).toLong(),
-                    tsProgress,
-                    totalTs
-                )
-            )
-        }
-
-        fun stopIfError(ts: M3u8Helper.HlsDownloadData): Int? {
-            if (ts.errored || ts.bytes.isEmpty()) {
-                val error: Int = if (!ts.errored) {
-                    logcatPrint("Error: No stream was found.")
-                    ERROR_UNKNOWN
-                } else {
-                    logcatPrint("Error: Failed to fetch data.")
-                    ERROR_CONNECTION_ERROR
-                }
-                isFailed = true
-                fileStream.close()
-                deleteFile()
-                updateNotification()
-                return error
-            }
-            return null
-        }
-
-        val notificationCoroutine = main {
-            while (true) {
-                if (!isDone) {
-                    updateNotification()
-                }
-                for (i in 1..10) {
-                    delay(100)
-                }
-            }
-        }
-
-        val downloadEventListener = { event: Pair<Int, DownloadActionType> ->
-            if (event.first == parentId) {
-                when (event.second) {
-                    DownloadActionType.Stop -> {
-                        isFailed = true
-                    }
-                    DownloadActionType.Pause -> {
-                        isPaused =
-                            true  // Pausing is not supported since well...I need to know the index of the ts it was paused at
-                        // it may be possible to store it in a variable, but when the app restarts it will be lost
-                    }
-                    DownloadActionType.Resume -> {
-                        isPaused = false
-                    }
-                }
-                updateNotification()
-            }
-        }
-
-        fun closeAll() {
-            try {
-                if (parentId != null)
-                    downloadEvent -= downloadEventListener
-            } catch (e: Exception) {
-                logError(e)
-            }
-            try {
-                parentId?.let {
-                    downloadStatus.remove(it)
-                }
-            } catch (e: Exception) {
-                logError(e)
-                // IDK MIGHT ERROR
-            }
-            notificationCoroutine.cancel()
-        }
-
-        stopIfError(firstTs).let {
-            if (it != null) {
-                closeAll()
-                return it
-            }
-        }
-
-        if (parentId != null)
-            downloadEvent += downloadEventListener
-
-        fileStream.write(firstTs.bytes)
-
-        fun onFailed() {
-            fileStream.close()
-            deleteFile()
-            updateNotification()
-            closeAll()
-        }
-
-        for (ts in tsIterator) {
-            while (isPaused) {
-                if (isFailed) {
-                    onFailed()
-                    return SUCCESS_STOPPED
-                }
-                sleep(100)
-            }
-
-            if (isFailed) {
-                onFailed()
-                return SUCCESS_STOPPED
-            }
-
-            stopIfError(ts).let {
-                if (it != null) {
-                    closeAll()
-                    return it
-                }
-            }
-
-            fileStream.write(ts.bytes)
-            tsProgress = ts.currentIndex.toLong()
-            bytesDownloaded += ts.bytes.size.toLong()
-            logcatPrint("Download progress ${((tsProgress.toFloat() / totalTs.toFloat()) * 100).roundToInt()}%")
-            updateInfo()
-        }
-        isDone = true
-        fileStream.close()
-        updateNotification()
-
-        closeAll()
-        updateInfo()
-        return SUCCESS_DOWNLOAD_DONE
-    }
-
     fun getFileName(context: Context, metadata: DownloadEpisodeMetadata): String {
         return getFileName(context, metadata.name, metadata.episode, metadata.season)
     }
@@ -1370,7 +1523,7 @@ object VideoDownloadManager {
         )
     }
 
-    private fun downloadSingleEpisode(
+    private suspend fun downloadSingleEpisode(
         context: Context,
         source: String?,
         folder: String?,
@@ -1378,7 +1531,12 @@ object VideoDownloadManager {
         link: ExtractorLink,
         notificationCallback: (Int, Notification) -> Unit,
         tryResume: Boolean = false,
-    ): Int {
+    ): DownloadStatus {
+        // no support for these file formats
+        if(link.type == ExtractorLinkType.MAGNET || link.type == ExtractorLinkType.TORRENT || link.type == ExtractorLinkType.DASH) {
+            return DOWNLOAD_INVALID_INPUT
+        }
+
         val name = getFileName(context, ep)
 
         // Make sure this is cancelled when download is done or cancelled.
@@ -1388,155 +1546,171 @@ object VideoDownloadManager {
             }
         }
 
-        if (link.isM3u8 || URL(link.url).path.endsWith(".m3u8")) {
-            val startIndex = if (tryResume) {
-                context.getKey<DownloadedFileInfo>(
-                    KEY_DOWNLOAD_INFO,
-                    ep.id.toString(),
-                    null
-                )?.extraInfo?.toIntOrNull()
-            } else null
-            return downloadHLS(context, link, name, folder, ep.id, startIndex) { meta ->
-                main {
-                    createNotification(
-                        context,
-                        source,
-                        link.name,
-                        ep,
-                        meta.type,
-                        meta.bytesDownloaded,
-                        meta.bytesTotal,
-                        notificationCallback,
-                        meta.hlsProgress,
-                        meta.hlsTotal
-                    )
-                }
-            }.also { extractorJob.cancel() }
-        }
-
-        return normalSafeApiCall {
-            downloadThing(context, link, name, folder, "mp4", tryResume, ep.id) { meta ->
-                main {
-                    createNotification(
-                        context,
-                        source,
-                        link.name,
-                        ep,
-                        meta.type,
-                        meta.bytesDownloaded,
-                        meta.bytesTotal,
-                        notificationCallback
-                    )
-                }
-            }
-        }.also { extractorJob.cancel() } ?: ERROR_UNKNOWN
-    }
-
-    fun downloadCheck(
-        context: Context, notificationCallback: (Int, Notification) -> Unit,
-    ): Int? {
-        if (currentDownloads.size < maxConcurrentDownloads && downloadQueue.size > 0) {
-            val pkg = downloadQueue.removeFirst()
-            val item = pkg.item
-            val id = item.ep.id
-            if (currentDownloads.contains(id)) { // IF IT IS ALREADY DOWNLOADING, RESUME IT
-                downloadEvent.invoke(Pair(id, DownloadActionType.Resume))
-                /** ID needs to be returned to the work-manager to properly await notification */
-                return id
-            }
-
-            currentDownloads.add(id)
-
+        val callback: (CreateNotificationMetadata) -> Unit = { meta ->
             main {
-                try {
-                    for (index in (pkg.linkIndex ?: 0) until item.links.size) {
-                        val link = item.links[index]
-                        val resume = pkg.linkIndex == index
-
-                        setKey(
-                            KEY_RESUME_PACKAGES,
-                            id.toString(),
-                            DownloadResumePackage(item, index)
-                        )
-                        val connectionResult = withContext(Dispatchers.IO) {
-                            normalSafeApiCall {
-                                downloadSingleEpisode(
-                                    context,
-                                    item.source,
-                                    item.folder,
-                                    item.ep,
-                                    link,
-                                    notificationCallback,
-                                    resume
-                                ).also { println("Single episode finished with return code: $it") }
-                            }
-                        }
-                        if (connectionResult != null && connectionResult > 0) { // SUCCESS
-                            removeKey(KEY_RESUME_PACKAGES, id.toString())
-                            break
-                        } else if (index == item.links.lastIndex) {
-                            downloadStatusEvent.invoke(Pair(id, DownloadType.IsFailed))
-                        }
-                    }
-                } catch (e: Exception) {
-                    logError(e)
-                } finally {
-                    currentDownloads.remove(id)
-                    // Because otherwise notifications will not get caught by the workmanager
-                    downloadCheckUsingWorker(context)
-                }
+                createNotification(
+                    context,
+                    source,
+                    link.name,
+                    ep,
+                    meta.type,
+                    meta.bytesDownloaded,
+                    meta.bytesTotal,
+                    notificationCallback,
+                    meta.hlsProgress,
+                    meta.hlsTotal,
+                    meta.bytesPerSecond
+                )
             }
         }
-        return null
-    }
 
-    fun getDownloadFileInfoAndUpdateSettings(context: Context, id: Int): DownloadedFileInfoResult? {
-        val res = getDownloadFileInfo(context, id)
-        if (res == null) context.removeKey(KEY_DOWNLOAD_INFO, id.toString())
-        return res
-    }
-
-    private fun getDownloadFileInfo(context: Context, id: Int): DownloadedFileInfoResult? {
         try {
-            val info =
-                context.getKey<DownloadedFileInfo>(KEY_DOWNLOAD_INFO, id.toString()) ?: return null
-            val base = basePathToFile(context, info.basePath)
+            when(link.type) {
+                ExtractorLinkType.M3U8 -> {
+                    val startIndex = if (tryResume) {
+                        context.getKey<DownloadedFileInfo>(
+                            KEY_DOWNLOAD_INFO,
+                            ep.id.toString(),
+                            null
+                        )?.extraInfo?.toIntOrNull()
+                    } else null
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && base.isDownloadDir()) {
-                val cr = context.contentResolver ?: return null
-                val fileUri =
-                    cr.getExistingDownloadUriOrNullQ(info.relativePath, info.displayName)
-                        ?: return null
-                val fileLength = cr.getFileLength(fileUri) ?: return null
-                if (fileLength == 0L) return null
-                return DownloadedFileInfoResult(fileLength, info.totalBytes, fileUri)
-            } else {
+                    return downloadHLS(
+                        context,
+                        link,
+                        name,
+                        folder ?: "",
+                        ep.id,
+                        startIndex,
+                        callback, parallelConnections = maxConcurrentConnections
+                    )
+                }
+                ExtractorLinkType.VIDEO -> {
+                    return downloadThing(
+                        context,
+                        link,
+                        name,
+                        folder ?: "",
+                        "mp4",
+                        tryResume,
+                        ep.id,
+                        callback, parallelConnections = maxConcurrentConnections
+                    )
+                }
+                else -> throw IllegalArgumentException("unsuported download type")
+            }
+        } catch (t: Throwable) {
+            return DOWNLOAD_FAILED
+        } finally {
+            extractorJob.cancel()
+        }
+    }
 
-                val file = base?.gotoDir(info.relativePath, false)?.findFile(info.displayName)
+    suspend fun downloadCheck(
+        context: Context, notificationCallback: (Int, Notification) -> Unit,
+    ) {
+        if (!(currentDownloads.size < maxConcurrentDownloads && downloadQueue.size > 0)) return
 
-//            val normalPath = context.getNormalPath(getFile(info.relativePath), info.displayName)
-//            val dFile = File(normalPath)
+        val pkg = downloadQueue.removeFirst()
+        val item = pkg.item
+        val id = item.ep.id
+        if (currentDownloads.contains(id)) { // IF IT IS ALREADY DOWNLOADING, RESUME IT
+            downloadEvent.invoke(id to DownloadActionType.Resume)
+            return
+        }
 
-                if (file?.exists() != true) return null
+        currentDownloads.add(id)
+        try {
+            for (index in (pkg.linkIndex ?: 0) until item.links.size) {
+                val link = item.links[index]
+                val resume = pkg.linkIndex == index
 
-                return DownloadedFileInfoResult(file.size(), info.totalBytes, file.uri)
+                setKey(
+                    KEY_RESUME_PACKAGES,
+                    id.toString(),
+                    DownloadResumePackage(item, index)
+                )
+
+                var connectionResult =
+                    downloadSingleEpisode(
+                        context,
+                        item.source,
+                        item.folder,
+                        item.ep,
+                        link,
+                        notificationCallback,
+                        resume
+                    )
+
+                if (connectionResult.retrySame) {
+                    connectionResult = downloadSingleEpisode(
+                        context,
+                        item.source,
+                        item.folder,
+                        item.ep,
+                        link,
+                        notificationCallback,
+                        true
+                    )
+                }
+
+                if (connectionResult.success) { // SUCCESS
+                    removeKey(KEY_RESUME_PACKAGES, id.toString())
+                    break
+                } else if (!connectionResult.tryNext || index >= item.links.lastIndex) {
+                    downloadStatusEvent.invoke(Pair(id, DownloadType.IsFailed))
+                    break
+                }
             }
         } catch (e: Exception) {
             logError(e)
-            return null
+        } finally {
+            currentDownloads.remove(id)
+            // Because otherwise notifications will not get caught by the work manager
+            downloadCheckUsingWorker(context)
         }
+
+        // return id
     }
 
-    /**
-     * Gets the true download size as Scoped Storage sometimes wrongly returns 0.
-     * */
-    fun UniFile.size(): Long {
-        val len = length()
-        return if (len <= 1) {
-            val inputStream = this.openInputStream()
-            return inputStream.available().toLong().also { inputStream.closeQuietly() }
-        } else {
-            len
+    /* fun getDownloadFileInfoAndUpdateSettings(context: Context, id: Int): DownloadedFileInfoResult? {
+         val res = getDownloadFileInfo(context, id)
+         if (res == null) context.removeKey(KEY_DOWNLOAD_INFO, id.toString())
+         return res
+     }
+ */
+    fun getDownloadFileInfoAndUpdateSettings(context: Context, id: Int): DownloadedFileInfoResult? =
+        getDownloadFileInfo(context, id, removeKeys = true)
+
+    private fun DownloadedFileInfo.toFile(context: Context): SafeFile? {
+        return basePathToFile(context, this.basePath)?.gotoDirectory(relativePath)
+            ?.findFile(displayName)
+    }
+
+    private fun getDownloadFileInfo(
+        context: Context,
+        id: Int,
+        removeKeys: Boolean = false
+    ): DownloadedFileInfoResult? {
+        try {
+            val info =
+                context.getKey<DownloadedFileInfo>(KEY_DOWNLOAD_INFO, id.toString()) ?: return null
+            val file = info.toFile(context)
+
+            // only delete the key if the file is not found
+            if (file == null || !file.existsOrThrow()) {
+                //if (removeKeys) context.removeKey(KEY_DOWNLOAD_INFO, id.toString()) // TODO READD
+                return null
+            }
+
+            return DownloadedFileInfoResult(
+                file.lengthOrThrow(),
+                info.totalBytes,
+                file.uriOrThrow()
+            )
+        } catch (e: Exception) {
+            logError(e)
+            return null
         }
     }
 
@@ -1546,67 +1720,53 @@ object VideoDownloadManager {
         return success
     }
 
+    /*private fun deleteFile(
+        context: Context,
+        folder: SafeFile?,
+        relativePath: String,
+        displayName: String
+    ): Boolean {
+        val file = folder?.gotoDirectory(relativePath)?.findFile(displayName) ?: return false
+        if (file.exists() == false) return true
+        return try {
+            file.delete()
+        } catch (e: Exception) {
+            logError(e)
+            (context.contentResolver?.delete(file.uri() ?: return true, null, null)
+                ?: return false) > 0
+        }
+    }*/
+
     private fun deleteFile(context: Context, id: Int): Boolean {
         val info =
             context.getKey<DownloadedFileInfo>(KEY_DOWNLOAD_INFO, id.toString()) ?: return false
-        downloadEvent.invoke(Pair(id, DownloadActionType.Stop))
+        downloadEvent.invoke(id to DownloadActionType.Stop)
         downloadProgressEvent.invoke(Triple(id, 0, 0))
-        downloadStatusEvent.invoke(Pair(id, DownloadType.IsStopped))
+        downloadStatusEvent.invoke(id to DownloadType.IsStopped)
         downloadDeleteEvent.invoke(id)
-        val base = basePathToFile(context, info.basePath)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && base.isDownloadDir()) {
-            val cr = context.contentResolver ?: return false
-            val fileUri =
-                cr.getExistingDownloadUriOrNullQ(info.relativePath, info.displayName)
-                    ?: return true // FILE NOT FOUND, ALREADY DELETED
-
-            return cr.delete(fileUri, null, null) > 0 // IF DELETED ROWS IS OVER 0
-        } else {
-            val file = base?.gotoDir(info.relativePath)?.findFile(info.displayName)
-//            val normalPath = context.getNormalPath(getFile(info.relativePath), info.displayName)
-//            val dFile = File(normalPath)
-            if (file?.exists() != true) return true
-            return try {
-                file.delete()
-            } catch (e: Exception) {
-                logError(e)
-                val cr = context.contentResolver
-                cr.delete(file.uri, null, null) > 0
-            }
-        }
+        return info.toFile(context)?.delete() ?: false
     }
 
     fun getDownloadResumePackage(context: Context, id: Int): DownloadResumePackage? {
         return context.getKey(KEY_RESUME_PACKAGES, id.toString())
     }
 
-    fun downloadFromResume(
+    suspend fun downloadFromResume(
         context: Context,
         pkg: DownloadResumePackage,
         notificationCallback: (Int, Notification) -> Unit,
         setKey: Boolean = true
     ) {
-        if (!currentDownloads.any { it == pkg.item.ep.id }) {
-//            if (currentDownloads.size == maxConcurrentDownloads) {
-//                main {
-////                    showToast( // can be replaced with regular Toast
-////                        context,
-////                        "${pkg.item.ep.mainName}${pkg.item.ep.episode?.let { " ${context.getString(R.string.episode)} $it " } ?: " "}${
-////                            context.getString(
-////                                R.string.queued
-////                            )
-////                        }",
-////                        Toast.LENGTH_SHORT
-////                    )
-//                }
-//            }
+        if (!currentDownloads.any { it == pkg.item.ep.id } && !downloadQueue.any { it.item.ep.id == pkg.item.ep.id }) {
             downloadQueue.addLast(pkg)
             downloadCheck(context, notificationCallback)
             if (setKey) saveQueue()
+            //ret
         } else {
-            downloadEvent.invoke(
-                Pair(pkg.item.ep.id, DownloadActionType.Resume)
+            downloadEvent(
+                pkg.item.ep.id to DownloadActionType.Resume
             )
+            //null
         }
     }
 
@@ -1632,7 +1792,7 @@ object VideoDownloadManager {
         return false
     }*/
 
-    fun downloadEpisode(
+    suspend fun downloadEpisode(
         context: Context?,
         source: String?,
         folder: String?,
@@ -1641,13 +1801,12 @@ object VideoDownloadManager {
         notificationCallback: (Int, Notification) -> Unit,
     ) {
         if (context == null) return
-        if (links.isNotEmpty()) {
-            downloadFromResume(
-                context,
-                DownloadResumePackage(DownloadItem(source, folder, ep, links), null),
-                notificationCallback
-            )
-        }
+        if (links.isEmpty()) return
+        downloadFromResume(
+            context,
+            DownloadResumePackage(DownloadItem(source, folder, ep, links), null),
+            notificationCallback
+        )
     }
 
     /** Worker stuff */
diff --git a/app/src/main/res/anim/rotate_around_center_point.xml b/app/src/main/res/anim/rotate_around_center_point.xml
new file mode 100644
index 00000000..76e7b39b
--- /dev/null
+++ b/app/src/main/res/anim/rotate_around_center_point.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false" >
+
+    <rotate
+        android:duration="4000"
+        android:interpolator="@android:anim/linear_interpolator"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:repeatCount="infinite"
+        android:repeatMode="restart"
+        android:toDegrees="360" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/color/button_selector_color.xml b/app/src/main/res/color/button_selector_color.xml
new file mode 100644
index 00000000..9975946d
--- /dev/null
+++ b/app/src/main/res/color/button_selector_color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:state_focused="true" android:color="@color/black"/>
+    <item android:state_selected="true" android:state_focused="false" android:color="@color/white"/>
+    <item android:color="@color/transparent"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/player_on_button_tv_attr.xml b/app/src/main/res/color/player_on_button_tv_attr.xml
new file mode 100644
index 00000000..feb1eeb0
--- /dev/null
+++ b/app/src/main/res/color/player_on_button_tv_attr.xml
@@ -0,0 +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:color="?attr/black"/>
+    <item android:color="?attr/white"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/white_attr_20.xml b/app/src/main/res/color/white_attr_20.xml
new file mode 100644
index 00000000..e0237df0
--- /dev/null
+++ b/app/src/main/res/color/white_attr_20.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/white" android:alpha="0.2" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/baseline_stop_24.xml b/app/src/main/res/drawable/baseline_stop_24.xml
new file mode 100644
index 00000000..100cb1fc
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_stop_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,6h12v12H6z" />
+</vector>
diff --git a/app/src/main/res/drawable/circle_shape_dotted.xml b/app/src/main/res/drawable/circle_shape_dotted.xml
new file mode 100644
index 00000000..6ce2808c
--- /dev/null
+++ b/app/src/main/res/drawable/circle_shape_dotted.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:innerRadiusRatio="2.5"
+    android:shape="ring"
+    android:thickness="0dp"
+    android:useLevel="false">
+    <stroke
+        tools:color="#FFF"
+        android:width="2dp"
+        android:color="?attr/download_outline_color"
+        android:dashWidth="10px"
+        android:dashGap="10px" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circular_progress_bar_clockwise.xml b/app/src/main/res/drawable/circular_progress_bar_clockwise.xml
new file mode 100644
index 00000000..a2e7f022
--- /dev/null
+++ b/app/src/main/res/drawable/circular_progress_bar_clockwise.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:fromDegrees="270"
+    android:toDegrees="270">
+    <shape
+        android:innerRadiusRatio="50"
+        android:shape="ring"
+        android:innerRadius="0dp"
+        android:thicknessRatio="2.65"
+        android:useLevel="true"><!-- this line fixes the issue for lollipop api 21 -->
+        <solid android:color="?attr/download_fill_color" tools:color="#FFF" />
+    </shape>
+</rotate>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circular_progress_bar_counter_clockwise.xml b/app/src/main/res/drawable/circular_progress_bar_counter_clockwise.xml
new file mode 100644
index 00000000..477e8db1
--- /dev/null
+++ b/app/src/main/res/drawable/circular_progress_bar_counter_clockwise.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:fromDegrees="270"
+    android:toDegrees="-90">
+    <shape
+        android:innerRadiusRatio="50"
+        android:shape="ring"
+        android:innerRadius="0dp"
+        android:thicknessRatio="2.65"
+        android:useLevel="true"><!-- this line fixes the issue for lollipop api 21 -->
+        <solid android:color="?attr/download_fill_color" tools:color="#FFF" />
+    </shape>
+</rotate>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circular_progress_bar_small_to_large.xml b/app/src/main/res/drawable/circular_progress_bar_small_to_large.xml
new file mode 100644
index 00000000..eed44628
--- /dev/null
+++ b/app/src/main/res/drawable/circular_progress_bar_small_to_large.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<scale xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:scaleGravity="center"
+    android:scaleHeight="100%"
+    android:scaleWidth="100%">
+    <shape
+        android:shape="ring"
+        android:innerRadius="0dp"
+        android:thicknessRatio="2.5"
+        android:useLevel="false"><!-- this line fixes the issue for lollipop api 21 -->
+        <solid
+            android:color="?attr/download_fill_color"
+            tools:color="#FFF" />
+    </shape>
+</scale>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circular_progress_bar_top_to_bottom.xml b/app/src/main/res/drawable/circular_progress_bar_top_to_bottom.xml
new file mode 100644
index 00000000..f41eea84
--- /dev/null
+++ b/app/src/main/res/drawable/circular_progress_bar_top_to_bottom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list>
+    <item>
+        <scale xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:scaleGravity="top"
+            android:scaleHeight="100%"
+            android:scaleWidth="100%">
+            <shape
+                android:shape="rectangle"
+                android:innerRadius="0dp"
+                android:thicknessRatio="2.5"
+                android:useLevel="false"><!-- this line fixes the issue for lollipop api 21 -->
+                <solid
+                    android:color="?attr/download_fill_color"
+                    tools:color="#FFF" />
+            </shape>
+        </scale>
+    </item>
+    <item>
+        <scale xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:scaleGravity="right"
+            android:scaleHeight="100%"
+            android:scaleWidth="100%">
+            <shape
+                android:shape="rectangle"
+                android:innerRadius="0dp"
+                android:thicknessRatio="2.5"
+                android:useLevel="false"><!-- this line fixes the issue for lollipop api 21 -->
+                <solid
+                    android:color="?attr/download_fill_color"
+                    tools:color="#FFF" />
+            </shape>
+        </scale>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/download_icon_done.xml b/app/src/main/res/drawable/download_icon_done.xml
new file mode 100644
index 00000000..a41ac14e
--- /dev/null
+++ b/app/src/main/res/drawable/download_icon_done.xml
@@ -0,0 +1,23 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:name="path"
+        android:pathData="M 17 1.01 L 7 1 C 5.9 1 5 1.9 5 3 L 5 21 C 5 22.1 5.9 23 7 23 L 17 23 C 18.1 23 19 22.1 19 21 L 19 3 C 19 1.9 18.1 1.01 17 1.01 Z M 17 19 L 7 19 L 7 5 L 17 5 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_1"
+        android:pathData="M 7.488 13.004 L 9.132 11.36 L 12.492 14.72 L 10.848 16.364 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_2"
+        android:pathData="M 10.848 16.364 L 9.203 14.72 L 14.894 9.029 L 16.539 10.673 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/download_icon_error.xml b/app/src/main/res/drawable/download_icon_error.xml
new file mode 100644
index 00000000..ef56f19a
--- /dev/null
+++ b/app/src/main/res/drawable/download_icon_error.xml
@@ -0,0 +1,23 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:name="path"
+        android:pathData="M 17 1.01 L 7 1 C 5.9 1 5 1.9 5 3 L 5 21 C 5 22.1 5.9 23 7 23 L 17 23 C 18.1 23 19 22.1 19 21 L 19 3 C 19 1.9 18.1 1.01 17 1.01 Z M 17 19 L 7 19 L 7 5 L 17 5 Z M 10.101 13.289 L 10.513 10.311 L 9.848 9.33 L 9.496 8.867 L 11 13 L 9.706 13 L 9.745 15.93 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_1"
+        android:pathData="M 15.801 14.763 L 14.157 16.407 L 7.873 10.124 L 9.518 8.479 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_2"
+        android:pathData="M 14.157 8.479 L 15.801 10.124 L 9.518 16.407 L 7.873 14.763 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/download_icon_load.xml b/app/src/main/res/drawable/download_icon_load.xml
new file mode 100644
index 00000000..bde9a160
--- /dev/null
+++ b/app/src/main/res/drawable/download_icon_load.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/download_icon_pause.xml b/app/src/main/res/drawable/download_icon_pause.xml
new file mode 100644
index 00000000..08455521
--- /dev/null
+++ b/app/src/main/res/drawable/download_icon_pause.xml
@@ -0,0 +1,18 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:name="path"
+        android:pathData="M 17 1.01 L 7 1 C 5.9 1 5 1.9 5 3 L 5 21 C 5 22.1 5.9 23 7 23 L 17 23 C 18.1 23 19 22.1 19 21 L 19 3 C 19 1.9 18.1 1.01 17 1.01 Z M 17 19 L 7 19 L 7 5 L 17 5 Z M 10.101 13.289 L 10.513 10.311 L 9.848 9.33 L 9.496 8.867 L 11 13 L 9.706 13 L 9.745 15.93 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_1"
+        android:pathData="M 9.104 8.931 L 11.129 8.931 L 11.129 15.956 L 9.104 15.956 Z M 12.871 8.931 L 14.896 8.931 L 14.896 15.956 L 12.871 15.956 Z"
+        android:fillColor="@android:color/white"
+        android:strokeWidth="1"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/episodes_shadow.xml b/app/src/main/res/drawable/episodes_shadow.xml
new file mode 100644
index 00000000..a77cbf25
--- /dev/null
+++ b/app/src/main/res/drawable/episodes_shadow.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        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/ic_baseline_arrow_back_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
index ebe459b2..dbda1cc0 100644
--- a/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
@@ -3,6 +3,7 @@
     android:viewportWidth="48"
     android:viewportHeight="48"
     android:tint="?attr/white"
+    android:autoMirrored="true"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M22,39.35 L7.95,25.3Q7.65,25.05 7.525,24.725Q7.4,24.4 7.4,24Q7.4,23.65 7.525,23.325Q7.65,23 7.95,22.75L22.05,8.6Q22.6,8.1 23.325,8.125Q24.05,8.15 24.6,8.7Q25.1,9.25 25.1,10Q25.1,10.75 24.55,11.3L13.65,22.2H38.1Q38.85,22.2 39.375,22.725Q39.9,23.25 39.9,24Q39.9,24.8 39.375,25.325Q38.85,25.85 38.1,25.85H13.65L24.65,36.8Q25.15,37.35 25.125,38.075Q25.1,38.8 24.55,39.35Q24,39.9 23.25,39.9Q22.5,39.9 22,39.35Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_arrow_back_ios_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_back_ios_24.xml
index 6c3197a6..516df382 100644
--- a/app/src/main/res/drawable/ic_baseline_arrow_back_ios_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_arrow_back_ios_24.xml
@@ -1,5 +1,11 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.67,3.87L9.9,2.1 0,12l9.9,9.9 1.77,-1.77L3.54,12z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.67,3.87L9.9,2.1 0,12l9.9,9.9 1.77,-1.77L3.54,12z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml
index 2ec8c110..48ac45e7 100644
--- a/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml
@@ -3,6 +3,7 @@
     android:viewportWidth="48"
     android:viewportHeight="48"
     android:tint="?attr/white"
+    android:autoMirrored="true"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M22.7,39.3Q22.15,38.75 22.175,38Q22.2,37.25 22.75,36.7L33.6,25.85H9.2Q8.45,25.85 7.925,25.325Q7.4,24.8 7.4,24Q7.4,23.25 7.925,22.725Q8.45,22.2 9.2,22.2H33.6L22.75,11.35Q22.2,10.8 22.175,10.025Q22.15,9.25 22.7,8.7Q23.25,8.15 24,8.15Q24.75,8.15 25.3,8.7L39.35,22.75Q39.65,23.05 39.8,23.35Q39.95,23.65 39.95,24Q39.95,24.35 39.8,24.675Q39.65,25 39.35,25.3L25.3,39.35Q24.75,39.9 24,39.875Q23.25,39.85 22.7,39.3Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml
index 916c761c..b67188db 100644
--- a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml
@@ -1,5 +1,11 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="?attr/white" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M13.3,17.3 L8.7,12.7Q8.55,12.55 8.488,12.375Q8.425,12.2 8.425,12Q8.425,11.8 8.488,11.625Q8.55,11.45 8.7,11.3L13.3,6.7Q13.575,6.425 14,6.425Q14.425,6.425 14.7,6.7Q14.975,6.975 14.975,7.4Q14.975,7.825 14.7,8.1L10.8,12L14.7,15.9Q14.975,16.175 14.975,16.6Q14.975,17.025 14.7,17.3Q14.425,17.575 14,17.575Q13.575,17.575 13.3,17.3Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13.3,17.3 L8.7,12.7Q8.55,12.55 8.488,12.375Q8.425,12.2 8.425,12Q8.425,11.8 8.488,11.625Q8.55,11.45 8.7,11.3L13.3,6.7Q13.575,6.425 14,6.425Q14.425,6.425 14.7,6.7Q14.975,6.975 14.975,7.4Q14.975,7.825 14.7,8.1L10.8,12L14.7,15.9Q14.975,16.175 14.975,16.6Q14.975,17.025 14.7,17.3Q14.425,17.575 14,17.575Q13.575,17.575 13.3,17.3Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_language_24.xml b/app/src/main/res/drawable/ic_baseline_language_24.xml
index 1749952e..89b47937 100644
--- a/app/src/main/res/drawable/ic_baseline_language_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_language_24.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="?attr/white"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_more_vert_24.xml b/app/src/main/res/drawable/ic_baseline_more_vert_24.xml
index 249fe2a2..b6908e96 100644
--- a/app/src/main/res/drawable/ic_baseline_more_vert_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_more_vert_24.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="?attr/white"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_notifications_active_24.xml b/app/src/main/res/drawable/ic_baseline_notifications_active_24.xml
index 2003bfe7..5d6045e7 100644
--- a/app/src/main/res/drawable/ic_baseline_notifications_active_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_notifications_active_24.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="?attr/white"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M7.58,4.08L6.15,2.65C3.75,4.48 2.17,7.3 2.03,10.5h2c0.15,-2.65 1.51,-4.97 3.55,-6.42zM19.97,10.5h2c-0.15,-3.2 -1.73,-6.02 -4.12,-7.85l-1.42,1.43c2.02,1.45 3.39,3.77 3.54,6.42zM18,11c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2v-5zM12,22c0.14,0 0.27,-0.01 0.4,-0.04 0.65,-0.14 1.18,-0.58 1.44,-1.18 0.1,-0.24 0.15,-0.5 0.15,-0.78h-4c0.01,1.1 0.9,2 2.01,2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7.58,4.08L6.15,2.65C3.75,4.48 2.17,7.3 2.03,10.5h2c0.15,-2.65 1.51,-4.97 3.55,-6.42zM19.97,10.5h2c-0.15,-3.2 -1.73,-6.02 -4.12,-7.85l-1.42,1.43c2.02,1.45 3.39,3.77 3.54,6.42zM18,11c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2v-5zM12,22c0.14,0 0.27,-0.01 0.4,-0.04 0.65,-0.14 1.18,-0.58 1.44,-1.18 0.1,-0.24 0.15,-0.5 0.15,-0.78h-4c0.01,1.1 0.9,2 2.01,2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_account_circle_24.xml b/app/src/main/res/drawable/ic_outline_account_circle_24.xml
index cc564471..27c2d574 100644
--- a/app/src/main/res/drawable/ic_outline_account_circle_24.xml
+++ b/app/src/main/res/drawable/ic_outline_account_circle_24.xml
@@ -1,6 +1,13 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM7.35,18.5C8.66,17.56 10.26,17 12,17s3.34,0.56 4.65,1.5C15.34,19.44 13.74,20 12,20S8.66,19.44 7.35,18.5zM18.14,17.12L18.14,17.12C16.45,15.8 14.32,15 12,15s-4.45,0.8 -6.14,2.12l0,0C4.7,15.73 4,13.95 4,12c0,-4.42 3.58,-8 8,-8s8,3.58 8,8C20,13.95 19.3,15.73 18.14,17.12z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M12,6c-1.93,0 -3.5,1.57 -3.5,3.5S10.07,13 12,13s3.5,-1.57 3.5,-3.5S13.93,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM7.35,18.5C8.66,17.56 10.26,17 12,17s3.34,0.56 4.65,1.5C15.34,19.44 13.74,20 12,20S8.66,19.44 7.35,18.5zM18.14,17.12L18.14,17.12C16.45,15.8 14.32,15 12,15s-4.45,0.8 -6.14,2.12l0,0C4.7,15.73 4,13.95 4,12c0,-4.42 3.58,-8 8,-8s8,3.58 8,8C20,13.95 19.3,15.73 18.14,17.12z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,6c-1.93,0 -3.5,1.57 -3.5,3.5S10.07,13 12,13s3.5,-1.57 3.5,-3.5S13.93,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z" />
 </vector>
diff --git a/app/src/main/res/drawable/netflix_skip_back.xml b/app/src/main/res/drawable/netflix_skip_back.xml
index bb63e948..5ad9c1a1 100644
--- a/app/src/main/res/drawable/netflix_skip_back.xml
+++ b/app/src/main/res/drawable/netflix_skip_back.xml
@@ -1,23 +1,23 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="850.39dp"
-        android:height="850.39dp"
-        android:viewportWidth="850.39"
-        android:viewportHeight="850.39">
+    android:width="850.39dp"
+    android:height="850.39dp"
+    android:viewportWidth="850.39"
+    android:viewportHeight="850.39">
     <path
-            android:pathData="M143.05,279.28A317.41,317.41 0,0 0,106.3 428c0,176.13 142.77,318.9 318.9,318.9S744.09,604.16 744.09,428 601.32,109.14 425.2,109.14q-14.15,0 -28,1.2"
-            android:strokeWidth="45"
-            android:fillColor="#00000000"
-            android:strokeColor="#fff"/>
+        android:fillColor="#00000000"
+        android:pathData="M143.05,279.28A317.41,317.41 0,0 0,106.3 428c0,176.13 142.77,318.9 318.9,318.9S744.09,604.16 744.09,428 601.32,109.14 425.2,109.14q-14.15,0 -28,1.2"
+        android:strokeWidth="45"
+        android:strokeColor="#fff" />
     <path
-            android:pathData="M483.083,223.108l-111.666,-111.666l25.442,-25.442l111.666,111.666z"
-            android:fillColor="#fff"/>
+        android:fillColor="#fff"
+        android:pathData="M483.083,223.108l-111.666,-111.666l25.442,-25.442l111.666,111.666z" />
     <path
-            android:pathData="M371.421,111.662l111.666,-111.666l25.442,25.442l-111.666,111.666z"
-            android:fillColor="#fff"/>
+        android:fillColor="#fff"
+        android:pathData="M371.421,111.662l111.666,-111.666l25.442,25.442l-111.666,111.666z" />
     <path
-            android:pathData="M398.087,223.272l-111.666,-111.666l25.442,-25.442l111.666,111.666z"
-            android:fillColor="#fff"/>
+        android:fillColor="#fff"
+        android:pathData="M398.087,223.272l-111.666,-111.666l25.442,-25.442l111.666,111.666z" />
     <path
-            android:pathData="M286.427,111.826l111.666,-111.666l25.442,25.442l-111.666,111.666z"
-            android:fillColor="#fff"/>
+        android:fillColor="#fff"
+        android:pathData="M286.427,111.826l111.666,-111.666l25.442,25.442l-111.666,111.666z" />
 </vector>
\ 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 7b436c7d..30077a98 100644
--- a/app/src/main/res/drawable/outline.xml
+++ b/app/src/main/res/drawable/outline.xml
@@ -2,9 +2,11 @@
 <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_card.xml b/app/src/main/res/drawable/outline_card.xml
index 02116bb8..5716de45 100644
--- a/app/src/main/res/drawable/outline_card.xml
+++ b/app/src/main/res/drawable/outline_card.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@android:color/white">
+    android:color="@android:color/white">
 
     <item>
         <shape android:shape="rectangle">
             <stroke
-                    android:width="2dp"
-                    android:color="@android:color/white" />
-            <corners android:radius="2dp" />
+                android:width="2dp"
+                android:color="@android:color/white" />
+            <corners android:radius="@dimen/rounded_image_radius" />
         </shape>
     </item>
 
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <corners android:radius="2dp" />
+            <corners android:radius="@dimen/rounded_image_radius" />
             <solid android:color="?attr/iconGrayBackground" />
         </shape>
     </item>
-
 </ripple>
\ 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 16eba83c..8eec2d0b 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_forced.xml b/app/src/main/res/drawable/outline_drawable_forced.xml
new file mode 100644
index 00000000..16eba83c
--- /dev/null
+++ b/app/src/main/res/drawable/outline_drawable_forced.xml
@@ -0,0 +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 -->
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/outline_drawable_forced_round.xml b/app/src/main/res/drawable/outline_drawable_forced_round.xml
new file mode 100644
index 00000000..7736f088
--- /dev/null
+++ b/app/src/main/res/drawable/outline_drawable_forced_round.xml
@@ -0,0 +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_card"/> <!-- 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 0b641074..db74a092 100644
--- a/app/src/main/res/drawable/outline_drawable_less.xml
+++ b/app/src/main/res/drawable/outline_drawable_less.xml
@@ -1,4 +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/player_button_tv_attr.xml b/app/src/main/res/drawable/player_button_tv_attr.xml
new file mode 100644
index 00000000..4c90a64e
--- /dev/null
+++ b/app/src/main/res/drawable/player_button_tv_attr.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <shape android:shape="rectangle">
+            <solid android:color="?attr/white" />
+            <corners android:radius="3dp"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white_attr_20" />
+            <corners android:radius="3dp"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/player_button_tv_attr_no_bg.xml b/app/src/main/res/drawable/player_button_tv_attr_no_bg.xml
new file mode 100644
index 00000000..b9b927da
--- /dev/null
+++ b/app/src/main/res/drawable/player_button_tv_attr_no_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <shape android:shape="rectangle">
+            <solid android:color="?attr/white" />
+            <corners android:radius="3dp"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/simkl_logo.xml b/app/src/main/res/drawable/simkl_logo.xml
new file mode 100644
index 00000000..eb29fb5b
--- /dev/null
+++ b/app/src/main/res/drawable/simkl_logo.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="1536"
+    android:viewportHeight="1536">
+    <path
+        android:fillColor="?attr/white"
+        android:pathData="M205.8,970.3c0,35.3 1.8,65.9 5.4,91.8 6.7,53.2 28.2,94.4 64.5,123.5 33.6,27.3 88.9,45.7 166,55.1 63.2,8 166,12 308.5,12 234.3,0 377.5,-8 429.4,-23.9 52.9,-16 90.9,-45.8 114.2,-89.5 23.3,-44.2 34.9,-113.4 34.9,-207.8 0,-84.5 -11.9,-145.8 -35.6,-183.9 -15.7,-25.8 -36.6,-45.8 -62.9,-59.9 -26.2,-14.1 -61.5,-24.6 -105.9,-31.7 -43.9,-7 -145.5,-12.9 -304.6,-17.6 -175.8,-5.6 -274.6,-11.5 -296.5,-17.6 -26,-7.5 -39,-28.2 -39,-62 0,-35.2 12.3,-57 37,-65.5 22,-7 92.1,-10.6 210.5,-10.6 119.7,0 195,1.4 225.9,4.2 34.9,3.3 55.6,18 61.8,44.3 2.3,8.9 3.8,24.8 4.7,47.8h271c0.4,-22.4 0.6,-38.8 0.6,-49.1 0,-95.5 -21.5,-161.7 -64.6,-198.7 -31.8,-26.7 -83.9,-45.4 -156,-56.2 -54.7,-7.9 -148.4,-11.9 -281.1,-11.9 -204,0 -333.1,4.7 -387.4,14.1 -60.1,10.8 -104.9,33 -134.5,66.7 -39.5,44.5 -59.2,121.2 -59.2,229.8 0,51.6 4,93.3 12.1,125.1 14.3,57.6 44.8,98.4 91.5,122.3 36.3,18.7 98.9,29.5 187.6,32.4 34.1,0.9 108.4,4.2 223.2,9.8 111.2,5.6 184.2,8.4 219.2,8.4 50.6,0.9 82.7,8.2 96.2,21.8 9.8,9.8 14.8,26.9 14.8,51.3 0,35.6 -7.9,58.6 -23.5,68.9 -11.2,7 -34.5,12 -69.9,14.7 -18.8,1 -87.8,1.7 -207,2.1 -87,-0.5 -138.3,-0.9 -153.9,-1.4 -31.4,-0.9 -53.3,-2.6 -65.9,-4.9 -12.5,-2.3 -23.7,-6.4 -33.6,-13 -18.8,-13.6 -28,-44 -27.6,-91.4H205.8v50.8,-0.3z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_main_tv.xml b/app/src/main/res/layout/activity_main_tv.xml
index dc29dec9..a70a40cd 100644
--- a/app/src/main/res/layout/activity_main_tv.xml
+++ b/app/src/main/res/layout/activity_main_tv.xml
@@ -41,6 +41,22 @@
 
         </com.google.android.material.navigationrail.NavigationRailView>
 
+        <com.google.android.material.bottomnavigation.BottomNavigationView
+            android:id="@+id/nav_view"
+            android:layout_height="70dp"
+            android:layout_width="0dp"
+            app:labelVisibilityMode="unlabeled"
+            android:visibility="gone"
+            android:background="?attr/primaryGrayBackground"
+
+            app:itemIconTint="@color/item_select_color"
+            app:itemTextColor="@color/item_select_color"
+
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:menu="@menu/bottom_nav_menu" />
+
         <LinearLayout
             android:id="@+id/cast_mini_controller_holder"
             android:layout_width="0dp"
@@ -61,4 +77,21 @@
                 tools:ignore="FragmentTagUsage" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:clickable="false"
+            android:visibility="gone"
+            android:id="@+id/focus_outline"
+            android:src="@drawable/outline"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:importantForAccessibility="no">
+        </ImageView>
+    </FrameLayout>
 </FrameLayout>
\ 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 8403940c..54df59a8 100644
--- a/app/src/main/res/layout/cast_item.xml
+++ b/app/src/main/res/layout/cast_item.xml
@@ -1,105 +1,99 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
 
-        android:nextFocusLeft="@id/episode_poster"
-        android:nextFocusRight="@id/result_episode_download"
-        android:id="@+id/episode_holder"
-        app:cardElevation="0dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        app:cardBackgroundColor="@color/transparent"
+    android:id="@+id/episode_holder"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="5dp"
+    android:foreground="@drawable/outline_drawable"
+    app:cardBackgroundColor="@color/transparent"
+
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    app:cardElevation="0dp">
 
-        android:foreground="@drawable/outline_drawable"
-        android:layout_margin="5dp">
     <LinearLayout
-            android:padding="5dp"
-            android:layout_width="100dp"
-            android:orientation="vertical"
-            android:layout_height="wrap_content">
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="5dp">
         <!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
         <FrameLayout
-                android:layout_gravity="center_horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal">
 
             <androidx.cardview.widget.CardView
-                    app:cardCornerRadius="35dp"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:foreground="@drawable/outline_drawable">
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                android:foreground="@drawable/outline_drawable"
+                app:cardCornerRadius="35dp">
 
                 <ImageView
-                        android:nextFocusLeft="@id/result_episode_download"
-                        android:nextFocusRight="@id/episode_holder"
 
-                        android:id="@+id/actor_image"
-                        tools:src="@drawable/example_poster"
+                    android:id="@+id/actor_image"
+                    android:layout_width="match_parent"
 
-                        android:scaleType="centerCrop"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/episode_poster_img_des" />
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/episode_poster_img_des"
+                    android:scaleType="centerCrop"
+                    tools:src="@drawable/example_poster" />
 
             </androidx.cardview.widget.CardView>
 
             <androidx.cardview.widget.CardView
-                    android:id="@+id/voice_actor_image_holder"
-                    android:layout_gravity="end|bottom"
-                    app:cardCornerRadius="20dp"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:foreground="@drawable/outline_drawable">
+                android:id="@+id/voice_actor_image_holder"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="end|bottom"
+                android:foreground="@drawable/outline_drawable"
+                app:cardCornerRadius="20dp">
 
                 <ImageView
-                        android:nextFocusLeft="@id/result_episode_download"
-                        android:nextFocusRight="@id/episode_holder"
+                    android:id="@+id/voice_actor_image"
+                    android:layout_width="match_parent"
 
-                        android:id="@+id/voice_actor_image"
-                        tools:src="@drawable/example_poster"
-
-                        android:scaleType="centerCrop"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/episode_poster_img_des" />
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/episode_poster_img_des"
+                    android:scaleType="centerCrop"
+                    tools:src="@drawable/example_poster" />
             </androidx.cardview.widget.CardView>
         </FrameLayout>
 
         <LinearLayout
-                android:paddingTop="3dp"
-                android:paddingBottom="3dp"
-                android:orientation="vertical"
-                android:layout_gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:paddingTop="3dp"
+            android:paddingBottom="3dp">
+
+            <TextView
+                android:id="@+id/actor_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:textColor="?attr/textColor"
+                android:textStyle="bold"
+                tools:text="Ackerman, Mikasa" />
 
             <TextView
-                    android:gravity="center_horizontal"
-                    android:id="@+id/actor_name"
-                    tools:text="Ackerman, Mikasa"
-                    android:textStyle="bold"
-                    android:textColor="?attr/textColor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                android:id="@+id/voice_actor_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:textColor="?attr/grayTextColor"
+                tools:text="voiceactor" />
 
             <TextView
-                    android:gravity="center_horizontal"
-                    android:id="@+id/voice_actor_name"
-                    tools:text="voiceactor"
-                    android:textColor="?attr/grayTextColor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            <TextView
-                    android:gravity="center_horizontal"
-                    android:id="@+id/actor_extra"
-                    tools:text="Main"
-                    android:textColor="?attr/grayTextColor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                android:id="@+id/actor_extra"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:textColor="?attr/grayTextColor"
+                tools:text="Main" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/chromecast_subtitle_settings.xml b/app/src/main/res/layout/chromecast_subtitle_settings.xml
index 624c2201..4d3b50df 100644
--- a/app/src/main/res/layout/chromecast_subtitle_settings.xml
+++ b/app/src/main/res/layout/chromecast_subtitle_settings.xml
@@ -35,7 +35,7 @@
                     android:layout_height="match_parent"
                     android:contentDescription="@string/preview_background_img_des" />
 
-            <com.google.android.exoplayer2.ui.SubtitleView
+            <androidx.media3.ui.SubtitleView
                     android:id="@+id/subtitle_text"
 
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/download_button.xml b/app/src/main/res/layout/download_button.xml
new file mode 100644
index 00000000..e8023243
--- /dev/null
+++ b/app/src/main/res/layout/download_button.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.lagradost.cloudstream3.ui.download.button.DownloadButton
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/result_download_movie"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    app:download_layout="@layout/download_button_layout" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_button_layout.xml b/app/src/main/res/layout/download_button_layout.xml
new file mode 100644
index 00000000..0ceca181
--- /dev/null
+++ b/app/src/main/res/layout/download_button_layout.xml
@@ -0,0 +1,60 @@
+<?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="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:orientation="horizontal">
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/download_movie_button"
+        style="@style/BlackButton"
+        android:layout_width="match_parent"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="0dp"
+        android:visibility="visible" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center">
+
+        <include
+            layout="@layout/download_button_view"
+            android:layout_width="30dp"
+            android:layout_height="30dp" />
+
+        <TextView
+            android:id="@+id/result_movie_download_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="10dp"
+            android:gravity="center"
+            android:letterSpacing="0.09"
+            android:textAllCaps="false"
+            android:textColor="?attr/textColor"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            tools:text="Downloading" />
+
+        <TextView
+            android:id="@+id/result_movie_download_text_precentage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:letterSpacing="0.09"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:textAllCaps="false"
+            android:textColor="?attr/textColor"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:visibility="gone"
+            tools:text="68%"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_button_view.xml b/app/src/main/res/layout/download_button_view.xml
new file mode 100644
index 00000000..6e40a597
--- /dev/null
+++ b/app/src/main/res/layout/download_button_view.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:background="@android:color/holo_blue_light">
+
+    <androidx.core.widget.ContentLoadingProgressBar
+        android:id="@+id/progress_downloaded"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:indeterminate="false"
+        android:max="100"
+        android:progress="0"
+
+        tools:progress="60"
+        android:progressDrawable="@drawable/circular_progress_bar_top_to_bottom"
+        android:visibility="visible" />
+
+    <View
+        android:id="@+id/progress_downloaded_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/circle_shape_dotted" />
+
+    <ImageView
+        android:scaleX="?attr/download_icon_scale"
+        android:scaleY="?attr/download_icon_scale"
+        tools:visibility="visible"
+        android:id="@+id/image_download_status"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_baseline_play_arrow_24"
+        android:visibility="visible"
+        app:tint="?attr/download_icon_color" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_child_episode.xml b/app/src/main/res/layout/download_child_episode.xml
index f2633dd6..fd845ee8 100644
--- a/app/src/main/res/layout/download_child_episode.xml
+++ b/app/src/main/res/layout/download_child_episode.xml
@@ -1,118 +1,90 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
 
-        android:nextFocusRight="@id/download_child_episode_download"
-        android:nextFocusLeft="@id/nav_rail_view"
+    android:id="@+id/download_child_episode_holder"
+    android:layout_width="match_parent"
 
-        android:id="@+id/download_child_episode_holder"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        app:cardBackgroundColor="@color/transparent"
-        app:cardElevation="0dp"
-        android:foreground="@drawable/outline_drawable"
-        android:layout_marginBottom="5dp">
+    android:layout_height="50dp"
+    android:layout_marginBottom="5dp"
+    android:foreground="@drawable/outline_drawable"
+    android:nextFocusLeft="@id/nav_rail_view"
+    android:nextFocusRight="@id/download_button"
+    app:cardBackgroundColor="@color/transparent"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    app:cardElevation="0dp">
 
     <androidx.core.widget.ContentLoadingProgressBar
-            android:id="@+id/download_child_episode_progress"
+        android:id="@+id/download_child_episode_progress"
 
-            android:layout_marginBottom="-1.5dp"
-            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" />
+        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" />
 
     <GridLayout
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless">
 
         <ImageView
-                android:id="@+id/download_child_episode_play"
-                android:visibility="gone"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_baseline_play_arrow_24"
-                android:contentDescription="@string/episode_play_img_des" />
+            android:id="@+id/download_child_episode_play"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:contentDescription="@string/episode_play_img_des"
+            android:src="@drawable/ic_baseline_play_arrow_24"
+            android:visibility="gone" />
 
         <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="50dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/download_child_episode_text"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
-                android:orientation="vertical"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="50dp"
-                android:layout_width="match_parent">
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+
+                android:ellipsize="marquee"
+                android:gravity="center_vertical"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:scrollHorizontally="true"
+
+                android:singleLine="true"
+                android:textColor="?attr/textColor"
+                tools:text="Episode 1 Episode 1 Episode 1 Episode 1 Episode 1 Episode 1 Episode 1" />
 
             <TextView
-                    android:id="@+id/download_child_episode_text"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="center_vertical"
-                    tools:text="Episode 1 Episode 1 Episode 1 Episode 1 Episode 1 Episode 1 Episode 1"
-
-                    android:scrollHorizontally="true"
-                    android:ellipsize="marquee"
-                    android:marqueeRepeatLimit="marquee_forever"
-                    android:singleLine="true"
-
-                    android:textColor="?attr/textColor"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-
-            <TextView
-                    android:id="@+id/download_child_episode_text_extra"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="center_vertical"
-                    tools:text="128MB / 237MB"
-                    android:textColor="?attr/grayTextColor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent" />
+                android:id="@+id/download_child_episode_text_extra"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:gravity="center_vertical"
+                android:textColor="?attr/grayTextColor"
+                tools:text="128MB / 237MB" />
         </LinearLayout>
 
-        <FrameLayout
-                android:layout_marginStart="-50dp"
-                android:layout_gravity="end"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent">
 
-            <androidx.core.widget.ContentLoadingProgressBar
-                    android:id="@+id/download_child_episode_progress_downloaded"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginStart="10dp"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:indeterminate="false"
-                    android:progressDrawable="@drawable/circular_progress_bar"
-                    android:background="@drawable/circle_shape"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:max="100"
-                    android:layout_margin="5dp"
-                    android:layout_gravity="end|center_vertical"
-                    android:progress="0"
-                    android:visibility="visible" />
-
-            <ImageView
-                    android:nextFocusRight="@id/download_child_episode_holder"
-                    android:nextFocusLeft="@id/download_child_episode_holder"
-
-                    android:id="@+id/download_child_episode_download"
-                    android:visibility="visible"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:padding="10dp"
-                    android:layout_width="50dp"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:src="@drawable/ic_baseline_play_arrow_24"
-                    app:tint="?attr/textColor"
-                    android:contentDescription="@string/download" />
-        </FrameLayout>
+        <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
+            android:id="@+id/download_button"
+            android:layout_width="@dimen/download_size"
+            android:layout_height="@dimen/download_size"
+            android:layout_gravity="center_vertical|end"
+            android:layout_marginStart="-50dp"
+            android:background="?selectableItemBackgroundBorderless"
+            android:padding="10dp" />
     </GridLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_header_episode.xml b/app/src/main/res/layout/download_header_episode.xml
index da4b3617..226c1632 100644
--- a/app/src/main/res/layout/download_header_episode.xml
+++ b/app/src/main/res/layout/download_header_episode.xml
@@ -1,103 +1,77 @@
 <?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:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        app:cardBackgroundColor="?attr/boxItemBackground"
-        android:id="@+id/episode_holder"
-        android:foreground="@drawable/outline_drawable"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
-        android:layout_marginTop="10dp">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/episode_holder"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="10dp"
+    android:layout_marginTop="10dp"
+    android:layout_marginEnd="10dp"
+    android:foreground="@drawable/outline_drawable"
+    app:cardBackgroundColor="?attr/boxItemBackground"
+    app:cardCornerRadius="@dimen/rounded_image_radius">
 
     <LinearLayout
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:layout_width="match_parent"
-            android:orientation="horizontal"
-            android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+        android:orientation="horizontal">
         <!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
         <androidx.cardview.widget.CardView
-                android:layout_width="70dp"
-                android:layout_height="104dp">
+            android:layout_width="70dp"
+            android:layout_height="104dp">
 
             <ImageView
-                    android:id="@+id/download_header_poster"
-                    tools:src="@drawable/example_poster"
-                    android:scaleType="centerCrop"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:contentDescription="@string/episode_poster_img_des" />
+                android:id="@+id/download_header_poster"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/episode_poster_img_des"
+                android:scaleType="centerCrop"
+                tools:src="@drawable/example_poster" />
         </androidx.cardview.widget.CardView>
 
         <LinearLayout
-                android:layout_marginStart="15dp"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:layout_width="match_parent"
-                android:layout_marginEnd="70dp"
-                android:layout_height="wrap_content">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="70dp"
+            android:orientation="vertical">
 
             <TextView
-                    android:id="@+id/download_header_title"
-                    tools:text="Perfect Run"
-                    android:textStyle="bold"
-                    android:textColor="?attr/textColor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                android:id="@+id/download_header_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/textColor"
+                android:textStyle="bold"
+                tools:text="Perfect Run" />
 
             <TextView
-                    android:id="@+id/download_header_info"
-                    tools:text="1 episode | 285MB"
-                    android:textColor="?attr/grayTextColor"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                android:id="@+id/download_header_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/grayTextColor"
+                tools:text="1 episode | 285MB" />
         </LinearLayout>
 
         <ImageView
-                android:layout_marginStart="-50dp"
-                android:layout_height="match_parent"
-                android:padding="50dp"
-                android:layout_width="50dp"
-                android:id="@+id/download_header_goto_child"
-                android:layout_gravity="center_vertical|end"
-                android:src="@drawable/ic_baseline_keyboard_arrow_right_24"
-                android:contentDescription="@string/download" />
+            android:id="@+id/download_header_goto_child"
+            android:layout_width="50dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical|end"
+            android:layout_marginStart="-50dp"
+            android:contentDescription="@string/download"
+            android:padding="50dp"
+            android:src="@drawable/ic_baseline_keyboard_arrow_right_24" />
 
-        <FrameLayout
-                android:layout_marginStart="-50dp"
-                android:layout_gravity="end"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent">
-
-            <androidx.core.widget.ContentLoadingProgressBar
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginStart="10dp"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:id="@+id/download_header_progress_downloaded"
-                    android:indeterminate="false"
-                    android:progressDrawable="@drawable/circular_progress_bar"
-                    android:background="@drawable/circle_shape"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:max="100"
-                    android:layout_margin="5dp"
-                    android:layout_gravity="center_vertical"
-                    android:progress="0"
-                    android:visibility="visible" />
-
-            <ImageView
-                    android:visibility="visible"
-                    android:layout_gravity="center_vertical"
-                    android:layout_height="wrap_content"
-                    android:padding="10dp"
-                    android:layout_width="50dp"
-                    android:id="@+id/download_header_episode_download"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:src="@drawable/ic_baseline_play_arrow_24"
-                    android:contentDescription="@string/download"
-                    app:tint="?attr/white" />
-        </FrameLayout>
+        <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
+            android:id="@+id/download_button"
+            android:layout_width="@dimen/download_size"
+            android:layout_height="@dimen/download_size"
+            android:layout_gravity="center_vertical|end"
+            android:layout_marginStart="-50dp"
+            android:background="?selectableItemBackgroundBorderless"
+            android:padding="10dp" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_child_downloads.xml b/app/src/main/res/layout/fragment_child_downloads.xml
index a3cc8ce8..9afaea0b 100644
--- a/app/src/main/res/layout/fragment_child_downloads.xml
+++ b/app/src/main/res/layout/fragment_child_downloads.xml
@@ -1,39 +1,40 @@
 <?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:background="?attr/primaryGrayBackground"
-        android:id="@+id/download_child_root"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".ui.download.DownloadFragment">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/download_child_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/primaryGrayBackground"
+    android:orientation="vertical"
+    tools:context=".ui.download.DownloadFragment">
 
     <com.google.android.material.appbar.AppBarLayout
-            android:background="@android:color/transparent"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent">
 
         <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/download_child_toolbar"
-                android:paddingTop="@dimen/navbar_height"
-                tools:title="Overlord"
-                android:background="?attr/primaryGrayBackground"
-                app:navigationIconTint="?attr/iconColor"
-                app:titleTextColor="?attr/textColor"
-                app:layout_scrollFlags="scroll|enterAlways"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+            android:id="@+id/download_child_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/primaryGrayBackground"
+            android:paddingTop="@dimen/navbar_height"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:navigationIconTint="?attr/iconColor"
+            app:titleTextColor="?attr/textColor"
+            tools:title="Overlord" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
-            android:nextFocusUp="@id/download_child_toolbar"
+        android:id="@+id/download_child_list"
 
-            android:background="?attr/primaryBlackBackground"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            android:padding="10dp"
-            tools:listitem="@layout/download_child_episode"
-            android:id="@+id/download_child_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBlackBackground"
+        android:nextFocusLeft="@id/nav_rail_view"
+        android:nextFocusUp="@id/download_child_toolbar"
+        android:padding="10dp"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:listitem="@layout/download_child_episode" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_extensions.xml b/app/src/main/res/layout/fragment_extensions.xml
index a550efa4..71dd372b 100644
--- a/app/src/main/res/layout/fragment_extensions.xml
+++ b/app/src/main/res/layout/fragment_extensions.xml
@@ -11,6 +11,7 @@
     <include layout="@layout/standard_toolbar" />
 
     <androidx.recyclerview.widget.RecyclerView
+        android:clipToPadding="false"
         android:id="@+id/repo_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -64,6 +65,7 @@
         android:focusable="true"
         android:foreground="@drawable/outline_drawable"
         android:nextFocusRight="@id/add_repo_button_imageview"
+        android:nextFocusUp="@id/repo_recycler_view"
         android:orientation="horizontal"
         android:padding="10dp"
 
@@ -84,13 +86,13 @@
                 android:textColor="?attr/textColor" />
 
             <androidx.cardview.widget.CardView
-                app:cardElevation="0dp"
-                android:elevation="0dp"
-                app:cardMaxElevation="0dp"
                 android:layout_width="fill_parent"
                 android:layout_height="12dp"
                 android:layout_marginBottom="5dp"
-                app:cardCornerRadius="@dimen/storage_radius">
+                android:elevation="0dp"
+                app:cardCornerRadius="@dimen/storage_radius"
+                app:cardElevation="0dp"
+                app:cardMaxElevation="0dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -203,6 +205,8 @@
                 android:contentDescription="@string/add_repository"
                 android:focusable="true"
                 android:nextFocusLeft="@id/plugin_storage_appbar"
+                android:nextFocusUp="@id/repo_recycler_view"
+
                 android:src="@drawable/ic_baseline_add_24"
                 app:tint="?attr/textColor" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index eb38e262..36cb5f42 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
-        tools:visibility="gone">
+        tools:visibility="visible">
 
         <ProgressBar
             android:layout_width="50dp"
@@ -92,22 +92,56 @@
             </LinearLayout>
         </com.facebook.shimmer.ShimmerFrameLayout>
 
-        <FrameLayout
-            android:id="@+id/home_loading_statusbar"
-            android:layout_width="match_parent"
-            android:layout_height="70dp">
+        <LinearLayout
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="end"
+            android:layout_margin="10dp"
+            android:background="@color/transparent"
+            android:orientation="horizontal">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/home_change_api"
+                style="@style/RegularButtonTV"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="0dp"
+                android:layout_marginEnd="0dp"
+                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"
+/>
 
             <ImageView
-                android:id="@+id/home_change_api_loading"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_gravity="center_vertical|end"
+                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" />
 
-                android:layout_margin="10dp"
+            <ImageView
+                android:id="@+id/home_switch_account"
+
+                android:layout_width="50dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/home_change_provider_img_des"
-                android:src="@drawable/ic_baseline_keyboard_arrow_down_24" />
-        </FrameLayout>
+                android:contentDescription="@string/account"
+                android:nextFocusLeft="@id/home_search"
+                android:padding="10dp"
+                android:src="@drawable/ic_outline_account_circle_24" />
+        </LinearLayout>
     </FrameLayout>
 
     <LinearLayout
@@ -160,7 +194,8 @@
         android:descendantFocusability="afterDescendants"
         android:nextFocusLeft="@id/nav_rail_view"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        tools:listitem="@layout/homepage_parent" />
+        tools:listitem="@layout/homepage_parent"
+        tools:visibility="gone" />
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/home_api_fab"
diff --git a/app/src/main/res/layout/fragment_home_head.xml b/app/src/main/res/layout/fragment_home_head.xml
index 603621f7..90386ccf 100644
--- a/app/src/main/res/layout/fragment_home_head.xml
+++ b/app/src/main/res/layout/fragment_home_head.xml
@@ -14,7 +14,7 @@
         android:layout_height="0dp" />
 
     <FrameLayout
-        android:id="@+id/home_preview"
+        android:id="@+id/home_preview_viewpager_text"
         android:layout_width="match_parent"
         android:layout_height="500dp">
 
@@ -26,29 +26,25 @@
 
         </androidx.viewpager2.widget.ViewPager2>
 
-        <ImageView
-            android:id="@+id/home_preview_image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:alpha="0.8"
-            android:scaleType="centerCrop"
-            android:visibility="gone"
-            tools:src="@drawable/example_poster" />
-
         <LinearLayout
             android:id="@+id/home_padding"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_height="50dp"
+            android:gravity="center"
+            android:orientation="horizontal">
 
             <androidx.appcompat.widget.SearchView
                 android:id="@+id/home_search"
                 android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_gravity="start"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="50dp"
                 android:editTextColor="@color/white"
-                android:gravity="start"
+                android:gravity="center_vertical"
                 android:iconifiedByDefault="true"
+                android:nextFocusRight="@id/home_preview_switch_account"
+
+                android:padding="0dp"
                 android:textColor="@color/white"
                 android:textColorHint="@color/white"
                 app:closeIcon="@drawable/ic_baseline_close_24"
@@ -57,6 +53,19 @@
                 app:queryHint="@string/search_hint"
                 app:searchIcon="@drawable/search_icon"
                 tools:ignore="RtlSymmetry" />
+
+            <ImageView
+                android:id="@+id/home_preview_switch_account"
+
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_marginStart="-50dp"
+                android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/account"
+                android:nextFocusLeft="@id/home_search"
+                android:padding="10dp"
+                android:src="@drawable/ic_outline_account_circle_24" />
         </LinearLayout>
 
         <!--
@@ -132,6 +141,7 @@
                     app:tint="?attr/white" />
             </LinearLayout>
         </LinearLayout>
+
     </FrameLayout>
 
 
@@ -278,4 +288,4 @@
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/home_result_grid" />
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
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 b9b4fec0..f9ea6974 100644
--- a/app/src/main/res/layout/fragment_home_head_tv.xml
+++ b/app/src/main/res/layout/fragment_home_head_tv.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:orientation="vertical"
-    android:id="@+id/home_header"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
 
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/home_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/primaryBlackBackground"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:orientation="vertical">
 
     <View
         android:id="@+id/home_none_padding"
@@ -15,35 +15,102 @@
         android:layout_height="0dp" />
 
     <FrameLayout
-        android:id="@+id/home_preview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <androidx.viewpager2.widget.ViewPager2
-            android:descendantFocusability="blocksDescendants"
             android:id="@+id/home_preview_viewpager"
             android:layout_width="match_parent"
             android:layout_height="400dp"
+            android:descendantFocusability="blocksDescendants"
             android:orientation="horizontal">
 
         </androidx.viewpager2.widget.ViewPager2>
 
-        <FrameLayout
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="end"
+            android:layout_margin="10dp"
+            android:background="@drawable/player_button_tv_attr"
+            android:orientation="horizontal">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/home_preview_change_api"
+                style="@style/RegularButtonTV"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="0dp"
+                android:layout_marginEnd="0dp"
+                android:background="@drawable/player_button_tv_attr_no_bg"
+                android:gravity="center_vertical"
+                android:nextFocusLeft="@id/nav_rail_view"
+                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: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"
+                android:layout_height="match_parent"
+                android:layout_gravity="end"
+                android:background="@drawable/player_button_tv_attr_no_bg"
+                android:contentDescription="@string/account"
+                android:nextFocusLeft="@id/home_preview_search_button"
+                android:nextFocusRight="@id/home_preview_switch_account"
+                android:nextFocusDown="@id/home_preview_info_btt"
+
+                android:padding="10dp"
+                android:src="@drawable/ic_outline_account_circle_24"
+                android:tag="@string/tv_no_focus_tag"
+                app:tint="@color/player_on_button_tv_attr" />
+        </LinearLayout>
+
+        <!--<FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_margin="10dp">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/home_preview_change_api"
-                style="@style/BlackButton"
+                style="@style/RegularButtonTV"
+                android:nextFocusRight="@id/home_preview_switch_account"
                 android:layout_width="wrap_content"
                 android:layout_gravity="top|start"
                 android:layout_marginStart="@dimen/navbar_width"
-                android:backgroundTint="@color/semiWhite"
-                android:minWidth="150dp" />
-        </FrameLayout>
+                android:minWidth="150dp"
+                android:nextFocusLeft="@id/nav_rail_view"
+                android:nextFocusDown="@id/home_preview_play_btt" />
 
+            <ImageView
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:nextFocusDown="@id/home_preview_play_btt"
+                android:nextFocusLeft="@id/home_preview_change_api"
+                android:id="@+id/home_preview_switch_account"
+                android:layout_width="50dp"
+                android:layout_gravity="end"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/account"
+                android:padding="10dp"
+                android:src="@drawable/ic_outline_account_circle_24" />
+
+        </FrameLayout>-->
         <LinearLayout
+            android:id="@+id/home_preview_viewpager_text"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="bottom"
@@ -92,27 +159,27 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/home_preview_play_btt"
-                    style="@style/WhiteButton"
+                    style="@style/RegularButtonTV"
                     android:layout_width="wrap_content"
                     android:layout_margin="0dp"
                     android:minWidth="150dp"
                     android:nextFocusLeft="@id/home_preview_hidden_prev_focus"
                     android:nextFocusRight="@id/home_preview_info_btt"
                     android:nextFocusUp="@id/home_preview_change_api"
-                    android:nextFocusDown="@id/home_watch_parent_item_title"
+                    android:nextFocusDown="@id/home_watch_child_recyclerview"
                     android:text="@string/home_play"
                     app:icon="@drawable/ic_baseline_play_arrow_24" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/home_preview_info_btt"
-                    style="@style/BlackButton"
+                    style="@style/RegularButtonTV"
                     android:layout_width="wrap_content"
                     android:minWidth="150dp"
 
                     android:nextFocusLeft="@id/home_preview_play_btt"
                     android:nextFocusRight="@id/home_preview_hidden_next_focus"
                     android:nextFocusUp="@id/home_preview_change_api"
-                    android:nextFocusDown="@id/home_watch_parent_item_title"
+                    android:nextFocusDown="@id/home_watch_child_recyclerview"
                     android:text="@string/home_info"
                     app:icon="@drawable/ic_outline_info_24" />
 
@@ -123,22 +190,28 @@
                     android:focusable="false" />
             </LinearLayout>
         </LinearLayout>
+
+
     </FrameLayout>
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="10dp">
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/home_preview_change_api2"
-            style="@style/BlackButton"
-            android:layout_width="wrap_content"
-            android:layout_gravity="top|start"
-            android:layout_marginStart="@dimen/navbar_width"
-            android:backgroundTint="@color/semiWhite"
-            android:minWidth="150dp" />
-    </FrameLayout>
+    <!-- <FrameLayout
+         android:layout_width="match_parent"
+         android:layout_height="match_parent"
+         android:layout_margin="10dp">
+
+         <com.google.android.material.button.MaterialButton
+             android:id="@+id/home_preview_change_api2"
+             style="@style/RegularButtonTV"
+             android:layout_width="wrap_content"
+             android:layout_gravity="top|start"
+             android:layout_marginStart="@dimen/navbar_width"
+             android:backgroundTint="@color/white_attr_20"
+             android:minWidth="150dp"
+             android:nextFocusUp="@id/home_preview_play_btt"
+             android:nextFocusLeft="@id/nav_rail_view"
+             android:nextFocusDown="@id/home_watch_child_recyclerview" />
+     </FrameLayout>-->
 
     <LinearLayout
         android:id="@+id/home_watch_holder"
@@ -165,6 +238,8 @@
             android:layout_height="wrap_content"
             android:clipToPadding="false"
             android:descendantFocusability="afterDescendants"
+            android:nextFocusUp="@id/home_preview_play_btt"
+            android:nextFocusDown="@id/home_type_holder"
             android:orientation="horizontal"
             android:paddingStart="@dimen/navbar_width"
             android:paddingEnd="5dp"
@@ -187,9 +262,6 @@
             android:fadingEdge="horizontal"
 
             android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:nextFocusLeft="@id/nav_rail_view"
-            android:nextFocusUp="@id/home_watch_child_recyclerview"
-            android:nextFocusForward="@id/home_bookmarked_child_recyclerview"
             android:paddingStart="12dp"
             android:paddingTop="5dp"
             android:paddingEnd="12dp"
@@ -198,9 +270,15 @@
             android:requiresFadingEdge="horizontal">
 
             <com.google.android.material.chip.ChipGroup
+                android:id="@+id/home_type_holder"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/navbar_width"
+
+                android:descendantFocusability="afterDescendants"
+                android:nextFocusLeft="@id/nav_rail_view"
+                android:nextFocusUp="@id/home_watch_child_recyclerview"
+                android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
                 android:orientation="horizontal">
 
                 <com.google.android.material.chip.Chip
@@ -208,9 +286,11 @@
                     style="@style/ChipFilled"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-
                     android:nextFocusLeft="@id/nav_rail_view"
                     android:nextFocusRight="@id/home_plan_to_watch_btt"
+
+                    android:nextFocusUp="@id/home_watch_child_recyclerview"
+                    android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
                     android:text="@string/type_watching" />
 
                 <com.google.android.material.chip.Chip
@@ -218,9 +298,11 @@
                     style="@style/ChipFilled"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-
                     android:nextFocusLeft="@id/home_type_watching_btt"
                     android:nextFocusRight="@id/home_type_on_hold_btt"
+
+                    android:nextFocusUp="@id/home_watch_child_recyclerview"
+                    android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
                     android:text="@string/type_plan_to_watch" />
 
                 <com.google.android.material.chip.Chip
@@ -228,9 +310,11 @@
                     style="@style/ChipFilled"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-
                     android:nextFocusLeft="@id/home_plan_to_watch_btt"
                     android:nextFocusRight="@id/home_type_dropped_btt"
+
+                    android:nextFocusUp="@id/home_watch_child_recyclerview"
+                    android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
                     android:text="@string/type_on_hold" />
 
                 <com.google.android.material.chip.Chip
@@ -238,18 +322,22 @@
                     style="@style/ChipFilled"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-
                     android:nextFocusLeft="@id/home_type_on_hold_btt"
                     android:nextFocusRight="@id/home_type_completed_btt"
+
+                    android:nextFocusUp="@id/home_watch_child_recyclerview"
+                    android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
                     android:text="@string/type_dropped" />
 
                 <com.google.android.material.chip.Chip
                     android:id="@+id/home_type_completed_btt"
                     style="@style/ChipFilled"
                     android:layout_width="wrap_content"
-
                     android:layout_height="wrap_content"
                     android:nextFocusLeft="@id/home_type_dropped_btt"
+
+                    android:nextFocusUp="@id/home_watch_child_recyclerview"
+                    android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
                     android:text="@string/type_completed" />
             </com.google.android.material.chip.ChipGroup>
         </HorizontalScrollView>
@@ -261,6 +349,10 @@
             android:clipToPadding="false"
 
             android:descendantFocusability="afterDescendants"
+            android:nextFocusLeft="@id/nav_rail_view"
+            android:nextFocusUp="@id/home_type_holder"
+
+            android:nextFocusDown="@id/home_child_recyclerview"
             android:orientation="horizontal"
             android:paddingStart="@dimen/navbar_width"
             android:paddingEnd="5dp"
diff --git a/app/src/main/res/layout/fragment_home_tv.xml b/app/src/main/res/layout/fragment_home_tv.xml
index ebcd3e9f..e44457d9 100644
--- a/app/src/main/res/layout/fragment_home_tv.xml
+++ b/app/src/main/res/layout/fragment_home_tv.xml
@@ -8,13 +8,14 @@
     android:layout_height="match_parent"
     tools:context=".ui.home.HomeFragment">
 
+
     <FrameLayout
         android:id="@+id/home_loading"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginStart="@dimen/navbar_width"
         android:visibility="gone"
-        tools:visibility="gone">
+        tools:visibility="visible">
 
         <ProgressBar
             android:layout_width="50dp"
@@ -93,22 +94,61 @@
             </LinearLayout>
         </com.facebook.shimmer.ShimmerFrameLayout>
 
-        <FrameLayout
-            android:id="@+id/home_loading_statusbar"
-            android:layout_width="match_parent"
-            android:layout_height="70dp">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="end"
+            android:layout_margin="10dp"
+            android:background="@drawable/player_button_tv_attr"
+            android:orientation="horizontal">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/home_change_api"
+                style="@style/RegularButtonTV"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="0dp"
+                android:layout_marginEnd="0dp"
+                android:background="@drawable/player_button_tv_attr_no_bg"
+                android:gravity="center_vertical"
+                android:nextFocusLeft="@id/nav_rail_view"
+                android:nextFocusRight="@id/home_preview_search_button"
+                android:nextFocusDown="@id/home_preview_play_btt" />
 
             <ImageView
-                android:id="@+id/home_change_api_loading"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_gravity="center_vertical|end"
+                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" />
 
-                android:layout_margin="10dp"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/home_change_provider_img_des"
-                android:src="@drawable/ic_baseline_keyboard_arrow_down_24" />
-        </FrameLayout>
+            <ImageView
+                android:id="@+id/home_switch_account"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="end"
+                android:background="@drawable/player_button_tv_attr_no_bg"
+                android:contentDescription="@string/account"
+                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"
+                android:tag="@string/tv_no_focus_tag"
+                app:tint="@color/player_on_button_tv_attr" />
+        </LinearLayout>
     </FrameLayout>
 
     <LinearLayout
@@ -155,15 +195,16 @@
             android:textColor="?attr/textColor" />
     </LinearLayout>
 
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/home_master_recycler"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:descendantFocusability="afterDescendants"
         android:nextFocusLeft="@id/nav_rail_view"
+        android:nextFocusUp="@id/home_bookmarked_child_recyclerview"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        tools:listitem="@layout/homepage_parent_tv" />
+        tools:listitem="@layout/homepage_parent_tv"
+        tools:visibility="gone" />
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/home_api_fab"
@@ -172,4 +213,15 @@
         app:icon="@drawable/ic_baseline_filter_list_24"
         tools:ignore="ContentDescription"
         tools:visibility="visible" />
+
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+        android:id="@+id/home_random"
+        style="@style/ExtendedFloatingActionButton"
+        android:layout_gravity="bottom|start"
+        android:text="@string/home_random"
+        android:textColor="?attr/textColor"
+        android:visibility="gone"
+        app:icon="@drawable/ic_baseline_play_arrow_24"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 250551cb..a620b6ae 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -13,7 +13,7 @@
     <!--
           app:fastforward_increment="10000"
             app:rewind_increment="10000"-->
-    <com.google.android.exoplayer2.ui.PlayerView
+    <androidx.media3.ui.PlayerView
         android:id="@+id/player_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -93,7 +93,7 @@
         </FrameLayout>
     </FrameLayout>
 
-    <FrameLayout
+   <!-- <FrameLayout
         android:id="@+id/player_torrent_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -127,5 +127,5 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/player_video_title"
             tools:text="17 seeders" />
-    </FrameLayout>
+    </FrameLayout>-->
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_player_tv.xml b/app/src/main/res/layout/fragment_player_tv.xml
index a0826087..07cbb3c3 100644
--- a/app/src/main/res/layout/fragment_player_tv.xml
+++ b/app/src/main/res/layout/fragment_player_tv.xml
@@ -13,7 +13,7 @@
     <!--
           app:fastforward_increment="10000"
             app:rewind_increment="10000"-->
-    <com.google.android.exoplayer2.ui.PlayerView
+    <androidx.media3.ui.PlayerView
         android:id="@+id/player_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -78,6 +78,7 @@
                 app:tint="@android:color/white" />
 
             <ImageView
+                android:tag="@string/tv_no_focus_tag"
                 android:id="@+id/player_loading_go_back"
                 android:layout_width="70dp"
                 android:layout_height="70dp"
@@ -92,7 +93,7 @@
         </FrameLayout>
     </FrameLayout>
 
-    <FrameLayout
+    <!--<FrameLayout
         android:id="@+id/player_torrent_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -126,5 +127,5 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/player_video_title"
             tools:text="17 seeders" />
-    </FrameLayout>
+    </FrameLayout>-->
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_plugin_details.xml b/app/src/main/res/layout/fragment_plugin_details.xml
index 35ab9216..7a8f85e4 100644
--- a/app/src/main/res/layout/fragment_plugin_details.xml
+++ b/app/src/main/res/layout/fragment_plugin_details.xml
@@ -284,23 +284,10 @@
         android:layout_gravity="center"
         android:gravity="center_horizontal|center_vertical">
 
-        <ImageView
-            android:id="@+id/downvote"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/ic_baseline_thumb_down_24"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/plugin_votes"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <TextView
             android:id="@+id/plugin_votes"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
             android:layout_marginTop="32dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="32dp"
@@ -308,7 +295,7 @@
             android:text="0"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/upvote"
-            app:layout_constraintStart_toEndOf="@+id/downvote"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
diff --git a/app/src/main/res/layout/fragment_plugins.xml b/app/src/main/res/layout/fragment_plugins.xml
index 40a0299c..ee86f12b 100644
--- a/app/src/main/res/layout/fragment_plugins.xml
+++ b/app/src/main/res/layout/fragment_plugins.xml
@@ -25,18 +25,22 @@
             app:titleTextColor="?attr/textColor"
             tools:title="Overlord" />
 
-        <include layout="@layout/tvtypes_chips_scroll" />
+        <include
+            android:id="@+id/tvtypes_chips_scroll"
+            layout="@layout/tvtypes_chips_scroll" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
-        android:clipToPadding="false"
         android:id="@+id/plugin_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:nextFocusLeft="@id/nav_rail_view"
+        android:nextFocusUp="@id/tvtypes_chips"
+
+        android:clipToPadding="false"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:listitem="@layout/repository_item" />
 
-
 </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 a481ed6b..87de7186 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -277,7 +277,9 @@
                         android:layout_height="wrap_content"
                         android:descendantFocusability="blocksDescendants">
 
-                        <include layout="@layout/fragment_trailer" />
+                        <include
+                            android:id="@+id/fragment_trailer"
+                            layout="@layout/fragment_trailer" />
                     </FrameLayout>
 
                     <FrameLayout
@@ -474,7 +476,7 @@
                         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                         tools:itemCount="2"
                         tools:listitem="@layout/cast_item"
-                        tools:visibility="gone" />
+                        tools:visibility="visible" />
 
                     <TextView
                         android:id="@+id/result_vpn"
@@ -601,89 +603,11 @@
                                     android:focusable="true"
                                     android:layout_width="match_parent" />-->
 
-                            <FrameLayout
-                                android:id="@+id/result_movie_progress_downloaded_holder"
+                            <com.lagradost.cloudstream3.ui.download.button.DownloadButton
+                                android:id="@+id/download_button"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-
-                                <com.google.android.material.button.MaterialButton
-                                    android:id="@+id/result_download_movie"
-                                    style="@style/BlackButton"
-
-                                    android:layout_width="match_parent"
-                                    android:layout_gravity="center_vertical"
-                                    android:layout_marginStart="0dp"
-                                    android:layout_marginEnd="0dp"
-                                    android:clickable="true"
-                                    android:focusable="true"
-
-                                    android:nextFocusUp="@id/result_play_movie"
-                                    android:nextFocusDown="@id/result_season_button"
-                                    android:visibility="visible" />
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:gravity="center"
-                                    android:orientation="horizontal">
-
-                                    <androidx.core.widget.ContentLoadingProgressBar
-                                        android:id="@+id/result_movie_progress_downloaded"
-                                        style="?android:attr/progressBarStyleHorizontal"
-                                        android:layout_width="25dp"
-                                        android:layout_height="25dp"
-                                        android:layout_gravity="end|center_vertical"
-                                        android:layout_margin="5dp"
-                                        android:background="@drawable/circle_shape"
-                                        android:indeterminate="false"
-                                        android:max="100"
-                                        android:paddingStart="5dp"
-                                        android:paddingEnd="5dp"
-                                        android:progress="30"
-                                        android:progressDrawable="@drawable/circular_progress_bar_filled"
-                                        android:visibility="visible" />
-
-                                    <ImageView
-                                        android:id="@+id/result_movie_download_icon"
-                                        android:layout_width="30dp"
-                                        android:layout_height="wrap_content"
-                                        android:layout_gravity="center"
-                                        android:background="?selectableItemBackgroundBorderless"
-                                        android:contentDescription="@string/download"
-                                        android:src="@drawable/ic_baseline_play_arrow_24"
-                                        android:visibility="visible"
-                                        app:tint="?attr/white" />
-
-                                    <TextView
-                                        android:id="@+id/result_movie_download_text"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="match_parent"
-                                        android:gravity="center"
-                                        android:letterSpacing="0.09"
-                                        android:textAllCaps="false"
-                                        android:textColor="?attr/textColor"
-                                        android:textSize="15sp"
-                                        android:textStyle="bold"
-                                        tools:text="Downloading" />
-
-                                    <TextView
-                                        android:id="@+id/result_movie_download_text_precentage"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="match_parent"
-                                        android:gravity="center"
-                                        android:letterSpacing="0.09"
-                                        android:paddingStart="5dp"
-                                        android:paddingEnd="5dp"
-                                        android:textAllCaps="false"
-                                        android:textColor="?attr/textColor"
-                                        android:textSize="15sp"
-                                        android:textStyle="bold"
-                                        android:visibility="gone"
-                                        tools:text="68%" />
-                                </LinearLayout>
-                            </FrameLayout>
-
+                                android:layout_height="wrap_content"
+                                app:download_layout="@layout/download_button_layout" />
 
                             <!--<androidx.core.widget.ContentLoadingProgressBar
                                     android:layout_width="match_parent"
@@ -799,7 +723,6 @@
 
 
                         <LinearLayout
-                            android:id="@+id/result_episodes_tab"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="vertical">
@@ -982,4 +905,4 @@
                 android:contentDescription="@string/search_poster_descript"/>
     </androidx.cardview.widget.CardView>-->
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_result_swipe.xml b/app/src/main/res/layout/fragment_result_swipe.xml
index 27729bf8..4e8e3c14 100644
--- a/app/src/main/res/layout/fragment_result_swipe.xml
+++ b/app/src/main/res/layout/fragment_result_swipe.xml
@@ -189,7 +189,7 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="start">
 
-                <include layout="@layout/result_sync"/>
+                <include layout="@layout/result_sync" android:id="@+id/result_sync"/>
             </FrameLayout>
 
             <FrameLayout
@@ -198,7 +198,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
-                <include layout="@layout/fragment_result" />
+                <include layout="@layout/fragment_result" android:id="@+id/fragment_result" />
 
             </FrameLayout>
 
@@ -209,7 +209,7 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="end">
 
-                <include layout="@layout/result_recommendations" />
+                <include layout="@layout/result_recommendations" android:id="@+id/result_recommendations" />
             </FrameLayout>
         </com.discord.panels.OverlappingPanelsLayout>
 
diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml
index 5eacdbe2..a143fbda 100644
--- a/app/src/main/res/layout/fragment_result_tv.xml
+++ b/app/src/main/res/layout/fragment_result_tv.xml
@@ -1,4 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+https://developer.android.com/design/ui/tv/guides/foundations/navigation-on-tv
+1. Don't display a back button
+
+https://developer.android.com/design/ui/tv/guides/styles/layouts
+Two-pane layout
+or https://developer.android.com/design/ui/tv/guides/styles/layouts#layout-templates
+
+cast:
+https://developer.android.com/design/ui/tv/guides/components/cards#1:1
+
+https://developer.android.com/design/ui/tv/samples/jet-fit
+-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -88,6 +100,7 @@
             android:text="@string/reload_error"
             app:icon="@drawable/ic_baseline_autorenew_24" />
 
+        <!--
         <com.google.android.material.button.MaterialButton
             android:id="@+id/result_reload_connection_open_in_browser"
             style="@style/BlackButton"
@@ -99,6 +112,7 @@
             android:minWidth="200dp"
             android:text="@string/result_open_in_browser"
             app:icon="@drawable/ic_baseline_public_24" />
+            -->
 
         <TextView
             android:id="@+id/result_error_text"
@@ -110,545 +124,312 @@
             android:textColor="?attr/textColor" />
     </LinearLayout>
 
-    <LinearLayout
+
+    <FrameLayout
+        android:id="@+id/background_poster_holder"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:visibility="visible">
+
+        <ImageView
+            android:id="@+id/background_poster"
+            android:layout_width="match_parent"
+            android:layout_height="250dp"
+            android:layout_gravity="center"
+            android:alpha="0.8"
+            android:scaleType="centerCrop"
+            tools:src="@drawable/profile_bg_dark_blue" />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_gravity="bottom"
+            android:src="@drawable/background_shadow">
+
+        </ImageView>
+    </FrameLayout>
+
+
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/result_finish_loading"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
+        android:layout_height="wrap_content">
 
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/result_scroll"
+
+        <LinearLayout
             android:layout_width="match_parent"
-
             android:layout_height="wrap_content"
-            android:background="?attr/primaryGrayBackground">
+            android:orientation="vertical"
+            android:paddingStart="@dimen/result_padding"
+            android:paddingEnd="@dimen/result_padding">
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="?attr/primaryBlackBackground"
-                android:orientation="vertical">
-
-                <com.facebook.shimmer.ShimmerFrameLayout
-                    android:id="@+id/result_trailer_loading"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:orientation="vertical"
-                    android:visibility="gone"
-                    app:shimmer_auto_start="true"
-                    app:shimmer_base_alpha="0.2"
-                    app:shimmer_duration="@integer/loading_time"
-                    app:shimmer_highlight_alpha="0.3"
-                    tools:visibility="gone">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/result_padding"
-                        android:orientation="vertical">
-
-                        <androidx.cardview.widget.CardView
-                            android:layout_width="match_parent"
-                            android:layout_height="150dp"
-                            android:background="@color/grayShimmer"
-                            android:foreground="@drawable/outline_drawable"
-                            app:cardCornerRadius="@dimen/loading_radius" />
-                    </LinearLayout>
-                </com.facebook.shimmer.ShimmerFrameLayout>
-
-                <FrameLayout
-                    android:id="@+id/result_smallscreen_holder"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:descendantFocusability="blocksDescendants">
-
-                    <include layout="@layout/fragment_trailer" />
-                </FrameLayout>
+                android:layout_height="wrap_content"
+                android:layout_marginTop="100dp"
+                android:orientation="horizontal">
 
                 <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:clipToPadding="false"
-                    android:orientation="vertical"
-                    android:paddingStart="@dimen/result_padding"
-                    android:paddingEnd="@dimen/result_padding">
+                    android:layout_width="250dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="10dp"
+                    android:layout_weight="0"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/result_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="marquee"
+                        android:gravity="center_vertical"
+                        android:singleLine="true"
+                        android:textColor="?attr/textColor"
+                        android:textSize="20sp"
+                        android:textStyle="bold"
+                        tools:text="The Perfect Run The Perfect Run" />
 
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:id="@+id/result_next_airing_holder"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:layout_marginBottom="15dp"
-                        android:orientation="horizontal"
-                        android:visibility="visible">
+                        android:layout_gravity="start"
+                        android:orientation="vertical">
 
-                        <LinearLayout
+                        <TextView
+                            android:id="@+id/result_episodes_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginEnd="20dp"
+                            android:textColor="?attr/textColor"
+                            android:textSize="17sp"
+                            android:textStyle="normal"
+                            android:visibility="gone"
+                            tools:text="8 Episodes" />
+
+                        <TextView
+                            android:id="@+id/result_next_airing"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:orientation="vertical">
 
-                            <LinearLayout
-                                android:layout_width="wrap_content"
-                                android:layout_height="30dp"
-                                android:layout_marginBottom="10dp"
-                                android:orientation="horizontal">
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:gravity="center"
+                            android:textColor="?attr/grayTextColor"
+                            android:textSize="17sp"
+                            android:textStyle="normal"
+                            tools:text="Episode 1022 will be released in" />
 
-                                <ImageView
-                                    android:id="@+id/result_back"
-                                    android:layout_width="30dp"
-                                    android:layout_height="30dp"
-                                    android:layout_gravity="center_vertical"
-                                    android:layout_marginEnd="10dp"
-                                    android:background="?android:attr/selectableItemBackgroundBorderless"
-                                    android:clickable="true"
-                                    android:contentDescription="@string/go_back"
-                                    android:focusable="true"
-                                    android:gravity="center_vertical"
-                                    android:nextFocusDown="@id/result_description"
-                                    android:src="@drawable/ic_baseline_arrow_back_24"
-                                    app:tint="?attr/white" />
-
-                                <TextView
-                                    android:id="@+id/result_title"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="30dp"
-                                    android:layout_marginBottom="5dp"
-                                    android:gravity="center_vertical"
-                                    android:maxLines="1"
-                                    android:textColor="?attr/textColor"
-                                    android:textSize="20sp"
-                                    android:textStyle="bold"
-                                    tools:text="The Perfect Run The Perfect Run" />
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="horizontal">
-
-                                <androidx.cardview.widget.CardView
-                                    android:id="@+id/result_poster_holder"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginEnd="10dp"
-                                    app:cardCornerRadius="@dimen/rounded_image_radius">
-
-                                    <ImageView
-                                        android:id="@+id/result_poster"
-                                        android:layout_width="100dp"
-                                        android:layout_height="140dp"
-                                        android:layout_gravity="bottom"
-                                        android:contentDescription="@string/result_poster_img_des"
-                                        android:foreground="@drawable/outline_drawable"
-                                        android:scaleType="centerCrop"
-                                        tools:src="@drawable/example_poster" />
-                                </androidx.cardview.widget.CardView>
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
-                                    android:orientation="vertical">
-
-                                    <com.lagradost.cloudstream3.widget.FlowLayout
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        app:itemSpacing="10dp">
-
-                                        <com.google.android.material.button.MaterialButton
-                                            android:id="@+id/result_meta_site"
-                                            style="@style/SmallBlackButton"
-                                            android:layout_gravity="center_vertical"
-                                            tools:text="Gogoanime" />
-
-                                        <TextView
-                                            android:id="@+id/result_meta_type"
-                                            style="@style/ResultInfoText"
-                                            tools:text="Movie" />
-
-                                        <TextView
-                                            android:id="@+id/result_meta_year"
-                                            style="@style/ResultInfoText"
-                                            tools:text="2022" />
-
-                                        <TextView
-                                            android:id="@+id/result_meta_rating"
-                                            style="@style/ResultInfoText"
-                                            tools:text="Rated: 8.5/10.0" />
-
-                                        <TextView
-                                            android:id="@+id/result_meta_status"
-                                            style="@style/ResultInfoText"
-                                            tools:text="Ongoing" />
-
-                                        <TextView
-                                            android:id="@+id/result_meta_duration"
-                                            style="@style/ResultInfoText"
-                                            tools:text="121min" />
-                                    </com.lagradost.cloudstream3.widget.FlowLayout>
-                                    <!--
-                                    This has half margin and half padding to make TV focus on description look better.
-                                    The focus outline now settles between the poster and text.
-                                    -->
-                                    <TextView
-                                        android:id="@+id/result_description"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:ellipsize="end"
-                                        android:foreground="@drawable/outline_drawable"
-                                        android:maxLength="1000"
-                                        android:nextFocusUp="@id/result_back"
-                                        android:nextFocusDown="@id/result_play_movie"
-                                        android:padding="5dp"
-                                        android:textColor="?attr/textColor"
-                                        android:textSize="15sp"
-                                        tools:text="Ryan Quicksave Romano is an eccentric adventurer with a strange power: he can create a save-point in time and redo his life whenever he dies. Arriving in New Rome, the glitzy capital of sin of a rebuilding Europe, he finds the city torn between mega-corporations, sponsored heroes, superpowered criminals, and true monsters. It's a time of chaos, where potions can grant the power to rule the world and dangers lurk everywhere. " />
-                                </LinearLayout>
-                            </LinearLayout>
-
-
-                        </LinearLayout>
+                        <TextView
+                            android:id="@+id/result_next_airing_time"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:gravity="start"
+                            android:textColor="?attr/textColor"
+                            android:textSize="17sp"
+                            android:textStyle="normal"
+                            tools:text="5d 3h 30m" />
                     </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/result_cast_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="5dp"
-                        android:ellipsize="end"
-                        android:maxLines="2"
-                        android:textColor="?attr/grayTextColor"
-                        android:textSize="15sp"
-                        tools:text="Cast: Joe Ligma" />
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/result_cast_items"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-
-                        android:descendantFocusability="afterDescendants"
-                        android:fadingEdge="horizontal"
-                        android:focusable="false"
-                        android:focusableInTouchMode="false"
-                        android:nextFocusUp="@id/result_back"
-                        android:nextFocusDown="@id/result_play_movie"
-                        android:orientation="horizontal"
-                        android:paddingTop="5dp"
-                        android:requiresFadingEdge="horizontal"
-                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                        tools:itemCount="2"
-                        tools:listitem="@layout/cast_item"
-                        tools:visibility="visible" />
-
-                    <TextView
-                        android:id="@+id/result_vpn"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textColor="?attr/grayTextColor"
-                        android:textSize="15sp"
-                        tools:text="@string/vpn_torrent" />
-
-                    <TextView
-                        android:id="@+id/result_info"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="5dp"
-                        android:textColor="?attr/grayTextColor"
-                        android:textSize="15sp"
-                        tools:text="@string/provider_info_meta" />
-
-                    <TextView
-                        android:id="@+id/result_no_episodes"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="5dp"
-                        android:textColor="?attr/grayTextColor"
-                        android:textSize="15sp"
-                        tools:text="@string/no_episodes_found" />
-
-                    <TextView
-                        android:id="@+id/result_tag_holder"
+                    <LinearLayout
+                        android:id="@+id/result_movie_parent"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="start"
                         android:layout_marginTop="10dp"
-                        android:layout_marginBottom="10dp"
-                        android:text="@string/result_tags"
-                        android:textColor="?attr/textColor"
-                        android:textSize="17sp"
-                        android:textStyle="normal"
-                        android:visibility="gone" />
+                        android:animateLayoutChanges="true"
+                        android:orientation="vertical"
+                        tools:visibility="visible">
 
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/result_play_movie"
+                            style="@style/ResultButtonTV"
+
+                            android:nextFocusRight="@id/result_description"
+                            android:nextFocusUp="@id/result_play_movie"
+                            android:nextFocusDown="@id/result_play_series"
+                            android:text="@string/play_movie_button"
+                            android:visibility="visible"
+                            app:icon="@drawable/ic_baseline_play_arrow_24" />
+
+                        <LinearLayout
+                            android:id="@+id/series_holder"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_play_series"
+                                style="@style/ResultButtonTV"
+
+                                android:nextFocusRight="@id/result_description"
+                                android:nextFocusUp="@id/result_play_movie"
+                                android:nextFocusDown="@id/result_resume_series"
+                                android:text="@string/play_episode"
+                                android:visibility="visible"
+                                app:icon="@drawable/ic_baseline_play_arrow_24" />
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_resume_series"
+                                style="@style/ResultButtonTV"
+
+                                android:nextFocusRight="@id/result_description"
+                                android:nextFocusUp="@id/result_play_series"
+                                android:nextFocusDown="@id/result_play_trailer"
+                                android:text="@string/resume"
+                                android:visibility="visible"
+                                app:icon="@drawable/ic_baseline_play_arrow_24" />
+                        </LinearLayout>
+
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/result_play_trailer"
+                            style="@style/ResultButtonTV"
+
+                            android:nextFocusRight="@id/result_description"
+                            android:nextFocusUp="@id/result_resume_series"
+                            android:nextFocusDown="@id/result_bookmark_button"
+                            android:text="@string/play_trailer_button"
+                            android:visibility="gone"
+                            app:icon="@drawable/ic_baseline_play_arrow_24"
+                            tools:visibility="visible" />
+
+
+                        <!--  <com.lagradost.cloudstream3.ui.download.button.DownloadButton
+                              android:visibility="gone"
+                              android:id="@+id/download_button"
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:layout_weight="1"
+                              android:minWidth="250dp"
+                              app:download_layout="@layout/download_button_layout" />
+            -->
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/result_bookmark_button"
+                            style="@style/ResultButtonTV"
+                            android:nextFocusRight="@id/result_description"
+                            android:nextFocusUp="@id/result_play_trailer"
+                            android:nextFocusDown="@id/result_episodes_show"
+
+                            android:text="@string/type_none"
+                            android:visibility="visible"
+                            app:icon="@drawable/ic_baseline_bookmark_24" />
+
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/result_episodes_show"
+                            style="@style/ResultButtonTV"
+
+                            android:nextFocusRight="@id/redirect_to_episodes"
+                            android:nextFocusUp="@id/result_bookmark_button"
+                            android:nextFocusDown="@id/result_cast_items"
+
+                            android:text="@string/episodes"
+                            android:visibility="visible"
+                            app:icon="@drawable/ic_baseline_sort_24"
+                            tools:visibility="visible" />
+
+                        <View
+                            android:id="@+id/redirect_to_episodes"
+                            android:layout_width="1dp"
+                            android:layout_height="1dp"
+                            android:focusable="true"
+                            android:focusableInTouchMode="true" />
+
+
+                        <View
+                            android:id="@+id/redirect_to_play"
+                            android:layout_width="1dp"
+                            android:layout_height="1dp"
+                            android:focusable="true"
+                            android:focusableInTouchMode="true" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/right_layout"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/linearLayout2"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <com.lagradost.cloudstream3.widget.FlowLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:itemSpacing="10dp">
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/result_meta_site"
+                            style="@style/SmallWhiteButton"
+                            android:layout_gravity="center_vertical"
+                            tools:text="Gogoanime" />
+
+                        <TextView
+                            android:id="@+id/result_meta_type"
+                            style="@style/ResultInfoText"
+                            tools:text="Movie" />
+
+                        <TextView
+                            android:id="@+id/result_meta_year"
+                            style="@style/ResultInfoText"
+                            tools:text="2022" />
+
+                        <TextView
+                            android:id="@+id/result_meta_rating"
+                            style="@style/ResultInfoText"
+                            tools:text="Rated: 8.5/10.0" />
+
+                        <TextView
+                            android:id="@+id/result_meta_status"
+                            style="@style/ResultInfoText"
+                            tools:text="Ongoing" />
+
+                        <TextView
+                            android:id="@+id/result_meta_duration"
+                            style="@style/ResultInfoText"
+                            tools:text="121min" />
+                    </com.lagradost.cloudstream3.widget.FlowLayout>
+
+
+                    <TextView
+                        android:id="@+id/result_description"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:fadingEdgeLength="30dp"
+                        android:foreground="@drawable/outline_drawable"
+                        android:maxLines="7"
+                        android:nextFocusUp="@id/result_back"
+                        android:nextFocusDown="@id/result_bookmark_button"
+                        android:padding="5dp"
+                        android:requiresFadingEdge="vertical"
+                        android:textColor="?attr/textColor"
+                        android:textSize="16sp"
+                        tools:text="Ryan Quicksave Romano is an eccentric adventurer with a strange power: he can create a save-point in time and redo his life whenever he dies. Arriving in New Rome, the glitzy capital of sin of a rebuilding Europe, he finds the city torn between mega-corporations, sponsored heroes, superpowered criminals, and true monsters. It's a time of chaos, where potions can grant the power to rule the world and dangers lurk everywhere. " />
 
                     <com.google.android.material.chip.ChipGroup
                         android:id="@+id/result_tag"
                         style="@style/ChipParent"
+
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                    <TextView
-                        android:id="@+id/result_coming_soon"
-                        android:layout_width="match_parent"
+                    <FrameLayout
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:paddingTop="50dp"
-                        android:text="@string/coming_soon"
-                        android:textColor="?attr/textColor"
-                        android:textSize="20sp"
-                        android:textStyle="bold"
-                        android:visibility="gone" />
-
-                    <LinearLayout
-                        android:id="@+id/result_data_holder"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/result_add_sync"
-                            style="@style/WhiteButton"
-                            android:layout_width="match_parent"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginStart="0dp"
-
-                            android:layout_marginBottom="10dp"
-                            android:text="@string/add_sync"
-                            android:visibility="gone"
-                            app:icon="@drawable/ic_baseline_add_24" />
-
-
-                        <LinearLayout
-                            android:id="@+id/result_movie_parent"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:animateLayoutChanges="true"
-                            android:orientation="horizontal"
-                            tools:visibility="visible">
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/result_play_movie"
-                                style="@style/WhiteButton"
-                                android:layout_width="wrap_content"
-
-                                android:layout_marginStart="0dp"
-                                android:layout_marginEnd="5dp"
-                                android:layout_marginBottom="10dp"
-                                android:layout_weight="1"
-                                android:minWidth="250dp"
-                                android:nextFocusRight="@id/result_play_trailer"
-                                android:nextFocusUp="@id/result_cast_items"
-                                android:nextFocusDown="@id/result_resume_series_button_play"
-                                android:text="@string/play_movie_button"
-                                android:visibility="visible"
-                                app:icon="@drawable/ic_baseline_play_arrow_24">
-
-                            </com.google.android.material.button.MaterialButton>
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/result_play_trailer"
-                                style="@style/WhiteButton"
-                                android:layout_width="wrap_content"
-                                android:layout_marginStart="0dp"
-                                android:layout_marginEnd="5dp"
-                                android:layout_marginBottom="10dp"
-                                android:layout_weight="1"
-                                android:minWidth="250dp"
-                                android:nextFocusUp="@id/result_cast_items"
-                                android:nextFocusDown="@id/result_resume_series_button_play"
-                                android:text="@string/play_trailer_button"
-                                android:visibility="gone"
-                                app:icon="@drawable/ic_baseline_play_arrow_24">
-
-                            </com.google.android.material.button.MaterialButton>
-
-                            <FrameLayout
-                                android:id="@+id/result_movie_progress_downloaded_holder"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="5dp"
-                                android:layout_marginEnd="5dp"
-                                android:layout_weight="1"
-                                android:minWidth="250dp"
-                                android:nextFocusRight="@id/result_bookmark_button">
-
-                                <com.google.android.material.button.MaterialButton
-                                    android:id="@+id/result_download_movie"
-                                    style="@style/BlackButton"
-                                    android:layout_width="match_parent"
-
-                                    android:layout_gravity="center_vertical"
-                                    android:layout_marginStart="0dp"
-
-                                    android:layout_marginEnd="0dp"
-                                    android:clickable="true"
-                                    android:focusable="true"
-                                    android:nextFocusLeft="@id/result_play_trailer"
-                                    android:nextFocusUp="@id/result_cast_items"
-                                    android:nextFocusDown="@id/result_resume_series_button_play"
-
-                                    android:visibility="visible" />
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:gravity="center"
-                                    android:orientation="horizontal">
-
-                                    <androidx.core.widget.ContentLoadingProgressBar
-                                        android:id="@+id/result_movie_progress_downloaded"
-                                        style="?android:attr/progressBarStyleHorizontal"
-                                        android:layout_width="25dp"
-                                        android:layout_height="25dp"
-                                        android:layout_gravity="end|center_vertical"
-                                        android:layout_margin="5dp"
-                                        android:background="@drawable/circle_shape"
-                                        android:indeterminate="false"
-                                        android:max="100"
-                                        android:paddingStart="5dp"
-                                        android:paddingEnd="5dp"
-                                        android:progress="30"
-                                        android:progressDrawable="@drawable/circular_progress_bar_filled"
-                                        android:visibility="visible" />
-
-                                    <ImageView
-                                        android:id="@+id/result_movie_download_icon"
-                                        android:layout_width="30dp"
-                                        android:layout_height="wrap_content"
-                                        android:layout_gravity="center"
-                                        android:background="?selectableItemBackgroundBorderless"
-                                        android:contentDescription="@string/download"
-                                        android:src="@drawable/ic_baseline_play_arrow_24"
-                                        android:visibility="visible"
-                                        app:tint="?attr/white" />
-
-                                    <TextView
-                                        android:id="@+id/result_movie_download_text"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="match_parent"
-                                        android:gravity="center"
-                                        android:letterSpacing="0.09"
-                                        android:textAllCaps="false"
-                                        android:textColor="?attr/textColor"
-                                        android:textSize="15sp"
-                                        android:textStyle="bold"
-                                        tools:text="Downloading" />
-
-                                    <TextView
-                                        android:id="@+id/result_movie_download_text_precentage"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="match_parent"
-                                        android:gravity="center"
-                                        android:letterSpacing="0.09"
-                                        android:paddingStart="5dp"
-                                        android:paddingEnd="5dp"
-                                        android:textAllCaps="false"
-                                        android:textColor="?attr/textColor"
-                                        android:textSize="15sp"
-                                        android:textStyle="bold"
-                                        android:visibility="gone"
-                                        tools:text="68%" />
-                                </LinearLayout>
-                            </FrameLayout>
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/result_bookmark_button"
-                                style="@style/BlackButton"
-
-                                android:layout_width="wrap_content"
-                                android:layout_marginStart="5dp"
-                                android:layout_marginEnd="5dp"
-                                android:layout_marginBottom="10dp"
-                                android:layout_weight="1"
-                                android:minWidth="250dp"
-                                android:nextFocusLeft="@id/result_movie_progress_downloaded_holder"
-                                android:nextFocusRight="@id/result_bookmark_button"
-                                android:nextFocusDown="@id/result_resume_series_button_play"
-                                android:text="@string/type_none"
-                                android:visibility="visible" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/result_resume_parent"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:orientation="vertical"
-                            android:visibility="gone"
-                            tools:visibility="visible">
-
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/result_next_series_button"
-                                style="@style/WhiteButton"
-                                android:layout_width="match_parent"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginStart="0dp"
-                                android:layout_marginEnd="0dp"
-                                android:layout_marginBottom="10dp"
-                                android:nextFocusUp="@id/result_bookmark_button"
-                                android:nextFocusDown="@id/result_download_movie"
-                                android:text="@string/next_episode"
-                                android:visibility="gone"
-                                app:icon="@drawable/cast_ic_mini_controller_skip_next" />
-
-                            <LinearLayout
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:orientation="horizontal">
-
-                                <ImageView
-                                    android:id="@+id/result_resume_series_button_play"
-                                    android:layout_width="30dp"
-                                    android:layout_height="30dp"
-
-                                    android:layout_gravity="center"
-                                    android:background="?selectableItemBackgroundBorderless"
-                                    android:contentDescription="@string/download"
-
-                                    android:nextFocusUp="@id/result_play_movie"
-                                    android:nextFocusDown="@id/result_season_selection"
-                                    android:src="@drawable/ic_baseline_play_arrow_24"
-                                    android:visibility="visible"
-                                    app:tint="?attr/white" />
-
-
-                                <TextView
-                                    android:id="@+id/result_resume_series_title"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:gravity="center"
-                                    android:paddingStart="10dp"
-                                    android:paddingEnd="10dp"
-                                    android:textColor="?attr/textColor"
-                                    android:textSize="17sp"
-                                    android:textStyle="bold"
-                                    tools:text="S1E1 Episode 1" />
-
-                                <TextView
-                                    android:id="@+id/result_resume_series_progress_text"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:layout_weight="0"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:textColor="?attr/grayTextColor"
-                                    tools:ignore="RtlSymmetry"
-                                    tools:text="69m remaining" />
-                            </LinearLayout>
-
-                        </LinearLayout>
+                        android:visibility="gone">
 
                         <LinearLayout
                             android:id="@+id/result_resume_progress_holder"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:layout_marginBottom="10dp"
                             android:orientation="horizontal"
-                            android:paddingTop="10dp"
                             android:visibility="gone"
                             tools:visibility="visible">
 
@@ -661,202 +442,659 @@
                                 android:layout_weight="1"
                                 android:indeterminate="false"
                                 android:max="100"
+
+                                android:paddingEnd="10dp"
                                 android:progress="0"
                                 android:progressBackgroundTint="?attr/colorPrimary"
-                                android:visibility="visible"
+                                android:visibility="gone"
                                 tools:progress="50"
                                 tools:visibility="visible" />
 
+                            <TextView
+                                android:id="@+id/result_resume_series_progress_text"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:layout_weight="0"
+                                android:gravity="center"
+                                android:maxLines="1"
+                                android:paddingEnd="5dp"
+                                android:textColor="?attr/grayTextColor"
+                                android:visibility="gone"
+                                tools:ignore="RtlSymmetry"
+                                tools:text="69m remaining" />
                         </LinearLayout>
 
+                    </FrameLayout>
+
+
+                </LinearLayout>
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/result_cast_items"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:descendantFocusability="afterDescendants"
+
+                android:fadingEdge="horizontal"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
+                android:nextFocusUp="@id/result_episodes_show"
+                android:nextFocusDown="@id/result_recommendations_filter_selection"
+                android:orientation="horizontal"
+                android:paddingTop="5dp"
+                android:requiresFadingEdge="horizontal"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:itemCount="2"
+                tools:listitem="@layout/cast_item"
+                tools:visibility="visible" />
+
+            <LinearLayout
+                android:id="@+id/result_recommendations_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/result_recommendations_filter_selection"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="10dp"
+                    android:nextFocusUp="@id/result_cast_items"
+                    android:nextFocusDown="@id/result_recommendations_list"
+
+                    android:orientation="horizontal"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:itemCount="2"
+                    tools:listitem="@layout/result_selection" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:text="@string/recommended"
+                    android:textColor="?attr/textColor"
+                    android:textSize="17sp" />
+            </LinearLayout>
+
+            <com.lagradost.cloudstream3.ui.AutofitRecyclerView
+                android:id="@+id/result_recommendations_list"
+                android:layout_width="match_parent"
+
+                android:layout_height="wrap_content"
+                android:clipToPadding="false"
+                android:descendantFocusability="afterDescendants"
+                android:nextFocusUp="@id/result_recommendations_filter_selection"
+                android:orientation="vertical"
+                app:spanCount="8"
+                tools:listitem="@layout/search_result_grid" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/episodes_shadow"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="end"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+
+        <!--
+         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" />
+
+        <!--
+        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" />
+
+        <ImageView
+            android:layout_width="0dp"
+            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"
+            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"
+            android:clipToPadding="false"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/result_padding"
+            android:paddingEnd="@dimen/result_padding"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="15dp"
+                android:orientation="horizontal"
+                android:visibility="visible">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_marginBottom="10dp"
+                        android:orientation="horizontal">
+
+                        <!--
+                        <ImageView
+                            android:id="@+id/result_back"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginEnd="10dp"
+                            android:background="?android:attr/selectableItemBackgroundBorderless"
+                            android:clickable="true"
+                            android:contentDescription="@string/go_back"
+                            android:focusable="true"
+                            android:gravity="center_vertical"
+                            android:nextFocusDown="@id/result_play_movie"
+                            android:src="@drawable/ic_baseline_arrow_back_24"
+                            app:tint="?attr/white" />-->
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <!--
+
+                        <LinearLayout
+                            android:id="@+id/result_movie_parent"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:animateLayoutChanges="true"
+                            android:orientation="vertical"
+                            tools:visibility="visible">
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_play_movie"
+                                style="@style/RegularButtonTV"
+                                android:layout_width="wrap_content"
+
+                                android:layout_marginStart="0dp"
+                                android:layout_marginEnd="5dp"
+                                android:layout_marginBottom="10dp"
+                                android:layout_weight="1"
+                                android:minWidth="250dp"
+                                android:nextFocusUp="@id/result_back"
+                                android:nextFocusDown="@id/result_play_series"
+                                android:text="@string/play_movie_button"
+                                android:visibility="visible"
+                                app:icon="@drawable/ic_baseline_play_arrow_24">
+
+                            </com.google.android.material.button.MaterialButton>
+
+                            <LinearLayout
+                                android:id="@+id/series_holder"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical">
+
+                                <com.google.android.material.button.MaterialButton
+                                    android:id="@+id/result_play_series"
+                                    style="@style/RegularButtonTV"
+                                    android:layout_width="wrap_content"
+                                    android:layout_marginStart="0dp"
+
+                                    android:layout_marginEnd="5dp"
+                                    android:layout_marginBottom="10dp"
+                                    android:layout_weight="1"
+                                    android:minWidth="250dp"
+                                    android:nextFocusUp="@id/result_play_movie"
+                                    android:nextFocusDown="@id/result_resume_series"
+                                    android:text="@string/play_episode"
+                                    android:visibility="visible"
+                                    app:icon="@drawable/ic_baseline_play_arrow_24"
+                                    tools:visibility="gone" />
+
+                                <com.google.android.material.button.MaterialButton
+                                    android:id="@+id/result_resume_series"
+                                    style="@style/RegularButtonTV"
+                                    android:layout_width="wrap_content"
+                                    android:layout_marginStart="0dp"
+
+                                    android:layout_marginEnd="5dp"
+                                    android:layout_marginBottom="10dp"
+                                    android:layout_weight="1"
+                                    android:minWidth="250dp"
+                                    android:nextFocusUp="@id/result_play_series"
+                                    android:nextFocusDown="@id/result_play_trailer"
+                                    android:text="@string/resume"
+                                    android:visibility="visible"
+                                    app:icon="@drawable/ic_baseline_play_arrow_24"
+                                    tools:visibility="gone" />
+
+                            </LinearLayout>
+
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_play_trailer"
+                                style="@style/RegularButtonTV"
+                                android:layout_width="wrap_content"
+                                android:layout_marginStart="0dp"
+                                android:layout_marginEnd="5dp"
+                                android:layout_marginBottom="10dp"
+                                android:layout_weight="1"
+                                android:minWidth="250dp"
+                                android:nextFocusUp="@id/result_resume_series"
+                                android:nextFocusDown="@id/result_bookmark_button"
+                                android:text="@string/play_trailer_button"
+                                android:visibility="gone"
+                                app:icon="@drawable/ic_baseline_play_arrow_24"
+                                tools:visibility="visible">
+
+                            </com.google.android.material.button.MaterialButton>
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_bookmark_button"
+                                style="@style/RegularButtonTV"
+
+                                android:layout_width="wrap_content"
+                                android:layout_marginStart="0dp"
+                                android:layout_marginEnd="5dp"
+                                android:layout_marginBottom="10dp"
+                                android:layout_weight="1"
+                                android:minWidth="250dp"
+                                android:nextFocusUp="@id/result_play_trailer"
+                                android:nextFocusDown="@id/result_resume_series_button"
+                                android:text="@string/type_none"
+                                android:visibility="visible" />
+
+                            <LinearLayout
+                                android:id="@+id/result_resume_progress_holder"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginBottom="10dp"
+                                android:orientation="horizontal"
+                                android:visibility="gone"
+                                tools:visibility="visible">
+
+                                <androidx.core.widget.ContentLoadingProgressBar
+                                    android:id="@+id/result_resume_series_progress"
+                                    style="?android:attr/progressBarStyleHorizontal"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="20dp"
+                                    android:layout_gravity="end|center_vertical"
+                                    android:layout_weight="1"
+                                    android:indeterminate="false"
+                                    android:max="100"
+                                    android:paddingEnd="10dp"
+                                    android:progress="0"
+                                    android:progressBackgroundTint="?attr/colorPrimary"
+                                    android:visibility="visible"
+                                    tools:progress="50"
+                                    tools:visibility="visible" />
+
+                                <TextView
+                                    android:id="@+id/result_resume_series_progress_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:layout_weight="0"
+                                    android:gravity="center"
+                                    android:maxLines="1"
+                                    android:paddingEnd="5dp"
+                                    android:textColor="?attr/grayTextColor"
+                                    tools:ignore="RtlSymmetry"
+                                    tools:text="69m remaining" />
+                            </LinearLayout>
+
+                        </LinearLayout>
+-->
+                        <androidx.cardview.widget.CardView
+                            android:id="@+id/result_poster_holder"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="10dp"
+                            android:visibility="gone"
+                            app:cardCornerRadius="@dimen/rounded_image_radius">
+
+                            <ImageView
+                                android:id="@+id/result_poster"
+                                android:layout_width="100dp"
+                                android:layout_height="140dp"
+                                android:layout_gravity="bottom"
+                                android:contentDescription="@string/result_poster_img_des"
+                                android:foreground="@drawable/outline_drawable"
+                                android:scaleType="centerCrop"
+                                tools:src="@drawable/example_poster" />
+                        </androidx.cardview.widget.CardView>
+
+                        <!--
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="vertical">
 
-                            <androidx.recyclerview.widget.RecyclerView
-                                android:id="@+id/result_season_selection"
-                                android:layout_width="wrap_content"
+                            <com.lagradost.cloudstream3.widget.FlowLayout
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
+                                app:itemSpacing="10dp">
 
-                                android:nextFocusUp="@id/result_resume_series_button_play"
-                                android:nextFocusDown="@id/result_range_selection"
-                                android:orientation="horizontal"
-                                android:paddingBottom="10dp"
-                                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:nextFocusUp="@id/result_season_selection"
-                                android:nextFocusDown="@id/result_dub_selection"
-                                android:orientation="horizontal"
-                                android:paddingBottom="10dp"
-                                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                                tools:listitem="@layout/result_selection" />
-
-                            <androidx.recyclerview.widget.RecyclerView
-                                android:id="@+id/result_dub_selection"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-
-                                android:nextFocusUp="@id/result_range_selection"
-                                android:nextFocusDown="@id/result_episodes"
-                                android:orientation="horizontal"
-                                android:paddingBottom="10dp"
-                                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                                tools:listitem="@layout/result_selection" />
-
-                            <LinearLayout
-                                android:id="@+id/result_next_airing_holder"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="start"
-                                android:layout_marginBottom="5dp"
-                                android:orientation="horizontal">
-
-                                <TextView
-                                    android:id="@+id/result_episodes_text"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
+                                <com.google.android.material.button.MaterialButton
+                                    android:id="@+id/result_meta_site"
+                                    style="@style/SmallBlackButton"
                                     android:layout_gravity="center_vertical"
-                                    android:layout_marginEnd="20dp"
-                                    android:textColor="?attr/textColor"
-                                    android:textSize="17sp"
-                                    android:textStyle="normal"
-                                    tools:text="8 Episodes" />
+                                    tools:text="Gogoanime" />
 
                                 <TextView
-                                    android:id="@+id/result_next_airing"
-
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="center"
-                                    android:textColor="?attr/grayTextColor"
-                                    android:textSize="17sp"
-                                    android:textStyle="normal"
-                                    tools:text="Episode 1022 will be released in" />
+                                    android:id="@+id/result_meta_type"
+                                    style="@style/ResultInfoText"
+                                    tools:text="Movie" />
 
                                 <TextView
-                                    android:id="@+id/result_next_airing_time"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="center"
-                                    android:paddingStart="5dp"
-                                    android:paddingEnd="5dp"
-                                    android:textColor="?attr/textColor"
-                                    android:textSize="17sp"
-                                    android:textStyle="normal"
-                                    tools:text="5d 3h 30m" />
-                            </LinearLayout>
+                                    android:id="@+id/result_meta_year"
+                                    style="@style/ResultInfoText"
+                                    tools:text="2022" />
 
-                            <com.facebook.shimmer.ShimmerFrameLayout
-                                android:id="@+id/result_episode_loading"
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="center"
-                                android:layout_marginTop="15dp"
-                                android:orientation="vertical"
-                                app:shimmer_auto_start="true"
-                                app:shimmer_base_alpha="0.2"
-                                app:shimmer_duration="@integer/loading_time"
-                                app:shimmer_highlight_alpha="0.3"
-                                tools:visibility="gone">
+                                <TextView
+                                    android:id="@+id/result_meta_rating"
+                                    style="@style/ResultInfoText"
+                                    tools:text="Rated: 8.5/10.0" />
 
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="vertical">
+                                <TextView
+                                    android:id="@+id/result_meta_status"
+                                    style="@style/ResultInfoText"
+                                    tools:text="Ongoing" />
 
-                                    <include layout="@layout/loading_episode" />
+                                <TextView
+                                    android:id="@+id/result_meta_duration"
+                                    style="@style/ResultInfoText"
+                                    tools:text="121min" />
+                            </com.lagradost.cloudstream3.widget.FlowLayout>
 
-                                    <include layout="@layout/loading_episode" />
-
-                                    <include layout="@layout/loading_episode" />
-
-                                    <include layout="@layout/loading_episode" />
-                                </LinearLayout>
-                            </com.facebook.shimmer.ShimmerFrameLayout>
-                            <!--<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"
+                            <TextView
+                                android:id="@+id/result_description"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:clipToPadding="false"
-                                android:nextFocusUp="@id/result_dub_selection"
-                                android:nextFocusDown="@id/result_recommendations_filter_selection"
-                                android:orientation="horizontal"
-                                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" />
+                                android:ellipsize="end"
+                                android:fadingEdgeLength="30dp"
+                                android:foreground="@drawable/outline_drawable"
+                                android:maxLines="7"
+                                android:nextFocusUp="@id/result_back"
+                                android:nextFocusDown="@id/result_bookmark_button"
+                                android:padding="5dp"
+                                android:requiresFadingEdge="vertical"
+                                android:textColor="?attr/textColor"
+                                android:textSize="15sp"
+                                tools:text="Ryan Quicksave Romano is an eccentric adventurer with a strange power: he can create a save-point in time and redo his life whenever he dies. Arriving in New Rome, the glitzy capital of sin of a rebuilding Europe, he finds the city torn between mega-corporations, sponsored heroes, superpowered criminals, and true monsters. It's a time of chaos, where potions can grant the power to rule the world and dangers lurk everywhere. " />
                         </LinearLayout>
+                        -->
+                        <!--
+                                                    This has half margin and half padding to make TV focus on description look better.
+                                                    The focus outline now settles between the poster and text.
+                                                    -->
                     </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/result_cast_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:ellipsize="end"
+                android:maxLines="2"
+                android:textColor="?attr/grayTextColor"
+                android:textSize="15sp"
+                tools:text="Cast: Joe Ligma" />
+
+            <TextView
+                android:id="@+id/result_vpn"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?attr/grayTextColor"
+                android:textSize="15sp"
+                tools:text="@string/vpn_torrent" />
+
+            <TextView
+                android:id="@+id/result_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:textColor="?attr/grayTextColor"
+                android:textSize="15sp"
+                tools:text="@string/provider_info_meta" />
+
+            <TextView
+                android:id="@+id/result_no_episodes"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:textColor="?attr/grayTextColor"
+                android:textSize="15sp"
+                tools:text="@string/no_episodes_found" />
+
+
+            <TextView
+                android:id="@+id/result_coming_soon"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:paddingTop="50dp"
+                android:text="@string/coming_soon"
+                android:textColor="?attr/textColor"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:id="@+id/result_data_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/result_add_sync"
+                    style="@style/WhiteButton"
+                    android:layout_width="match_parent"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="0dp"
+
+                    android:layout_marginBottom="10dp"
+                    android:text="@string/add_sync"
+                    android:visibility="gone"
+                    app:icon="@drawable/ic_baseline_add_24" />
+
+
+                <!--<LinearLayout
+
+                    android:id="@+id/result_resume_parent"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:orientation="vertical"
+                    android:visibility="gone"
+                    tools:visibility="gone">
+
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/result_next_series_button"
+                        style="@style/WhiteButton"
+                        android:layout_width="match_parent"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="0dp"
+                        android:layout_marginEnd="0dp"
+                        android:layout_marginBottom="10dp"
+                        android:nextFocusUp="@id/result_bookmark_button"
+                        android:nextFocusDown="@id/result_download_movie"
+                        android:text="@string/next_episode"
+                        android:visibility="gone"
+                        app:icon="@drawable/cast_ic_mini_controller_skip_next" />
 
                     <LinearLayout
-                        android:id="@+id/result_recommendations_holder"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp">
+                        android:orientation="horizontal">
 
-                        <androidx.recyclerview.widget.RecyclerView
-                            android:id="@+id/result_recommendations_filter_selection"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="10dp"
-                            android:nextFocusUp="@id/result_episodes"
+                        <ImageView
+                            android:id="@+id/result_resume_series_button"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+
+                            android:layout_gravity="center"
+                            android:background="?selectableItemBackgroundBorderless"
+                            android:contentDescription="@string/download"
+
+                            android:nextFocusUp="@id/result_play_movie"
+                            android:nextFocusDown="@id/result_season_selection"
+                            android:src="@drawable/ic_baseline_play_arrow_24"
+                            android:visibility="visible"
+                            app:tint="?attr/white" />
 
-                            android:nextFocusDown="@id/result_recommendations"
-                            android:orientation="horizontal"
-                            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                            tools:itemCount="2"
-                            tools:listitem="@layout/result_selection" />
 
                         <TextView
+                            android:id="@+id/result_resume_series_title"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:gravity="center_vertical"
-                            android:text="@string/recommended"
+                            android:layout_gravity="center"
+                            android:gravity="center"
+                            android:paddingStart="10dp"
+                            android:paddingEnd="10dp"
                             android:textColor="?attr/textColor"
-                            android:textSize="17sp" />
+                            android:textSize="17sp"
+                            android:textStyle="bold"
+                            tools:text="S1E1 Episode 1" />
+
                     </LinearLayout>
 
-                    <com.lagradost.cloudstream3.ui.AutofitRecyclerView
-                        android:id="@+id/result_recommendations"
-                        android:layout_width="match_parent"
-
-                        android:layout_height="wrap_content"
-                        android:background="?attr/primaryBlackBackground"
-                        android:clipToPadding="false"
-                        android:descendantFocusability="afterDescendants"
-                        android:nextFocusUp="@id/result_recommendations_filter_selection"
-                        android:orientation="vertical"
-                        app:spanCount="8"
-                        tools:listitem="@layout/search_result_grid" />
-                </LinearLayout>
-
+                </LinearLayout>-->
             </LinearLayout>
-        </androidx.core.widget.NestedScrollView>
-    </LinearLayout>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index bed08570..c5a43b6d 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -11,10 +11,10 @@
     tools:context=".ui.search.SearchFragment">
 
     <LinearLayout
-        android:paddingBottom="10dp"
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="10dp">
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -88,7 +88,9 @@
                 app:tint="?attr/textColor" />
         </FrameLayout>
 
-        <include layout="@layout/tvtypes_chips_scroll" />
+        <include
+            android:id="@+id/tvtypes_chips_scroll"
+            layout="@layout/tvtypes_chips_scroll" />
     </LinearLayout>
 
 
@@ -116,7 +118,10 @@
 
         android:background="?attr/primaryBlackBackground"
         android:descendantFocusability="afterDescendants"
+
         android:nextFocusLeft="@id/nav_rail_view"
+        android:nextFocusUp="@id/tvtypes_chips"
+        android:nextFocusDown="@id/search_clear_call_history"
         android:visibility="gone"
         tools:listitem="@layout/homepage_parent" />
 
@@ -134,20 +139,24 @@
             android:background="?attr/primaryBlackBackground"
             android:descendantFocusability="afterDescendants"
             android:nextFocusLeft="@id/nav_rail_view"
-            android:visibility="visible"
+            android:nextFocusUp="@id/tvtypes_chips"
+            android:nextFocusDown="@id/search_clear_call_history"
+
             android:paddingBottom="50dp"
+            android:visibility="visible"
             tools:listitem="@layout/search_history_item" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/search_clear_call_history"
             style="@style/BlackButton"
-            android:layout_gravity="bottom"
-            android:padding="0dp"
-            app:cornerRadius="0dp"
-            android:layout_margin="0dp"
-            android:text="@string/clear_history"
-            app:icon="@drawable/delete_all"
             android:layout_width="match_parent"
-            android:layout_height="50dp" />
+            android:layout_height="50dp"
+            android:layout_gravity="bottom"
+            android:layout_margin="0dp"
+            android:nextFocusUp="@id/search_history_recycler"
+            android:padding="0dp"
+            android:text="@string/clear_history"
+            app:cornerRadius="0dp"
+            app:icon="@drawable/delete_all" />
     </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search_tv.xml b/app/src/main/res/layout/fragment_search_tv.xml
index 0a85a471..5fec8c6a 100644
--- a/app/src/main/res/layout/fragment_search_tv.xml
+++ b/app/src/main/res/layout/fragment_search_tv.xml
@@ -11,11 +11,11 @@
     tools:context=".ui.search.SearchFragment">
 
     <LinearLayout
-        android:layout_marginStart="@dimen/navbar_width"
-        android:paddingBottom="10dp"
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/navbar_width"
+        android:orientation="vertical"
+        android:paddingBottom="10dp">
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -89,7 +89,9 @@
                 app:tint="?attr/textColor" />
         </FrameLayout>
 
-        <include layout="@layout/tvtypes_chips_scroll" />
+        <include
+            android:id="@+id/tvtypes_chips_scroll"
+            layout="@layout/tvtypes_chips_scroll" />
     </LinearLayout>
 
 
@@ -97,7 +99,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"
@@ -118,38 +120,43 @@
         android:background="?attr/primaryBlackBackground"
         android:descendantFocusability="afterDescendants"
         android:nextFocusLeft="@id/nav_rail_view"
+        android:nextFocusUp="@id/tvtypes_chips"
+        android:nextFocusDown="@id/search_clear_call_history"
         android:visibility="gone"
         tools:listitem="@layout/homepage_parent" />
 
     <FrameLayout
         android:id="@+id/search_history_holder"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBlackBackground">
 
         <androidx.recyclerview.widget.RecyclerView
-            android:paddingStart="@dimen/navbar_width"
             android:id="@+id/search_history_recycler"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginStart="@dimen/navbar_width"
 
-            android:background="?attr/primaryBlackBackground"
             android:descendantFocusability="afterDescendants"
             android:nextFocusLeft="@id/nav_rail_view"
-            android:visibility="visible"
+            android:nextFocusUp="@id/tvtypes_chips"
+            android:nextFocusDown="@id/search_clear_call_history"
             android:paddingBottom="50dp"
+            android:visibility="visible"
             tools:listitem="@layout/search_history_item" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/search_clear_call_history"
             style="@style/BlackButton"
-            android:layout_gravity="bottom"
-            android:padding="0dp"
-            app:cornerRadius="0dp"
-            android:layout_margin="0dp"
-            android:text="@string/clear_history"
-            app:icon="@drawable/delete_all"
             android:layout_width="match_parent"
-            android:layout_height="50dp" />
+            android:layout_height="50dp"
+            android:layout_gravity="bottom"
+            android:layout_margin="0dp"
+            android:layout_marginStart="@dimen/navbar_width"
+            android:nextFocusUp="@id/search_history_recycler"
+            android:padding="0dp"
+            android:text="@string/clear_history"
+            app:cornerRadius="0dp"
+            app:icon="@drawable/delete_all" />
     </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_trailer.xml b/app/src/main/res/layout/fragment_trailer.xml
index ff477118..977198cf 100644
--- a/app/src/main/res/layout/fragment_trailer.xml
+++ b/app/src/main/res/layout/fragment_trailer.xml
@@ -14,7 +14,7 @@
     <!--
           app:fastforward_increment="10000"
             app:rewind_increment="10000"-->
-    <com.google.android.exoplayer2.ui.PlayerView
+    <androidx.media3.ui.PlayerView
             android:id="@+id/player_view"
             app:show_timeout="0"
             app:hide_on_touch="false"
diff --git a/app/src/main/res/layout/home_result_grid_expanded.xml b/app/src/main/res/layout/home_result_grid_expanded.xml
index b697c1de..3c3804a5 100644
--- a/app/src/main/res/layout/home_result_grid_expanded.xml
+++ b/app/src/main/res/layout/home_result_grid_expanded.xml
@@ -7,7 +7,7 @@
 <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/background_card"
+
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_margin="2dp"
@@ -16,13 +16,22 @@
     app:cardCornerRadius="@dimen/rounded_image_radius"
     app:cardElevation="0dp">
 
+    <ImageView
+        android:id="@+id/title_shadow"
+        android:visibility="gone"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_gravity="bottom"
+        android:clickable="false"
+        android:focusable="false"
+        tools:ignore="ContentDescription" />
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <androidx.cardview.widget.CardView
-            android:id="@+id/image_holder"
+            android:id="@+id/background_card"
             android:layout_width="114dp"
             android:layout_height="180dp"
             android:elevation="10dp"
diff --git a/app/src/main/res/layout/home_select_mainpage.xml b/app/src/main/res/layout/home_select_mainpage.xml
index a4bb686c..1d2d1780 100644
--- a/app/src/main/res/layout/home_select_mainpage.xml
+++ b/app/src/main/res/layout/home_select_mainpage.xml
@@ -26,7 +26,7 @@
         android:layout_gravity="bottom"
         android:layout_width="match_parent"
         android:layout_height="60dp">
-        <include layout="@layout/tvtypes_chips_scroll" />
+        <include layout="@layout/tvtypes_chips_scroll" android:id="@+id/tvtypes_chips_scroll" />
         <LinearLayout
             android:id="@+id/apply_btt_holder"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/library_viewpager_page.xml b/app/src/main/res/layout/library_viewpager_page.xml
index f69f68b5..7d278cff 100644
--- a/app/src/main/res/layout/library_viewpager_page.xml
+++ b/app/src/main/res/layout/library_viewpager_page.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-
 <com.lagradost.cloudstream3.ui.AutofitRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/page_recyclerview"
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 54f92d1f..5592f3a6 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -54,7 +54,6 @@
             android:background="@color/black_overlay" />
 
         <RelativeLayout
-            android:id="@+id/player_time_menu"
             android:layout_width="match_parent"
             android:layout_height="200dp"
             android:orientation="horizontal"
@@ -85,6 +84,33 @@
                 style="@style/SmallBlackButton"
                 android:text="@string/filler" />
         </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"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="20dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/baseline_fullscreen_24"
+            app:tint="@color/white" />
+        <FrameLayout
+            android:id="@+id/player_intro_play"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/player_open_source"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:clickable="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:visibility="gone"
+            android:importantForAccessibility="no" />
+
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/player_video_holder"
@@ -190,39 +216,6 @@
                 tools:visibility="visible" />
 
             <!-- This nested layout is necessary because of buffering and clicking-->
-            <FrameLayout
-                android:id="@+id/player_pause_play_holder_holder"
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <FrameLayout
-                    android:id="@+id/player_pause_play_holder"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    tools:ignore="uselessParent">
-
-                    <ImageView
-                        android:id="@+id/player_pause_play"
-                        android:layout_width="70dp"
-                        android:layout_height="70dp"
-                        android:layout_gravity="center"
-                        android:background="@drawable/video_tap_button"
-                        android:nextFocusLeft="@id/exo_rew"
-
-                        android:nextFocusRight="@id/exo_ffwd"
-
-                        android:nextFocusUp="@id/player_go_back"
-                        android:nextFocusDown="@id/player_lock"
-
-                        android:src="@drawable/netflix_pause"
-                        app:tint="@color/white"
-                        tools:ignore="ContentDescription" />
-                </FrameLayout>
-            </FrameLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/player_center_menu"
@@ -279,7 +272,32 @@
                         app:tint="@color/white"
                         tools:ignore="ContentDescription" />
                 </FrameLayout>
+                <FrameLayout
+                    android:id="@+id/player_pause_play_holder_holder"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
 
+                    <ImageView
+                        android:id="@+id/player_pause_play"
+                        android:layout_width="70dp"
+                        android:layout_height="70dp"
+                        android:layout_gravity="center"
+                        android:background="@drawable/video_tap_button"
+                        android:nextFocusLeft="@id/exo_rew"
+
+                        android:nextFocusRight="@id/exo_ffwd"
+
+                        android:nextFocusUp="@id/player_go_back"
+                        android:nextFocusDown="@id/player_lock"
+
+                        android:src="@drawable/netflix_pause"
+                        app:tint="@color/white"
+                        tools:ignore="ContentDescription" />
+                </FrameLayout>
                 <FrameLayout
                     android:id="@+id/player_ffwd_holder"
                     android:layout_width="0dp"
@@ -432,7 +450,7 @@
                         android:textStyle="normal"
                         tools:text="15:30" />
                     <!--app:buffered_color="@color/videoCache"-->
-                    <com.google.android.exoplayer2.ui.DefaultTimeBar
+                    <androidx.media3.ui.DefaultTimeBar
                         android:id="@id/exo_progress"
                         android:layout_width="0dp"
                         android:layout_height="30dp"
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 62b359b6..e9805d31 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -54,6 +54,146 @@
 
         </LinearLayout>
     -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layoutDirection="ltr"
+            android:orientation="horizontal">
+
+            <RelativeLayout
+                android:id="@+id/player_progressbar_left_holder"
+                android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="start"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@+id/centerMenuView"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:alpha="1"
+                tools:visibility="visible">
+                <!--VERY hacky layout -->
+                <ImageView
+                    android:id="@+id/player_progressbar_left_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginBottom="220dp"
+                    android:src="@drawable/ic_baseline_volume_up_24"
+                    app:tint="@android:color/white"
+                    tools:ignore="ContentDescription">
+
+                </ImageView>
+
+                <ProgressBar
+                    android:id="@+id/player_progressbar_left"
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                    android:layout_width="5dp"
+                    android:layout_height="150dp"
+                    android:layout_centerInParent="true"
+                    android:layout_gravity="end|center_vertical"
+                    android:layout_marginStart="40dp"
+                    android:indeterminate="false"
+                    android:max="100"
+                    android:progress="100"
+                    android:progressDrawable="@drawable/progress_drawable_vertical"
+                    tools:progress="30" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/player_progressbar_right_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="right"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toRightOf="@+id/centerMenuView"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:alpha="1"
+                tools:ignore="RtlHardcoded"
+                tools:visibility="visible">
+
+                <ImageView
+                    android:id="@+id/player_progressbar_right_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginBottom="220dp"
+                    android:src="@drawable/ic_baseline_brightness_7_24"
+                    app:tint="@android:color/white"
+                    tools:ignore="ContentDescription">
+
+                </ImageView>
+
+                <ProgressBar
+                    android:id="@+id/player_progressbar_right"
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                    android:layout_width="5dp"
+                    android:layout_height="150dp"
+                    android:layout_centerInParent="true"
+                    android:layout_gravity="end|center_vertical"
+                    android:layout_marginEnd="40dp"
+                    android:indeterminate="false"
+                    android:max="100"
+                    android:progress="100"
+                    android:progressDrawable="@drawable/progress_drawable_vertical" />
+            </RelativeLayout>
+        </LinearLayout>
+
+
+        <TextView
+            android:id="@+id/player_time_text"
+            android:layout_width="match_parent"
+            android:layout_height="200dp"
+            android:gravity="center"
+            android:shadowColor="@android:color/black"
+            android:shadowRadius="10.0"
+            android:textColor="@android:color/white"
+            android:textSize="30sp"
+            android:visibility="gone"
+            tools:text="+100"
+            tools:visibility="visible" />
+
+        <FrameLayout
+            android:id="@+id/player_pause_play_holder_holder"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <FrameLayout
+            android:id="@+id/player_intro_play"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/player_open_source"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:clickable="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:importantForAccessibility="no"
+            android:visibility="gone" />
+
+        <!-- atm this is useless, however it might be used for PIP one day? -->
+        <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"
+            android:visibility="gone"
+            app:tint="@color/white" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/player_video_holder"
@@ -61,35 +201,73 @@
             android:layout_height="match_parent"
             android:padding="16dp">
 
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/skip_chapter_button"
+                style="@style/NiceButton"
+                android:layout_width="150dp"
+                android:layout_height="40dp"
+                android:layout_marginEnd="100dp"
+                android:backgroundTint="@color/skipOpTransparent"
+                android:maxLines="1"
+                android:nextFocusLeft="@id/player_pause_play"
+                android:nextFocusUp="@id/player_go_back"
+                android:nextFocusDown="@id/player_pause_play"
+                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:strokeColor="@color/white"
+                app:strokeWidth="1dp"
+                tools:text="Skip Opening"
+                tools:visibility="visible" />
+
             <FrameLayout
                 android:id="@+id/player_top_holder"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <TextView
-                    android:id="@+id/player_video_title"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="80dp"
                     android:layout_marginTop="20dp"
                     android:layout_marginEnd="32dp"
-                    android:gravity="end"
-                    android:textColor="@color/white"
-                    android:textSize="16sp"
-                    android:textStyle="bold"
-                    tools:text="Hello world" />
+                    android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/player_video_title_rez"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="80dp"
-                    android:layout_marginTop="40dp"
-                    android:layout_marginEnd="32dp"
-                    android:gravity="end"
-                    android:textColor="@color/white"
-                    android:textSize="16sp"
-                    tools:text="1920x1080" />
+                    <TextView
+                        android:id="@+id/player_video_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="end"
+                        android:textColor="@color/white"
+                        android:textSize="16sp"
+                        android:textStyle="bold"
+                        tools:text="Hello world" />
+
+                    <TextView
+                        android:id="@+id/player_video_title_rez"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="end"
+                        android:textColor="@color/white"
+                        android:textSize="16sp"
+                        tools:text="1920x1080" />
+
+                    <FrameLayout
+                        android:id="@+id/player_episode_filler_holder"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end"
+                        android:layout_marginTop="2dp">
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_episode_filler"
+                            style="@style/SmallBlackButton"
+                            android:text="@string/filler" />
+                    </FrameLayout>
+                </LinearLayout>
 
                 <!-- Removed as it has no use anymore-->
                 <!--<androidx.mediarouter.app.MediaRouteButton
@@ -127,10 +305,113 @@
                         android:background="@drawable/video_tap_button_always_white"
                         android:clickable="true"
                         android:contentDescription="@string/go_back_img_des"
-                        android:focusable="true" />
+                        android:focusable="true"
+                        android:tag="@string/tv_no_focus_tag" />
                 </FrameLayout>
             </FrameLayout>
 
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/player_center_menu"
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:layoutDirection="ltr"
+                android:orientation="horizontal"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:visibility="visible">
+
+                <FrameLayout
+                    android:id="@+id/player_rew_holder"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|start"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toLeftOf="@id/player_ffwd_holder"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintWidth_percent="0.5">
+
+                    <TextView
+                        android:id="@+id/exo_rew_text"
+                        android:layout_width="200dp"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center"
+
+                        android:gravity="center"
+                        android:textColor="@color/white"
+                        android:textSize="19sp"
+
+                        android:textStyle="bold"
+                        tools:text="10" />
+
+                    <ImageButton
+                        android:id="@id/exo_rew"
+                        android:layout_width="70dp"
+                        android:layout_height="70dp"
+                        android:layout_gravity="center"
+
+                        android:background="@drawable/video_tap_button_skip"
+                        android:nextFocusLeft="@id/exo_rew"
+                        android:nextFocusUp="@id/player_go_back"
+                        android:nextFocusDown="@id/player_pause_play"
+                        android:padding="10dp"
+                        android:scaleType="fitCenter"
+                        android:scaleX="-1"
+                        android:src="@drawable/netflix_skip_forward"
+                        android:tintMode="src_in"
+                        app:tint="@color/white"
+                        tools:ignore="ContentDescription" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:id="@+id/player_ffwd_holder"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|end"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toRightOf="@id/player_rew_holder"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintWidth_percent="0.5">
+
+                    <TextView
+                        android:id="@+id/exo_ffwd_text"
+                        android:layout_width="200dp"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:textColor="@color/white"
+                        android:textSize="19sp"
+                        android:textStyle="bold"
+                        tools:text="10" />
+
+                    <ImageButton
+                        android:id="@id/exo_ffwd"
+                        android:layout_width="70dp"
+                        android:layout_height="70dp"
+                        android:layout_gravity="center"
+
+                        android:background="@drawable/video_tap_button_skip"
+                        android:nextFocusRight="@id/exo_rew"
+                        android:nextFocusUp="@id/player_go_back"
+                        android:nextFocusDown="@id/player_pause_play"
+                        android:padding="10dp"
+                        android:scaleType="fitCenter"
+                        android:src="@drawable/netflix_skip_forward"
+                        android:tintMode="src_in"
+                        app:tint="@color/white"
+                        tools:ignore="ContentDescription" />
+                </FrameLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
             <!--use for thinner app:trackThickness="3dp" com.google.android.material.progressindicator.CircularProgressIndicator-->
             <ProgressBar
                 android:id="@+id/player_buffering"
@@ -231,6 +512,7 @@
 
                     <ImageView
                         android:id="@+id/player_pause_play"
+
                         android:layout_width="30dp"
                         android:layout_height="30dp"
                         android:layout_gravity="center"
@@ -238,10 +520,11 @@
                         android:background="@drawable/video_tap_button"
                         android:focusable="true"
                         android:focusableInTouchMode="true"
-                        android:nextFocusUp="@id/player_go_back"
-                        android:nextFocusDown="@id/player_lock"
-
+                        android:nextFocusUp="@id/skip_chapter_button"
+                        android:nextFocusDown="@id/player_skip_op"
                         android:src="@drawable/netflix_pause"
+
+                        android:tag="@string/tv_no_focus_tag"
                         app:tint="@color/player_button_tv"
                         tools:ignore="ContentDescription" />
 
@@ -260,7 +543,7 @@
                         android:textStyle="normal"
                         tools:text="15:30" />
                     <!--app:buffered_color="@color/videoCache"-->
-                    <com.google.android.exoplayer2.ui.DefaultTimeBar
+                    <androidx.media3.ui.DefaultTimeBar
                         android:id="@id/exo_progress"
                         android:layout_width="0dp"
                         android:layout_height="30dp"
@@ -304,12 +587,52 @@
                         android:layout_height="match_parent"
                         android:orientation="horizontal">
 
+                        <FrameLayout
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:visibility="gone">
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/player_lock"
+                                style="@style/VideoButtonTV"
+                                android:nextFocusLeft="@id/player_skip_episode"
+
+                                android:nextFocusRight="@id/player_resize_btt"
+                                android:nextFocusUp="@id/player_pause_play"
+                                android:text="@string/video_lock"
+                                android:visibility="gone"
+                                app:icon="@drawable/video_locked" />
+                        </FrameLayout>
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_skip_op"
+                            style="@style/VideoButtonTV"
+                            android:nextFocusLeft="@id/player_pause_play"
+                            android:nextFocusRight="@id/player_skip_episode"
+                            android:nextFocusUp="@id/player_pause_play"
+                            android:nextFocusDown="@id/player_skip_episode"
+                            android:text="@string/video_skip_op"
+                            app:icon="@drawable/ic_baseline_fast_forward_24" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_skip_episode"
+                            style="@style/VideoButtonTV"
+                            android:nextFocusLeft="@id/player_skip_op"
+
+                            android:nextFocusRight="@id/player_resize_btt"
+                            android:nextFocusUp="@id/player_pause_play"
+                            android:nextFocusDown="@id/player_resize_btt"
+                            android:text="@string/next_episode"
+                            app:icon="@drawable/ic_baseline_skip_next_24" />
+
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/player_resize_btt"
                             style="@style/VideoButtonTV"
-                            android:nextFocusLeft="@id/player_lock"
+                            android:nextFocusLeft="@id/player_skip_episode"
+
                             android:nextFocusRight="@id/player_speed_btt"
                             android:nextFocusUp="@id/player_pause_play"
+                            android:nextFocusDown="@id/player_speed_btt"
                             android:text="@string/video_aspect_ratio_resize"
                             app:icon="@drawable/ic_baseline_aspect_ratio_24" />
 
@@ -317,8 +640,10 @@
                             android:id="@+id/player_speed_btt"
                             style="@style/VideoButtonTV"
                             android:nextFocusLeft="@id/player_resize_btt"
+
                             android:nextFocusRight="@id/player_subtitle_offset_btt"
                             android:nextFocusUp="@id/player_pause_play"
+                            android:nextFocusDown="@id/player_subtitle_offset_btt"
                             app:icon="@drawable/ic_baseline_speed_24"
                             tools:text="Speed" />
 
@@ -327,6 +652,8 @@
                             style="@style/VideoButtonTV"
                             android:nextFocusLeft="@id/player_speed_btt"
                             android:nextFocusRight="@id/player_sources_btt"
+                            android:nextFocusUp="@id/player_pause_play"
+                            android:nextFocusDown="@id/player_sources_btt"
                             android:text="@string/subtitle_offset"
 
                             android:visibility="gone"
@@ -339,6 +666,8 @@
                             android:nextFocusLeft="@id/player_subtitle_offset_btt"
                             android:nextFocusRight="@id/player_tracks_btt"
                             android:nextFocusUp="@id/player_pause_play"
+                            android:nextFocusDown="@id/player_tracks_btt"
+
                             android:text="@string/video_source"
                             app:icon="@drawable/ic_baseline_playlist_play_24" />
 
@@ -350,25 +679,6 @@
                             android:nextFocusUp="@id/player_pause_play"
                             android:text="@string/tracks"
                             app:icon="@drawable/ic_baseline_playlist_play_24" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_skip_op"
-                            style="@style/VideoButtonTV"
-                            android:nextFocusLeft="@id/player_sources_btt"
-                            android:nextFocusRight="@id/player_skip_episode"
-                            android:nextFocusUp="@id/player_pause_play"
-                            android:text="@string/video_skip_op"
-                            app:icon="@drawable/ic_baseline_fast_forward_24" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_skip_episode"
-                            style="@style/VideoButtonTV"
-
-                            android:nextFocusLeft="@id/player_skip_op"
-                            android:nextFocusRight="@id/player_lock"
-                            android:nextFocusUp="@id/player_pause_play"
-                            android:text="@string/next_episode"
-                            app:icon="@drawable/ic_baseline_skip_next_24" />
                     </LinearLayout>
                 </HorizontalScrollView>
             </LinearLayout>
diff --git a/app/src/main/res/layout/player_episodes_large.xml b/app/src/main/res/layout/player_episodes_large.xml
index b1f815e4..47696563 100644
--- a/app/src/main/res/layout/player_episodes_large.xml
+++ b/app/src/main/res/layout/player_episodes_large.xml
@@ -40,7 +40,6 @@
             android:foreground="@drawable/outline_drawable">
 
         <ImageView
-                android:nextFocusLeft="@id/result_episode_download"
                 android:nextFocusRight="@id/episode_holder"
 
                 android:id="@+id/episode_poster"
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 3fad69ac..0eab2407 100644
--- a/app/src/main/res/layout/player_quality_profile_item.xml
+++ b/app/src/main/res/layout/player_quality_profile_item.xml
@@ -34,7 +34,7 @@
             android:id="@+id/outline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/outline"
+            android:background="@drawable/outline_card"
             android:visibility="gone"
             tools:visibility="visible" />
 
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 550b08d5..7351a41f 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,8 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_rowWeight="1"
                 android:layout_marginTop="10dp"
-                android:background="@drawable/outline_drawable_less"
-                android:foreground="?attr/selectableItemBackgroundBorderless"
+                android:foreground="@drawable/outline_drawable_forced"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -66,7 +65,7 @@
                 android:layout_height="match_parent"
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
-                android:listSelector="@drawable/outline_drawable_less"
+                android:listSelector="@drawable/outline_drawable_forced"
                 android:nextFocusLeft="@id/sort_subtitles"
                 android:nextFocusRight="@id/apply_btt"
                 android:requiresFadingEdge="vertical"
@@ -95,8 +94,7 @@
                     android:layout_height="wrap_content"
                     android:layout_rowWeight="1"
                     android:layout_marginTop="10dp"
-                    android:background="@drawable/outline_drawable_less"
-                    android:foreground="?attr/selectableItemBackgroundBorderless"
+                    android:foreground="@drawable/outline_drawable_forced"
                     android:orientation="horizontal"
                     android:paddingTop="10dp"
                     android:paddingBottom="10dp">
@@ -140,7 +138,7 @@
                 android:layout_height="match_parent"
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
-                android:listSelector="@drawable/outline_drawable_less"
+                android:listSelector="@drawable/outline_drawable_forced"
                 android:nextFocusLeft="@id/sort_providers"
                 android:nextFocusRight="@id/cancel_btt"
                 android:requiresFadingEdge="vertical"
diff --git a/app/src/main/res/layout/result_episode.xml b/app/src/main/res/layout/result_episode.xml
index 127cbd34..80ff4bec 100644
--- a/app/src/main/res/layout/result_episode.xml
+++ b/app/src/main/res/layout/result_episode.xml
@@ -1,17 +1,17 @@
 <?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:nextFocusRight="@id/result_episode_download"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/episode_holder"
 
-        android:id="@+id/episode_holder"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
+    android:layout_width="match_parent"
+    android:layout_height="50dp"
+    android:layout_marginBottom="5dp"
 
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        app:cardBackgroundColor="@color/transparent"
-        app:cardElevation="0dp"
-        android:layout_marginBottom="5dp">
+    android:nextFocusRight="@id/download_button"
+    app:cardBackgroundColor="@color/transparent"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    app:cardElevation="0dp">
     <!--
         android:nextFocusLeft="@id/result_episode_download"
         -->
@@ -39,91 +39,63 @@
         </View>
     </LinearLayout>-->
     <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" />
+        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:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless">
 
         <ImageView
-                app:tint="?attr/textColor"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                android:id="@+id/episode_play"
-                android:src="@drawable/ic_baseline_play_arrow_24"
-                android:contentDescription="@string/episode_play_img_des"
-                android:layout_height="match_parent"
-                android:layout_width="wrap_content" />
+            android:id="@+id/episode_play"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:contentDescription="@string/episode_play_img_des"
+            android:src="@drawable/ic_baseline_play_arrow_24"
+            app:tint="?attr/textColor" />
         <!--marquee_forever-->
         <com.google.android.material.button.MaterialButton
-                android:layout_gravity="center"
-                style="@style/SmallBlackButton"
-                android:text="@string/filler"
-                android:id="@+id/episode_filler" />
+            android:id="@+id/episode_filler"
+            style="@style/SmallWhiteButton"
+            android:layout_gravity="center"
+            android:text="@string/filler" />
 
         <TextView
-                android:id="@+id/episode_text"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="50dp"
-                android:layout_gravity="center_vertical"
-                android:gravity="center_vertical"
-                tools:text="Episode 1"
-                android:textColor="?attr/textColor"
+            android:id="@+id/episode_text"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="50dp"
+            android:ellipsize="marquee"
 
-                android:scrollHorizontally="true"
-                android:ellipsize="marquee"
+            android:gravity="center_vertical"
+            android:marqueeRepeatLimit="0"
 
-                android:marqueeRepeatLimit="0"
-                android:singleLine="true"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
 
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+            android:textColor="?attr/textColor"
+            tools:text="Episode 1" />
     </LinearLayout>
 
-    <FrameLayout
-            android:layout_gravity="end"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent">
-
-        <androidx.core.widget.ContentLoadingProgressBar
-                android:layout_marginEnd="10dp"
-                android:layout_marginStart="10dp"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:id="@+id/result_episode_progress_downloaded"
-                android:indeterminate="false"
-                android:progressDrawable="@drawable/circular_progress_bar"
-                android:background="@drawable/circle_shape"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:max="100"
-                android:layout_margin="5dp"
-                android:layout_gravity="end|center_vertical"
-                android:progress="0"
-                android:visibility="visible" />
-
-        <!--
-        android:nextFocusRight="@id/episode_holder"-->
-        <ImageView
-                android:nextFocusLeft="@id/episode_holder"
-                app:tint="?attr/white"
-                android:id="@+id/result_episode_download"
-                android:visibility="visible"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:padding="10dp"
-                android:layout_width="50dp"
-                android:background="?selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_baseline_play_arrow_24"
-                android:contentDescription="@string/download" />
-    </FrameLayout>
+    <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
+        android:id="@+id/download_button"
+        android:layout_width="@dimen/download_size"
+        android:layout_height="@dimen/download_size"
+        android:layout_gravity="center_vertical|end"
+        android:layout_marginStart="-50dp"
+        android:background="?selectableItemBackgroundBorderless"
+        android:padding="10dp" />
 </androidx.cardview.widget.CardView>
\ 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 0aeedeea..75292965 100644
--- a/app/src/main/res/layout/result_episode_large.xml
+++ b/app/src/main/res/layout/result_episode_large.xml
@@ -1,151 +1,125 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
 
-        android:nextFocusRight="@id/result_episode_download"
-        android:id="@+id/episode_holder_large"
+    android:id="@+id/episode_holder_large"
+    android:layout_width="wrap_content"
 
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        app:cardBackgroundColor="?attr/boxItemBackground"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="10dp"
+    android:nextFocusRight="@id/download_button"
+    app:cardBackgroundColor="?attr/boxItemBackground"
 
-        android:layout_marginBottom="10dp">
+    app:cardCornerRadius="@dimen/rounded_image_radius">
 
     <LinearLayout
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:padding="10dp"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:id="@+id/episode_holder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+        android:orientation="vertical"
+        android:padding="10dp">
 
         <LinearLayout
-                android:layout_width="match_parent"
-                android:orientation="horizontal"
-                android:layout_height="wrap_content">
+            android:id="@+id/episode_lin_holder"
+            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">
+                android:layout_width="126dp"
+                android:layout_height="72dp"
+                android:foreground="@drawable/outline_drawable">
 
                 <ImageView
-                        android:nextFocusRight="@id/result_episode_download"
+                    android:id="@+id/episode_poster"
 
-                        android:id="@+id/episode_poster"
-                        tools:src="@drawable/example_poster"
-                        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/episode_poster_img_des"
 
-                        android:scaleType="centerCrop"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/episode_poster_img_des" />
+                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                    android:nextFocusRight="@id/download_button"
+                    android:scaleType="centerCrop"
+                    tools:src="@drawable/example_poster" />
 
                 <ImageView
-                        android:src="@drawable/play_button"
-                        android:layout_gravity="center"
-                        android:layout_width="36dp"
-                        android:layout_height="36dp"
-                        android:contentDescription="@string/play_episode" />
+                    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: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" />
+                    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_marginStart="15dp"
-                    android:orientation="vertical"
-                    android:layout_gravity="center"
-                    android:layout_width="match_parent"
-                    android:layout_marginEnd="50dp"
-                    android:layout_height="wrap_content">
+                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:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
                     <com.google.android.material.button.MaterialButton
-                            android:layout_gravity="start"
-                            style="@style/SmallBlackButton"
-                            android:layout_marginEnd="10dp"
-                            android:text="@string/filler"
-                            android:id="@+id/episode_filler" />
+                        android:id="@+id/episode_filler"
+                        style="@style/SmallWhiteButton"
+                        android:layout_gravity="start"
+                        android:layout_marginEnd="10dp"
+                        android:text="@string/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" />
+                        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"
-                        tools:text="Rated: 8.8"
-                        android:textColor="?attr/grayTextColor"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+                    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>
 
-            <FrameLayout
-                    android:layout_marginStart="-50dp"
-                    android:layout_gravity="end"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                <androidx.core.widget.ContentLoadingProgressBar
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginStart="10dp"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:id="@+id/result_episode_progress_downloaded"
-                        android:indeterminate="false"
-                        android:progressDrawable="@drawable/circular_progress_bar"
-                        android:background="@drawable/circle_shape"
-                        style="?android:attr/progressBarStyleHorizontal"
-                        android:max="100"
-                        android:layout_margin="5dp"
-                        android:layout_gravity="end|center_vertical"
-                        android:progress="0"
-                        android:visibility="visible" />
-
-                <ImageView
-                        android:nextFocusLeft="@id/episode_poster"
-                        android:id="@+id/result_episode_download"
-
-                        android:visibility="visible"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:padding="10dp"
-                        android:layout_width="50dp"
-                        android:background="?selectableItemBackgroundBorderless"
-                        android:src="@drawable/ic_baseline_play_arrow_24"
-                        android:contentDescription="@string/download"
-                        app:tint="?attr/white" />
-            </FrameLayout>
+            <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
+                android:id="@+id/download_button"
+                android:layout_width="@dimen/download_size"
+                android:layout_height="@dimen/download_size"
+                android:layout_gravity="center_vertical|end"
+                android:layout_marginStart="-50dp"
+                android:background="?selectableItemBackgroundBorderless"
+                android:padding="10dp" />
         </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" />
+            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_large_tv.xml b/app/src/main/res/layout/result_episode_large_tv.xml
index 2222bd36..5a9dee30 100644
--- a/app/src/main/res/layout/result_episode_large_tv.xml
+++ b/app/src/main/res/layout/result_episode_large_tv.xml
@@ -3,7 +3,6 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
 
-        android:nextFocusRight="@id/result_episode_download"
         android:id="@+id/episode_holder_large"
 
         android:layout_width="wrap_content"
@@ -74,7 +73,7 @@
 
                     <com.google.android.material.button.MaterialButton
                             android:layout_gravity="start"
-                            style="@style/SmallBlackButton"
+                            style="@style/SmallWhiteButton"
                             android:layout_marginEnd="10dp"
                             android:text="@string/filler"
                             android:id="@+id/episode_filler" />
diff --git a/app/src/main/res/layout/result_episode_tv.xml b/app/src/main/res/layout/result_episode_tv.xml
index 597aca08..53590b6b 100644
--- a/app/src/main/res/layout/result_episode_tv.xml
+++ b/app/src/main/res/layout/result_episode_tv.xml
@@ -2,7 +2,6 @@
 <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:nextFocusRight="@id/result_episode_download"
 
         android:id="@+id/episode_holder"
         android:layout_width="wrap_content"
@@ -38,7 +37,7 @@
                 tools:visibility="visible"
                 android:gravity="center"
                 android:layout_gravity="center"
-                style="@style/SmallBlackButton"
+                style="@style/SmallWhiteButton"
                 android:text="@string/filler"
                 android:id="@+id/episode_filler" />
 
diff --git a/app/src/main/res/layout/result_recommendations.xml b/app/src/main/res/layout/result_recommendations.xml
index 1585960a..38d00b3d 100644
--- a/app/src/main/res/layout/result_recommendations.xml
+++ b/app/src/main/res/layout/result_recommendations.xml
@@ -20,7 +20,7 @@
                 android:layout_marginBottom="10dp"
                 android:layout_marginStart="0dp"
                 android:layout_marginEnd="0dp"
-                app:layout_constraintBottom_toTopOf="@id/result_recommendations" />
+                app:layout_constraintBottom_toTopOf="@id/result_recommendations_list" />
 
         <com.lagradost.cloudstream3.ui.AutofitRecyclerView
                 android:descendantFocusability="afterDescendants"
@@ -30,7 +30,7 @@
                 android:layout_height="wrap_content"
                 android:clipToPadding="false"
                 app:spanCount="3"
-                android:id="@+id/result_recommendations"
+                android:id="@+id/result_recommendations_list"
                 tools:listitem="@layout/search_result_grid"
                 android:orientation="vertical" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/result_selection.xml b/app/src/main/res/layout/result_selection.xml
index fe880dc9..368c8384 100644
--- a/app/src/main/res/layout/result_selection.xml
+++ b/app/src/main/res/layout/result_selection.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--style="@style/SelectableButton"-->
+
 <com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        style="@style/SelectableButton"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="10dp"
-        tools:text="Season 1" />
\ No newline at end of file
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/SelectableButtonTV"
+    android:layout_gravity="start"
+    android:layout_margin="2dp"
+    android:minWidth="115dp"
+    android:singleLine="true"
+    tools:text="1000-1000" />
\ 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 ef441234..3e9ee833 100644
--- a/app/src/main/res/layout/search_history_item.xml
+++ b/app/src/main/res/layout/search_history_item.xml
@@ -6,10 +6,11 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/outline_drawable_less"
-    android:foreground="?android:attr/selectableItemBackgroundBorderless"
+
     android:nextFocusRight="@id/home_history_remove"
     android:orientation="horizontal">
-
+    <!-- android:foreground="?android:attr/selectableItemBackgroundBorderless"
+      -->
     <TextView
         android:id="@+id/home_history_title"
         android:layout_width="wrap_content"
@@ -29,7 +30,6 @@
         android:layout_gravity="center_vertical|end"
 
         android:background="@drawable/outline_drawable_less"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
 
         android:nextFocusLeft="@id/home_history_tab"
         android:padding="10dp"
diff --git a/app/src/main/res/layout/search_result_grid.xml b/app/src/main/res/layout/search_result_grid.xml
index f3c35ca4..cec7d4ce 100644
--- a/app/src/main/res/layout/search_result_grid.xml
+++ b/app/src/main/res/layout/search_result_grid.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/search_result_root"
@@ -75,6 +75,12 @@
                 style="@style/SubButton"
                 android:layout_gravity="end" />
 
+            <TextView
+                android:id="@+id/text_rating"
+                style="@style/RatingButton"
+                android:layout_gravity="end"
+
+                tools:text="7.7" />
             <TextView
                 android:id="@+id/text_flag"
                 style="@style/SearchBox"
@@ -85,6 +91,18 @@
                 tools:text="🇸🇪"
                 tools:visibility="visible" />
         </LinearLayout>
+        <androidx.core.widget.ContentLoadingProgressBar
+            android:id="@+id/watchProgress"
+            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"
+            android:visibility="gone"
+            tools:progress="50"
+            tools:visibility="visible" />
     </androidx.cardview.widget.CardView>
 
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_result_grid_expanded.xml b/app/src/main/res/layout/search_result_grid_expanded.xml
index cf6ab3b2..c64486b4 100644
--- a/app/src/main/res/layout/search_result_grid_expanded.xml
+++ b/app/src/main/res/layout/search_result_grid_expanded.xml
@@ -58,29 +58,12 @@
                     style="@style/SubButton"
                     android:layout_gravity="end" />
 
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/text_rating_holder"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+
+                <TextView
+                    android:id="@+id/text_rating"
+                    style="@style/RatingButton"
                     android:layout_gravity="end"
-                    android:layout_margin="2dp"
-                    android:backgroundTint="@color/ratingColorBg"
-                    android:elevation="0dp"
-                    android:visibility="gone"
-                    app:cardCornerRadius="@dimen/rounded_image_radius"
-                    app:cardElevation="0dp"
-                    tools:visibility="visible">
-
-                    <TextView
-                        android:id="@+id/text_rating"
-                        style="@style/SearchBox"
-                        android:layout_margin="0dp"
-                        android:minWidth="40dp"
-                        android:textColor="@color/ratingColor"
-
-                        tools:text="★ 7.7" />
-                </androidx.cardview.widget.CardView>
-
+                    tools:text="7.7" />
 
                 <TextView
                     android:id="@+id/text_flag"
@@ -93,6 +76,15 @@
                     tools:visibility="visible" />
             </LinearLayout>
 
+            <ImageView
+                android:focusable="false"
+                android:visibility="gone"
+                android:clickable="false"
+                android:focusableInTouchMode="false"
+                android:id="@+id/title_shadow"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                tools:ignore="ContentDescription" />
 
             <androidx.core.widget.ContentLoadingProgressBar
                 android:id="@+id/watchProgress"
diff --git a/app/src/main/res/layout/sort_bottom_footer_add_choice.xml b/app/src/main/res/layout/sort_bottom_footer_add_choice.xml
index 82937ba1..63d79227 100644
--- a/app/src/main/res/layout/sort_bottom_footer_add_choice.xml
+++ b/app/src/main/res/layout/sort_bottom_footer_add_choice.xml
@@ -4,5 +4,6 @@
         style="@style/CheckLabel"
         android:id="@android:id/text1"
         tools:text="hello"
+        android:foreground="@drawable/outline_drawable_forced"
         app:drawableStartCompat="@drawable/ic_baseline_add_24"
         app:drawableTint="?attr/textColor" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/sort_bottom_single_choice_no_checkmark.xml b/app/src/main/res/layout/sort_bottom_single_choice_no_checkmark.xml
index 0938ad1f..a9b8bde9 100644
--- a/app/src/main/res/layout/sort_bottom_single_choice_no_checkmark.xml
+++ b/app/src/main/res/layout/sort_bottom_single_choice_no_checkmark.xml
@@ -14,9 +14,9 @@
 -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        style="@style/NoCheckLabel"
-        tools:text="hello"
-        android:textStyle="normal"
-        android:textColor="?attr/textColor"
-        android:id="@android:id/text1" />
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/text1"
+    style="@style/NoCheckLabel"
+    android:textColor="?attr/textColor"
+    android:textStyle="normal"
+    tools:text="hello" />
diff --git a/app/src/main/res/layout/standard_toolbar.xml b/app/src/main/res/layout/standard_toolbar.xml
index a28bdc80..bd1f251d 100644
--- a/app/src/main/res/layout/standard_toolbar.xml
+++ b/app/src/main/res/layout/standard_toolbar.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.AppBarLayout android:background="@android:color/transparent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/transparent">
 
     <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/settings_toolbar"
-            android:paddingTop="@dimen/navbar_height"
-            tools:title="Overlord"
-            android:background="?attr/primaryGrayBackground"
-            app:navigationIconTint="?attr/iconColor"
-            app:titleTextColor="?attr/textColor"
-            app:layout_scrollFlags="scroll|enterAlways"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+        android:id="@+id/settings_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/primaryGrayBackground"
+        android:descendantFocusability="afterDescendants"
+        android:paddingTop="@dimen/navbar_height"
+        app:layout_scrollFlags="scroll|enterAlways"
+        app:navigationIconTint="?attr/iconColor"
+        app:titleTextColor="?attr/textColor"
+        tools:title="Overlord" />
 </com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/stream_input.xml b/app/src/main/res/layout/stream_input.xml
index 20a91b4a..83605ce3 100644
--- a/app/src/main/res/layout/stream_input.xml
+++ b/app/src/main/res/layout/stream_input.xml
@@ -49,7 +49,8 @@
             android:layout_marginTop="10dp"
             android:text="@string/hls_playlist"
             android:textColor="?attr/textColor"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            android:visibility="invisible" />
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/subtitle_settings.xml b/app/src/main/res/layout/subtitle_settings.xml
index 2491b254..8b3f5b2f 100644
--- a/app/src/main/res/layout/subtitle_settings.xml
+++ b/app/src/main/res/layout/subtitle_settings.xml
@@ -35,9 +35,8 @@
                 android:scaleType="centerCrop"
                 android:src="@drawable/subtitles_preview_background" />
 
-            <com.google.android.exoplayer2.ui.SubtitleView
+            <androidx.media3.ui.SubtitleView
                 android:id="@+id/subtitle_text"
-
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index 0dd19a5b..736d114c 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -75,11 +75,123 @@
             android:src="@drawable/play_button" />
     </FrameLayout>
 
+    <FrameLayout
+        android:id="@+id/player_top_holder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="80dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="32dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/player_video_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                tools:text="Hello world" />
+
+            <TextView
+                android:id="@+id/player_video_title_rez"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="end"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                tools:text="1920x1080" />
+
+            <FrameLayout
+                android:id="@+id/player_episode_filler_holder"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginTop="2dp"
+                android:visibility="gone">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/player_episode_filler"
+                    style="@style/SmallBlackButton"
+                    android:text="@string/filler" />
+            </FrameLayout>
+        </LinearLayout>
+
+        <!-- Removed as it has no use anymore-->
+        <!--<androidx.mediarouter.app.MediaRouteButton
+                android:id="@+id/player_media_route_button"
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                android:layout_gravity="end"
+                android:layout_margin="5dp"
+                android:mediaRouteTypes="user"
+                android:visibility="visible"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />-->
+
+        <FrameLayout
+            android:id="@+id/player_go_back_holder"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_margin="5dp"
+            android:clickable="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center"
+                android:contentDescription="@string/go_back_img_des"
+                android:src="@drawable/ic_baseline_arrow_back_24"
+                app:tint="@android:color/white" />
+
+            <ImageView
+                android:id="@+id/player_go_back"
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                android:layout_gravity="center"
+                android:background="@drawable/video_tap_button_always_white"
+                android:clickable="true"
+                android:contentDescription="@string/go_back_img_des"
+                android:focusable="true" />
+        </FrameLayout>
+    </FrameLayout>
+
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/player_video_holder"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/skip_chapter_button"
+            style="@style/NiceButton"
+            android:layout_width="150dp"
+            android:layout_height="40dp"
+            android:layout_marginEnd="100dp"
+            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:strokeColor="@color/white"
+            app:strokeWidth="1dp"
+            tools:text="Skip Opening"
+            tools:visibility="visible" />
+
         <!--use for thinner app:trackThickness="3dp" com.google.android.material.progressindicator.CircularProgressIndicator-->
         <ProgressBar
             android:id="@+id/player_buffering"
@@ -99,40 +211,7 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:visibility="visible" />
 
-        <!-- This nested layout is necessary because of buffering and clicking-->
-        <FrameLayout
-            android:id="@+id/player_pause_play_holder_holder"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
 
-            <FrameLayout
-                android:id="@+id/player_pause_play_holder"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:ignore="uselessParent">
-
-                <ImageView
-                    android:id="@+id/player_pause_play"
-                    android:layout_width="70dp"
-                    android:layout_height="70dp"
-                    android:layout_gravity="center"
-                    android:background="@drawable/video_tap_button"
-                    android:nextFocusLeft="@id/exo_rew"
-
-                    android:nextFocusRight="@id/exo_ffwd"
-
-                    android:nextFocusUp="@id/player_go_back"
-                    android:nextFocusDown="@id/player_lock"
-
-                    android:src="@drawable/netflix_pause"
-                    app:tint="@color/white"
-                    tools:ignore="ContentDescription" />
-            </FrameLayout>
-        </FrameLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/player_center_menu"
@@ -188,7 +267,33 @@
                     app:tint="@color/white"
                     tools:ignore="ContentDescription" />
             </FrameLayout>
+            <!-- This nested layout is necessary because of buffering and clicking-->
+            <FrameLayout
+                android:id="@+id/player_pause_play_holder_holder"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
+                <ImageView
+                    android:id="@+id/player_pause_play"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_gravity="center"
+                    android:background="@drawable/video_tap_button"
+                    android:nextFocusLeft="@id/exo_rew"
+
+                    android:nextFocusRight="@id/exo_ffwd"
+
+                    android:nextFocusUp="@id/player_go_back"
+                    android:nextFocusDown="@id/player_lock"
+
+                    android:src="@drawable/netflix_pause"
+                    app:tint="@color/white"
+                    tools:ignore="ContentDescription" />
+            </FrameLayout>
             <FrameLayout
                 android:id="@+id/player_ffwd_holder"
                 android:layout_width="0dp"
@@ -289,6 +394,11 @@
                 tools:ignore="ContentDescription" />
         </LinearLayout>
 
+        <FrameLayout
+            android:id="@+id/piphide"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
         <ImageView
             android:id="@+id/player_open_source"
             android:layout_width="24dp"
@@ -333,7 +443,7 @@
                     android:textStyle="normal"
                     tools:text="15:30" />
                 <!--app:buffered_color="@color/videoCache"-->
-                <com.google.android.exoplayer2.ui.DefaultTimeBar
+                <androidx.media3.ui.DefaultTimeBar
                     android:id="@id/exo_progress"
                     android:layout_width="0dp"
                     android:layout_height="30dp"
@@ -373,7 +483,110 @@
                 android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:src="@drawable/baseline_fullscreen_24"
                 app:tint="@color/white" />
+
+            <HorizontalScrollView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:visibility="gone">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="60dp"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/player_lock"
+                        style="@style/VideoButton"
+                        android:nextFocusLeft="@id/player_skip_episode"
+                        android:nextFocusRight="@id/player_resize_btt"
+                        android:text="@string/video_lock"
+                        app:icon="@drawable/video_locked"
+
+                        app:iconSize="30dp" />
+
+                    <LinearLayout
+                        android:id="@+id/player_lock_holder"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_resize_btt"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_lock"
+
+                            android:nextFocusRight="@id/player_speed_btt"
+                            android:text="@string/video_aspect_ratio_resize"
+                            app:icon="@drawable/ic_baseline_aspect_ratio_24" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_speed_btt"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_resize_btt"
+
+                            android:nextFocusRight="@id/player_subtitle_offset_btt"
+                            app:icon="@drawable/ic_baseline_speed_24"
+                            tools:text="Speed" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_subtitle_offset_btt"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_speed_btt"
+                            android:nextFocusRight="@id/player_sources_btt"
+                            android:text="@string/subtitle_offset"
+
+                            android:visibility="gone"
+                            app:icon="@drawable/ic_outline_subtitles_24"
+                            tools:visibility="visible" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_sources_btt"
+                            style="@style/VideoButton"
+                            android:layout_height="40dp"
+
+                            android:nextFocusLeft="@id/player_subtitle_offset_btt"
+                            android:nextFocusRight="@id/player_tracks_btt"
+                            android:text="@string/video_source"
+                            app:icon="@drawable/ic_baseline_playlist_play_24" />
+
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_tracks_btt"
+                            style="@style/VideoButton"
+                            android:layout_height="40dp"
+
+                            android:nextFocusLeft="@id/player_sources_btt"
+                            android:nextFocusRight="@id/player_skip_op"
+                            android:text="@string/tracks"
+                            app:icon="@drawable/ic_baseline_playlist_play_24" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_skip_op"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_sources_btt"
+
+                            android:nextFocusRight="@id/player_skip_episode"
+                            android:text="@string/video_skip_op"
+                            app:icon="@drawable/ic_baseline_fast_forward_24" />
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_skip_episode"
+                            style="@style/VideoButton"
+                            android:nextFocusLeft="@id/player_skip_op"
+
+                            android:nextFocusRight="@id/player_lock"
+                            android:text="@string/next_episode"
+                            app:icon="@drawable/ic_baseline_skip_next_24" />
+                    </LinearLayout>
+                </LinearLayout>
+            </HorizontalScrollView>
+
         </LinearLayout>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/tvtypes_chips.xml b/app/src/main/res/layout/tvtypes_chips.xml
index 6b13546b..ee792602 100644
--- a/app/src/main/res/layout/tvtypes_chips.xml
+++ b/app/src/main/res/layout/tvtypes_chips.xml
@@ -6,6 +6,7 @@
     android:paddingStart="8dp"
     android:paddingEnd="8dp"
     android:id="@+id/home_select_group"
+    android:descendantFocusability="afterDescendants"
     app:singleSelection="false"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
diff --git a/app/src/main/res/layout/tvtypes_chips_scroll.xml b/app/src/main/res/layout/tvtypes_chips_scroll.xml
index 45b27dbc..8d006036 100644
--- a/app/src/main/res/layout/tvtypes_chips_scroll.xml
+++ b/app/src/main/res/layout/tvtypes_chips_scroll.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<HorizontalScrollView android:id="@+id/tv_types_scroll_view"
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tv_types_scroll_view"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:fadingEdge="horizontal"
-    android:requiresFadingEdge="horizontal"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:requiresFadingEdge="horizontal">
 
-    <include layout="@layout/tvtypes_chips" />
+    <include
+        android:descendantFocusability="afterDescendants"
+        android:id="@+id/tvtypes_chips"
+        layout="@layout/tvtypes_chips" />
 </HorizontalScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/who_is_watching.xml b/app/src/main/res/layout/who_is_watching.xml
new file mode 100644
index 00000000..f61cf6e4
--- /dev/null
+++ b/app/src/main/res/layout/who_is_watching.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <TextView
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:layout_marginTop="20dp"
+        android:textStyle="bold"
+        android:text="@string/switch_account"
+        android:textSize="20sp"
+        android:textColor="?attr/textColor"
+        android:layout_width="match_parent"
+        android:layout_rowWeight="1"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:text="@string/history"
+        android:textSize="15sp"
+        android:textColor="?attr/grayTextColor"
+        android:layout_width="match_parent"
+        android:layout_rowWeight="1"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:text="@string/error_bookmarks_text"
+        android:textSize="15sp"
+        android:textColor="?attr/grayTextColor"
+        android:layout_width="match_parent"
+        android:layout_rowWeight="1"
+        android:layout_height="wrap_content" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_marginTop="10dp"
+        android:descendantFocusability="afterDescendants"
+        android:id="@+id/profiles_recyclerview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+
+        android:orientation="horizontal"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:itemCount="4"
+        tools:listitem="@layout/who_is_watching_account">
+
+        <requestFocus />
+    </androidx.recyclerview.widget.RecyclerView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/who_is_watching_account.xml b/app/src/main/res/layout/who_is_watching_account.xml
new file mode 100644
index 00000000..afa1a2a7
--- /dev/null
+++ b/app/src/main/res/layout/who_is_watching_account.xml
@@ -0,0 +1,47 @@
+<?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/card_view"
+    android:layout_width="100dp"
+    android:layout_height="100dp"
+    android:animateLayoutChanges="true"
+    android:backgroundTint="?attr/primaryGrayBackground"
+    android:foreground="?attr/selectableItemBackgroundBorderless"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    android:layout_margin="5dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintDimensionRatio="1"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHeight_percent="0.4"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <ImageView
+        android:id="@+id/profile_image_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:alpha="0.4"
+        android:contentDescription="@string/profile_background_des"
+        android:scaleType="centerCrop" />
+
+    <View
+        android:id="@+id/outline"
+        tools:visibility="visible"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/outline_card"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/profile_text"
+        tools:text="@string/mobile_data"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:padding="10dp"
+        android:textSize="16sp" />
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
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
new file mode 100644
index 00000000..ed67e144
--- /dev/null
+++ b/app/src/main/res/layout/who_is_watching_account_add.xml
@@ -0,0 +1,29 @@
+<?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/card_view"
+    android:layout_width="100dp"
+    android:layout_height="100dp"
+    android:animateLayoutChanges="true"
+    android:backgroundTint="?attr/primaryGrayBackground"
+    android:foreground="?attr/selectableItemBackgroundBorderless"
+    app:cardCornerRadius="@dimen/rounded_image_radius"
+    android:layout_margin="5dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintDimensionRatio="1"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHeight_percent="0.4"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <ImageView
+        android:layout_gravity="center"
+        android:src="@drawable/ic_baseline_add_24"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:scaleType="centerCrop"
+        android:contentDescription="@string/add_account" />
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
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
new file mode 100644
index 00000000..74553517
--- /dev/null
+++ b/app/src/main/res/layout/who_is_watching_account_edit.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="10dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/text1"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_rowWeight="1"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+
+            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+            android:text="@string/create_account"
+            android:textColor="?attr/textColor"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+
+        <!--        <com.google.android.material.button.MaterialButton-->
+        <!--            android:nextFocusDown="@id/repo_name_input"-->
+        <!--            android:id="@+id/list_repositories"-->
+        <!--            android:nextFocusLeft="@id/apply_btt"-->
+        <!--            android:nextFocusRight="@id/cancel_btt"-->
+        <!--            style="@style/WhiteButton"-->
+        <!--            android:layout_width="wrap_content"-->
+        <!--            android:layout_gravity="center_vertical"-->
+        <!--            android:text="@string/view_public_repositories_button_short" />-->
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="match_parent"
+
+        android:layout_height="wrap_content"
+        android:layout_rowWeight="1"
+        android:layout_gravity="center_vertical"
+
+        android:layout_marginBottom="10dp"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:textColor="?attr/grayTextColor"
+        android:textSize="15sp"
+        android:visibility="gone"
+        tools:text="Gogoanime" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="10dp"
+        android:layout_marginBottom="60dp"
+        android:orientation="vertical">
+
+        <EditText
+            android:id="@+id/account_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="username"
+            android:hint="@string/default_account"
+            android:inputType="text"
+            android:nextFocusLeft="@id/apply_btt"
+            android:nextFocusRight="@id/cancel_btt"
+            android:nextFocusDown="@id/site_url_input"
+            android:requiresFadingEdge="vertical"
+            android:textColorHint="?attr/grayTextColor"
+            tools:ignore="LabelFor" />
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:cardCornerRadius="@dimen/rounded_image_radius">
+
+            <ImageView
+                android:foreground="@drawable/outline_drawable_forced_round"
+                android:id="@+id/profile_pic"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_gravity="center"
+                android:contentDescription="@string/preview_background_img_des"
+                android:scaleType="centerCrop"
+                android:src="@drawable/profile_bg_blue" />
+        </androidx.cardview.widget.CardView>
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/apply_btt_holder"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_gravity="bottom"
+        android:layout_marginTop="-60dp"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/delete_btt"
+            style="@style/BlackButton"
+            android:layout_width="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_gravity="center_vertical"
+            android:nextFocusRight="@id/apply_btt"
+            android:text="@string/delete" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/apply_btt"
+            style="@style/WhiteButton"
+
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:layout_toStartOf="@+id/cancel_btt"
+            android:nextFocusLeft="@id/delete_btt"
+            android:nextFocusRight="@id/cancel_btt"
+            android:text="@string/sort_apply" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/cancel_btt"
+            style="@style/BlackButton"
+
+            android:layout_width="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_gravity="center_vertical|end"
+            android:nextFocusLeft="@id/apply_btt"
+            android:text="@string/sort_cancel" />
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index e59f670e..6d0a94fb 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -436,7 +436,7 @@
 
     <fragment
         android:id="@+id/navigation_results_phone"
-        android:name="com.lagradost.cloudstream3.ui.result.ResultFragmentPhone"
+        android:name="com.lagradost.cloudstream3.ui.result.ResultTrailerPlayer"
         android:layout_height="match_parent"
         app:enterAnim="@anim/enter_anim"
         app:exitAnim="@anim/exit_anim"
diff --git a/app/src/main/res/values-ajp/strings.xml b/app/src/main/res/values-ajp/strings.xml
new file mode 100644
index 00000000..42eba3cc
--- /dev/null
+++ b/app/src/main/res/values-ajp/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources/>
diff --git a/app/src/main/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml
new file mode 100644
index 00000000..5a799eb4
--- /dev/null
+++ b/app/src/main/res/values-am/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s ክፍል %d</string>
+    <string name="cast_format" 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 c1f07d6c..0c11f7e9 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -55,7 +55,7 @@
     <string name="download_failed">فشل التنزيل</string>
     <string name="download_canceled">تم إلغاء التنزيل</string>
     <string name="download_done">تم التنزيل</string>
-    <string name="stream">تشغيل</string>
+    <string name="stream">بث</string>
     <string name="error_loading_links_toast">خطأ في تحميل الرابط</string>
     <string name="download_storage_text">التخزين الداخلي</string>
     <string name="app_dubbed_text">مدبلج</string>
@@ -71,7 +71,7 @@
     <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="action_remove_from_bookmarks">ازالة</string>
     <string name="action_add_to_bookmarks">إعداد حالة المشاهدة</string>
     <string name="sort_apply">تطبيق</string>
     <string name="sort_cancel">إلغاء</string>
@@ -561,4 +561,28 @@
     <string name="jsdelivr_proxy_summary">تجاوز حظر GitHub باستخدام jsdelivr ، قد يتسبب في تأخير التحديثات لبضعة أيام.</string>
     <string name="jsdelivr_proxy">وكيل raw.githubusercontent.com</string>
     <string name="watch_quality_pref_data">جودة المشاهدة المفضلة (بيانات الجوال)</string>
+    <string name="profile_number">الملف الشخصي %d</string>
+    <string name="wifi">واي فاي</string>
+    <string name="mobile_data">بيانات الهاتف</string>
+    <string name="set_default">تعيين الافتراضي</string>
+    <string name="use">استخدام</string>
+    <string name="edit">تعديل</string>
+    <string name="profiles">الملفات التعريفية</string>
+    <string name="help">مساعدة</string>
+    <string name="quality_profile_help">‎‎هنا يمكنك تغيير طريقة ترتيب المصادر. إذا كان للفيديو أولوية أعلى ، فسيظهر في الأعلى في اختيار المصدر. يمثل مجموع أولوية المصدر وأولوية الجودة أولوية الفيديو.
+\n
+\nالمصدر أ: 3
+\nالجودة ب: 7
+\nسيكون لها أولوية فيديو مجمعة تبلغ 10.
+\n
+\nملاحظة: إذا كان المجموع 10 أو أكثر ، فسيتخطى المشغل التحميل تلقائيًا عند تحميل هذا الرابط!</string>
+    <string name="qualities">النوعيات</string>
+    <string name="profile_background_des">خلفية الملف الشخصي</string>
+    <string name="unable_to_inflate">تعذر إنشاء واجهة المستخدم بشكل صحيح ، وهذا خطأ كبير ويجب الإبلاغ عنه على الفور %s</string>
+    <string name="automatic_plugin_download_mode_title">حدد الوضع لتصفية تنزيل المكونات الإضافية</string>
+    <string name="disable">تعطيل</string>
+    <string name="default_account">@string/default_subtitles</string>
+    <string name="no_plugins_found_error">لا توجد اضافة في المستودع</string>
+    <string name="no_repository_found_error">المستودع لم يتم العثور عليه، تحقق من العنوان اوجرب شبكة افتراضية خاصة(vpn)</string>
+    <string name="already_voted">لقد صوتت بالفعل</string>
 </resources>
diff --git a/app/src/main/res/values-ars/strings.xml b/app/src/main/res/values-ars/strings.xml
index 42eba3cc..a1042b7e 100644
--- a/app/src/main/res/values-ars/strings.xml
+++ b/app/src/main/res/values-ars/strings.xml
@@ -1,2 +1,268 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources/>
+<resources>
+    <string name="search_poster_img_des">لافتة</string>
+    <string name="home_change_provider_img_des">تغيير مزود</string>
+    <string name="downloading">جارى التحميل</string>
+    <string name="cast_format" formatted="true">بث%s</string>
+    <string name="filler" formatted="true">ملء</string>
+    <string name="skip_loading">تخطي التحميل</string>
+    <string name="loading">تحميل…</string>
+    <string name="pick_subtitle">ترجمات</string>
+    <string name="reload_error">إعادة محاولة الاتصال …</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%sييبي%d</string>
+    <string name="next_episode_format" formatted="true">الحلقة%dسيتم نشرها في</string>
+    <string name="next_episode_time_day_format" formatted="true">%dي%dس%dد</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dس%dد</string>
+    <string name="next_episode_time_min_format" formatted="true">%dد</string>
+    <string name="episode_poster_img_des">لافتة الحلقة</string>
+    <string name="home_main_poster_img_des">اللافتة الاساسية</string>
+    <string name="go_back_img_des">اذهب للخالف</string>
+    <string name="preview_background_img_des">معاينة الخلفية</string>
+    <string name="player_speed_text_format" formatted="true">سرعة(%.2fx)</string>
+    <string name="play_with_app_name">فتح مع كلاودستريم</string>
+    <string name="title_home">الصفحة الاساسية</string>
+    <string name="search_hint_site" formatted="true">...%sابحث</string>
+    <string name="no_data">لايوجد بيانات</string>
+    <string name="episode_more_options_des">المزيد من الخيارات</string>
+    <string name="result_open_in_browser">فتح في المتصفح</string>
+    <string name="browser">المتصفح</string>
+    <string name="play_movie_button">شاهد الفلم</string>
+    <string name="play_torrent_button">دفق التورنت</string>
+    <string name="download_started">بدأ التنزيل</string>
+    <string name="home_next_random_img_des">عشوائي قادم</string>
+    <string name="play_trailer_button">تشغيل المقطع الدعائي</string>
+    <string name="result_tags">الأنواع</string>
+    <string name="download_paused">توقف التنزيل</string>
+    <string name="type_plan_to_watch">خطط للمشاهدة</string>
+    <string name="type_none">لا يوجد</string>
+    <string name="type_re_watching">إعادة المشاهدة</string>
+    <string name="new_update_format" formatted="true">!تم العثور على تحديث جديد
+\n%s-&gt;%s</string>
+    <string name="rated_format" formatted="true">%.1f:قدر</string>
+    <string name="duration_format" formatted="true">%dاقل</string>
+    <string name="app_name">كلاودستريم</string>
+    <string name="title_search">بحث</string>
+    <string name="title_downloads">التحميلات</string>
+    <string name="title_settings">اعدادات</string>
+    <string name="search_hint">...بحث</string>
+    <string name="next_episode">الحلقة القادمة</string>
+    <string name="result_share">شارك</string>
+    <string name="type_watching">مشاهدة</string>
+    <string name="type_on_hold">في التوقف</string>
+    <string name="type_completed">مكتمل</string>
+    <string name="type_dropped">توقف</string>
+    <string name="play_livestream_button">تشغيل البث المباشر</string>
+    <string name="pick_source">مصادر</string>
+    <string name="play_episode">تشغيل الحلقة</string>
+    <string name="download_canceled">تم إلغاء التنزيل</string>
+    <string name="download_done">تم التنزيل</string>
+    <string name="downloaded">تنززل</string>
+    <string name="download">تحميل</string>
+    <string name="go_back">عُد</string>
+    <string name="download_failed">التحميل فشل</string>
+    <string name="use_system_brightness_settings_des">استخدم سطوع النظام في مشغل التطبيق بدلاً من التراكب الداكن</string>
+    <string name="restore_success">تم تحميل ملف النسخ الاحتياطي</string>
+    <string name="advanced_search">البحث المتقدم</string>
+    <string name="player_size_settings_des">إزالة الحدود السوداء</string>
+    <string name="player_subtitles_settings">ترجمات</string>
+    <string name="eigengraumode_settings_des">يضيف خيار السرعة في المشغل</string>
+    <string name="double_tap_to_seek_settings">انقر نقرا مزدوجا للبحث</string>
+    <string name="double_tap_to_pause_settings">انقر نقرًا مزدوجًا للإيقاف المؤقت</string>
+    <string name="double_tap_to_seek_amount_settings">اللاعب يبحث عن المبلغ (بالثواني)</string>
+    <string name="swipe_to_seek_settings_des">اسحب من جانب إلى آخر للتحكم بموقعك في الفيديو</string>
+    <string name="autoplay_next_settings_des">ابدأ الحلقة التالية عندما تنتهي الحلقة الحالية</string>
+    <string name="use_system_brightness_settings">استخدام سطوع النظام</string>
+    <string name="episode_sync_settings">تحديث مراقبة التقدم</string>
+    <string name="episode_sync_settings_des">قم بمزامنة تقدم الحلقة الحالية تلقائيًا</string>
+    <string name="swipe_to_change_settings">اسحب لتغيير الإعدادات</string>
+    <string name="restore_settings">استعادة البيانات من النسخة الاحتياطية</string>
+    <string name="restore_failed_format" formatted="true">فشل في استعادة البيانات من الملف %s</string>
+    <string name="double_tap_to_seek_settings_des">انقر مرتين على الجانب الأيمن أو الأيسر للبحث للأمام أو للخلف</string>
+    <string name="backup_success">البيانات المخزنة</string>
+    <string name="double_tap_to_pause_settings_des">اضغط مرتين في المنتصف للتوقف مؤقتًا</string>
+    <string name="backup_failed">أذونات التخزين مفقودة. حاول مرة اخرى.</string>
+    <string name="backup_failed_error_format">حدث خطأ أثناء النسخ الاحتياطي %s</string>
+    <string name="search">بحث</string>
+    <string name="library">مكتبة</string>
+    <string name="settings_info">معلومات</string>
+    <string name="category_updates">التحديثات والنسخ الاحتياطي</string>
+    <string name="advanced_search_des">يعطيك نتائج البحث مفصولة حسب المزود</string>
+    <string name="bug_report_settings_off">يرسل فقط البيانات عن الأعطال</string>
+    <string name="show_trailers_settings">عرض المقطورات</string>
+    <string name="kitsu_settings">عرض الملصقات من كيتسو</string>
+    <string name="category_account">حسابات</string>
+    <string name="bug_report_settings_on">لا يرسل أي بيانات</string>
+    <string name="show_fillers_settings">عرض حلقة حشو للأنمي</string>
+    <string name="pref_filter_search_quality">إخفاء جودة الفيديو المحددة في نتائج البحث</string>
+    <string name="automatic_plugin_updates">تحديثات البرنامج المساعد التلقائي</string>
+    <string name="updates_settings_des">البحث تلقائيًا عن التحديثات الجديدة بعد بدء تشغيل التطبيق.</string>
+    <string name="uprereleases_settings">التحديث إلى الإصداراالمسبق</string>
+    <string name="automatic_plugin_download">تنزيل المكونات الإضافية تلقائيًا</string>
+    <string name="redo_setup_process">إعادة عملية الإعداد</string>
+    <string name="uprereleases_settings_des">ابحث عن تحديثات الإصدار التجريبي بدلاً من الإصدارات الكاملة فقط</string>
+    <string name="automatic_plugin_download_mode_title">حدد الوضع لتصفية تنزيل المكونات الإضافية</string>
+    <string name="automatic_plugin_download_summary">قم تلقائيًا بتثبيت جميع المكونات الإضافية التي لم يتم تثبيتها بعد من المستودعات المضافة.</string>
+    <string name="chromecast_subtitles_settings_des">إعدادات ترجمات كرومكاست</string>
+    <string name="eigengraumode_settings">وضع إيجينجرافي</string>
+    <string name="swipe_to_seek_settings">انتقد للبحث</string>
+    <string name="backup_settings">نسخ إحتياطي للبيانات</string>
+    <string name="updates_settings">إظهار تحديثات التطبيق</string>
+    <string name="player_subtitles_settings_des">إعدادات ترجمات المشغل</string>
+    <string name="chromecast_subtitles_settings">ترجمات كرومكاست</string>
+    <string name="swipe_to_change_settings_des">قم بالتمرير لأعلى أو لأسفل على الجانب الأيسر أو الأيمن لتغيير السطوع أو مستوى الصوت</string>
+    <string name="autoplay_next_settings">التشغيل التلقائي للحلقة القادمة</string>
+    <string name="lightnovel">تطبيق رواية خفيفة من نفس المطورين</string>
+    <string name="benene">أعط بينيني للمطورين</string>
+    <string name="github">جيتهب</string>
+    <string name="anim">تطبيق انيمي من نفس المطورين</string>
+    <string name="app_language">لغة التطبيق</string>
+    <string name="discord">انضم إلى الديسكورد</string>
+    <string name="benene_des">بنيني معطا</string>
+    <string name="apk_installer_settings_des">بعض الهواتف لا تدعم مثبت الحزمة الجديد. جرب الخيار القديم إذا لم يتم تثبيت التحديثات.</string>
+    <string name="apk_installer_settings">مثبت تتبيق</string>
+    <string name="test_passed">اجتاز</string>
+    <string name="episodes">الحلقات</string>
+    <string name="season">موسم</string>
+    <string name="copy_link_toast">تم نسخ الرابط إلى الحافظة</string>
+    <string name="delete">مسح</string>
+    <string name="pause">وقف</string>
+    <string name="update_notification_downloading">جارٍ تنزيل تحديث التطبيق…</string>
+    <string name="subs_default_reset_toast">إعادة التعيين إلى القيمة العادية</string>
+    <string name="season_short">س</string>
+    <string name="episode_format" formatted="true">%d%s</string>
+    <string name="no_chromecast_support_toast">لا يتمتع هذا المزود بدعم كرومكاست</string>
+    <string name="no_links_found_toast">لم يتم العثور على أي روابط</string>
+    <string name="play_episode_toast">تشغيل الحلقة</string>
+    <string name="acra_report_toast">عذرًا، تعطل التطبيق. سيتم إرسال تقرير خطأ مجهول إلى المطورين</string>
+    <string name="season_format">%s%d%s</string>
+    <string name="no_season">لا يوجد موسم</string>
+    <string name="episode">حلقة</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="episode_short">يي</string>
+    <string name="clear_history">امسح التاريخ</string>
+    <string name="update_notification_installing">جارٍ تثبيت تحديث التطبيق…</string>
+    <string name="start">بدأ</string>
+    <string name="no_episodes_found">لم يتم العثور على أي حلقات</string>
+    <string name="enable_skip_op_from_database_des">إظهار تخطي النوافذ المنبثقة للفتح/الإنهاء</string>
+    <string name="clipboard_too_large">الكثير من النص. غير قادر على الحفظ في الحافظة.</string>
+    <string name="action_mark_as_watched">وضع علامة كما شاهدت</string>
+    <string name="action_remove_from_watched">إزالة من شاهد</string>
+    <string name="delete_file">حذف ملف</string>
+    <string name="test_failed">فشل</string>
+    <string name="resume">اكتمل</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="history">تاريخ</string>
+    <string name="confirm_exit_dialog">هل أنت متأكد أنك تريد الخروج؟</string>
+    <string name="yes">نعم</string>
+    <string name="no">لا</string>
+    <string name="update_notification_failed">تعذر تثبيت الإصدار الجديد من التطبيق</string>
+    <string name="apk_installer_legacy">إرث</string>
+    <string name="apk_installer_package_installer">منزل المجموعة</string>
+    <string name="sort_rating_asc">التقييم (من الأقل إلى الأعلى)</string>
+    <string name="sort_updated_new">تم التحديث (من الجديد إلى القديم)</string>
+    <string name="sort_updated_old">تم التحديث (القديم إلى الجديد)</string>
+    <string name="sort_alphabetical_a">أبجديًا (من الألف إلى الياء)</string>
+    <string name="empty_library_no_accounts_message">مكتبتك فارغة :(
+\nقم بتسجيل الدخول إلى حساب المكتبة أو قم بإضافة العروض إلى مكتبتك المحلية.</string>
+    <string name="safe_mode_file">!تم العثور على ملف الوضع الآمن
+\n.عدم تحميل أي ملحقات عند بدء التشغيل حتى تتم إزالة الملف</string>
+    <string name="revert">ارجع</string>
+    <string name="subscription_in_progress_notification">تحديث العروض المشتركة</string>
+    <string name="set_default">الوضع العادي</string>
+    <string name="edit">حرر</string>
+    <string name="profiles">ملفات تعريفية</string>
+    <string name="help">مساعدة</string>
+    <string name="quality_profile_help">.هنا يمكنك تغيير كيفية ترتيب المصادر. إذا كان للفيديو أولوية أعلى، فسيظهر في مكان أعلى في تحديد المصدر. مجموع أولوية المصدر وأولوية الجودة هو أولوية الفيديو
+\n
+\nالمصدر أ: 3
+\nالجودة ب: 7
+\nستكون أولوية الفيديو المدمجة .10
+\n
+\n!ملاحظة: إذا كان المجموع 10 أو أكثر، فسيقوم اللاعب تلقائيًا بتخطي التحميل عند تحميل هذا الرابط</string>
+    <string name="already_voted">لقد صوت بالفعل</string>
+    <string name="sort_alphabetical_z">أبجديًا (ياء إلى ألف)</string>
+    <string name="sort_by">ترتيب حسب</string>
+    <string name="subscription_list_name">مشترك</string>
+    <string name="delayed_update_notice">سيتم تحديث التطبيق عند الخروج</string>
+    <string name="sort">رتب</string>
+    <string name="sort_rating_desc">التقييم (من الأعلى إلى الأقل)</string>
+    <string name="select_library">حدد المكتبة</string>
+    <string name="open_with">افتع مع</string>
+    <string name="empty_library_logged_in_message">.هذه القائمة فارغة. حاول التبديل إلى واحد آخر</string>
+    <string name="subscription_new">%sتم الاشتراك في</string>
+    <string name="subscription_deleted">%sتم إلغاء الاشتراك من</string>
+    <string name="subscription_episode_released">!%dتم إصدار الحلقة</string>
+    <string name="profile_background_des">خلفية الملف الشخصي</string>
+    <string name="profile_number">%dملف التعريف</string>
+    <string name="wifi">واي فاي</string>
+    <string name="mobile_data">بيانات الجوال</string>
+    <string name="use">استخدم</string>
+    <string name="unable_to_inflate">%sتعذر إنشاء واجهة المستخدم بشكل صحيح، وهذا خطأ كبير ويجب الإبلاغ عنه على الفور</string>
+    <string name="qualities">الصفات</string>
+    <string name="subs_edge_type">نوع الحافة</string>
+    <string name="home_play">العب</string>
+    <string name="error_loading_links_toast">حدث خطأ أثناء تحميل الروابط</string>
+    <string name="download_storage_text">التخزين الداخلي</string>
+    <string name="app_subbed_text">الترجمة</string>
+    <string name="popup_resume_download">استئناف تحميل</string>
+    <string name="home_info">معلومات</string>
+    <string name="popup_pause_download">وقفة التحميل</string>
+    <string name="sort_cancel">الغي</string>
+    <string name="sort_save">احفظ</string>
+    <string name="subtitles_settings">إعدادات الترجمة</string>
+    <string name="subs_text_color">لون الخط</string>
+    <string name="subs_outline_color">لون المخطط التفصيلي</string>
+    <string name="sort_close">اقفل</string>
+    <string name="sort_clear">امسح</string>
+    <string name="player_speed">سرعة اللاعب</string>
+    <string name="subs_background_color">لون الخلفية</string>
+    <string name="subs_window_color">لون النافذة</string>
+    <string name="subs_subtitle_elevation">ارتفاع الترجمة</string>
+    <string name="popup_delete_file">حذف ملف</string>
+    <string name="pref_disable_acra">تعطيل الإبلاغ التلقائي عن الأخطاء</string>
+    <string name="update_started">بدأ التحديث</string>
+    <string name="sort_copy">انسخ</string>
+    <string name="stream">بث</string>
+    <string name="popup_play_file">ملف اللعب</string>
+    <string name="home_more_info">مزيد من المعلومات</string>
+    <string name="filter_bookmarks">تصفية الإشارات المرجعية</string>
+    <string name="error_bookmarks_text">إشارات مرجعية</string>
+    <string name="action_remove_from_bookmarks">زيل</string>
+    <string name="action_add_to_bookmarks">ضبط حالة المشاهدة</string>
+    <string name="app_dubbed_text">مدبلجة</string>
+    <string name="home_expanded_hide">اخفي</string>
+    <string name="sort_apply">قدم</string>
+    <string name="torrent_plot">وصف</string>
+    <string name="picture_in_picture_des">يستمر التشغيل في مشغل مصغر فوق التطبيقات الأخرى</string>
+    <string name="delete_message" formatted="true">نهائيا %sسيؤدي هذا الى حذف 
+\nهل أنت متأكد؟</string>
+    <string name="subs_font">الخط</string>
+    <string name="subs_font_size">حجم الخط</string>
+    <string name="action_remove_watching">زيل</string>
+    <string name="vpn_torrent">هذا المزود عبارة عن تورنت، ويوصى باستخدام فيبيان</string>
+    <string name="provider_info_meta">لا يتم توفير البيانات الوصفية بواسطة الموقع، وسيفشل تحميل الفيديو إذا لم يكن موجودًا في الموقع.</string>
+    <string name="status_ongoing">جاري التنفيذ</string>
+    <string name="status_completed">مكتمل</string>
+    <string name="status">حالة</string>
+    <string name="subs_auto_select_language">التحديد التلقائي للغة</string>
+    <string name="player_size_settings">زر تغيير حجم المشغل</string>
+    <string name="continue_watching">مواصلة المشاهدة</string>
+    <string name="action_open_watching">مزيد من المعلومات</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_download_languages">تحميل اللغات</string>
+    <string name="subs_subtitle_languages">لغة الترجمة</string>
+    <string name="subs_hold_to_reset_to_default">اضغط لإعادة التعيين إلى الوضع الافتراضي</string>
+    <string name="subs_import_text" formatted="true">%s قم باستيراد الخطوط بوضعها في</string>
+    <string name="vpn_might_be_needed">قد تكون هناك حاجة إلى فيبيان حتى يعمل هذا المزود بشكل صحيح</string>
+    <string name="normal_no_plot">لم يتم العثور على قطعة أرض</string>
+    <string name="torrent_no_plot">لم يتم العثور على وصف</string>
+    <string name="show_log_cat">🐈عرض لوجكات</string>
+    <string name="test_log">سجل</string>
+    <string name="picture_in_picture">صور في صور</string>
+    <string name="resume_time_left" formatted="true">%d
+\nباقي</string>
+</resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 0543a94e..d76aa94b 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -29,7 +29,7 @@
     <string name="search_hint">Търсене…</string>
     <string formatted="true" name="search_hint_site">Търси %s…</string>
     <string name="no_data">Няма данни</string>
-    <string name="episode_more_options_des">Още опций</string>
+    <string name="episode_more_options_des">Още опции</string>
     <string name="next_episode">Следващ епизод</string>
     <string name="result_tags">Жанрове</string>
     <string name="result_share">Сподели</string>
@@ -124,16 +124,16 @@
     <string name="eigengraumode_settings">Режим Eigengravy (промяна скорост на възпроизвеждане)</string>
     <string name="eigengraumode_settings_des">Добавя опция за скорост в плейъра</string>
     <string name="swipe_to_seek_settings">Плъзнете за преместване</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_seek_settings">Докоснете двукратно за превъртане</string>
     <string name="double_tap_to_pause_settings">Докоснете два пъти за пауза</string>
-    <string name="double_tap_to_seek_amount_settings">Размер на превъртане</string>
+    <string name="double_tap_to_seek_amount_settings">Размер на превъртане (секунди)</string>
     <string name="double_tap_to_seek_settings_des">Докоснете два пъти от дясната или лявата страна, за да превъртите напред или назад</string>
-    <string name="double_tap_to_pause_settings_des">Докоснете в средата, за да направите пауза</string>
+    <string name="double_tap_to_pause_settings_des">Докоснете два пъти в средата, за да поставите на пауза</string>
     <string name="use_system_brightness_settings">Използвайте яркостта на системата</string>
     <string name="use_system_brightness_settings_des">Използвайте системна яркост в плейъра на приложението вместо тъмно наслагване</string>
     <string name="episode_sync_settings">Актуализирайте прогреса на гледане</string>
@@ -497,4 +497,12 @@
     <string name="delayed_update_notice">Приложението ще се актуализира при изход от него</string>
     <string name="update_started">Започна Актуализация</string>
     <string name="action_remove_from_watched">Премахване от гледани</string>
+    <string name="search_poster_img_des">Постер</string>
+    <string name="browser">Браузър</string>
+    <string name="test_log">Регистър</string>
+    <string name="test_passed">Преминато</string>
+    <string name="test_failed">Неуспешен</string>
+    <string name="library">Библиотека</string>
+    <string name="watch_quality_pref_data">Предпочитано качество за гледане (Мобилни данни)</string>
+    <string name="start">Начало</string>
 </resources>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 12752938..ba754fa5 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -7,7 +7,7 @@
     <string name="next_episode_time_day_format" formatted="true">%dদিন %dঘন্টা %dমিনিট</string>
     <string name="next_episode_time_hour_format" formatted="true">%dঘন্টা %dমিনিট</string>
     <string name="next_episode_time_min_format" formatted="true">%d মিনিট</string>
-    <string name="episode_poster_img_des">এপিসোড পোস্টার</string>
+    <string name="episode_poster_img_des">পর্বের পোস্টার</string>
     <string name="home_main_poster_img_des">মূল পোস্টার</string>
     <string name="home_next_random_img_des">পরবর্তী র‍্যান্ডম</string>
     <string name="go_back_img_des">ফিরে যান</string>
@@ -24,9 +24,9 @@
     <string name="title_downloads">ডাউনলোডসমূহ</string>
     <string name="title_settings">সেটিংস</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s এপি %d</string>
-    <string name="next_episode_format" formatted="true">এপিসোড %d রিলিজ হবে</string>
+    <string name="next_episode_format" formatted="true">পর্ব %d মুক্তির তারিখ</string>
     <string name="result_share">শেয়ার</string>
-    <string name="result_open_in_browser">ব্রাঊজারে খুলুন</string>
+    <string name="result_open_in_browser">ব্রাউজারে খুলুন</string>
     <string name="result_tags">জনরা</string>
     <string name="search_hint">খুঁজুন…</string>
     <string name="search_hint_site" formatted="true">খুঁজুন %s…</string>
@@ -35,7 +35,7 @@
     <string name="go_back">পিছনে যান</string>
     <string name="no_data">কোন তথ্য নেই</string>
     <string name="episode_more_options_des">আরো অপশন</string>
-    <string name="next_episode">পরবর্তি এপিসোড</string>
+    <string name="next_episode">পরবর্তী পর্ব</string>
     <string name="skip_loading">লোডিং বাদ দিন</string>
     <string name="loading">লোডিং…</string>
     <string name="type_watching">দেখা হচ্ছে</string>
@@ -46,10 +46,10 @@
     <string name="type_none">কোন কিছুই না</string>
     <string name="type_re_watching">পুনরায় দেখা হচ্ছে</string>
     <string name="play_torrent_button">টরেন্ট স্ট্রিম করুন</string>
-    <string name="pick_source">সোর্সসমূহ</string>
+    <string name="pick_source">উৎসসমূহ</string>
     <string name="pick_subtitle">সাবটাইটেলসমূহ</string>
     <string name="reload_error">আবার সংযোগ দেওয়ার চেষ্টা করুন…</string>
-    <string name="play_episode">এপিসোড চালান</string>
+    <string name="play_episode">পর্ব চালান</string>
     <string name="download">ডাউনলোড</string>
     <string name="downloaded">ডাউনলোড হয়েছে</string>
     <string name="downloading">ডাউনলোড চলছে</string>
@@ -61,22 +61,22 @@
     <string name="error_loading_links_toast">লিংক লোডিং ব্যর্থ</string>
     <string name="app_dubbed_text">ডাব</string>
     <string name="app_subbed_text">সাব</string>
-    <string name="popup_play_file">ফাইল প্লে করুন</string>
+    <string name="popup_play_file">ফাইল চালান</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_play">চালান</string>
     <string name="home_info">তথ্য</string>
     <string name="error_bookmarks_text">বুকমার্কসমূহ</string>
     <string name="action_remove_from_bookmarks">বাদ দিন</string>
     <string name="action_add_to_bookmarks">বুকমার্ক করুন</string>
-    <string name="sort_apply">এপ্লাই করুন</string>
+    <string name="sort_apply">প্রয়োগ করুন</string>
     <string name="sort_cancel">বাদ দিন</string>
     <string name="sort_copy">কপি করুন</string>
     <string name="sort_close">বন্ধ করুন</string>
     <string name="sort_clear">মুছুন</string>
-    <string name="sort_save">সেভ করুন</string>
+    <string name="sort_save">সংরক্ষণ করুন</string>
     <string name="player_speed">ভিডিও এর গতি</string>
     <string name="subs_outline_color">ফন্ট আউটলাইন কালার</string>
     <string name="subs_edge_type">সাবটাইটেল এজের ধরণ</string>
@@ -100,11 +100,11 @@
     <string name="download_failed">ডাউনলোড ব্যর্থ</string>
     <string name="download_storage_text">ইন্টারনাল স্টোরেজ</string>
     <string name="filter_bookmarks">বুকমার্ক ফিল্টার করুন</string>
-    <string name="popup_delete_file">ফাইল ডিলিট করুন</string>
+    <string name="popup_delete_file">ফাইল মুছুন</string>
     <string name="popup_resume_download">ডাউনলোড চালু করুন</string>
     <string name="subtitles_settings">সাবটাইটেল সেটিংস</string>
     <string name="subs_background_color">সাবটাইটেল ব্যাকগ্রাউন্ড কালার</string>
-    <string name="subs_text_color">ফন্ট কালার</string>
+    <string name="subs_text_color">লেখার রং</string>
     <string name="vpn_torrent">এটা একটি টরেন্ট প্রভাইডার, ভিপিএন ব্যবহার করা উচিৎ</string>
     <string name="subs_window_color">উইন্ডো কালার</string>
     <string name="subs_font_size">ফন্টের সাইজ</string>
@@ -130,8 +130,8 @@
     <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="autoplay_next_settings">স্বয়ংক্রিয়ভাবে পরবর্তী এপিসোড প্লে করুন</string>
-    <string name="autoplay_next_settings_des">পরবর্তী এপিসোডটি চালু করুন যখন চলতি এপিসোডটি শেষ হয়</string>
+    <string name="autoplay_next_settings">স্বয়ংক্রিয়ভাবে পরবর্তী পর্ব চালান</string>
+    <string name="autoplay_next_settings_des">বর্তমান পর্বটি শেষ হলে পরের পর্বটি চালান</string>
     <string name="double_tap_to_pause_settings">থামতে দুইবার চাপুন</string>
     <string name="backup_success">ডাটা জমা হয়েছে</string>
     <string name="backup_failed">স্টোরেজ এর অনুমতি অনুপস্থিত। দয়া করে আবার চেষ্টা করুন।</string>
@@ -148,4 +148,5 @@
     <string name="double_tap_to_seek_settings">আগাতে ডবল ট্যাপ করুন</string>
     <string name="eigengraumode_settings">আইজেনগ্রাভি মোড</string>
     <string name="update_started">আপডেট শুরু হয়েছে</string>
+    <string name="browser">ব্রাউজার</string>
 </resources>
diff --git a/app/src/main/res/values-bp/strings.xml b/app/src/main/res/values-bp/strings.xml
index 38424e56..016fbe43 100644
--- a/app/src/main/res/values-bp/strings.xml
+++ b/app/src/main/res/values-bp/strings.xml
@@ -10,7 +10,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Pôster</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -66,7 +66,7 @@
     <string name="error_loading_links_toast">Erro Carregando Links</string>
     <string name="download_storage_text">Armazenamento Interno</string>
     <string name="app_dubbed_text">Dub</string>
-    <string name="app_subbed_text">Leg</string>
+    <string name="app_subbed_text">Sub</string>
     <string name="popup_delete_file">Deletar Arquivo</string>
     <string name="popup_play_file">Assistir Arquivo</string>
     <string name="popup_resume_download">Retomar Download</string>
@@ -156,8 +156,8 @@
     <string name="bug_report_settings_on">Não enviar nenhum dado</string>
     <string name="show_fillers_settings">Mostrar episódios de Filler em anime</string>
     <string name="show_trailers_settings">Mostrar trailers</string>
-    <string name="kitsu_settings">Mostrar posters do kitsu</string>
-    <string name="pref_filter_search_quality">Esconder qualidades de vídeo selecionadas nos resultados da Pesquisa</string>
+    <string name="kitsu_settings">Mostrar posters do Kitsu</string>
+    <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>
@@ -183,7 +183,7 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Nenhum Episódio encontrado</string>
-    <string name="delete_file">Deletar Arquivo</string>
+    <string name="delete_file">Apagar Arquivo</string>
     <string name="delete">Deletar</string>
     <string name="pause">Pausar</string>
     <string name="resume">Retomar</string>
@@ -222,7 +222,7 @@
     <string name="movies_singular">Filme</string>
     <string name="tv_series_singular">Série</string>
     <string name="cartoons_singular">Desenho Animado</string>
-    <string name="anime_singular">@string/anime</string>
+    <string name="anime_singular">Anime</string>
     <string name="ova_singular">@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Documentário</string>
@@ -257,7 +257,7 @@
     <string name="dont_show_again">Não mostrar de novo</string>
     <string name="skip_update">Pular essa Atualização</string>
     <string name="update">Atualizar</string>
-    <string name="watch_quality_pref">Qualidade preferida</string>
+    <string name="watch_quality_pref">Qualidade preferida de reprodução (Wi-fi)</string>
     <string name="limit_title">Máximo de caracteres do título de vídeos</string>
     <string name="limit_title_rez">Resolução do player de vídeo</string>
     <string name="video_buffer_size_settings">Tamanho do buffer do vídeo</string>
@@ -265,14 +265,14 @@
     <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_disk_description">Pode causar problemas em sistemas com pouco espaço de armazenamento se definido muito alto, como em dispositivos 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>
     <string name="add_site_pref">Clonar site</string>
     <string name="remove_site_pref">Remover site</string>
     <string name="add_site_summary">Adiciona um clone de um site existente, com uma URL diferente</string>
     <string name="download_path_pref">Caminho para Download</string>
-    <string name="nginx_url_pref">Url do servidor Nginx</string>
+    <string name="nginx_url_pref">URL do servidor NGINX</string>
     <string name="display_subbed_dubbed_settings">Mostrar Anime Dublado/Legendado</string>
     <string name="resize_fit">Ajustar para a Tela</string>
     <string name="resize_fill">Esticar</string>
@@ -338,7 +338,7 @@
     <string name="subtitles_shadow">Sombreado</string>
     <string name="subtitles_raised">Em Relevo</string>
     <string name="subtitle_offset">Sincronizar legendas</string>
-    <string name="subtitle_offset_hint">1000ms</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>
@@ -382,9 +382,9 @@
     <string name="resolution_and_title">Resolução e título</string>
     <string name="title">Título</string>
     <string name="resolution">Resolução</string>
-    <string name="error_invalid_id">Id invalida</string>
+    <string name="error_invalid_id">ID inválido</string>
     <string name="error_invalid_data">Dado invalido</string>
-    <string name="error_invalid_url">URL invalido</string>
+    <string name="error_invalid_url">URL inválida</string>
     <string name="error">Erro</string>
     <string name="subtitles_remove_captions">Remover legendas ocultas(CC) das legendas</string>
     <string name="subtitles_remove_bloat">Remover bloat das legendas</string>
@@ -406,19 +406,23 @@
     <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="batch_download_start_format" formatted="true">Iniciada a transferência %d %s</string>
-    <string name="batch_download_finish_format" formatted="true">Transferido %d %s com sucesso</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>
     <string name="batch_download">Transferência em batch</string>
-    <string name="plugin_singular">plugin</string>
-    <string name="plugin">plugins</string>
+    <string name="plugin_singular">Plugin</string>
+    <string name="plugin">Plugins</string>
     <string name="delete_repository_plugins">Isto irá apagar todos os repositórios de plugins</string>
     <string name="delete_repository">Apagar repositório</string>
     <string name="setup_extensions_subtext">Transferir lista de sites a usar</string>
     <string name="plugins_downloaded" formatted="true">Transferido: %d</string>
     <string name="plugins_disabled" formatted="true">Desativado: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Não transferido: %d</string>
-    <string name="blank_repo_message">Adicionar um repositório para instalar extensões de sites</string>
+    <string name="blank_repo_message">CloudStream não tem fontes instaladas por padrão. Você precisa instalar um site de repositórios.
+\n
+\nPor causa das limitações do DMCA (Digital Millennium Copyright Act ) feito em nome de Sky UK Limited 🤮nós não podemos adicionar site de repositórios no app.
+\n
+\nEntre no nosso Discord ou pesquise online.</string>
     <string name="view_public_repositories_button">Ver repositórios da comunidade</string>
     <string name="view_public_repositories_button_short">Lista pública</string>
     <string name="uppercase_all_subtitles">Todas as legendas em maiúsculas</string>
@@ -428,4 +432,139 @@
     <string name="autoplay_next_settings_des">Começa o próximo episódio quando o atual termina</string>
     <string name="enable_nsfw_on_providers">Ativar NSFW em fornecedores compatíveis</string>
     <string name="category_providers">Fornecedores</string>
+    <string name="revert">Reverter</string>
+    <string name="pref_category_actions">Ações</string>
+    <string name="already_voted">votou com sucesso</string>
+    <string name="update_notification_downloading">Baixando atualização do aplicativo…</string>
+    <string name="referer">Referencias</string>
+    <string name="pref_category_app_updates">Atualizações do App</string>
+    <string name="play_with_app_name">Tocar com CloudStream</string>
+    <string name="automatic_plugin_download_summary">Automaticamente instale todos os plugins não instalados dos repositórios adicionados.</string>
+    <string name="play_trailer_button">Reproduzir Trailer</string>
+    <string name="browser">Navegador</string>
+    <string name="pref_category_backup">Copia de Segurança</string>
+    <string name="android_tv_interface_off_seek_settings_summary">A Barra de Progresso pode ser usada quando o player estiver oculto</string>
+    <string name="subscription_list_name">Inscrito</string>
+    <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_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>
+    <string name="sort">Organizar</string>
+    <string name="yes">Sim</string>
+    <string name="confirm_exit_dialog">Você tem certeza que deseja sair\?</string>
+    <string name="update_notification_installing">Instalando atualização do aplicativo…</string>
+    <string name="edit">Editar</string>
+    <string name="profiles">Perfis</string>
+    <string name="android_tv_interface_on_seek_settings">Exibindo Player - procure na Barra de Progresso</string>
+    <string name="action_remove_from_watched">Remover dos assistidos</string>
+    <string name="pref_category_extensions">Extensões</string>
+    <string name="sort_alphabetical_a">Alfabética(A =&gt; Z)</string>
+    <string name="open_with">Abrir com</string>
+    <string name="select_library">Selecionar Biblioteca</string>
+    <string name="test_passed">Passou</string>
+    <string name="empty_library_no_accounts_message">Sua biblioteca está vazia :0
+\nEntre numa conta de biblioteca ou adicione Midias para sua biblioteca local.</string>
+    <string name="watch_quality_pref_data">Qualidade preferida de reprodução (Dados Móveis)</string>
+    <string name="apk_installer_legacy">Legado</string>
+    <string name="library">Biblioteca</string>
+    <string name="no">Não</string>
+    <string name="tracks">Trilhas Sonoras</string>
+    <string name="sort_rating_asc">Votação (Baixa para Alta)</string>
+    <string name="update_started">Atualização iniciada</string>
+    <string name="nsfw_singular">Conteúdo +18</string>
+    <string name="help">Ajuda</string>
+    <string name="redo_setup_process">Processo de configuração de Redo</string>
+    <string name="update_notification_failed">Não pudemos instalar a nova versão do App</string>
+    <string name="apk_installer_package_installer">instalador de pacotes</string>
+    <string name="sort_by">Organizar por</string>
+    <string name="sort_rating_desc">Votação (Alta para Baixa)</string>
+    <string name="sort_alphabetical_z">Alfabética(Z =&gt; A)</string>
+    <string name="qualities">Qualidade</string>
+    <string name="profile_background_des">Perfil de plano de fundo</string>
+    <string name="quality_profile_help">Aqui você pode alterar como as fontes são ordenadas. Se um vídeo tiver uma prioridade mais alta, aparecerá mais alto na seleção da fonte. A soma da prioridade da fonte e da prioridade da qualidade é a prioridade do vídeo.
+\n
+\nFonte A: 3
+\nQualidade B: 7
+\nTerá uma prioridade de vídeo combinada de 10.
+\n
+\nNOTA: Se a soma for 10 ou mais, o Player pulará automaticamente o carregamento quando o link for carregado!</string>
+    <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="set_default">Selecionar padrão</string>
+    <string name="subscription_deleted">Desinscrito 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>
+    <string name="subscription_in_progress_notification">Atualizando shows inscritos</string>
+    <string name="android_tv_interface_off_seek_settings">Player oculto - Procure na barra de progresso</string>
+    <string name="nsfw">Conteúdo +18</string>
+    <string name="restart">Reiniciar</string>
+    <string name="stop">Parar</string>
+    <string name="action_mark_as_watched">Marcar como assistido</string>
+    <string name="delayed_update_notice">Aplicativo precisa ser fechado para atualizar</string>
+    <string name="enable_skip_op_from_database_des">Mostrar popups pulados para abertura e finalização</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="player_settings_play_in_app">Player interno</string>
+    <string name="extension_size">Tamanho</string>
+    <string name="skip_type_op">Abrindo</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="plugins_updated" formatted="true">%d plugins atualizados</string>
+    <string name="safe_mode_description">Todos as extensões serão desligadas para ajuda se talvez estejam causando algum bug.</string>
+    <string name="app_not_found_error">Aplicativo não encontrado</string>
+    <string name="skip_type_recap">Recapitular</string>
+    <string name="all_languages_preference">Todas as linguagens</string>
+    <string name="skip_type_format" formatted="true">Pula %s</string>
+    <string name="skip_type_mixed_ed">Mistura terminada</string>
+    <string name="safe_mode_title">Modo seguro ligado</string>
+    <string name="extension_rating" formatted="true">Ranquear: %s</string>
+    <string name="extension_language">Linguagem</string>
+    <string name="hls_playlist">Lista de reprodução HLS</string>
+    <string name="skip_type_ed">Terminando</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="sort_updated_old">Adicionado em (antigo para novo)</string>
+    <string name="skip_type_intro">Introdução</string>
+    <string name="no_plugins_found_error">plug-ins não foram encontrados no repositório</string>
+    <string name="no_repository_found_error">Repositório não encontrado, verifique o URL e tente usa uma VPN</string>
+    <string name="extension_description">Descrição</string>
+    <string name="extension_version">Versão</string>
+    <string name="extension_authors">Autores</string>
+    <string name="extension_install_first">Instale a extensão primeiro</string>
+    <string name="skip_type_creddits">Créditos</string>
+    <string name="history">Historico</string>
+    <string name="clear_history">Limpar historico</string>
+    <string name="clipboard_too_large">Tem Muito texto. Não é possível salvar no clipboard.</string>
+    <string name="player_pref">Player de vídeo preferido</string>
+    <string name="start">Começar</string>
+    <string name="extension_types">Suportado</string>
+    <string name="extension_status">Status</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="skip_type_mixed_op">Abrindo mistura</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="apply_on_restart">Aplicar quando reiniciar</string>
+    <string name="safe_mode_crash_info">Visualização info de crash</string>
+    <string name="audio_tracks">Faixas de áudio</string>
+    <string name="sort_updated_new">Adicionado em (novo para antigo)</string>
+    <string name="video_tracks">Faixas de video</string>
+    <string name="pref_category_subtitles">Legendas</string>
+    <string name="player_settings_play_in_browser">Navegador</string>
+    <string name="is_adult">18+</string>
+    <string name="pref_category_links">Links</string>
+    <string name="pref_category_player_features">Funcionalidades do Player</string>
+    <string name="apk_installer_settings">Instalador APK</string>
+    <string name="pref_category_looks">Aparência</string>
+    <string name="disable">Desativar</string>
+    <string name="use">Usar</string>
+    <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="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>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 16ceff2d..46bd860d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -553,4 +553,28 @@
     <string name="revert">Vrátit zpět</string>
     <string name="jsdelivr_proxy_summary">Obchází blokování GitHubu pomocí jsDelivr. Může způsobit zpoždění aktualizací o několik dní.</string>
     <string name="pref_category_bypass">Obcházení ISP</string>
+    <string name="profile_number">Profil %d</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="mobile_data">Mobilní data</string>
+    <string name="set_default">Nastavit jako výchozí</string>
+    <string name="use">Použít</string>
+    <string name="edit">Upravit</string>
+    <string name="profiles">Profily</string>
+    <string name="help">Nápověda</string>
+    <string name="qualities">Kvality</string>
+    <string name="profile_background_des">Pozadí profilu</string>
+    <string name="quality_profile_help">Zde můžete změnit pořadí zdrojů. Pokud má video vyšší prioritu, objeví se ve výběru zdrojů výše. Součet priority zdroje a priority kvality je priorita videa.
+\n
+\nZdroj A: 3
+\nKvalita B: 7
+\nBudou mít celkovou prioritu videa 10.
+\n
+\nPOZNÁMKA: Pokud je součet 10 nebo vyšší, přehrávač automaticky přeskočí načítání při načtení daného odkazu!</string>
+    <string name="unable_to_inflate">Nepodařilo se správně vytvořit rozhraní. Toto je VÁŽNÁ CHYBA, kterou je potřeba ihned nahlásit %s</string>
+    <string name="disable">Vypnout</string>
+    <string name="automatic_plugin_download_mode_title">Výběr režimu pro filtrování stahování doplňků</string>
+    <string name="no_plugins_found_error">V repozitáři nebyly nalezeny žádné doplňky</string>
+    <string name="no_repository_found_error">Repozitář nenalezen, zkontrolujte adresu URL a zkuste použít VPN</string>
+    <string name="default_account">@string/default_subtitles</string>
+    <string name="already_voted">Již jste hlasovali</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e0a9594c..3efc4072 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -5,19 +5,19 @@
     <string name="next_episode_format" formatted="true">Episode %d wird veröffentlicht in</string>
     <string name="result_poster_img_des">Vorschaubild</string>
     <string name="search_poster_img_des">Vorschaubild</string>
-    <string name="subs_hold_to_reset_to_default">Halten, um auf die Standardeinstellungen zurückzusetzen</string>
+    <string name="subs_hold_to_reset_to_default">Halten, um auf Standardeinstellungen zurückzusetzen</string>
     <string name="restore_failed_format" formatted="true">Wiederherstellung der Daten aus der Datei %s fehlgeschlagen</string>
     <string name="backup_success">Daten erfolgreich gesichert</string>
     <string name="backup_failed_error_format">Fehler beim Sichern von %s</string>
     <string name="no_chromecast_support_toast">Dieser Anbieter hat keine Chromecast-Unterstützung</string>
     <string name="episode_action_chromecast_mirror">Chromecast-Mirror</string>
     <string name="episode_action_play_in_app">In App wiedergeben</string>
-    <string name="skip_type_mixed_op">Vermischte Openings</string>
+    <string name="skip_type_mixed_op">Gemischte Openings</string>
     <string name="skip_type_creddits">Abspann</string>
     <string name="skip_type_intro">Intro</string>
     <string name="clear_history">Verlauf löschen</string>
     <string name="history">Verlauf</string>
-    <string name="enable_skip_op_from_database_des">Überspringen Knopf für Openings/Endings anzeigen</string>
+    <string name="enable_skip_op_from_database_des">Button zum Überspringen für Openings/Endings anzeigen</string>
     <string name="clipboard_too_large">Zu viel Text. Kann nicht in der Zwischenablage gespeichert werden.</string>
     <string name="episode_poster_img_des">Episodenvorschaubild</string>
     <string name="home_main_poster_img_des">Medienvorschaubild</string>
@@ -34,7 +34,7 @@
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Mit CloudStream abspielen</string>
     <string name="title_home">Startseite</string>
-    <string name="title_search">Suchen</string>
+    <string name="title_search">Suche</string>
     <string name="title_downloads">Downloads</string>
     <string name="title_settings">Einstellungen</string>
     <string name="search_hint">Suchen…</string>
@@ -44,8 +44,8 @@
     <string name="next_episode">Nächste Episode</string>
     <string name="result_tags">Genres</string>
     <string name="result_share">Teilen</string>
-    <string name="result_open_in_browser">In Browser öffnen</string>
-    <string name="skip_loading">Puffern überspringen</string>
+    <string name="result_open_in_browser">Im Browser öffnen</string>
+    <string name="skip_loading">Laden überspringen</string>
     <string name="loading">Lädt…</string>
     <string name="type_watching">Am schauen</string>
     <string name="type_on_hold">Pausiert</string>
@@ -79,7 +79,7 @@
     <string name="popup_play_file">Datei abspielen</string>
     <string name="popup_resume_download">Download fortsetzen</string>
     <string name="popup_pause_download">Download pausieren</string>
-    <string name="pref_disable_acra">Automatische Fehlerberichterstattung deaktivieren</string>
+    <string name="pref_disable_acra">Automatische Fehlerberichtserstattung deaktivieren</string>
     <string name="home_more_info">Mehr Infos</string>
     <string name="home_expanded_hide">Verstecken</string>
     <string name="home_play">Abspielen</string>
@@ -92,7 +92,7 @@
     <string name="sort_cancel">Abbrechen</string>
     <string name="sort_copy">Kopieren</string>
     <string name="sort_close">Schließen</string>
-    <string name="sort_clear">Löschen</string>
+    <string name="sort_clear">Leeren</string>
     <string name="sort_save">Speichern</string>
     <string name="player_speed">Player-Geschwindigkeit</string>
     <string name="subtitles_settings">Untertiteleinstellungen</string>
@@ -106,8 +106,8 @@
     <string name="subs_font_size">Schriftgröße</string>
     <string name="search_provider_text_providers">Suche anhand Anbietern</string>
     <string name="search_provider_text_types">Suche anhand Typen</string>
-    <string name="benene_count_text">%d Benenes an die Devs verteilt</string>
-    <string name="benene_count_text_none">Noch keine Benenes verteilt</string>
+    <string name="benene_count_text">%d Benenes an die Devs geschenkt</string>
+    <string name="benene_count_text_none">Noch keine Benenes verschenkt</string>
     <string name="subs_auto_select_language">Sprache automatisch wählen</string>
     <string name="subs_download_languages">Sprachen herunterladen</string>
     <string name="subs_subtitle_languages">Untertitelsprache</string>
@@ -117,8 +117,8 @@
     <string name="action_open_watching">Mehr Infos</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Damit dieser Anbieter korrekt funktioniert, ist möglicherweise ein VPN erforderlich</string>
-    <string name="vpn_torrent">Dieser Anbieter bietet Torrents an, ein VPN wird dringend empfohlen</string>
-    <string name="provider_info_meta">Metadaten werden nicht von der Website bereitgestellt, das Laden des Videos schlägt fehl, wenn sie auf der Website nicht vorhanden sind.</string>
+    <string name="vpn_torrent">Dieser Anbieter bietet Torrents an, ein VPN wird deswegen dringend empfohlen</string>
+    <string name="provider_info_meta">Metadaten werden nicht von der Website bereitgestellt, das Laden des Videos schlägt fehl, wenn sie nicht auf der Website vorhanden sind.</string>
     <string name="torrent_plot">Beschreibung</string>
     <string name="normal_no_plot">Keine Handlung gefunden</string>
     <string name="torrent_no_plot">Keine Beschreibung gefunden</string>
@@ -143,7 +143,7 @@
     <string name="double_tap_to_pause_settings">Doppeltippen zum Pausieren</string>
     <string name="double_tap_to_seek_amount_settings">Zeit für vor- und zurückspulen im Player (Sekunden)</string>
     <string name="double_tap_to_seek_settings_des">Zweimal auf die rechte oder linke Seite tippen, um vor- oder zurückzuspulen</string>
-    <string name="double_tap_to_pause_settings_des">Doppelt in die Mitte tippen, um zu pausieren</string>
+    <string name="double_tap_to_pause_settings_des">Zweimal in die Mitte tippen, um zu pausieren</string>
     <string name="use_system_brightness_settings">Systemhelligkeit verwenden</string>
     <string name="use_system_brightness_settings_des">Systemhelligkeit anstelle eines dunklen Overlay im Player verwenden</string>
     <string name="episode_sync_settings">Episodenfortschritt aktualisieren</string>
@@ -163,7 +163,7 @@
     <string name="show_fillers_settings">Füller-Episoden für Animes anzeigen</string>
     <string name="show_trailers_settings">Trailer anzeigen</string>
     <string name="kitsu_settings">Vorschaubilder von Kitsu anzeigen</string>
-    <string name="pref_filter_search_quality">Ausgewählte Videoqualität bei Suchergebnissen ausblenden</string>
+    <string name="pref_filter_search_quality">Ausgewählte Videoqualität in den Suchergebnissen ausblenden</string>
     <string name="automatic_plugin_updates">Automatische Plugin-Updates</string>
     <string name="updates_settings">App-Updates anzeigen</string>
     <string name="updates_settings_des">Automatisches Suchen nach neuen Updates nach dem Start.</string>
@@ -172,11 +172,11 @@
     <string name="github">Github</string>
     <string name="lightnovel">Light Novel App von denselben Entwicklern</string>
     <string name="anim">Anime App von denselben Entwicklern</string>
-    <string name="discord">Discord beitreten</string>
-    <string name="benene">Eine Benene an die Devs verteilen</string>
-    <string name="benene_des">Verteilte Benenes</string>
+    <string name="discord">Trete dem Discord Server bei</string>
+    <string name="benene">Eine Benene an die Devs schenken</string>
+    <string name="benene_des">Geschenkte Benenes</string>
     <string name="app_language">App-Sprache</string>
-    <string name="no_links_found_toast">Keine Verlinkung gefunden</string>
+    <string name="no_links_found_toast">Keine Links gefunden</string>
     <string name="copy_link_toast">Link in die Zwischenablage kopiert</string>
     <string name="play_episode_toast">Episode abspielen</string>
     <string name="subs_default_reset_toast">Auf Standardwert zurücksetzen</string>
@@ -240,7 +240,7 @@
     <string name="remote_error">Remote-Fehler</string>
     <string name="render_error">Renderfehler</string>
     <string name="unexpected_error">Unerwarteter Playerfehler</string>
-    <string name="storage_error">Downloadfehler, Speicherberechtigungen prüfen</string>
+    <string name="storage_error">Downloadfehler, bitte überprüfen sie die Speicherberechtigungen</string>
     <string name="episode_action_chromecast_episode">Chromecast-Episode</string>
     <string name="episode_action_play_in_format">In %s wiedergeben</string>
     <string name="episode_action_play_in_browser">In Browser wiedergeben</string>
@@ -255,7 +255,7 @@
     <string name="show_title">Titel</string>
     <string name="poster_ui_settings">UI-Elemente auf Vorschaubild umschalten</string>
     <string name="no_update_found">Kein Update gefunden</string>
-    <string name="check_for_update">Auf Update prüfen</string>
+    <string name="check_for_update">Auf Updates prüfen</string>
     <string name="video_lock">Sperren</string>
     <string name="video_aspect_ratio_resize">Skalieren</string>
     <string name="video_source">Quelle</string>
@@ -270,16 +270,16 @@
     <string name="video_buffer_length_settings">Videopufferlänge</string>
     <string name="video_buffer_disk_settings">Video-Cache in Speicher</string>
     <string name="video_buffer_clear_settings">Video- und Bild-Cache leeren</string>
-    <string name="video_ram_description">Verursacht Abstürze, wenn zu hoch eingestellt. Nicht ändern, wenn wenig Arbeitsspeicher verfügbar ist, wie z.B. ein Android TV oder ein altes Telefon.</string>
-    <string name="video_disk_description">Kann auf Systemen mit geringem Speicherplatz, wie z. B. Android TV-Geräten, zu Problemen führen, wenn der Wert zu hoch eingestellt ist.</string>
+    <string name="video_ram_description">Verursacht Abstürze, wenn zu hoch eingestellt. Nicht ändern, wenn wenig Arbeitsspeicher verfügbar ist, wie z.B. auf einem Android TV oder auf einem alten Smartphone.</string>
+    <string name="video_disk_description">Kann auf Systemen mit geringem Speicherplatz, wie z. B. auf Android TV-Geräten, zu Problemen führen, wenn der Wert zu hoch eingestellt ist.</string>
     <string name="dns_pref">DNS über HTTPS</string>
-    <string name="dns_pref_summary">Nützlich für die Umgehung von ISP-Sperren</string>
+    <string name="dns_pref_summary">Nützlich zur Umgehung von ISP-Sperren</string>
     <string name="add_site_pref">Website klonen</string>
     <string name="remove_site_pref">Website entfernen</string>
     <string name="add_site_summary">Einen Klon einer bestehenden Website mit einer anderen URL hinzufügen</string>
     <string name="download_path_pref">Downloadpfad</string>
     <string name="nginx_url_pref">Nginx-Server-URL</string>
-    <string name="display_subbed_dubbed_settings">Dubbed/Subbed Anime anzeigen (Synchronisiert/Untertitelt)</string>
+    <string name="display_subbed_dubbed_settings">Dubbed/Subbed Anime anzeigen</string>
     <string name="resize_fit">An Bildschirm anpassen</string>
     <string name="resize_fill">Strecken</string>
     <string name="resize_zoom">Vergrößern</string>
@@ -308,7 +308,7 @@
     <string name="example_ip">127.0.0.1</string>
     <string name="example_site_name">MeineCooleSeite</string>
     <string name="example_site_url">example.com</string>
-    <string name="example_lang_name">Sprachcode (en)</string>
+    <string name="example_lang_name">Sprachencode (en)</string>
     <string name="login_format" formatted="true">%s %s</string>
     <string name="account">Account</string>
     <string name="logout">Ausloggen</string>
@@ -317,13 +317,13 @@
     <string name="add_account">Account hinzufügen</string>
     <string name="create_account">Account erstellen</string>
     <string name="add_sync">Synchronisation hinzufügen</string>
-    <string name="added_sync_format" formatted="true">Hinzugefügt %s</string>
+    <string name="added_sync_format" formatted="true">%s hinzugefügt</string>
     <string name="upload_sync">Sync</string>
     <string name="sync_score">Bewertung</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user" formatted="true">Authentifiziert %s</string>
+    <string name="authenticated_user" formatted="true">%s authentifiziert</string>
     <string name="authenticated_user_fail" formatted="true">Die Authentifizierung bei %s ist fehlgeschlagen</string>
     <string name="none">Keine</string>
     <string name="normal">Normal</string>
@@ -335,10 +335,10 @@
     <string name="subtitles_shadow">Schatten</string>
     <string name="subtitles_raised">Erhöht</string>
     <string name="subtitle_offset">Untertitel synchronisieren</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Untertitelverzögerung</string>
-    <string name="subtitle_offset_extra_hint_later_format">Verwenden, wenn die Untertitel %dms zu früh angezeigt werden</string>
-    <string name="subtitle_offset_extra_hint_before_format">Verwenden, wenn die Untertitel %dms zu spät angezeigt werden</string>
+    <string name="subtitle_offset_extra_hint_later_format">Verwenden, wenn die Untertitel %d ms zu früh angezeigt werden</string>
+    <string name="subtitle_offset_extra_hint_before_format">Verwenden, wenn die Untertitel %d ms zu spät angezeigt werden</string>
     <string name="subtitle_offset_extra_hint_none_format">Keine Untertitelverzögerung</string>
     <string name="subtitles_example_text">Vogel Quax zwickt Johnys Pferd Bim</string>
     <string name="recommended">Empfohlen</string>
@@ -359,7 +359,7 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="quality_blueray">BlueRay</string>
+    <string name="quality_blueray">Blue-ray</string>
     <string name="quality_workprint">WP</string>
     <string name="quality_dvd">DVD</string>
     <string name="quality_4k">4K</string>
@@ -390,7 +390,7 @@
     <string name="skip_setup">Einrichtung überspringen</string>
     <string name="app_layout_subtext">Aussehen der App passend zu dem des Geräts ändern</string>
     <string name="crash_reporting_title">Absturzmeldung</string>
-    <string name="preferred_media_subtext">Was möchtest du anschauen\?</string>
+    <string name="preferred_media_subtext">Was möchten Sie sehen\?</string>
     <string name="setup_done">Fertig</string>
     <string name="extensions">Erweiterungen</string>
     <string name="add_repository">Repository hinzufügen</string>
@@ -408,7 +408,7 @@
     <string name="plugin">Plugins</string>
     <string name="delete_repository_plugins">Dadurch werden auch alle Repository-Plugins gelöscht</string>
     <string name="delete_repository">Repository löschen</string>
-    <string name="setup_extensions_subtext">Lade eine Liste der Websiten herunter, welche du verwenden möchtest</string>
+    <string name="setup_extensions_subtext">Lade eine Liste der Websites herunter, welche du verwenden möchtest</string>
     <string name="plugins_downloaded" formatted="true">Heruntergeladen: %d</string>
     <string name="plugins_disabled" formatted="true">Deaktiviert: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Nicht heruntergeladen: %d</string>
@@ -416,7 +416,7 @@
 \n
 \nAufgrund eines hirnlosen DMCA-Takedowns durch Sky UK Limited 🤮 können wir die Repository-Site nicht in der App verlinken.
 \n
-\nTrete unserem Discord bei oder suche online.</string>
+\nTrete unserem Discord Server bei oder suche online.</string>
     <string name="view_public_repositories_button">Community-Repositories anzeigen</string>
     <string name="view_public_repositories_button_short">Öffentliche Liste</string>
     <string name="uppercase_all_subtitles">Alle Untertitel in Großbuchstaben</string>
@@ -427,7 +427,7 @@
     <string name="video_tracks">Videospuren</string>
     <string name="apply_on_restart">Bei Neustart anwenden</string>
     <string name="safe_mode_title">Abgesicherter Modus aktiviert</string>
-    <string name="safe_mode_description">Alle Erweiterungen wurden aufgrund eines Absturzes deaktiviert, damit Sie diejenige finden können, die Probleme verursacht.</string>
+    <string name="safe_mode_description">Alle Erweiterungen wurden aufgrund eines Absturzes deaktiviert, damit Sie diejenige finden können, welche Probleme verursacht.</string>
     <string name="safe_mode_crash_info">Absturzinfo ansehen</string>
     <string name="extension_rating" formatted="true">Bewertung: %s</string>
     <string name="extension_description">Beschreibung</string>
@@ -460,7 +460,7 @@
     <string name="automatic_plugin_download_summary">Automatische Installation aller noch nicht installierten Plugins aus hinzugefügten Repositories.</string>
     <string name="redo_setup_process">Einrichtungsvorgang wiederholen</string>
     <string name="apk_installer_settings">APK-Installer</string>
-    <string name="apk_installer_settings_des">Einige Telefone unterstützen den neuen Package-Installer nicht. Benutze die Legacy-Option, wenn sich die Updates nicht installieren lassen.</string>
+    <string name="apk_installer_settings_des">Einige Smartphones unterstützen den neuen Package-Installer nicht. Benutze die Legacy-Option, wenn sich die Updates nicht installieren lassen.</string>
     <string name="season_format">%s %d%s</string>
     <string name="pref_category_links">Links</string>
     <string name="pref_category_app_updates">App-Updates</string>
@@ -482,7 +482,7 @@
     <string name="no">Nein</string>
     <string name="update_notification_downloading">App-Update wird heruntergeladen…</string>
     <string name="update_notification_installing">App-Update wird installiert…</string>
-    <string name="update_notification_failed">Konnte die neue Version der App nicht installieren</string>
+    <string name="update_notification_failed">Die neue Version der App konnte nicht installieren werden</string>
     <string name="apk_installer_legacy">Legacy</string>
     <string name="apk_installer_package_installer">PackageInstaller</string>
     <string name="update_started">Aktualisierung gestartet</string>
@@ -493,18 +493,18 @@
     <string name="browser">Browser</string>
     <string name="sort_by">Sortieren nach</string>
     <string name="sort">Sortieren</string>
-    <string name="sort_rating_desc">Bewertung (gut bis schlecht)</string>
-    <string name="sort_rating_asc">Bewertung (schlecht bis gut)</string>
-    <string name="sort_updated_new">Aktualisiert (neu bis alt)</string>
-    <string name="sort_updated_old">Aktualisiert (alt bis neu)</string>
-    <string name="sort_alphabetical_a">Alphabetisch (A bis Z)</string>
-    <string name="sort_alphabetical_z">Alphabetisch (Z bis A)</string>
+    <string name="sort_rating_desc">Bewertung (gut zu schlecht)</string>
+    <string name="sort_rating_asc">Bewertung (schlecht zu gut)</string>
+    <string name="sort_updated_new">Aktualisiert (neu zu alt)</string>
+    <string name="sort_updated_old">Aktualisiert (alt zu neu)</string>
+    <string name="sort_alphabetical_a">Alphabetisch (A zu Z)</string>
+    <string name="sort_alphabetical_z">Alphabetisch (Z zu A)</string>
     <string name="select_library">Bibliothek auswählen</string>
     <string name="open_with">Öffnen mit</string>
     <string name="empty_library_no_accounts_message">Deine Bibliothek ist leer :(
 \nMelde dich mit einem Bibliothekskonto an oder füge Titel zu deiner lokalen Bibliothek hinzu.</string>
-    <string name="empty_library_logged_in_message">Diese Liste ist leer. Versuche zu einer anderen Liste zu wechseln.</string>
-    <string name="safe_mode_file">Datei für abgesicherten Modus gefunden!
+    <string name="empty_library_logged_in_message">Diese Liste ist leer. Versuch zu einer anderen Liste zu wechseln.</string>
+    <string name="safe_mode_file">Datei für den abgesicherten Modus gefunden!
 \nBeim Start werden keine Erweiterungen geladen, bis die Datei entfernt wird.</string>
     <string name="android_tv_interface_off_seek_settings">Player ausgeblendet - Betrag zum vor- und zurückspulen</string>
     <string name="android_tv_interface_on_seek_settings_summary">Der Betrag, welcher verwendet wird, wenn der Player eingeblendet ist</string>
@@ -529,4 +529,27 @@
     <string name="revert">Rückgängig</string>
     <string name="subscription_list_name">Abonniert</string>
     <string name="pref_category_bypass">ISP-Umgehungen</string>
+    <string name="profile_number">Profil %d</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="mobile_data">Mobile Daten</string>
+    <string name="set_default">Standard festlegen</string>
+    <string name="use">Verwenden</string>
+    <string name="edit">Bearbeiten</string>
+    <string name="profiles">Profile</string>
+    <string name="help">Hilfe</string>
+    <string name="qualities">Qualitäten</string>
+    <string name="profile_background_des">Profil-Hintergrund</string>
+    <string name="quality_profile_help">Hier kannst du verändern, wie die Quellen geordnet werden. Wenn ein Video eine höhere Priorität hat, wird es höher in der Quellenauswahl erscheinen. Die Summe der Quellenpriorität und der Qualitätspriorität ist die Videopriorität.
+\n
+\nQuelle A: 3
+\nQualität B: 7
+\nWerden eine kombinierte Videopriorität von 10 haben.
+\n
+\nHINWEIS: Wenn die Summe 10 oder mehr beträgt, überspringt der Player automatisch das Laden, wenn der Link geladen wird!</string>
+    <string name="automatic_plugin_download_mode_title">Filtermodus für Plugin-Downloads auswählen</string>
+    <string name="already_voted">Es wurde bereits abgestimmt</string>
+    <string name="no_plugins_found_error">Keine Plugins im Repository gefunden</string>
+    <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>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 5e02924f..e88e4fc0 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -7,7 +7,7 @@
     <string name="title_settings">Ρυθμίσεις</string>
     <string name="play_with_app_name">Άνοιγμα με CloudStream</string>
     <string name="search_hint">Αναζήτηση…</string>
-    <string name="search_poster_img_des">Πόστερ</string>
+    <string name="search_poster_img_des">Αφίσα</string>
     <string name="no_data">Χωρίς δεδομένα</string>
     <string name="episode_more_options_des">Περισσότερες Επιλογές</string>
     <string name="go_back_img_des">Πίσω</string>
@@ -96,9 +96,9 @@
     <string name="eigengraumode_settings">Eigengravy Mode</string>
     <string name="eigengraumode_settings_des">Προσθέτει την επιλογή ταχύτητας στο πρόγραμμα αναπαραγωγής</string>
     <string name="swipe_to_seek_settings">Σύρετε για αναζήτηση</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="double_tap_to_seek_settings">Διπλό πάτημα για αναζήτηση</string>
     <string name="double_tap_to_seek_settings_des">Διπλό πάτημα στα αριστερά ή δεξιά για αναζήτηση προς τα μπροστά ή πίσω</string>
     <string name="search">Αναζήτηση</string>
@@ -108,7 +108,7 @@
     <string name="bug_report_settings_off">Αποστέλλει δεδομένα μόνο για καταρρεύσεις</string>
     <string name="bug_report_settings_on">Δεν στέλνει δεδομένα</string>
     <string name="updates_settings">Εμφάνιση ενημερώσεων</string>
-    <string name="updates_settings_des">Αυτόματη αναζήτηση νέων ενημερώσεων</string>
+    <string name="updates_settings_des">Αυτόματη αναζήτηση νέων ενημερώσεων κατά την εκκίνηση της εφαρμογής.</string>
     <string name="uprereleases_settings">Ενημέρωση σε προ-εκδόσεις (beta)</string>
     <string name="uprereleases_settings_des">Αναζητήστε ενημερώσεις προ-εκδόσεων (beta) αντί για σταθερές εκδόσεις (stable)</string>
     <string name="github">GitHub</string>
@@ -121,7 +121,7 @@
     <string name="rated_format" formatted="true">Βαθμολογία: %.1f</string>
     <string name="new_update_format" formatted="true">Νέα διαθέσιμη ενημέρωση!
 \n%s -&gt; %s</string>
-    <string name="double_tap_to_pause_settings_des">Πάτημα στη μέση για παύση</string>
+    <string name="double_tap_to_pause_settings_des">Πατήστε δύο φορές στη μέση για παύση</string>
     <string name="use_system_brightness_settings">Χρήση φωτεινότητας συστήματος</string>
     <string name="use_system_brightness_settings_des">Χρήση φωτεινότητας συστήματος στο ενσωματωμένο πρόγραμμα αναπαραγωγής, αντί εφαρμογής προεπιλεγμένου σκούρου επικαλύμματος</string>
     <string name="episode_sync_settings">Ενημέρωση προόδου παρακολούθησης</string>
@@ -214,7 +214,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">Μέγεθος buffer για βίντεο</string>
@@ -390,7 +390,7 @@
     <string name="action_open_play">@string/home_play</string>
     <string name="provider_info_meta">Δεν έχουν παρασχεθεί μεταδεδομένα από τον ιστότοπο, η φόρτωση του βίντεο θα αποτύχει αν δεν υπάρχει στον ιστότοπο.</string>
     <string name="double_tap_to_pause_settings">Διπλό πάτημα για παύση</string>
-    <string name="double_tap_to_seek_amount_settings">Μέγεθος αναζήτησης στο πρόγραμμα αναπαραγωγής</string>
+    <string name="double_tap_to_seek_amount_settings">Μέγεθος αναζήτησης στο πρόγραμμα αναπαραγωγής (σε δευτερόλεπτα)</string>
     <string name="automatic_plugin_updates">Αυτόματη ενημέρωση plugin</string>
     <string name="automatic_plugin_download">Αυτόματη λήψη plugin</string>
     <string name="dns_pref">DNS μέσω HTTPS</string>
@@ -452,7 +452,7 @@
     <string name="skip_type_mixed_ed">Ανάμεικτοι τίτλοι τέλους</string>
     <string name="go_back_30">-30</string>
     <string name="rating">Κριτική</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="ova_singular">OVA</string>
     <string name="pref_category_app_updates">Ενημερώσεις εφαρμογής</string>
     <string name="pref_category_backup">Αντίγραφο ασφαλείας</string>
     <string name="pref_category_extensions">Extensions</string>
@@ -464,7 +464,7 @@
     <string name="pref_category_defaults">Προεπιλεγμένα</string>
     <string name="login_format" formatted="true">%s %s</string>
     <string name="subs_font_size">Μέγεθος γραμματοσειράς</string>
-    <string name="anime_singular">@string/anime</string>
+    <string name="anime_singular">Άνιμε</string>
     <string name="pref_category_links">Σύνδεσμοι</string>
     <string name="pref_category_looks">Εμφάνιση</string>
     <string name="pref_category_ui_features">Χαρακτηριστικά</string>
@@ -500,12 +500,53 @@
     <string name="sort_by">Ταξινόμηση με βάση</string>
     <string name="sort_alphabetical_a">Αλφαβητικά (Α προς Ω)</string>
     <string name="select_library">Διάλεξε βιβλιοθήκη</string>
-    <string name="empty_library_logged_in_message">Φαίνεται πως η λίστα είναι άδεια, δοκίμασε να μεταβείς σε μία άλλη</string>
+    <string name="empty_library_logged_in_message">Αυτή η λίστα είναι άδεια. Δοκιμάστε μια άλλη.</string>
     <string name="action_remove_from_watched">Αφαίρεση από παρακολουθημένα</string>
     <string name="browser">Περιηγητής</string>
     <string name="open_with">Άνοιγμα με</string>
-    <string name="empty_library_no_accounts_message">Φαίνεται πως η βιβλιοθήκη σου είναι άδεια :(
-\nΣυνδέσου σε έναν λογαριασμό που έχει βιβλιοθήκη, ή πρόσθεσε σειρές στην τοπική βιβλιοθήκη σου</string>
+    <string name="empty_library_no_accounts_message">Η βιβλιοθήκη σας είναι άδεια :(
+\nΣυνδεθείτε με έναν λογαριασμό βιβλιοθήκης ή προσθέστε σειρές στην τοπική βιβλιοθήκη σας.</string>
     <string name="safe_mode_file">Βρέθηκε αρχείο Ασφαλούς Λειτουργίας!
 \nΔεν πρόκειται να φορτωθούν extensions κατά το ξεκίνημα μέχρι να διαγραφεί το αρχείο.</string>
+    <string name="test_log">Αρχείο Καταγραφής</string>
+    <string name="test_failed">Απέτυχε</string>
+    <string name="test_passed">Πέτυχε</string>
+    <string name="start">Εκκίνηση</string>
+    <string name="no_plugins_found_error">Δε βρέθηκαν επεκτάσεις στο αποθετήριο</string>
+    <string name="no_repository_found_error">Δε βρέθηκε αποθετήριο, ελέγξτε την URL και δοκιμάστε VPN</string>
+    <string name="quality_profile_help">Από εδώ μπορείτε να αλλάξετε τον τρόπο σειράς των πηγών. Εάν ένα βίντεο έχει υψηλότερη προτεραιότητα, θα εμφανίζεται ψηλότερα στην επιλογή πηγής. Το άθροισμα της προτεραιότητας πηγής και της ποιότητας, είναι η προτεραιότητα του βίντεο.
+\n
+\nΠηγή Α: 3
+\nΠοιότητα Β: 7
+\nΘα έχει συνδυασμένη προτεραιότητα βίντεο 10.
+\n
+\nΣΗΜΕΙΩΣΗ: Εάν το άθροισμα είναι 10 ή περισσότερο, η συσκευή αναπαραγωγής θα παραλείψει αυτόματα τη φόρτωση όταν φορτωθεί αυτός ο σύνδεσμος!</string>
+    <string name="category_provider_test">Δοκιμή παρόχου</string>
+    <string name="watch_quality_pref_data">Προτιμώμενη ποιότητας παρακολούθησης (Δεδομένα τηλεφώνου)</string>
+    <string name="jsdelivr_proxy">Διακομιστής μεσολάβησης raw.githubusercontent.com</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="subscription_in_progress_notification">Ενημέρωση εγγεγραμμένων εκπομπών</string>
+    <string name="subscription_new">Έγινε εγγραφή σε %s</string>
+    <string name="revert">Επαναφορά</string>
+    <string name="subscription_episode_released">Δημοσιεύθηκε το επεισόδιο %d!</string>
+    <string name="help">Βοήθεια</string>
+    <string name="qualities">Ποιότητες</string>
+    <string name="profile_background_des">Φόντο προφίλ</string>
+    <string name="restart">Επανεκκίνηση</string>
+    <string name="jsdelivr_enabled">Το GitHub δεν είναι προσβάσιμο. Ενεργοποίηση διακομιστή μεσολάβησης jsDelivr…</string>
+    <string name="pref_category_bypass">Παράκαμψη ISP</string>
+    <string name="subscription_deleted">Αφαιρέθηκε η εγγραφή από %s</string>
+    <string name="subscription_list_name">Εγγεγραμμένος</string>
+    <string name="profile_number">Προφίλ %d</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="mobile_data">Δεδομένα τηλεφώνου</string>
+    <string name="set_default">Ορισμός προεπιλογής</string>
+    <string name="use">Χρήση</string>
+    <string name="edit">Επεξεργασία</string>
+    <string name="profiles">Προφίλ</string>
+    <string name="unable_to_inflate">Το UI δεν ήταν σε θέση να δημιουργηθεί σωστά, είναι ένα σφάλμα και θα πρέπει να αναφερθεί αμέσως %s</string>
+    <string name="automatic_plugin_download_mode_title">Επιλέξτε κατάσταση για φιλτράρισμα επεκτάσεων για λήψη</string>
+    <string name="disable">Απενεργοποιημένο</string>
+    <string name="default_account">@string/default_subtitles</string>
+    <string name="stop">Τέλος</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d248044d..8e9f9c2c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -503,7 +503,7 @@
     <string name="select_library">Seleccionar biblioteca</string>
     <string name="open_with">Abrir con</string>
     <string name="empty_library_no_accounts_message">Tu biblioteca está vacía :(
-\nRegístrate con una cuenta en la biblioteca o agrega los títulos a tu biblioteca local.</string>
+\nInicia sesión en una cuenta de biblioteca o añade series desde tu biblioteca local.</string>
     <string name="safe_mode_file">¡Se encontró un archivo en modo seguro!
 \nNo cargar ninguna extensión al inicio hasta que se elimine el archivo.</string>
     <string name="android_tv_interface_on_seek_settings">Reproductor visible - buscar cantidad</string>
@@ -529,4 +529,28 @@
     <string name="revert">Revertir</string>
     <string name="pref_category_bypass">ISP Bypasses</string>
     <string name="watch_quality_pref_data">Calidad de visualización preferida (Datos móviles)</string>
+    <string name="help">Ayuda</string>
+    <string name="quality_profile_help">Aquí puedes cambiar el orden de las fuentes. Si un vídeo tiene una prioridad más alta, aparecerá más arriba en la selección de las fuentes. La suma de la prioridad de la fuente y la prioridad de la calidad es la prioridad del vídeo.
+\n
+\nFuente A: 3
+\nCalidad B: 7
+\nTendrá una prioridad en el vídeo combinada de 10.
+\n
+\nNOTA: ¡Si la suma es 10 o más el reproductor saltará automáticamente la carga cuando se cargue ese enlace!</string>
+    <string name="profile_number">Perfil %d</string>
+    <string name="wifi">Wifi</string>
+    <string name="edit">Editar</string>
+    <string name="profiles">Perfiles</string>
+    <string name="mobile_data">Datos móviles</string>
+    <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="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="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>
 </resources>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 2e4b89b3..f9d28e24 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -45,4 +45,12 @@
     <string name="cartoons">کارتونها</string>
     <string name="used_storage">استفاده شده</string>
     <string name="app_storage">برنامه</string>
+    <string name="go_back_img_des">بازگشت</string>
+    <string name="autoplay_next_settings_des">آغاز قسمت بعد پس از پایان قسمت فعلی</string>
+    <string name="home_change_provider_img_des">تغییر ارائه دهنده</string>
+    <string name="action_remove_watching">حذف</string>
+    <string name="action_open_watching">اطلاعات بیشتر</string>
+    <string name="torrent_plot">شرح</string>
+    <string name="subs_subtitle_languages">زبان زیرنویس</string>
+    <string name="player_subtitles_settings">زیرنویس</string>
 </resources>
diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
new file mode 100644
index 00000000..42eba3cc
--- /dev/null
+++ b/app/src/main/res/values-fil/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources/>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 36c1cf1f..63d03a6b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -530,4 +530,28 @@
     <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="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.
+\n
+\nSource A : 3
+\nQualité B : 7
+\nLa priorité vidéo combinée sera de 10.
+\n
+\nREMARQUE : Si la somme est de 10 ou plus, le joueur sautera automatiquement le chargement lorsque ce lien est chargé !</string>
+    <string name="no_plugins_found_error">Aucun plugin trouvé dans ce dossier</string>
+    <string name="no_repository_found_error">Dépôt introuvable, vérifiez l\'URL et essayez avec un VPN</string>
+    <string name="mobile_data">Données mobiles</string>
+    <string name="set_default">Définir par défaut</string>
+    <string name="use">Utiliser</string>
+    <string name="edit">Modifier</string>
+    <string name="profiles">Profils</string>
+    <string name="help">Aide</string>
+    <string name="profile_number">Profil %d</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="qualities">Qualités</string>
+    <string name="unable_to_inflate">L\'interface utilisateur n\'a pas pu être créée correctement. Il s\'agit d\'un bogue majeur qui doit être signalé immédiatement %s</string>
+    <string name="automatic_plugin_download_mode_title">Sélectionnez le mode pour filtrer le téléchargement des plugins</string>
+    <string name="profile_background_des">Fond de profil</string>
+    <string name="default_account">@string/default_subtitles</string>
 </resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
new file mode 100644
index 00000000..ad7916be
--- /dev/null
+++ b/app/src/main/res/values-gl/strings.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <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="home_main_poster_img_des">Póster Principal</string>
+    <string name="home_next_random_img_des">Seguinte ó azar</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
+    <string name="cast_format" formatted="true">Elenco: %s</string>
+    <string name="next_episode_format" formatted="true">O episodio %d se lanzará en</string>
+    <string name="result_poster_img_des">Póster</string>
+    <string name="search_poster_img_des">Cartel</string>
+    <string name="episode_poster_img_des">Póster do Episodio</string>
+    <string name="go_back_img_des">Regresar</string>
+    <string name="home_change_provider_img_des">Cambiar provedor</string>
+    <string name="new_update_format" formatted="true">Nova actualización atopada!
+\n%s -&gt; %s</string>
+    <string name="filler" formatted="true">Recheo</string>
+    <string name="duration_format" formatted="true">%d min</string>
+    <string name="title_settings">Configuración</string>
+    <string name="search_hint">Procurar…</string>
+    <string name="search_hint_site" formatted="true">Procurar en %s…</string>
+    <string name="no_data">Sen datos</string>
+    <string name="episode_more_options_des">Máis opcións</string>
+    <string name="next_episode">Seguinte episodio</string>
+    <string name="result_tags">Xéneros</string>
+    <string name="type_watching">Mirando</string>
+    <string name="type_on_hold">En espera</string>
+    <string name="type_completed">Completado</string>
+    <string name="type_dropped">Descartado</string>
+    <string name="type_plan_to_watch">Planeando ver</string>
+    <string name="type_none">Ningún</string>
+    <string name="type_re_watching">Remirando</string>
+    <string name="error_bookmarks_text">Marcadores</string>
+    <string name="action_remove_from_bookmarks">Borrar</string>
+    <string name="action_add_to_bookmarks">Seleccionar estado de visualización</string>
+    <string name="sort_apply">Aplicar</string>
+    <string name="sort_cancel">Cancelar</string>
+    <string name="sort_copy">Copiar</string>
+    <string name="sort_close">Cerrar</string>
+    <string name="sort_clear">Limpar</string>
+    <string name="sort_save">Gardar</string>
+    <string name="player_speed">Velocidade do reproductor</string>
+    <string name="subtitles_settings">Configurar Subtítulos</string>
+    <string name="subs_background_color">Cor de Fondo</string>
+    <string name="subs_text_color">Cor de Texto</string>
+    <string name="subs_outline_color">Cor de Contorno</string>
+    <string name="subs_window_color">Cor de Ventá</string>
+    <string name="continue_watching">Continuar Vendo</string>
+    <string name="rated_format" formatted="true">Nota: %.1f</string>
+    <string name="app_name">CloudStream</string>
+    <string name="title_home">Inicio</string>
+    <string name="title_downloads">Descarga</string>
+    <string name="result_share">Compartir</string>
+    <string name="result_open_in_browser">Abrir no Navegador</string>
+    <string name="browser">Navegador</string>
+    <string name="skip_loading">Omitir carga</string>
+    <string name="loading">Cargando…</string>
+    <string name="play_movie_button">Reproducir o filme</string>
+    <string name="play_trailer_button">Reproducir Trailer</string>
+    <string name="play_livestream_button">Reproducir transmisión en vivo</string>
+    <string name="play_torrent_button">Transmitir Torrent</string>
+    <string name="pick_source">Fontes</string>
+    <string name="reload_error">Tentar de novo a conexión…</string>
+    <string name="go_back">Volver</string>
+    <string name="play_episode">Reproducir Episodio</string>
+    <string name="download">Descargar</string>
+    <string name="downloaded">Descargado</string>
+    <string name="downloading">Descargando</string>
+    <string name="download_paused">Descarga Pausada</string>
+    <string name="download_started">Descarga comezada</string>
+    <string name="download_failed">Descarga Fallida</string>
+    <string name="download_canceled">Descarga Cancelada</string>
+    <string name="download_done">Descarga rematada</string>
+    <string name="update_started">Actualización Comezada</string>
+    <string name="app_subbed_text">Subtitulado</string>
+    <string name="popup_delete_file">Borrar Arquivo</string>
+    <string name="popup_play_file">Reproducir Arquivo</string>
+    <string name="popup_resume_download">Continuar Descarga</string>
+    <string name="popup_pause_download">Pausar Descarga</string>
+    <string name="pref_disable_acra">Desactivar reporte automático de bugs</string>
+    <string name="home_more_info">Máis información</string>
+    <string name="home_expanded_hide">Agochar</string>
+    <string name="home_play">Reproducir</string>
+    <string name="subs_edge_type">Tipo de Borde</string>
+    <string name="subs_font">Fonte</string>
+    <string name="benene_count_text_none">Non se deron bananas</string>
+    <string name="subs_auto_select_language">Seleccionar idioma automáticamente</string>
+    <string name="subs_download_languages">Descargar Idiomas</string>
+    <string name="subs_subtitle_languages">Idioma do Subtítulo</string>
+    <string name="subs_hold_to_reset_to_default">Manteña premido para restablecer os valores predeterminados</string>
+    <string name="subs_import_text" formatted="true">Importar fontes colocandoas en %s</string>
+    <string name="action_remove_watching">Borrar</string>
+    <string name="action_open_watching">Máis Info</string>
+    <string name="action_open_play">@string/home_play</string>
+    <string name="vpn_might_be_needed">Unha VPN pode ser necesaria para o correcto funcionamento deste provedor</string>
+    <string name="vpn_torrent">Este proveedor é un torrent, recomendase o uso dunha VPN</string>
+    <string name="provider_info_meta">Os metadatos non son proporcionados polo sitio, a carga do video fallará se non existe no sitio</string>
+    <string name="torrent_plot">Descripción</string>
+    <string name="normal_no_plot">Trama non atopada</string>
+    <string name="torrent_no_plot">Descripción non atopada</string>
+    <string name="show_log_cat">Amosar Logcat 🐈</string>
+    <string name="test_log">Rexistro</string>
+    <string name="picture_in_picture_des">Continúa a reprodución nun reproductor miniatura enriba doutras aplicacións</string>
+    <string name="play_with_app_name">Reproducir con CloudStream</string>
+    <string name="title_search">Procurar</string>
+    <string name="preview_background_img_des">Vista previa do fondo</string>
+    <string name="player_speed_text_format" formatted="true">Velocidade (%.2fx)</string>
+    <string name="pick_subtitle">Subtítulos</string>
+    <string name="stream">Transmitir</string>
+    <string name="error_loading_links_toast">Error Cargando Ligazón</string>
+    <string name="app_dubbed_text">Dobrado</string>
+    <string name="filter_bookmarks">Filtrar Marcadores</string>
+    <string name="download_storage_text">Almacenamento Interno</string>
+    <string name="subs_font_size">Tamaño de Fonte</string>
+    <string name="home_info">Info</string>
+    <string name="subs_subtitle_elevation">Elevación de Subtítulo</string>
+    <string name="search_provider_text_providers">Procurar usando proveedores</string>
+    <string name="benene_count_text">%d Bananas dadas aos desenvolvedores</string>
+    <string name="search_provider_text_types">Procurar por tipos</string>
+    <string name="picture_in_picture">Imaxe en Imaxe</string>
+    <string name="player_subtitles_settings_des">Configuración de subtítulos do reprodutor</string>
+    <string name="chromecast_subtitles_settings">Subtítulos de Chromecast</string>
+    <string name="chromecast_subtitles_settings_des">Configuración de subtítulos de Chromecast</string>
+    <string name="eigengraumode_settings">Modo Eigengravy</string>
+    <string name="eigengraumode_settings_des">Engadir a opción de velocidade no reprodutor</string>
+    <string name="swipe_to_seek_settings">Deslice para avanzar/retroceder</string>
+    <string name="swipe_to_seek_settings_des">Deslice o dedo de lado a lado para controlar a posición nun video</string>
+    <string name="swipe_to_change_settings">Deslice para cambiar a configuración</string>
+    <string name="swipe_to_change_settings_des">Deslice cara arriba ou cara abaixo no lado esquerdo ou dereito para cambiar o brillo ou o volumen</string>
+    <string name="autoplay_next_settings">Reproducir automáticamente episodio seguinte</string>
+    <string name="autoplay_next_settings_des">Comezar o seguinte episodio cando o actual remate</string>
+    <string name="double_tap_to_seek_settings">Toca dúas veces para procurar</string>
+    <string name="double_tap_to_pause_settings">Tocar dúas veces para pausar</string>
+    <string name="double_tap_to_seek_amount_settings">Tempo de rebobinado do reprodutor (segundos)</string>
+    <string name="double_tap_to_seek_settings_des">Toque dúas veces no lado dereito ou esquerdo para rebobinar cara adiante ou cara atrás</string>
+    <string name="double_tap_to_pause_settings_des">Toque dúas veces no medio para pausar</string>
+    <string name="use_system_brightness_settings">Usar brillo do sistema</string>
+    <string name="episode_sync_settings">Actualizar progreso do visto</string>
+    <string name="restore_settings">Restaurar datos dende o respaldo</string>
+    <string name="backup_settings">Crear respaldo de datos</string>
+    <string name="restore_success">Arquivo de respaldo cargado</string>
+    <string name="restore_failed_format" formatted="true">Fallou a restauración dos datos dende o arquivo %s</string>
+    <string name="backup_success">Datos gardados</string>
+    <string name="backup_failed">Faltan permisos de almacenamento. Por favor tenteo de novo.</string>
+    <string name="backup_failed_error_format">Error respaldando de %s</string>
+    <string name="search">Procurar</string>
+    <string name="library">Biblioteca</string>
+    <string name="category_account">Contas</string>
+    <string name="category_updates">Actualizacións e copias de seguridade</string>
+    <string name="settings_info">Info</string>
+    <string name="advanced_search">Procura Avanzada</string>
+    <string name="advanced_search_des">Da os resultados da procura separados por proveedor</string>
+    <string name="player_size_settings">Botón de cambio de tamaño do reprodutor</string>
+    <string name="player_size_settings_des">Eliminar bordes negros</string>
+    <string name="player_subtitles_settings">Subtítulos</string>
+    <string name="episode_sync_settings_des">Sincronizar automáticamente o progreso do episodio actual</string>
+    <string name="use_system_brightness_settings_des">Use o brillo do sistema no reprodutor da aplicación en lugar dunha superposición oscura</string>
+    <string name="bug_report_settings_off">Só envía datos se a aplicacción falla inesperadamente</string>
+    <string name="bug_report_settings_on">Non enviar datos</string>
+    <string name="show_fillers_settings">Mostrar episodio de recheo para Anime</string>
+    <string name="show_trailers_settings">Mostrar Trailers</string>
+    <string name="kitsu_settings">Mostrar pósters de Kitsu</string>
+    <string name="pref_filter_search_quality">Ocultar calidade de video nos resultados da procura</string>
+    <string name="automatic_plugin_updates">Actualicación automática de complementos</string>
+    <string name="automatic_plugin_download">Descarga automática de complementos</string>
+    <string name="automatic_plugin_download_mode_title">Selecciona o modo para filtrar a descarga dos complementos</string>
+    <string name="automatic_plugin_download_summary">Instala automáticamente todos os complementos aínda non instalados dos repositorios engadidos.</string>
+    <string name="updates_settings">Mostrar actualizacións da aplicación</string>
+</resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 754b7a3a..477ab92b 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -48,7 +48,7 @@
     <string name="result_share">Podijeli</string>
     <string name="result_open_in_browser">Otvori u pregledniku</string>
     <string name="skip_loading">Preskoči učitavanje</string>
-    <string name="loading">Učitavanje...</string>
+    <string name="loading">Učitavanje …</string>
     <string name="type_watching">Gledam</string>
     <string name="type_on_hold">Na čekanju</string>
     <string name="type_completed">Dovršeno</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">Izgled</string>
+    <string name="category_ui">Respored</string>
     <string name="automatic">Auto</string>
     <string name="tv_layout">TV izgled</string>
     <string name="phone_layout">Izgled za telefone</string>
@@ -417,22 +417,22 @@
     <string name="add_repository">Dodaj repository</string>
     <string name="repository_name_hint">Ime repositorya</string>
     <string name="repository_url_hint">URL spremišta (repositorija)</string>
-    <string name="plugin_loaded">Dodatak je učitan</string>
-    <string name="plugin_deleted">Dodatak je izbrisan</string>
+    <string name="plugin_loaded">Dodatak učitan</string>
+    <string name="plugin_deleted">Dodatak izbrisan</string>
     <string name="plugin_load_fail" formatted="true">Nije moguće učitati %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">Započelo preuzimanje %d %s…</string>
     <string name="batch_download_finish_format" formatted="true">Preuzeto %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Sve %s je već preuzeto</string>
     <string name="batch_download">Skupno preuzimanje</string>
-    <string name="plugin_singular">plugin</string>
-    <string name="plugin">plugins</string>
-    <string name="delete_repository_plugins">Ovo će također izbrisati sve dodatke spremišta</string>
+    <string name="plugin_singular">dodatak</string>
+    <string name="plugin">dodaci</string>
+    <string name="delete_repository_plugins">Ovo će također izbrisati sve dodatke repozitorija</string>
     <string name="delete_repository">Izbriši repository</string>
     <string name="setup_extensions_subtext">Preuzmi popis stranica koje želite koristiti</string>
     <string name="plugins_downloaded" formatted="true">Preuzeto: %d</string>
     <string name="plugins_disabled" formatted="true">Onemogućeno: %d</string>
-    <string name="plugins_not_downloaded" formatted="true">Nije preuzeto: %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Nepreuzeto: %d</string>
     <string name="blank_repo_message">CloudStream nema instalirane web stranice prema zadanim postavkama. Morate instalirati stranice iz repozitorija.
 \n
 \nZbog bezumnog uklanjanja DMCA od strane Sky UK Limited 🤮 ne možemo povezati web mjesto repozitorija u aplikaciji.
@@ -459,9 +459,9 @@
     <string name="extension_types">Podržano</string>
     <string name="extension_language">Jezik</string>
     <string name="hls_playlist">HLS Playlista</string>
-    <string name="automatic_plugin_download">Automatski instaliraj ekstenzije</string>
+    <string name="automatic_plugin_download">Automatski instaliraj dodatke</string>
     <string name="skip_type_creddits">Zasluge</string>
-    <string name="automatic_plugin_download_summary">Automatski instaliraj sve neinstalirane ekstenzije iz dodanih repozitorija.</string>
+    <string name="automatic_plugin_download_summary">Automatski instaliraj sve neinstalirane dodatke iz dodanih repozitorija.</string>
     <string name="player_pref">Preferirani video player</string>
     <string name="player_settings_play_in_app">Interni player</string>
     <string name="extension_install_first">Prvo instalirajte ekstenziju</string>
@@ -479,7 +479,7 @@
     <string name="no">Ne</string>
     <string name="update_notification_installing">Instaliranje ažuriranja aplikacije…</string>
     <string name="update_notification_failed">Nije moguće instalirati novu verziju aplikacije</string>
-    <string name="plugins_updated" formatted="true">Ažurirano %d ekstenzija</string>
+    <string name="plugins_updated" formatted="true">Ažurirano %d dodataka</string>
     <string name="skip_type_mixed_op">Mješoviti početak</string>
     <string name="skip_type_intro">Uvod</string>
     <string name="pref_category_links">Linkovi</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">Izgled</string>
+    <string name="pref_category_player_layout">Respored</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>
@@ -554,4 +554,27 @@
     <string name="jsdelivr_enabled">Neuspješno dohvaćanje GitHuba. Uključuje se jsdelivr proxy …</string>
     <string name="jsdelivr_proxy_summary">Zaobilazi blokiranje GitHuba koristeći jsdelivr. Može odgoditi ažuriranja za nekoliko dana.</string>
     <string name="watch_quality_pref_data">Preferirana kvaliteta gledanja (podatkovna mobilna mreža)</string>
+    <string name="profile_number">Profil %d</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="mobile_data">Mobilni podaci</string>
+    <string name="set_default">Postavi standardnu vrijednost</string>
+    <string name="use">Koristi</string>
+    <string name="edit">Uredi</string>
+    <string name="profiles">Profili</string>
+    <string name="help">Pomoć</string>
+    <string name="qualities">Kvalitete</string>
+    <string name="profile_background_des">Pozadina profila</string>
+    <string name="unable_to_inflate">Nije bilo moguće ispravno izraditi korisničko sučelje. Ovo je ZNAČAJNA GREŠKA i treba se odmah prijaviti %s</string>
+    <string name="automatic_plugin_download_mode_title">Odaberi modus za filtriranje preuzimanja dodataka</string>
+    <string name="disable">Onemogući</string>
+    <string name="default_account">@string/default_subtitles</string>
+    <string name="no_plugins_found_error">U repozitoriju nisu pronađeni dodaci</string>
+    <string name="no_repository_found_error">Repozitorij nije pronađen, provjerite URL i pokušajte koristiti VPN</string>
+    <string name="quality_profile_help">Ovdje možete promijeniti način na koji su izvori poredani. Ako video ima viši prioritet, pojavit će se više u odabiru izvora. Zbroj prioriteta izvora i prioriteta kvalitete je video prioritet.
+\n
+\nIzvor A: 3
+\nKvaliteta B: 7
+\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>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 46407f76..677beaf8 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -190,7 +190,7 @@
     <string name="backup_success">Adatok eltárolva</string>
     <string name="backup_failed_error_format">Hiba a biztonsági mentés során %s</string>
     <string name="category_account">Fiókok</string>
-    <string name="advanced_search_des">Szolgáltatás szerinti keresés eredmények</string>
+    <string name="advanced_search_des">Szolgáltató szerint elkülönítve adja meg a keresési eredményeket</string>
     <string name="bug_report_settings_on">Nem küld adatokat</string>
     <string name="kitsu_settings">Poszterek megjelenítése Kitsu-ról</string>
     <string name="pref_filter_search_quality">Kiválasztott videóminőségek elrejtése keresési eredményekbe</string>
@@ -198,7 +198,7 @@
     <string name="automatic_plugin_download">Bővítmények automatikus letöltése</string>
     <string name="automatic_plugin_download_summary">Automatikusan telepíti az összes még nem telepített bővítményt a hozzáadott tárolókból.</string>
     <string name="updates_settings">Alkalmazás frissítések megjelenítése</string>
-    <string name="updates_settings_des">Automatikusan keressen új frissítéseket indításkor</string>
+    <string name="updates_settings_des">Automatikusan keressen új frissítéseket indításkor.</string>
     <string name="uprereleases_settings">Frissítés az előzetes kiadásokhoz (prerelease)</string>
     <string name="uprereleases_settings_des">Csak előzetesen kiadott frissítések (prerelease) keresése a teljes kiadások helyett</string>
     <string name="github">Github</string>
@@ -219,7 +219,7 @@
     <string name="status_ongoing">Folyamatban levő</string>
     <string name="year">Év</string>
     <string name="site">Webhely</string>
-    <string name="synopsis">Szinopszis</string>
+    <string name="synopsis">Összegzés</string>
     <string name="no_subtitles">Nincsenek feliratok</string>
     <string name="remote_error">Távoli hiba</string>
     <string name="render_error">Render hiba</string>
@@ -232,30 +232,30 @@
     <string name="episode_action_play_in_browser">Lejátszás böngészőben</string>
     <string name="episode_action_download_subtitle">Feliratok letöltése</string>
     <string name="reload_error">Újracsatlakozás…</string>
-    <string name="swipe_to_seek_settings_des">Swipe balra vagy jobbra a videólejátszóban az idő vezérléséhez</string>
+    <string name="swipe_to_seek_settings_des">Húzd balra vagy jobbra a videólejátszóban az idő vezérléséhez</string>
     <string name="swipe_to_change_settings">Csúsztassa ujját a beállítások módosításához</string>
-    <string name="swipe_to_change_settings_des">Csúsztassa az újját bal vagy jobb oldalon a fényerő vagy hangerő megváltoztatásához</string>
+    <string name="swipe_to_change_settings_des">Csúsztassa felfelé vagy lefelé a bal vagy jobb oldalon a fényerő vagy a hangerő megváltoztatásához</string>
     <string name="backup_settings">Biztonsági mentés</string>
     <string name="benene_count_text_none">0 Banán a fejlesztőknek</string>
-    <string name="swipe_to_seek_settings">Swipe to seek</string>
+    <string name="swipe_to_seek_settings">Húzd el, hogy beless</string>
     <string name="autoplay_next_settings">Következő epizód automatikus lejátszása</string>
     <string name="autoplay_next_settings_des">Következő epizód lejátszása amikor az aktuális epizód véget ér</string>
-    <string name="double_tap_to_seek_settings">Dupla koppintás to seek</string>
+    <string name="double_tap_to_seek_settings">Dupla koppintás a kereséshez</string>
     <string name="double_tap_to_pause_settings">Dupla koppintás a szüneteltetéshez</string>
-    <string name="double_tap_to_seek_amount_settings">Player seek amount</string>
+    <string name="double_tap_to_seek_amount_settings">Lejátszó keresési értéke (Másodpercben)</string>
     <string name="double_tap_to_seek_settings_des">Koppintson kétszer a jobb vagy bal oldalra az előre vagy hátra ugráshoz</string>
-    <string name="double_tap_to_pause_settings_des">Koppintson középre a szüneteltetéshez</string>
+    <string name="double_tap_to_pause_settings_des">Koppintson kétszer középen a szüneteltetéshez</string>
     <string name="use_system_brightness_settings">Rendszer fényerejének használata</string>
     <string name="use_system_brightness_settings_des">Rendszer fényerejének használata az appban a sötét átfedés helyett</string>
     <string name="episode_sync_settings">Előrehaladás frissítése</string>
     <string name="episode_sync_settings_des">Automatikusan szinkronizálja az aktuális epizód előrehaladását</string>
-    <string name="restore_settings">Adatok visszaállítása a biztonsági mentésből</string>
+    <string name="restore_settings">Adatok visszaállítása biztonsági mentésből</string>
     <string name="restore_success">Biztonsági mentés betöltve</string>
     <string name="settings_info">Információ</string>
     <string name="resume">Folytatás</string>
     <string name="go_back_30">-30</string>
     <string name="update_started">Frissítés elkezdődött</string>
-    <string name="restore_failed_format" formatted="true">Nem sikerült visszaállítani az adatok a fájlból %s</string>
+    <string name="restore_failed_format" formatted="true">Nem sikerült visszaállítani az adatokat a %s fájlból</string>
     <string name="backup_failed">Tárolási engedélyek hiányoznak. Kérjük próbálja újra.</string>
     <string name="bug_report_settings_off">Csak összeomlásokról küld adatokat</string>
     <string name="apk_installer_settings">APK Telepítő</string>
@@ -280,7 +280,7 @@
     <string name="dns_pref">DNS HTTPS-en keresztül</string>
     <string name="browser">Böngésző</string>
     <string name="pref_category_android_tv">Android TV</string>
-    <string name="pref_category_gestures">kézmozdulatok</string>
+    <string name="pref_category_gestures">Kézmozdulatok</string>
     <string name="skip_update">frissítés kihagyása</string>
     <string name="pref_category_app_updates">Alkalmazásfrissítések</string>
     <string name="category_providers">Szolgáltatók</string>
@@ -496,4 +496,19 @@
     <string name="quality_hq">HQ</string>
     <string name="plugins_downloaded" formatted="true">%d letöltve</string>
     <string name="start">Start</string>
+    <string name="emulator_layout">Emulátor elrendezés</string>
+    <string name="add_sync">Nyomkövetés hozzáadása</string>
+    <string name="phone_layout">Telefon elrendezés</string>
+    <string name="bottom_title_settings">Poszter cím helye</string>
+    <string name="bottom_title_settings_des">Tegye a címet a poszter alá</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Az átugrás mértéke, amikor a lejátszó el van rejtve</string>
+    <string name="legal_notice">Jogi nyilatkozat</string>
+    <string name="android_tv_interface_on_seek_settings">Lejátszó megjelenítve - Ugrási Érték</string>
+    <string name="android_tv_interface_off_seek_settings">Lejátszó elrejtve - Ugrási Érték</string>
+    <string name="add_site_pref">Klónozott oldal</string>
+    <string name="add_site_summary">Egy meglévő webhely klónjának hozzáadása, más URL-címmel</string>
+    <string name="tv_layout">TV elrendezés</string>
+    <string name="automatic">Automatikus</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Az átugrás mértéke, amikor a lejátszó látható</string>
+    <string name="automatic_plugin_download_mode_title">Válassza ki a módot a pluginek letöltésének szűréséhez</string>
 </resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index a8c6a197..d514bcc4 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -193,7 +193,7 @@
     <string name="queued">antri</string>
     <string name="no_subtitles">Tidak Ada Subtitle</string>
     <string name="default_subtitles">Default</string>
-    <string name="free_storage">Bebas</string>
+    <string name="free_storage">Tersedia</string>
     <string name="used_storage">Terpakai</string>
     <string name="app_storage">Aplikasi</string>
     <!--plural-->
@@ -243,7 +243,7 @@
     <string name="dont_show_again">Jangan tunjukkan lagi</string>
     <string name="skip_update">Skip Update ini</string>
     <string name="update">Update</string>
-    <string name="watch_quality_pref">Kualitas tontonan yang lebih diinginkan (WIFI)</string>
+    <string name="watch_quality_pref">Kualitas nonton yang diinginkan (WiFi)</string>
     <string name="limit_title">Karakter maksimal judul pemutar video</string>
     <string name="limit_title_rez">Resolusi pemutar video</string>
     <string name="video_buffer_size_settings">Ukuran buffer video</string>
@@ -252,7 +252,7 @@
     <string name="video_buffer_clear_settings">Membersihkan cache video dan gambar</string>
     <string name="video_ram_description">Dapat menyebabkan crash jika disetel terlalu tinggi. Jangan diubah jika perangkat anda memiliki jumlah RAM yang rendah, seperti TV Android atau ponsel lama.</string>
     <string name="video_disk_description">Dapat bermasalah pada sistem dengan ruang penyimpanan rendah, seperti Android TV, jika diatur terlalu tinggi.</string>
-    <string name="dns_pref">DNS melalui HTTPS</string>
+    <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Berguna untuk melewati blok ISP</string>
     <string name="download_path_pref">Jalur download</string>
     <string name="nginx_url_pref">NGINX server URL</string>
@@ -260,7 +260,7 @@
     <string name="resize_fit">Paskan dengan layar</string>
     <string name="resize_fill">Regang</string>
     <string name="resize_zoom">Zoom</string>
-    <string name="legal_notice">Peringatan</string>
+    <string name="legal_notice">Disclaimer</string>
     <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Umum</string>
     <string name="random_button_settings">Tombol Acak</string>
@@ -364,7 +364,7 @@
     <string name="kitsu_settings">Tampilkan poster dari Kitsu</string>
     <string name="automatic_plugin_download_summary">Pasang otomatis semua plugins yang belum terpasang, dari repositori yang telah ditambahkan.</string>
     <string name="live_singular">Siaran langsung</string>
-    <string name="nsfw_singular">17+</string>
+    <string name="nsfw_singular">NSFW</string>
     <string name="example_password">password123</string>
     <string name="category_providers">Penyedia</string>
     <string name="pref_category_cache">Cache</string>
@@ -374,7 +374,7 @@
     <string name="pref_category_defaults">Bawaan</string>
     <string name="pref_category_looks">Tampilan</string>
     <string name="pref_category_ui_features">Fitur</string>
-    <string name="enable_nsfw_on_providers">Tampilkan konten 17+</string>
+    <string name="enable_nsfw_on_providers">Tampilkan konten NSFW</string>
     <string name="play_trailer_button">Putar Cuplikan</string>
     <string name="play_livestream_button">Putar Siaran</string>
     <string name="stream">Siaran</string>
@@ -385,7 +385,7 @@
     <string name="redo_setup_process">Ulang proses pemasangan</string>
     <string name="episodes_range">%d-%d</string>
     <string name="episode_format" formatted="true">%d %s</string>
-    <string name="nsfw">17+</string>
+    <string name="nsfw">NSFW</string>
     <string name="others">Lainnya</string>
     <string name="other_singular">Video</string>
     <string name="add_site_pref">Duplikasi Website</string>
@@ -393,7 +393,7 @@
     <string name="pref_category_links">Tautan</string>
     <string name="pref_category_app_updates">Perbarui Aplikasi</string>
     <string name="pref_category_backup">Cadangkan</string>
-    <string name="pref_category_extensions">Fitur Tambahan</string>
+    <string name="pref_category_extensions">Ekstensi</string>
     <string name="play_with_app_name">Putar di CloudStream</string>
     <string name="pref_filter_search_quality">Sembunyikan kualitas video terpilih di pencarian</string>
     <string name="season_format">%s %d%s</string>
@@ -464,7 +464,7 @@
     <string name="app_layout_subtext">Ubah tampilan aplikasi</string>
     <string name="crash_reporting_title">Laporkan Crash</string>
     <string name="setup_done">Selesai</string>
-    <string name="extensions">Fitur Tambahan</string>
+    <string name="extensions">Ekstensi</string>
     <string name="delete_repository">Hapus Repositori</string>
     <string name="setup_extensions_subtext">Unduh semua situs yang ingin digunakan</string>
     <string name="extension_size">Ukuran</string>
@@ -485,7 +485,7 @@
     <string name="pref_category_actions">Aksi</string>
     <string name="referer">Referer</string>
     <string name="yes">Ya</string>
-    <string name="extension_install_first">Pasang dulu fitur tambahan</string>
+    <string name="extension_install_first">Install ekstensi terlebih dahulu</string>
     <string name="all_languages_preference">Semua Bahasa</string>
     <string name="skip_type_format" formatted="true">Lewati %s</string>
     <string name="skip_type_op">Pembuka</string>
@@ -546,10 +546,34 @@
     <string name="subscription_new">Berlangganan ke %s</string>
     <string name="subscription_deleted">Berhenti berlangganan di %s</string>
     <string name="subscription_episode_released">Episode %d telah rilis!</string>
-    <string name="jsdelivr_proxy">raw.githubusercontent.com Proksi</string>
-    <string name="jsdelivr_enabled">Tidak dapat menjangkau GitHub. Mengaktifkan proksi jsDelivr…</string>
+    <string name="jsdelivr_proxy">Proxy raw.githubusercontent.com</string>
+    <string name="jsdelivr_enabled">Tidak dapat menjangkau GitHub. Mengaktifkan proxy jsDelivr…</string>
     <string name="jsdelivr_proxy_summary">Melewati pemblokiran GitHub menggunakan jsDelivr. Dapat menyebabkan pembaruan tertunda beberapa hari.</string>
     <string name="pref_category_bypass">Bypass ISP</string>
     <string name="revert">Pulihkan</string>
-    <string name="watch_quality_pref_data">Nonton dengan kualitas yang di inginkan (Data Seluler)</string>
+    <string name="watch_quality_pref_data">Kualitas nonton yang diinginkan (Data Seluler)</string>
+    <string name="mobile_data">Data seluler</string>
+    <string name="help">Bantuan</string>
+    <string name="quality_profile_help">Di sini anda dapat mengubah sumber yang diurutkan. Jika video memiliki prioritas lebih tinggi, video tersebut akan muncul lebih tinggi dalam pemilihan sumber. Jumlah prioritas sumber dan prioritas kualitas adalah prioritas video.
+\n
+\nSumber A: 3
+\nKualitas B: 7
+\nAkan memiliki prioritas video yang digabung 10.
+\n
+\nCATATAN: Jika jumlahnya 10 atau lebih, pemain akan melewatkan pemuatan secara otomatis saat tautan dimuat!</string>
+    <string name="profile_number">Profil %d</string>
+    <string name="wifi">Wifi</string>
+    <string name="set_default">Pengaturan default</string>
+    <string name="use">Gunakan</string>
+    <string name="edit">Edit</string>
+    <string name="profiles">Profil</string>
+    <string name="qualities">Kualitas</string>
+    <string name="profile_background_des">Latar belakang profil</string>
+    <string name="unable_to_inflate">UI tidak dapat dibuat dengan benar, ini adalah BUG UTAMA dan harus segera dilaporkan %s</string>
+    <string name="disable">Nonaktif</string>
+    <string name="automatic_plugin_download_mode_title">Pilih mode untuk memfilter unduhan plugin</string>
+    <string name="no_plugins_found_error">Tidak ada plugin yang ditemukan di repositori</string>
+    <string name="no_repository_found_error">Repositori tidak ditemukan, periksa URL dan coba VPN</string>
+    <string name="already_voted">Kamu sudah voting</string>
+    <string name="default_account">@string/default_subtitles</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6dca2e3a..0c34e89a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -121,7 +121,7 @@
     <string name="player_size_settings">Pulsante di ridimensionamento del video</string>
     <string name="player_size_settings_des">Rimuovi bordi neri</string>
     <string name="player_subtitles_settings">Sottotitoli</string>
-    <string name="player_subtitles_settings_des">Impostazioni sottotitoli</string>
+    <string name="player_subtitles_settings_des">Impostazioni sottotitoli lettore</string>
     <string name="chromecast_subtitles_settings">Sottotitoli Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Impostazioni sottotitoli Chromecast</string>
     <string name="eigengraumode_settings">Modalità Eigengravy</string>
@@ -226,7 +226,7 @@
     <string name="others">Altri</string>
     <!--singular-->
     <string name="movies_singular">Film</string>
-    <string name="tv_series_singular">Serie TV</string>
+    <string name="tv_series_singular">Serie</string>
     <string name="cartoons_singular">Cartoni</string>
     <string name="anime_singular">Anime</string>
     <string name="ova_singular">OVA</string>
@@ -551,4 +551,28 @@
     <string name="subscription_in_progress_notification">Aggiornando shows a cui sei iscritto</string>
     <string name="subscription_episode_released">L\'episodio %d è stato rilasciato!</string>
     <string name="watch_quality_pref_data">Qualità di visualizzazione preferita (Dati mobili)</string>
+    <string name="quality_profile_help">Qui puoi cambiare l\'ordine delle fonti. Se un video ha una priorità maggiore, apparirà più in alto nella selezione delle fonti. La somma tra la priorità della fonte e la priorità della qualità è la priorità video.
+\n
+\nFonte A: 3
+\nQualità B: 7
+\nAvranno una priorità video combinata di 10.
+\n
+\nNOTA: se la somma è pari o superiore a 10, il lettore salterà automaticamente il caricamento quando viene caricato quel link!</string>
+    <string name="profile_number">Profilo %d</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="set_default">Imposta predefinito</string>
+    <string name="use">Usa</string>
+    <string name="edit">Modifica</string>
+    <string name="profiles">Profili</string>
+    <string name="help">Aiuto</string>
+    <string name="mobile_data">Dati Mobili</string>
+    <string name="qualities">Qualità</string>
+    <string name="profile_background_des">Sfondo profilo</string>
+    <string name="no_plugins_found_error">Nessun plugin trovato nel repository</string>
+    <string name="no_repository_found_error">Repository non trovato, controlla l\'URL e prova la VPN</string>
+    <string name="unable_to_inflate">Non è stato possibile creare correttamente l\'interfaccia utente, questo è un GRANDE BUG e dovrebbe essere segnalato immediatamente %s</string>
+    <string name="automatic_plugin_download_mode_title">Seleziona la modalità per filtrare il download dei plugin</string>
+    <string name="default_account">@string/default_subtitles</string>
+    <string name="disable">Disabilita</string>
+    <string name="already_voted">Hai già votato</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 50e96c7c..aaa65897 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -96,7 +96,7 @@
     <string name="subs_download_languages">הורדת שפות</string>
     <string name="subs_subtitle_languages">שפת הכתוביות</string>
     <string name="subs_import_text" formatted="true">ייבא גופנים בהצבתם ב %s</string>
-    <string name="continue_watching">להמשיך לצפות</string>
+    <string name="continue_watching">המשך צפיה</string>
     <string name="action_remove_watching">להסיר</string>
     <string name="action_open_watching">עוד מידע</string>
     <string name="vpn_torrent">הספק הזה הוא טורנט, שימוש ב-VPN הוא מומלץ</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 5fcc14da..af4ea695 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -201,4 +201,21 @@
     <string name="preview_background_img_des">バックグラウンドをプレビュー</string>
     <string name="play_livestream_button">ライブストリームの再生</string>
     <string name="home_change_provider_img_des">プロバイダーの変更</string>
+    <string name="next_episode_format" formatted="true">エピソード %d は にリリースされます</string>
+    <string name="type_re_watching">再視聴</string>
+    <string name="play_torrent_button">ストリームトレント</string>
+    <string name="subs_text_color">文字の色</string>
+    <string name="popup_delete_file">ファイルを削除</string>
+    <string name="popup_play_file">再生ファイル</string>
+    <string name="subs_background_color">背景の色</string>
+    <string name="subs_window_color">窓の色</string>
+    <string name="subs_edge_type">エッジタイプ</string>
+    <string name="popup_pause_download">ダウンロードを一時停止する</string>
+    <string name="search_provider_text_types">使用タイプの検索</string>
+    <string name="subs_font">フォント</string>
+    <string name="subs_download_languages">言語をダウンロードする</string>
+    <string name="subs_subtitle_languages">字幕の言語</string>
+    <string name="subs_font_size">フォントサイズ</string>
+    <string name="search_provider_text_providers">プロバイダーから探す</string>
+    <string name="subs_auto_select_language">言語の自動選択</string>
 </resources>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 42eba3cc..17eeb883 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -1,2 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources/>
+<resources>
+    <string name="all_languages_preference">Semua bahasa</string>
+    <string name="skip_type_format" formatted="true">Langkau %s</string>
+    <string name="player_settings_play_in_browser">Pelayar web</string>
+    <string name="history">Sejarah</string>
+    <string name="clear_history">Kosongkan sejarah</string>
+    <string name="skip_type_intro">Pengenalan</string>
+    <string name="skip_type_creddits">Kredit</string>
+    <string name="skip_type_mixed_op">Pembukaan bercampur</string>
+    <string name="skip_type_ed">Penamat</string>
+    <string name="skip_type_op">Pembukaan</string>
+    <string name="update_notification_installing">Memasang kemaskini aplikasi…</string>
+    <string name="update_notification_downloading">Memuat turun kemaskini aplikasi…</string>
+    <string name="no">Tidak</string>
+    <string name="yes">Ya</string>
+    <string name="confirm_exit_dialog">Adakah anda pasti anda ingin keluar\?</string>
+    <string name="action_remove_from_watched">Keluarkan daripada ditonton</string>
+    <string name="action_mark_as_watched">Tanda sebagai sudah ditonton</string>
+    <string name="enable_skip_op_from_database_des">Tunjukkan pop timbul yang dilangkau untuk pembukaan/pengakhiran</string>
+    <string name="update_notification_failed">Tidak dapat memasang versi aplikasi terkini</string>
+    <string name="clipboard_too_large">Terlalu banyak perkataan. Tidak dapat disimpan di papan klip.</string>
+    <string name="app_not_found_error">Aplikasi tidak ditemui</string>
+    <string name="skip_type_mixed_ed">Penamat bercampur</string>
+    <string name="skip_type_recap">Imbas kembali</string>
+    <string name="next_episode_format" formatted="true">Episod %d akan disiarkan dalam</string>
+    <string name="cast_format" formatted="true">Pelakon:%s</string>
+    <string name="safe_mode_title">Mod Selamat Hidup</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="episode_poster_img_des">Poster Episod</string>
+    <string name="home_main_poster_img_des">Poster Utama</string>
+    <string name="go_back_img_des">Pergi Kembali</string>
+    <string name="home_next_random_img_des">Seterusnya Rawak</string>
+    <string name="home_change_provider_img_des">Tukar Pembekal</string>
+    <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>
+</resources>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
new file mode 100644
index 00000000..0cb44373
--- /dev/null
+++ b/app/src/main/res/values-my/strings.xml
@@ -0,0 +1,556 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="cast_format" formatted="true">သရုပ်ဆောင်များ: %s</string>
+    <string name="next_episode_time_day_format" formatted="true">%dရက် %ddနာရီ %ddမိနစ်</string>
+    <string name="next_episode_time_hour_format" formatted="true">%ddနာရီ %ddမိနစ်</string>
+    <string name="next_episode_time_min_format" formatted="true">%ddမိနစ်</string>
+    <string name="search_poster_img_des">ပိုစတာ</string>
+    <string name="episode_poster_img_des">အပိုင်း ပိုစတာ</string>
+    <string name="home_main_poster_img_des">မိန်း ပိုစတာ</string>
+    <string name="home_next_random_img_des">နောက် ကျပန်း</string>
+    <string name="go_back_img_des">နောက်သို့</string>
+    <string name="preview_background_img_des">နောက်ခံပုံရိပ်ကို အကြိုကြည့်ရန်</string>
+    <string name="rated_format" formatted="true">အဆင့်: %.1f</string>
+    <string name="new_update_format" formatted="true">အပ်ဒိတ်အသစ်!
+\n%s -&gt; %s</string>
+    <string name="filler" formatted="true">စစ်ထုတ်မှု</string>
+    <string name="duration_format" formatted="true">%d မိနစ်</string>
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">CloudStream ဖြင့်ကြည့်ရန်</string>
+    <string name="title_home">ပင်မ</string>
+    <string name="title_search">ရှာရန်</string>
+    <string name="search_hint">ရှာရန်…</string>
+    <string name="search_hint_site" formatted="true">ရှာရန် %s…</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_open_in_browser">ဘရောက်ဇာတွင်ဖွင့်ရန်</string>
+    <string name="browser">ဘရောက်ဇာ</string>
+    <string name="skip_loading">မစောင့်တော့ပါ</string>
+    <string name="type_watching">ကြည့်နေသည်</string>
+    <string name="type_completed">ကြည့်ပြီး</string>
+    <string name="type_dropped">ကြည့်ခြင်းရပ်ထားသော</string>
+    <string name="type_none">ဘာမျှ</string>
+    <string name="error_loading_links_toast">လင့်များချိတ်ဆက်ရာတွင်အချို့အယွင်း</string>
+    <string name="download_storage_text">ဖုန်း သိုလှောင်ရုံ</string>
+    <string name="filter_bookmarks">စာမှတ်များ စစ်ထုတ်မှု</string>
+    <string name="error_bookmarks_text">စာမှတ်များ</string>
+    <string name="action_remove_from_bookmarks">ဖယ်ရှားရန်</string>
+    <string name="action_add_to_bookmarks">ကြည့်ရှုမှုအခြေအနေသတ်မှတ်ခြင်း</string>
+    <string name="sort_copy">မိတ္တူကူးရန်</string>
+    <string name="sort_close">ပိတ်ရန်</string>
+    <string name="sort_clear">ရှင်းလင်းရန်</string>
+    <string name="sort_save">သိမ်းဆည်းရန်</string>
+    <string name="player_speed">ကြည့်ရှုမှုအရှိန်</string>
+    <string name="subs_background_color">နောက်ခံ အရောင်</string>
+    <string name="subs_window_color">ဝင်းဒိုး အရောင်</string>
+    <string name="subs_edge_type">အစွန်းနားပုံစံ</string>
+    <string name="subs_subtitle_elevation">စာတန်းထိုး အမြင့်</string>
+    <string name="subs_font">ဖောင့်</string>
+    <string name="subs_font_size">ဖောင့် အရွယ်အစား</string>
+    <string name="search_provider_text_types">အမျိုးအစားများအသုံးပြု၍ရှာရန်</string>
+    <string name="benene_count_text">%d အက်ပ်ဖန်တီးသူတွေကိုကျေးဇူးတင်ကြောင်းပို့မည်</string>
+    <string name="subs_auto_select_language">အလိုအလျောက် ဘာသာစကားရွေးချယ်ခြင်း</string>
+    <string name="subs_download_languages">ဒေါင်းလုဒ် လုပ်ထားသော ဘာသာစကားများ</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="action_open_play">@string/home_play</string>
+    <string name="vpn_torrent">ဒီဟာကတောရပ်တစ်ခုပါ ဗီပီအန်တစ်ခုသုံးဖို့အကြံပြုပါတယ်</string>
+    <string name="torrent_plot">ဖော်ပြချက်</string>
+    <string name="normal_no_plot">ဇာတ်လမ်းသွား မတွေ့ပါ</string>
+    <string name="torrent_no_plot">ဖော်ပြချက် မရိှပါ</string>
+    <string name="show_log_cat">Logcat ပြရန် 🐈</string>
+    <string name="test_log">Log</string>
+    <string name="picture_in_picture">ရုပ်ပုံထပ်</string>
+    <string name="player_size_settings">ကြည့်ရှုမှု စခရင်အရွယ်အစားချိန်ညိှမှု</string>
+    <string name="player_subtitles_settings">စာတန်းထိုးများ</string>
+    <string name="player_subtitles_settings_des">ကြည့်ရှုမှုစာတန်းထိုးပြုပြင်စရာများ</string>
+    <string name="eigengraumode_settings">Eigengravy လုပ်ဆောင်မှု</string>
+    <string name="swipe_to_seek_settings">ရစ်ရန်ဘယ်ညာဆွဲပါ</string>
+    <string name="swipe_to_seek_settings_des">သင်ရောက်နေတဲ့နေရာပြောင်းရန်ဘယ်ညာဆွဲပါ</string>
+    <string name="swipe_to_change_settings">ပြုပြင်စရာရိှပါက ပွတ်ဆွဲပါ</string>
+    <string name="autoplay_next_settings">နောက်အပိုင်းကို အလိုအလျောက် ဖွင့်ပါ</string>
+    <string name="double_tap_to_seek_settings">ကျော်ရန်နှစ်ချက်နှိပ်ပါ</string>
+    <string name="double_tap_to_pause_settings">ရပ်ရန်နှစ်ချက်နှိပ်ပါ</string>
+    <string name="double_tap_to_seek_amount_settings">ကျော်လိုသောပမာဏ (စက္ကန့်များ)</string>
+    <string name="double_tap_to_seek_settings_des">ရှေ့သို့ကျော်ရန် သို့ နောက်သို့ရစ်ရန် ဘယ် သို့ ညာ ပေါ်မှာနှစ်ချက်နှိပ်ပါ</string>
+    <string name="double_tap_to_pause_settings_des">ရပ်ရန် အလယ်တွင်နှစ်ချက်နှိပ်ပါ</string>
+    <string name="use_system_brightness_settings">ဖုန်းအလင်းအမှောင်အတိုင်းသုံးမည်</string>
+    <string name="use_system_brightness_settings_des">အက်ပ်ကြည့်ရှုမှုထဲမှာ ဖုန်းအလင်းအမှောင်အတိုင်းသုံးမည်</string>
+    <string name="episode_sync_settings">ကြည့်ရှုမှုတိုးတက်ခြင်းကိုအပ်ဒိတ်လုပ်ပါ</string>
+    <string name="restore_settings">အရန်သိမ်းဖိုင်မှပြန်သိုလှောင်မည်</string>
+    <string name="backup_settings">အရန်သိမ်းမည်</string>
+    <string name="restore_success">အရန်သိမ်းဖိုင်များရယူပြီး</string>
+    <string name="restore_failed_format" formatted="true">အရန်သိမ်းဖိုင်မှပြန်သိုလှောငးခြင်မအောင်မြင်ပါ %s</string>
+    <string name="backup_success">သိုလှောင်ပြီး</string>
+    <string name="backup_failed">သိုလှောင်ရုံခွင့်ပြုချက်မရိှပါ။ပြန်ကြိုးစားပါ။</string>
+    <string name="backup_failed_error_format">အရန်သိမ်းနေစဥ်အချို့အယွင်း %s</string>
+    <string name="library">လိုက်ဘရီ</string>
+    <string name="category_updates">အပ်ဒိတ်များနှင့်အရန်သိမ်းဆည်းမှု</string>
+    <string name="advanced_search">နက်နက်ရှိုင်းရှိုင်းရှာခြင်း</string>
+    <string name="advanced_search_des">သင့်ကိုဝန်ဆောင်မှုပေးသူအလိုက်ရှာဖွေမှုရလဒ်များပေးမည်</string>
+    <string name="bug_report_settings_off">ချို့ယွင်းမှုအကြီးစားဖြစ်မှသာဒေတာများပေးပို့ပါ</string>
+    <string name="show_fillers_settings">anime များအတွက်ဖြည့်စွက်အပိုင်းကိုပြရန်</string>
+    <string name="show_trailers_settings">ထွေလာများကိုပြရန်</string>
+    <string name="kitsu_settings">Kitsu မှ ပိုစတာများကိုပြရန်</string>
+    <string name="automatic_plugin_updates">အလိုအလျောက် ဖြည့်စွက်လုပ်ဆောင်ချက်များကိုအပ်ဒိတ်တင်ခြင်း</string>
+    <string name="automatic_plugin_download_mode_title">အပိုလုပ်ဆောင်ချက်များကိုစစ်ထုတ်ရန်မုဒ်ရွေးပါ</string>
+    <string name="updates_settings">အက်ပ်အပ်ဒိတ်များပြရန်</string>
+    <string name="redo_setup_process">အစီအစဥ်ချခြင်းကိုပြန်စမည်</string>
+    <string name="apk_installer_settings">အက်ပ်ထည့်သွင်းခြင်း</string>
+    <string name="apk_installer_settings_des">အချို့ဖုန်းတွေက အက်ပ်ထည့်သွင်းခြင်းလုပ်ဆောင်ချက်အသစ်ကို မပံ့ပိုးပါဘူး။အကယ်၍အလုပ်မဖြစ်ပါကသမားရိုးကျနည်းလမ်းကိုအသုံးပြုပါ။</string>
+    <string name="github">Github</string>
+    <string name="no_chromecast_support_toast">ဤဝန်ဆောင်မှုပေးသူသည် Chromecast ကိုမပံ့ပိုးပါ</string>
+    <string name="no_links_found_toast">လင့်များမတွေ့ပါ</string>
+    <string name="copy_link_toast">ကလစ်ဘုတ်သို့မိတ္တူကူးပြီး</string>
+    <string name="play_episode_toast">အပိုင်းကြည့်မည်</string>
+    <string name="season">အတွဲ</string>
+    <string name="no_season">အတွဲမရှိပါ</string>
+    <string name="episode">အပိုင်း</string>
+    <string name="episodes">အပိုင်းများ</string>
+    <string name="episodes_range">%d-%d</string>
+    <string name="delete_message" formatted="true">ဒါကအပြီးဖျက်ခြင်းဖြစ်ပါသည် %s
+\nသင်သေချာပါသလား။</string>
+    <string name="resume_time_left" formatted="true">%dမိနစ်
+\nကျန်ရိှသည်</string>
+    <string name="status_ongoing">ထုတ်လွှင့်နေဆဲ</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">အကျဥ်းချုပ်</string>
+    <string name="queued">နောက်အစီအစဥ်</string>
+    <string name="no_subtitles">စာတန်းထိုးမထည့်</string>
+    <string name="default_subtitles">ပုံသေ</string>
+    <string name="default_account">@string/default_subtitles</string>
+    <string name="free_storage">ကျန်ရှိသော</string>
+    <string name="app_storage">အက်ပ်</string>
+    <string name="movies">ရုပ်ရှင်များ</string>
+    <string name="tv_series">ဇာတ်လမ်းတွဲများ</string>
+    <string name="cartoons">ကာတွန်းများ</string>
+    <string name="anime">Anime</string>
+    <string name="torrent">ေတာရပ်များ</string>
+    <string name="documentaries">မှတ်တမ်းရုပ်ရှင်များ</string>
+    <string name="ova">OVA</string>
+    <string name="asian_drama">အာရှ ဒရာမာများ</string>
+    <string name="livestreams">တိုက်ရိုက်ထုတ်လွှင်မှုများ</string>
+    <string name="nsfw">အပြာဗီဒီယိုများ</string>
+    <string name="others">အခြား</string>
+    <string name="movies_singular">ရုပ်ရှင်</string>
+    <string name="tv_series_singular">ဇာတ်လမ်းတွဲ</string>
+    <string name="ova_singular">OVA</string>
+    <string name="torrent_singular">တောရပ်</string>
+    <string name="documentaries_singular">မှတ်တမ်းရုပ်ရှင်</string>
+    <string name="asian_drama_singular">အာရှ ဒရာမာ</string>
+    <string name="live_singular">တိုက်ရိုက်ထုတ်လွှင့်မှု</string>
+    <string name="nsfw_singular">အပြာဗီဒီယို</string>
+    <string name="other_singular">ဗီဒီယို</string>
+    <string name="source_error">ရင်းမြစ်အချို့အယွင်း</string>
+    <string name="remote_error">အဝေးထိန်းချုပ်မှုအချို့အယွင်း</string>
+    <string name="render_error">တင်ဆက်သူ အချို့အယွင်း</string>
+    <string name="unexpected_error">မျှော်လင့်မထားသော အချို့အယွင်း</string>
+    <string name="episode_action_chromecast_episode">Chromecast အပိုင်း</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>
+    <string name="episode_action_play_in_browser">ဘရောက်ဇာထဲမှာ ဖွင့်ရန်</string>
+    <string name="episode_action_copy_link">လင့်ကူးယူရန်</string>
+    <string name="episode_action_auto_download">အလိုအလျောက်ဒေါင်းလုဒ်</string>
+    <string name="episode_action_reload_links">လင့်များကို ပြန်စစ်ရန်</string>
+    <string name="show_hd">အရည်အသွေး အမှတ်အသား</string>
+    <string name="show_dub">နောက်ခံအသံ အမှတ်အသား</string>
+    <string name="show_sub">စာတန်း အမှတ်အသား</string>
+    <string name="show_title">ခေါင်းစဥ်</string>
+    <string name="no_update_found">အပ်ဒိတ်မရှိပါ</string>
+    <string name="check_for_update">အပ်ဒိတ်စစ်ရန်</string>
+    <string name="video_lock">လော့ခ်ခတ်ရန်</string>
+    <string name="video_source">ရင်းမြစ်</string>
+    <string name="video_skip_op">OPကိုကျော်ရန်</string>
+    <string name="skip_update">ဒီအပ်ဒိတ်ကိုကျော်ပါ</string>
+    <string name="update">အပ်ဒိတ်</string>
+    <string name="limit_title">ခေါင်းစဥ်အတွက်စာလုံးရေပြည့်ခြင်း</string>
+    <string name="limit_title_rez">ကြည့်ရှုမှု အရည်အသွေး</string>
+    <string name="video_buffer_size_settings">ဗီဒီယိုရှေ့ပြေးသိမ်းဆည်းမှုပမာဏ</string>
+    <string name="android_tv_interface_on_seek_settings_summary">ကြည့်ရှုမှုဘားမြင်တွေ့ရချိန်တွင်ပြသသောပမာဏ</string>
+    <string name="android_tv_interface_off_seek_settings">ဝှက်ထားသောကြည့်ရှုပြီးသောပမာဏ</string>
+    <string name="android_tv_interface_off_seek_settings_summary">ဝှက်ထားသည့်အခါ အသုံးပြုသည့် ရှာဖွေမှုပမာဏ</string>
+    <string name="video_ram_description">Android TV ကဲ့သို့သော မမ်မိုရီနည်းသော စက်ပစ္စည်းများတွင် သတ်မှတ်နှုန်း အလွန်မြင့်မားပါက ပျက်စီးမှုများ ဖြစ်စေသည်။</string>
+    <string name="dns_pref">DNS over HTTPS</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com ပရောက်စီ</string>
+    <string name="jsdelivr_enabled">GitHub သို့ မရောက်ရှိနိုင်ပါ။ jsDelivr ပရောက်စီကို ဖွင့်နေသည်…</string>
+    <string name="add_site_pref">ကလုန်း ဆိုဒ်</string>
+    <string name="remove_site_pref">ဆိုဒ်ကိုဖယ်ရှားရန်</string>
+    <string name="add_site_summary">မတူညီသော URL တစ်ခုဖြင့် ရှိပြီးသား ဝဘ်ဆိုက်တစ်ခု၏ ပုံတူတစ်ခုကို ထည့်ပါ</string>
+    <string name="download_path_pref">ဒေါင်းလုဒ်လမ်းကြောင်း</string>
+    <string name="nginx_url_pref">NGINX ဆာဗာ URL</string>
+    <string name="display_subbed_dubbed_settings">Dubbed/Subbed Anime ကိုပြသပါ</string>
+    <string name="resize_fit">မျက်နှာပြင်နှင့် အံကိုက်</string>
+    <string name="resize_fill">ဆန့်သည်</string>
+    <string name="resize_zoom">ချဲ့သည်</string>
+    <string name="legal_notice">ရှင်းလင်းချက်</string>
+    <string name="pref_category_bypass">ISP ရှောင်လွှဲမှုများ</string>
+    <string name="pref_category_links">လင့်များ</string>
+    <string name="pref_category_app_updates">အက်ပ်အပ်ဒိတ်များ</string>
+    <string name="pref_category_extensions">Extensions</string>
+    <string name="pref_category_actions">ဆောင်ရွက်ချက်များ</string>
+    <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_android_tv">Android တီဗွီ</string>
+    <string name="pref_category_subtitles">စာတန်းထိုးများ</string>
+    <string name="pref_category_defaults">ပုံသေများ</string>
+    <string name="pref_category_looks">ပုံပန်းသဏ္ဌာန်</string>
+    <string name="category_general">အထွေထွေ</string>
+    <string name="random_button_settings_desc">ပင်မစာမျက်နှာမှာကျပန်းခလုတ်ကိုပြပါ</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s အပိုင်း %d</string>
+    <string name="next_episode_format" formatted="true">အပိုင်း %d ထုတ်လွှင့်ပြသမည်</string>
+    <string name="result_poster_img_des">ပိုစတာ</string>
+    <string name="home_change_provider_img_des">ပံ့ပိုးပေးသောဝန်ဆောင်မှုပြောင်းရန်</string>
+    <string name="player_speed_text_format" formatted="true">အရှိန် (%.2fx)</string>
+    <string name="title_downloads">ဒေါင်းလုဒ်များ</string>
+    <string name="title_settings">ပြင်ဆင်ရန်</string>
+    <string name="loading">ခဏစောင့်ပါ…</string>
+    <string name="type_on_hold">ကြည့်ဆဲ</string>
+    <string name="type_plan_to_watch">ကြည့်ရန်</string>
+    <string name="type_re_watching">ပြန်ကြည့်နေသည်</string>
+    <string name="pick_subtitle">စာတန်းထိုး</string>
+    <string name="play_movie_button">ရုပ်ရှင်ကြည့်မည်</string>
+    <string name="play_trailer_button">ထွေလာ ကြည့်မည်</string>
+    <string name="play_livestream_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="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_canceled">ဒေါင်းလုဒ် ပယ်ဖျက်ပြီး</string>
+    <string name="download_done">ဒေါင်းလုဒ်ပြီးစီး</string>
+    <string name="update_started">အပ်ဒိတ်စတင်</string>
+    <string name="stream">တိုက်ရိုက်ကြည့်မည်</string>
+    <string name="app_dubbed_text">နောက်ခံအသံ</string>
+    <string name="pref_filter_search_quality">ရှာဖွေမှုရလဒ်များတွင်ရွေးချယ်ထားသောဗီဒီယိုအရည်အသွေးကိုဝှက်ထားရန်</string>
+    <string name="app_subbed_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="home_more_info">ပိုမို၍</string>
+    <string name="search_provider_text_providers">ပ့ံပိုးပေးသောဝန်ဆောင်မှုများအသုံးပြု၍ရှာရန်</string>
+    <string name="home_expanded_hide">ဝုက်ရန်</string>
+    <string name="benene_count_text_none">ကျေးဇူးတင်ကြောင်းမပို့ရသေး</string>
+    <string name="home_play">ကြည့်မည်</string>
+    <string name="home_info">အချက်အလက်</string>
+    <string name="subs_subtitle_languages">စာတန်းထိုး ဘာသာစကား</string>
+    <string name="subs_import_text" formatted="true">ဒီမှာနေရာချခြင်းဖြင့်ဖောင့်များကိုသွင်းပါ %s</string>
+    <string name="sort_apply">အတည်ပြု</string>
+    <string name="sort_cancel">ပယ်ဖျက်ရန်</string>
+    <string name="subtitles_settings">စာတန်းထိုး ပြုပြင်ခြင်း</string>
+    <string name="subs_text_color">စာသား အရောင်</string>
+    <string name="subs_outline_color">အနားကွပ် အရောင်</string>
+    <string name="vpn_might_be_needed">ဒီပံ့ပိုးမှုကောင်းမွန်စွာအလုပ်လုပ်ရန်ဗီပီအန်တစ်ခုလိုနိုင်ပါတယ်</string>
+    <string name="provider_info_meta">အသေးစိတ်အချက်အလက်များပြမထားပါ။ဝဘ်ဆိုဒ်ပေါ်မှာမရှိလျှင်ကြည့်ရှု၍မရနိုင်ပါ။</string>
+    <string name="automatic_plugin_download">ဖြည့်စွက်လုပ်ဆောင်ချက်များကို အလိုအလျောက်ဒေါင်းလုဒ်လုပ်ခြင်း</string>
+    <string name="automatic_plugin_download_summary">ရီပိုစစ်ထရီများမှမထည့်သွင်းရသေးသောဖြည့်စွက်လုပ်ဆောင်ချက်များအားလုံးကိုထည့်သွင်းပါ။</string>
+    <string name="picture_in_picture_des">ပြန်ကြည့်ခြင်းကိုအသေးစား ကြည့်ရှုမှုတွင်ဆက်ပြပါ</string>
+    <string name="player_size_settings_des">အနက်ရောင်ဘောင်များကို ဖယ်ရှားရန်</string>
+    <string name="updates_settings_des">အက်ပ်ထဲဝင်လိုက်သည့်နှင့်အက်ပ်အပ်ဒိတ်ကိုစစ်ဆေးပါ။</string>
+    <string name="chromecast_subtitles_settings">Chromecast စာတန်းထိုးများ</string>
+    <string name="chromecast_subtitles_settings_des">Chromecast စာတန်းထိုး ပြုပြင်ရန်</string>
+    <string name="eigengraumode_settings_des">ကြည့်ရှုမှုပုံစံထဲမှာအရိှန်ရွေးစရာတစ်ခုထည့်ရန်</string>
+    <string name="swipe_to_change_settings_des">အသံအတိုးအကျယ်နှင့်အလင်းအမှောင်များကိုချိန်ညိှရန် ဘယ် သို့ ညာ ဘက်တွင် အပေါ်အောက်ဆွဲပါ</string>
+    <string name="autoplay_next_settings_des">ယခုကြည့်နေသောအပိုင်းပြီးပါကနောက်အပိုင်းကိုဖွင့်ပါ</string>
+    <string name="episode_sync_settings_des">သင့်၏အပိုင်းကြည်ရှုမှုရောက်ရှိနေရာကိုအလိုအလျောက်သိမ်းဆည်းပါ</string>
+    <string name="search">ရှာရန်</string>
+    <string name="category_account">အကောင့်များ</string>
+    <string name="settings_info">အချက်အလက်</string>
+    <string name="bug_report_settings_on">ဒေတာများမပို့ရန်</string>
+    <string name="android_tv_interface_on_seek_settings">ကြည့်ရှုပြီးသောအချိန်ပမာဏ</string>
+    <string name="video_disk_description">Android TV ကဲ့သို့သော သိုလှောင်မှုနေရာနည်းပါးသော စက်ပစ္စည်းများတွင် အလွန်မြင့်မားစွာ သတ်မှတ်ပါက ပြဿနာများ ဖြစ်လာနိုင်သည်။</string>
+    <string name="dns_pref_summary">ISP ပိတ်ဆို့ခြင်းကို ကျော်လွှားရန်အတွက် အသုံးဝင်သည်</string>
+    <string name="jsdelivr_proxy_summary">jsDelivr ကို အသုံးပြု၍ GitHub ပိတ်ဆို့ခြင်းကို ကျော်ဖြတ်သည်။ အပ်ဒိတ်များကို ရက်အနည်းငယ်ကြာအောင် နှောင့်နှေးစေနိုင်သည်။</string>
+    <string name="pref_category_backup">အရန်သိမ်းထားသော</string>
+    <string name="pref_category_gestures">လက်ဟန်များ</string>
+    <string name="pref_category_player_features">ကြည့်ရှုမှုလုပ်ဆောင်ချက်များ</string>
+    <string name="pref_category_player_layout">အပြင်အဆင်</string>
+    <string name="pref_category_ui_features">လုပ်ဆောင်ချက်များ</string>
+    <string name="random_button_settings">ကျပန်းခလုတ်</string>
+    <string name="uprereleases_settings">ရှေ့ပြေးအပ်ဒိတ်များကိုထည့်သွင်းပါ</string>
+    <string name="uprereleases_settings_des">ပုံမှန်အပ်ဒိတ်များအစား ရှေ့ပြေးအက်ဒိတ်များကိုရှာပါ</string>
+    <string name="lightnovel">တူညီသောအက်ပ်ရေးသားသူများ၏ ဝတ္ထုရှည်များဖတ်နိုင်သည့် အက်ပ်</string>
+    <string name="anim">တူညီသောအက်ပ်ရေးသားသူများ၏ Anime အက်ပ်</string>
+    <string name="discord">Discord ကိုဝင်ရန်</string>
+    <string name="benene">အက်ပ်ရေးသားသူများထံ ကျေးဇူးတင်စာပို့မည်</string>
+    <string name="benene_des">ပေးခဲ့သောစာအရေအတွက်</string>
+    <string name="app_language">အက်ပ်ဘာသာစကား</string>
+    <string name="subs_default_reset_toast">မူလအခြေအနေများကိုပြန်ထားပါ</string>
+    <string name="acra_report_toast">စိတ်မကောင်းပါ။အက်ပ်ရပ်တန့်သွားပါတယ်။အမည်မဖော်ထားတဲ့တင်ပြချက်ကို အက်ပ်ရေးသားသူများထံ ပို့မှာဖြစ်ပါတယ်</string>
+    <string name="season_format">%s %d%s</string>
+    <string name="season_short">အတွဲ</string>
+    <string name="episode_format" formatted="true">%d %s</string>
+    <string name="episode_short">အပိုင်း</string>
+    <string name="no_episodes_found">အပိုင်းများမတွေ့ပါ</string>
+    <string name="delete_file">ဖိုင်ကိုဖျက်ရန်</string>
+    <string name="delete">ဖျက်ရန်</string>
+    <string name="pause">ရပ်ရန်</string>
+    <string name="start">စရန်</string>
+    <string name="test_failed">မအောင်မြင်ပါ</string>
+    <string name="test_passed">ကျော်ဖြတ်ပြီး</string>
+    <string name="resume">ကြည့်လက်စ</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="used_storage">အသုံးပြုပြီးသော</string>
+    <string name="cartoons_singular">ကာတွန်း</string>
+    <string name="anime_singular">Anime</string>
+    <string name="storage_error">ဒေါင်းလုဒ် အချို့အယွင်း၊သိုလှောင်ရုံခွင့်ပြုချက်တွေကိုစစ်ဆေးပါ</string>
+    <string name="episode_action_download_mirror">ဒေါင်းလုဒ် ကြေးမုံ</string>
+    <string name="episode_action_download_subtitle">စာတန်းထိုးများကို ဒေါင်းလုဒ်လုပ်ရန်</string>
+    <string name="poster_ui_settings">ပိုစတာပေါ်ရှိ UI အစိတ်အပိုင်းများကို ပြောင်းပါ</string>
+    <string name="video_aspect_ratio_resize">ပြန်ညိှ</string>
+    <string name="dont_show_again">နောက်ထပ်မပြရန်</string>
+    <string name="watch_quality_pref">ဝိုင်ဖိုင်ဖြင့်ကြည့်စဥ်ဗီဒီယိုအရည်အသွေး</string>
+    <string name="watch_quality_pref_data">မိုဘိုင်းဒေတာဖြင့်ကြည့်စဥ်ဗီဒီယိုအရည်အသွေး</string>
+    <string name="video_buffer_length_settings">ဗီဒီယိုရှေ့ပြေးသိမ်းဆည်းမှုအကွာအဝေး</string>
+    <string name="video_buffer_disk_settings">ဗီဒီယိုcacheအများ</string>
+    <string name="video_buffer_clear_settings">ဗီဒီယို cache နှင့် ရုပ်ပုံ cache များကိူရှင်းလင်းရန်</string>
+    <string name="enable_nsfw_on_providers">ပံ့ပိုးပေးထားသည့် ဝန်ဆောင်မှုများပေါ်တွင် အပြာဗီဒီယို ကို ဖွင့်ပါ</string>
+    <string name="provider_lang_settings">ဝန်ဆောင်မှုပံ့ပိုးသူဘာသာစကား</string>
+    <string name="app_layout">အက်ပ်အပြင်အဆင်</string>
+    <string name="preferred_media_settings">ဦးစားပေးမီဒီယာ</string>
+    <string name="app_theme_settings">အက်ပ် အပြင်အဆင်</string>
+    <string name="bottom_title_settings">ပိုစတာခေါင်းစဉ်တည်နေရာ</string>
+    <string name="bottom_title_settings_des">ခေါင်းစဉ်ကို ပိုစတာအောက်မှာ ထားပါ</string>
+    <string name="phone_layout">ဖုန်းအပြင်အဆင်</string>
+    <string name="emulator_layout">အင်မြူလိတ်တာ အပြင်အဆင်</string>
+    <string name="primary_color_settings">အဓိကအရောင်</string>
+    <string name="recommended">အကြံပြုသည်</string>
+    <string name="quality_dvd">ဒီဗွီဒီ</string>
+    <string name="quality_4k">4K</string>
+    <string name="network_adress_example">ထုတ်လွှင့်ရန် လင့်ခ် နှင့်ချိတ်ပါ</string>
+    <string name="referer">ရည်ညွှန်းသည်</string>
+    <string name="next">ရှေ့သို့</string>
+    <string name="previous">နောက်သို့</string>
+    <string name="plugins_updated" formatted="true">အပ်ဒိတ်လုပ်ပြီး %d ဖြည့်စွက်များ</string>
+    <string name="plugins_not_downloaded" formatted="true">ဒေါင်းလုဒ်မလုပ်ရသေး: %d</string>
+    <string name="player_settings_play_in_browser">ဝဘ်ဘရောက်ဇာ</string>
+    <string name="app_not_found_error">အက်ပ်မတွေ့ပါ</string>
+    <string name="all_languages_preference">ဘာသာစကားအားလုံး</string>
+    <string name="skip_type_format" formatted="true">ကျော်ရန် %s</string>
+    <string name="skip_type_recap">အစမှပြန်စ</string>
+    <string name="skip_type_mixed_ed">ရောထားသောအဆုံးပိုင်း</string>
+    <string name="skip_type_mixed_op">ရောထားသောအစပိုင်း</string>
+    <string name="skip_type_creddits">ခရက်ဒစ်များ</string>
+    <string name="skip_type_intro">အစ</string>
+    <string name="yes">သေချာသည်</string>
+    <string name="apk_installer_legacy">သမားရိုးကျ</string>
+    <string name="apk_installer_package_installer">ထည့်သွင်းသူ</string>
+    <string name="delayed_update_notice">ထွက်ချိန်တွင် အက်ပ်ကို အပ်ဒိတ်လုပ်ပါမည်</string>
+    <string name="blank_repo_message">CloudStream တွင် မူရင်းအတိုင်း ထည့်သွင်းထားသည့်ဆိုက်များ မရှိပါ။ ရီပိုစစ်ထရီများ မှ ဆိုဒ် များကို ထည့်သွင်းရန်လိုအပ်သည်။
+\n
+\nSky UK Limited မှ ဦးနှောက်မဲ့ DMCA ကို ဖယ်ရှားလိုက်ခြင်းကြောင့် 🤮 ကျွန်ုပ်တို့သည် ရီပိုစစ်ထရီဆိုဒ်ကို အက်ပ်တွင် ချိတ်ဆက်၍မရပါ။
+\n
+\nကျွန်ုပ်တို့၏ Discord တွင်ပါဝင်ပါ သို့မဟုတ် အွန်လိုင်းတွင်ရှာဖွေပါ။</string>
+    <string name="view_public_repositories_button">အခြားသူများ၏ရီပိုစစ်ထရီများကိုရှာဖွေမည်</string>
+    <string name="tracks">အသံများ</string>
+    <string name="audio_tracks">အသံဖိုင်များ</string>
+    <string name="video_tracks">ဗီဒီယိုအသံဖိုင်များ</string>
+    <string name="apply_on_restart">ပြန်စတင်ချိန်မှာအသုံးပြုပါ</string>
+    <string name="stop">ရပ်ရန်</string>
+    <string name="safe_mode_title">လုံခြုံသောမုဖွင့်ရန်</string>
+    <string name="player_settings_play_in_app">ဖုန်းတွင်းကြည့်ရှုမှု</string>
+    <string name="player_pref">ဦးစားပေး ဗီဒီယိုဖွင့်စက်</string>
+    <string name="safe_mode_description">ပြဿနာဖြစ်စေသည့်အရာကို သင်ရှာဖွေရာတွင် အထောက်အကူဖြစ်စေရန်အတွက် ပျက်စီးမှုတစ်ခုကြောင့် အဆက်များအားလုံးကို ပိတ်ထားသည်။</string>
+    <string name="extension_rating" formatted="true">အဆင့်သတ်မှတ်ချက်များ: %s</string>
+    <string name="safe_mode_crash_info">ပျက်စီးမှုအချက်အလက်ကို ကြည့်ပါ</string>
+    <string name="extension_description">ဖော်ပြချက်</string>
+    <string name="extension_version">ဗားရှင်း</string>
+    <string name="extension_status">အခြေအနေ</string>
+    <string name="extension_size">အရွယ်အစား</string>
+    <string name="extension_authors">ရေးသားသူများ</string>
+    <string name="hls_playlist">HLS ဖွင့်စဥ်</string>
+    <string name="history">ကြည့်ရှုခဲ့သည်များ</string>
+    <string name="update_notification_failed">အက်ပ်၏ ဗားရှင်းအသစ်ကို ထည့်သွင်း၍မရပါ</string>
+    <string name="enable_skip_op_from_database_des">အစပိုင်း/အဆုံးပိုင်းအတွက် ကျော်နိုင်သော ပေါ့ပ်အပ်များကို ပြပါ</string>
+    <string name="clipboard_too_large">စာသားအလွန်များသဖြင့်ကလစ်ဘုတ်တွင် သိမ်းဆည်း၍မရပါ။</string>
+    <string name="category_providers">ပံ့ပိုးပေးသူများ</string>
+    <string name="category_ui">အပြင်အဆင်</string>
+    <string name="automatic">အလိုအလျောက်</string>
+    <string name="tv_layout">တီဗွီအပြင်အဆင်</string>
+    <string name="example_password">သင့်စကားဝှက်</string>
+    <string name="example_username">သင့်ယူဇာနိမ်း</string>
+    <string name="example_email">သင့်အီးမေးလ် လိပ်စာ</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_site_name">သင့်ဆိုဒ်</string>
+    <string name="example_site_url">example.com</string>
+    <string name="subtitles_shadow">အရိပ်</string>
+    <string name="subtitles_raised">ထမြောက်မှု</string>
+    <string name="subtitle_offset">စာတန်းထိုးများ ထပ်တူပြုရန်</string>
+    <string name="subtitle_offset_extra_hint_later_format">စာတန်းထိုးများ အလွန်စောနေပါက %d ms ဒီဟာကိုသုံးပါ</string>
+    <string name="subtitles_example_text">The quick brown fox jumps over the lazy dog</string>
+    <string name="player_loaded_subtitles" formatted="true">တင်ပြီး %s</string>
+    <string name="player_load_subtitles">ဖိုင်မှတင်သွင်းပြီး</string>
+    <string name="quality_cam_hd">ရုံရိုက်</string>
+    <string name="quality_hq">အကြည်</string>
+    <string name="quality_hd">အကြည်</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="quality_webrip">Web</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_sd">SD</string>
+    <string name="category_player">ကြည့်ရှုမှု</string>
+    <string name="poster_image">ပိုစတာပုံရိပ်</string>
+    <string name="subtitles_remove_bloat">စာတန်းထိုးများမှ bloat ကိုဖယ်ရှားပါ</string>
+    <string name="subtitles_filter_lang">နှစ်သက်ရာ မီဒီယာဘာသာစကားဖြင့် စစ်ထုတ်ပါ</string>
+    <string name="extras">အပိုများ</string>
+    <string name="error_invalid_data">ဒေတာမမှန်ပါ</string>
+    <string name="error_invalid_url">URL မမှန်ပါ</string>
+    <string name="error">အချို့အယွင်း</string>
+    <string name="subtitles_remove_captions">စာတန်းထိုးများမှ ပိတ်ထားသော စာတန်းများကို ဖယ်ရှားပါ</string>
+    <string name="trailer">ထွေလာ</string>
+    <string name="plugin">ဖြည့်စွက်များ</string>
+    <string name="delete_repository_plugins">ရီပိုစစ်ထရီ ဖြည့်စွက်များအားလုံးကိုဖျက်မည်ဖြစ်သည်</string>
+    <string name="delete_repository">ရီပိုစစ်ထရီ ကိုဖျက်ရန်</string>
+    <string name="download_all_plugins_from_repo">ဤရီပိုစစ်ထရီမှ ဖြည့်စွက်များအားလုံးကို ဒေါင်းလုဒ်လုပ်မှာလား\?</string>
+    <string name="single_plugin_disabled" formatted="true">%s (ပိတ်ပြီး)</string>
+    <string name="extension_types">ထောက်ပံ့ထားသော</string>
+    <string name="extension_language">ဘာသာစကား</string>
+    <string name="extension_install_first">အဆက်များကိုအရင်သွင်းပါ</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">ဝဘ်ထဲတွင်ဖွင့်ရန်</string>
+    <string name="skip_type_op">အစပိုင်း</string>
+    <string name="skip_type_ed">အဆုံးပိုင်း</string>
+    <string name="clear_history">ကြည့်ရှုခဲ့သည်များကိုရှင်းရန်</string>
+    <string name="action_remove_from_watched">ကြည့်ပြီးသည်မှဖယ်ရှားရန်</string>
+    <string name="confirm_exit_dialog">သင်ထွက်ရန်သေချာပြီလား</string>
+    <string name="no">မသေချာပါ</string>
+    <string name="update_notification_downloading">အက်ပ်အပ်ဒိတ်အားဒေါင်းလုဒ်လုပ်နေသည်…</string>
+    <string name="update_notification_installing">အက်ပ်အပ်ဒိတ်အားသွင်းနေသည်…</string>
+    <string name="sort_updated_new">အပ်ဒိတ်ဖြစ်မှု (အသစ် မှ အဟောင်း)</string>
+    <string name="empty_library_no_accounts_message">သင့်လိုက်ဘရီသည် ဗလာဖြစ်နေသည် :(
+\nအကောင့်ဝင်ပါ သို့မဟုတ် သင့်ဖုန်းလိုက်ဘရီတွင် ကြည့်စရာများထည့်ပါ။</string>
+    <string name="use">သုံးရန်</string>
+    <string name="edit">တည်းဖြတ်ရန်</string>
+    <string name="qualities">အရည်အသွေးများ</string>
+    <string name="subtitles_encoding">စာတန်းထိုး ကုဒ်လုပ်ခြင်း</string>
+    <string name="category_provider_test">ပံ့ပိုးပေးသူ စစ်ဆေးမှု</string>
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="login">အကောင့်ဝင်မည်</string>
+    <string name="switch_account">အကောင့်ပြောင်းမည်</string>
+    <string name="upload_sync">ချိန်ညိှခြင်း</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="player_load_subtitles_online">အင်တာနက်မှ တင်သွင်းမည်</string>
+    <string name="actor_background">နောက်ခံ</string>
+    <string name="authenticated_user_fail" formatted="true">အကောင့်မဝင်ရောက်နိုင်ပါ %s</string>
+    <string name="none">ဘာမျှ</string>
+    <string name="min">အနည်းဆုံး</string>
+    <string name="subtitles_outline">အနားကွပ်</string>
+    <string name="home_random">ကျပန်း</string>
+    <string name="subtitles_depressed">ချုံ့ပြီး</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
+    <string name="subtitle_offset_title">စာတန်းထိုး ကြန့်ကြာမှု</string>
+    <string name="subtitle_offset_extra_hint_before_format">စာတန်းထိုးများအလွန်နောက်ကျနေပါက %d ms ဒီဟာကိုသုံးပါ</string>
+    <string name="subtitle_offset_extra_hint_none_format">စာတန်းထိုး ကြန့်ကြာမှု သတ်မှတ်ထားခြင်းမရှိ</string>
+    <string name="quality_cam">ရုံရိုက်</string>
+    <string name="quality_cam_rip">ရုံရိုက်</string>
+    <string name="quality_tc">TC</string>
+    <string name="resolution">အရည်အသွေး</string>
+    <string name="skip_setup">အစီအစဥ်ချခြင်းကိုကျော်မည်</string>
+    <string name="crash_reporting_title">ချို့ယွင်းမှုသတင်းပေးပို့ခြင်း</string>
+    <string name="preferred_media_subtext">ဘာတွေကြည့်ချင်လဲ</string>
+    <string name="setup_done">ပြီးပြီ</string>
+    <string name="extensions">အဆက်များ</string>
+    <string name="plugin_load_fail" formatted="true">မသွင်းနိုင်ပါ %s</string>
+    <string name="app_layout_subtext">သင့်စက်ပစ္စည်းနှင့် ကိုက်ညီစေရန် အက်ပ်၏အသွင်အပြင်ကို ပြောင်းလဲပါ</string>
+    <string name="add_repository">ရီပိုစစ်ထရီထည့်ရန်</string>
+    <string name="is_adult">အသက်ပြည့်ပြီးသူများသာ</string>
+    <string name="repository_name_hint">ရီပိုစစ်ထရီအမည်</string>
+    <string name="repository_url_hint">ရီပိုစစ်ထရီ URL</string>
+    <string name="plugin_loaded">ဖြည့်စွက်များ ထည့်ပြီး</string>
+    <string name="provider_languages_tip">ဤဘာသာစကားများဖြင့် ဗီဒီယိုများကို ကြည့်ရှုပါ</string>
+    <string name="plugin_downloaded">ဖြည့်စွက်များ ဒေါင်းလုဒ်လုပ်ပြီး</string>
+    <string name="plugin_deleted">ဖြည့်စွက်များဖျက်ပြီး</string>
+    <string name="batch_download_start_format" formatted="true">ဒေါင်းလုဒ်လုပ်ခြင်း စတင်သည် %d %s…</string>
+    <string name="batch_download_finish_format" formatted="true">ဒေါင်းလုဒ်လုပ်ပြီး %d %s</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">အားလုံး %s ဒေါင်းလုဒ်လုပ်ပြီးသား</string>
+    <string name="no_plugins_found_error">ရီပိုစစ်ထရီထဲတွင်ဖြည့်စွက်များမတွေ့ပါ</string>
+    <string name="no_repository_found_error">ရီပိုစစ်ထရီမတွေ့ပါ၊URLကိုပြန်စစ်ပြီးဗီပီအန်ဖြင့်ကြိုးစားကြည့်ပါ</string>
+    <string name="batch_download">အသုတ်လိုက် ဒေါင်းလုဒ်</string>
+    <string name="plugin_singular">ဖြည့်စွက်</string>
+    <string name="setup_extensions_subtext">သင်အသုံးပြုလိုသောဆိုက်များစာရင်းကို ဒေါင်းလုဒ်လုပ်ပါ</string>
+    <string name="plugins_downloaded" formatted="true">ဒေါင်းလုဒ်လုပ်ပြီး: %d</string>
+    <string name="plugins_disabled" formatted="true">ပိတ်ပြီး: %d</string>
+    <string name="example_lang_name">ဘာသာစကားကုဒ် (en)</string>
+    <string name="account">အကောင့်</string>
+    <string name="logout">အကောင့်ထွက်မည်</string>
+    <string name="add_account">အကောင့်ထည့်မည်</string>
+    <string name="create_account">အကောင့်ဖွင့်မည်</string>
+    <string name="add_sync">စောင့်ကြည့်ခြင်းထည့်မည်</string>
+    <string name="added_sync_format" formatted="true">ထည့်ပြီး %s</string>
+    <string name="sync_score">အဆင့်သတ်မှတ်ထားပြီး</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/\?\?</string>
+    <string name="authenticated_user" formatted="true">%s ချိတ်ဆက်ပြီး</string>
+    <string name="disable">ပိတ်ပါ</string>
+    <string name="normal">ပုံမှန်</string>
+    <string name="all">အားလုံး</string>
+    <string name="max">အပြည့်</string>
+    <string name="downloaded_file">ဖိုင်ဒေါင်းလုဒ်လုပ်ပြီး</string>
+    <string name="actor_main">အဓိက</string>
+    <string name="actor_supporting">ထောက်ပံ့သည်</string>
+    <string name="home_source">ရင်းမြစ်</string>
+    <string name="coming_soon">မကြာမီလာမည်…</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="resolution_and_title">အရည်အသွေးနှင့်ခေါင်းစဥ်</string>
+    <string name="title">ခေါင်းစဥ်</string>
+    <string name="error_invalid_id">အိုင်ဒီမမှန်ပါ</string>
+    <string name="view_public_repositories_button_short">အများမြင်နိုင်သော</string>
+    <string name="uppercase_all_subtitles">စာတန်းထိုးအားလုံးကို စာလုံးအကြီးပြောင်းပါ</string>
+    <string name="restart">ပြန်စတင်မည်</string>
+    <string name="action_mark_as_watched">ကြည့်ပြီးအဖြစ်မှတ်ရန်</string>
+    <string name="sort_by">အစီအစဥ်ချမှု</string>
+    <string name="sort">အစီအစဥ်</string>
+    <string name="sort_rating_desc">အဆင့်သတ်မှတ်ချက် (အမြင့်ဆုံးမှအနိမ့်ဆုံးသို့)</string>
+    <string name="sort_rating_asc">အဆင့်သတ်မှတ်ချက် (အနိမ့်ဆုံး မှ အမြင့်ဆုံးသို့)</string>
+    <string name="sort_updated_old">အပ်ဒိတ်ဖြစ်မှု (အဟောင် မှ အသစ်)</string>
+    <string name="sort_alphabetical_a">အက္ခရာစဥ်လိုက် (A မှ Z)</string>
+    <string name="sort_alphabetical_z">အက္ခရာစဥ်လိုက် (Z မှ A)</string>
+    <string name="revert">ပြောင်းပြန်</string>
+    <string name="subscription_in_progress_notification">စာရင်းသွင်းထားသောရှိုးများကိုအပ်ဒိတ်လုပ်နေသည်</string>
+    <string name="subscription_list_name">စာရင်းသွင်းပြီး</string>
+    <string name="subscription_new">စာရင်းသွင်းပြီး %s</string>
+    <string name="subscription_deleted">စာရင်းသွင်းမှုပယ်ဖျက်ပြီး %s</string>
+    <string name="empty_library_logged_in_message">ဤစာရင်းသည် ဗလာဖြစ်နေသည်။ အခြားတစ်ခုသို့ ပြောင်းကြည့်ပါ။</string>
+    <string name="safe_mode_file">Safe mode ဖိုင်ကို တွေ့ရှိခဲ့သည်။
+\nဖိုင်ကိုမဖယ်ရှားမချင်း စတင်ဖွင့်စတွင် မည်သည့် extension များကိုမျှ မတင်ပါ။</string>
+    <string name="subscription_episode_released">အပိုင်းသစ် %d ထွက်ပြီ</string>
+    <string name="profile_number">ပရိုဖိုင် %d</string>
+    <string name="wifi">ဝိုင်ဖိုင်</string>
+    <string name="mobile_data">မိုဘိုင်းဒေတာ</string>
+    <string name="set_default">ပုံသေထားရန်</string>
+    <string name="profiles">ပရိုဖိုင်များ</string>
+    <string name="help">အကူအညီ</string>
+    <string name="quality_profile_help">ဤနေရာတွင် သင်သည် အရင်းအမြစ်များကို မည်ကဲ့သို့ အစီအစဥ်ချမည်ကို ပြောင်းလဲနိုင်သည်။ ဗီဒီယိုတစ်ခုတွင် ပိုမိုဦးစားပေးပါက ရင်းမြစ်ရွေးချယ်မှုတွင် ပိုမိုမြင့်မားလာမည်ဖြစ်သည်။ အရင်းအမြစ် ဦးစားပေးနှင့် အရည်အသွေး ဦးစားပေး၏ ပေါင်းစုသည် ဗီဒီယို ဦးစားပေးဖြစ်သည်။
+\n
+\nအရင်းအမြစ် A: 3
+\nအရည်အသွေး B: 7
+\nပေါင်းစပ်ဗီဒီယို ဦးစားပေး 10 ခု ရှိပါမည်။
+\n
+\nမှတ်ချက်- ပေါင်းလဒ်သည် 10 သို့မဟုတ် ထို့ထက်ပိုပါက ထိုလင့်ခ်ကို တင်သည့်အခါ ဗီဒီယိုဖွင့်စက်သည် အလိုအလျောက် ဒေါင်းလုဒ်ကို ကျော်သွားမည်ဖြစ်သည်</string>
+    <string name="profile_background_des">ပရိုဖိုင်နောက်ခံ</string>
+    <string name="unable_to_inflate">UI ကို မှန်ကန်စွာ ဖန်တီး၍မရပါ၊ ၎င်းသည် အဓိက ချို့ယွင်းချက်တစ်ခုဖြစ်ပြီး ချက်ချင်းသတင်းပို့သင့်သည်။ %s</string>
+    <string name="already_voted">သင်နဂိုတည်းကသတ်မှတ်ပြီး</string>
+    <string name="select_library">လိုက်ဘရီရွေးချယ်ရန်</string>
+    <string name="open_with">ဖြင့်ဖွင့်မည်</string>
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index f56b0bfb..d19726fd 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -551,4 +551,28 @@
 \nWord lid van onze Discord of zoek online.</string>
     <string name="audio_tracks">Audiosporen</string>
     <string name="sort_by">Gesorteerd op</string>
+    <string name="wifi">Wifi</string>
+    <string name="mobile_data">Mobiele data</string>
+    <string name="set_default">Maak standaard</string>
+    <string name="edit">Aanpassen</string>
+    <string name="profiles">Profielen</string>
+    <string name="help">Help</string>
+    <string name="qualities">Kwaliteiten</string>
+    <string name="profile_background_des">Profiel achtergrond</string>
+    <string name="use">Gebruik</string>
+    <string name="quality_profile_help">Hier kan je de volgorde van de bronnen veranderen. Als een video een hogere prioriteit heeft zal het hoger in de bronnenlijst staan. De som van de prioriteit van de bron en de prioriteit van de kwaliteit is de prioriteit van de video.
+\n
+\nBron A: 3
+\nKwaliteit B: 7
+\nHeeft een totale prioriteit van de video van 10.
+\n
+\nNOTITIE: Als de som 10 of hoger is zal de speler automatisch het laden overslaan wanneer die link is geladen!</string>
+    <string name="profile_number">Profiel %d</string>
+    <string name="no_repository_found_error">Repository niet gevonden, controleer de URL en probeer een VPN</string>
+    <string name="no_plugins_found_error">Geen plug-ins gevonden in de repository</string>
+    <string name="automatic_plugin_download_mode_title">Selecteer een modus om het downloaden van plug-ins te filteren</string>
+    <string name="disable">Uitzetten</string>
+    <string name="unable_to_inflate">De gebruikersinterface kon niet correct worden gemaakt, dit is een ERNSTIG PROBLEEM en moet onmiddellijk gerapporteerd worden %s</string>
+    <string name="default_account">@string/default_subtitles</string>
+    <string name="already_voted">Je hebt al gestemd</string>
 </resources>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index b3dda84f..592ff22c 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -183,4 +183,17 @@
     <string name="duration">Varigheit</string>
     <string name="livestreams">Direktesendingar</string>
     <string name="pref_category_app_updates">Programoppdateringar</string>
+    <string name="subs_hold_to_reset_to_default">Trykk og hold inne for å nullstille til standardinnstillinger</string>
+    <string name="search_provider_text_types">Søk ved bruk av typer</string>
+    <string name="subs_auto_select_language">Automatisk språkvalg</string>
+    <string name="subs_download_languages">Last ned språk</string>
+    <string name="subs_subtitle_languages">Undertekstspråk</string>
+    <string name="provider_info_meta">Metadata er ikke tilgjengelig fra nettsiden. Videoavspilling vil mislykkes hvis metadata ikke finnes på nettsiden.</string>
+    <string name="player_subtitles_settings_des">Innstillinger for avspilling av undertekster</string>
+    <string name="search_poster_img_des">Plakat</string>
+    <string name="vpn_torrent">Denne leverandøren er en torrent, og det anbefales å bruke en VPN-tjeneste.</string>
+    <string name="vpn_might_be_needed">For at denne leverandøren skal fungere korrekt, kan det være nødvendig å bruke en VPN-tjeneste</string>
+    <string name="picture_in_picture">Bilde i bilde</string>
+    <string name="continue_watching">Fortsett å sjå</string>
+    <string name="reload_error">Prøv tilkopling på nytt…</string>
 </resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 92882faf..dac15d61 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Plakat</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">Plakat</string>
     <string name="episode_poster_img_des">Episode Plakat</string>
     <string name="home_main_poster_img_des">Main Plakat</string>
     <string name="home_next_random_img_des">Neste tilfeldig</string>
@@ -104,7 +104,7 @@
     <string name="swipe_to_seek_settings">Sveip for å søke</string>
     <string name="swipe_to_seek_settings_des">Sveip til venstre eller høyre for å kontrollere tiden i videospilleren</string>
     <string name="swipe_to_change_settings">Sveip for å endre innstillinger</string>
-    <string name="swipe_to_change_settings_des">Sveip på venstre eller høyre side for å endre lysstyrke eller volum</string>
+    <string name="swipe_to_change_settings_des">Sveip opp eller ned på venstre eller høyre side for å endre lysstyrke eller volum</string>
     <string name="double_tap_to_seek_settings">Dobbelttrykk til å søke</string>
     <string name="double_tap_to_seek_settings_des">Trykk to ganger på høyre eller venstre for å søke fremover eller bakover</string>
     <string name="use_system_brightness_settings">Bruk systemets lysstyrke</string>
@@ -117,7 +117,7 @@
     <string name="bug_report_settings_on">Sender ingen rapportere</string>
     <string name="show_fillers_settings">Vis filler-episode til anime</string>
     <string name="updates_settings">Vis appoppdateringer</string>
-    <string name="updates_settings_des">Søk automatisk etter nye oppdateringer</string>
+    <string name="updates_settings_des">Søk automatisk etter nye oppdateringer etter at appen har startet.</string>
     <string name="uprereleases_settings">Oppdatering til forhåndsutgivelser</string>
     <string name="uprereleases_settings_des">Søk etter oppdateringer før utgivelse i stedet for fullstendige utgivelser</string>
     <string name="github">Github</string>
@@ -186,7 +186,7 @@
     <string name="video_skip_op">Hoppe OP</string>
     <string name="dont_show_again">Ikke vis igjen</string>
     <string name="update">Oppdater</string>
-    <string name="watch_quality_pref">Foretrukket klokkekvalitet</string>
+    <string name="watch_quality_pref">Foretrukket avspillingskvalitet (WiFi)</string>
     <string name="dns_pref">DNS rundt HTTPS</string>
     <string name="dns_pref_summary">Nyttig til omgå Internettleverandør hinder</string>
     <string name="display_subbed_dubbed_settings">Vis dubbet/subbed Anime</string>
@@ -296,7 +296,7 @@
     <string name="chromecast_subtitles_settings">Chromecast-undertekster</string>
     <string name="autoplay_next_settings">Autospill neste episode</string>
     <string name="history">Historikk</string>
-    <string name="double_tap_to_pause_settings_des">Trykk i midten for å sette på pause</string>
+    <string name="double_tap_to_pause_settings_des">Trykk to ganger midt på skjermen for å pause</string>
     <string name="no_episodes_found">Fant ingen episoder</string>
     <string name="filler" formatted="true">Fyllstoff</string>
     <string name="play_livestream_button">Spill direktestrøm</string>
@@ -323,7 +323,7 @@
     <string name="actor_main">Hovedrolle</string>
     <string name="actor_supporting">Støtterolle</string>
     <string name="next">Neste</string>
-    <string name="referer">Referent</string>
+    <string name="referer">Referanse</string>
     <string name="plugin_deleted">Programtillegg slettet</string>
     <string name="repository_name_hint">Pakkebrønnsnavn</string>
     <string name="repository_url_hint">Pakkebrønnsnettadresse</string>
@@ -364,7 +364,7 @@
     <string name="plugin_singular">programtillegg</string>
     <string name="safe_mode_title">Trygt modus påslått</string>
     <string name="action_add_to_bookmarks">Sett visningsstatus</string>
-    <string name="episode_sync_settings_des">Auto-synkroniser din nåværende episode-framdrift</string>
+    <string name="episode_sync_settings_des">Synkroniser automatisk fremdriften din for gjeldende episode</string>
     <string name="episodes_range">%d-%d</string>
     <string name="view_public_repositories_button_short">Offentlig liste</string>
     <string name="plugin">programtillegg</string>
@@ -399,7 +399,7 @@
     <string name="skip_type_creddits">Rulletekst</string>
     <string name="skip_type_intro">Introduksjon</string>
     <string name="backup_failed">Lagringstilgang mangler. Prøv igjen.</string>
-    <string name="show_trailers_settings">Vis forfilmer</string>
+    <string name="show_trailers_settings">Vis trailere</string>
     <string name="show_dub">Dubbingsetikett</string>
     <string name="show_sub">Undertekstetikett</string>
     <string name="video_buffer_size_settings">Videomellomlagringsstørrelse</string>
@@ -407,11 +407,11 @@
     <string name="video_buffer_disk_settings">Videohurtiglager på disk</string>
     <string name="video_buffer_clear_settings">Tøm video- og bildehurtiglager</string>
     <string name="add_site_summary">Legg til en klone av en eksisterende side, med en annen nettadresse</string>
-    <string name="automatic_plugin_download_summary">Installer alle programtillegg som ikke er installert enda fra de pakkebrønnene som er lagt til.</string>
+    <string name="automatic_plugin_download_summary">Installer automatisk alle plugins som ikke er installert fra de tilføyde depotene.</string>
     <string name="show_hd">Kvalitetsetikett</string>
     <string name="poster_ui_settings">Slå av/på grensesnittselementer på plakat</string>
     <string name="skip_update">Hopp over denne oppdateringen</string>
-    <string name="video_ram_description">Forårsaker tilfeldige krasj hvis satt for høyt. Ikke endre dette hvis du ikke har lite minne.</string>
+    <string name="video_ram_description">Kan forårsake krasj hvis satt for høyt på enheter med lite minne, for eksempel en Android TV.</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="backup_settings">Sikkerhetskopier data</string>
     <string name="backup_success">Data lagret</string>
@@ -425,13 +425,13 @@
     <string name="anime_singular">@string/anime</string>
     <string name="pref_filter_search_quality">Skjul valgt videokvalitet i søkeresultater</string>
     <string name="restore_success">Lastet inn sikkerhetkopifil</string>
-    <string name="category_updates">Oppdateringer og sikkerhetskopi</string>
+    <string name="category_updates">Oppdateringer og sikkerhetskopier</string>
     <string name="ova_singular">@string/ova</string>
     <string name="confirm_exit_dialog">Avslutt\?</string>
     <string name="nsfw_singular">Sensurerbart</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Alle %s er allerede nedlastet</string>
     <string name="update_notification_failed">Kunne ikke installere den nye versjonen av programmet</string>
-    <string name="update_notification_installing">Installerer ny versjon av programmet …</string>
+    <string name="update_notification_installing">Installerer appoppdatering…</string>
     <string name="update_notification_downloading">Laster ned ny versjon av programmet …</string>
     <string name="upload_sync">Synkroniser</string>
     <string name="authenticated_user" formatted="true">%s innlogget</string>
@@ -449,7 +449,7 @@
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
     <string name="subtitles_remove_captions">Fjern døveteksting fra undertekster</string>
-    <string name="subtitles_remove_bloat">Minimale undertekster</string>
+    <string name="subtitles_remove_bloat">Fjern unødvendig informasjon fra undertekster</string>
     <string name="extras">Ekstra</string>
     <string name="subtitles_filter_lang">Filtrer etter foretrukket mediaspråk</string>
     <string name="player_settings_play_in_web">Vev-videosending</string>
@@ -488,7 +488,7 @@
     <string name="pref_category_subtitles">Undertekster</string>
     <string name="pref_category_backup">Sikkerhetskopi</string>
     <string name="apk_installer_settings">APK-installatør</string>
-    <string name="apk_installer_settings_des">Noen enheter støtter ikke den nye pakkeinstallatøren. Prøv gammeldags alternativ hvis ting ikke installeres.</string>
+    <string name="apk_installer_settings_des">Noen telefoner støtter ikke den nye pakkeinstallatøren. Prøv det eldre alternativet hvis oppdateringer ikke blir installert.</string>
     <string name="update_started">Oppdatering startet</string>
     <string name="plugin_downloaded">Programtillegg nedlastet</string>
     <string name="delayed_update_notice">Programmet vil oppgraderes når du avslutter det</string>
@@ -511,7 +511,7 @@
     <string name="android_tv_interface_on_seek_settings">Vist avspiller — blafringsmengde</string>
     <string name="sort_updated_old">Oppdatert (gammel til ny)</string>
     <string name="test_passed">Vellykket</string>
-    <string name="subscription_episode_released">Episode %d sluppet.</string>
+    <string name="subscription_episode_released">Episode %d sluppet!</string>
     <string name="watch_quality_pref_data">Foretrukket visningskvalitet (mobildata)</string>
     <string name="stop">Stopp</string>
     <string name="action_remove_from_watched">Fjern fra sette</string>
@@ -525,7 +525,7 @@
     <string name="subscription_new">Abonnerer på %s</string>
     <string name="android_tv_interface_off_seek_settings_summary">Blafringsmengde med skjult avspiller</string>
     <string name="select_library">Velg bibliotek</string>
-    <string name="jsdelivr_proxy_summary">Omgår blokkering av GitHub ved bruk av jsDelivr. Kan utsette oppdateringer et par dager.</string>
+    <string name="jsdelivr_proxy_summary">Omgår blokkering av GitHub ved hjelp av jsDelivr. Dette kan forårsake forsinkelser på oppdateringer med noen få dager.</string>
     <string name="pref_category_bypass">ISP-omgåelser</string>
     <string name="empty_library_logged_in_message">Denne listen er tom. Prøv å bytte til en annen.</string>
     <string name="sort">Sorter</string>
diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml
index eaa76652..177f7ea1 100644
--- a/app/src/main/res/values-or/strings.xml
+++ b/app/src/main/res/values-or/strings.xml
@@ -27,7 +27,7 @@
     <string name="play_episode_toast">ଅଧ୍ୟାୟ ଚଲାଅ</string>
     <string name="no_episodes_found">କୌଣସି ଅଧ୍ୟାୟ ମିଳିଲା ନାହିଁ</string>
     <string name="episodes">ଟି ଅଧ୍ୟାୟ</string>
-    <string name="episode">ଟିଏ ଅଧ୍ୟାୟ</string>
+    <string name="episode">ଅଧ୍ୟାୟ</string>
     <string name="episode_action_play_in_format">%s‌ରେ ଚଲାଅ</string>
     <string name="episode_action_play_in_browser">ବ୍ରାଉଜର୍‌ରେ ଚଲାଅ</string>
     <string name="episode_action_download_subtitle">ଉପଶୀର୍ଷକ ଡାଉନଲୋଡ୍ କରିବା</string>
@@ -146,4 +146,16 @@
     <string name="player_subtitles_settings">ଉପଶୀର୍ଷକ</string>
     <string name="go_forward_30">+୩୦</string>
     <string name="year">ଵର୍ଷ</string>
+    <string name="download_storage_text">ଅନ୍ତଃ-ଷ୍ଟୋରେଜ୍</string>
+    <string name="home_change_provider_img_des">ପ୍ରଦାତା ବଦଳାଅ</string>
+    <string name="search_provider_text_providers">ପ୍ରଦାତା ଵ୍ୟଵହାର କରି ଖୋଜିବା</string>
+    <string name="coming_soon">ଶୀଘ୍ର ଆସୁଅଛି…</string>
+    <string name="updates_settings">ଆପ୍ ଅଦ୍ୟତନ ଦେଖାଇବା</string>
+    <string name="update_started">ଅଦ୍ୟତନ ଆରମ୍ଭ ହୋଇଛି</string>
+    <string name="search_hint">ସନ୍ଧାନ କରିବା…</string>
+    <string name="skip_type_recap">ସଂକ୍ଷିପ୍ତବୃତ୍ତି</string>
+    <string name="play_movie_button">ଚଳଚ୍ଚିତ୍ର ଚଲାଅ</string>
+    <string name="search_hint_site" formatted="true">%s ସନ୍ଧାନ କରିବା…</string>
+    <string name="next_episode">ପରବର୍ତ୍ତୀ ଅଧ୍ୟାୟ</string>
+    <string name="no_data">କୌଣସି ତଥ୍ୟ ନାହିଁ</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 2961cb47..a170d610 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -532,4 +532,28 @@
     <string name="jsdelivr_proxy_summary">Obchodzi blokadę GitHuba za pomocą jsDelivr. może spowodować opóźnienie aktualizacji o kilka dni.</string>
     <string name="jsdelivr_enabled">Nie udało się połączyć z GitHub, włączono serwer pośredniczący jsDelivr…</string>
     <string name="watch_quality_pref_data">Domyślna jakość (dane mobilne)</string>
+    <string name="quality_profile_help">W tym miejscu można zmienić kolejność źródeł. Jeśli wideo ma wyższy priorytet, pojawi się wyżej w wyborze źródła. Priorytet wideo jest sumą priorytetu źródła i priorytetu jakości.
+\n
+\nŹródło A: 3
+\nJakość B: 7
+\nŁączny priorytet wideo będzie wynosił 10.
+\n
+\nUWAGA: Jeśli suma wynosi 10 lub więcej, odtwarzacz automatycznie pominie ładowanie po załadowaniu tego łącza!</string>
+    <string name="profile_number">Profil %d</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="mobile_data">Dane mobilne</string>
+    <string name="set_default">Ustaw domyślny</string>
+    <string name="use">Użyj</string>
+    <string name="edit">Edytuj</string>
+    <string name="profiles">Profile</string>
+    <string name="help">Pomoc</string>
+    <string name="qualities">Jakości</string>
+    <string name="profile_background_des">Tło profilu</string>
+    <string name="unable_to_inflate">Nie można było poprawnie utworzyć interfejsu użytkownika, jest to POWAŻNY BŁĄD i należy go natychmiast zgłosić %s</string>
+    <string name="automatic_plugin_download_mode_title">Wybierz tryb filtrowania pobieranych rozszerzeń</string>
+    <string name="disable">Wyłączać</string>
+    <string name="default_account">@string/default_subtitles</string>
+    <string name="no_plugins_found_error">Nie znaleziono żadnych wtyczek w repozytorium</string>
+    <string name="already_voted">Już oddano głos</string>
+    <string name="no_repository_found_error">Nie znaleziono tego repozytorium, sprawdź adres URL lub spróbuj połączyć się przez VPN</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 705285eb..908ddb0d 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -529,4 +529,28 @@
     <string name="pref_category_defaults">Configurações padrão</string>
     <string name="quality_sd">SD</string>
     <string name="audio_tracks">Faixas de áudio</string>
+    <string name="profile_number">Perfil %d</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="mobile_data">Dados móveis</string>
+    <string name="set_default">Definir predefinição</string>
+    <string name="use">Utilização</string>
+    <string name="edit">Editar</string>
+    <string name="profiles">Perfis</string>
+    <string name="help">Ajuda</string>
+    <string name="qualities">Qualidades</string>
+    <string name="profile_background_des">Perfil de fundo</string>
+    <string name="quality_profile_help">Aqui pode alterar a forma como as fontes são ordenadas. Se um vídeo tiver uma prioridade mais elevada, aparecerá mais alto na seleção da fonte. A soma da prioridade da fonte com a prioridade da qualidade é a prioridade do vídeo.
+\n
+\nFonte A: 3
+\nQualidade B: 7
+\nTerá uma prioridade de vídeo combinada de 10.
+\n
+\nNOTA: Se a soma for 10 ou mais, o leitor saltará automaticamente o carregamento quando essa ligação for carregada!</string>
+    <string name="automatic_plugin_download_mode_title">Selecionar o modo para filtrar a transferência de plug-ins</string>
+    <string name="unable_to_inflate">Não foi possível criar corretamente a interface do utilizador, trata-se de um GRANDE BUG e deve ser comunicado imediatamente %s</string>
+    <string name="default_account">\@ string/legendas_padrão</string>
+    <string name="disable">Desativar</string>
+    <string name="no_plugins_found_error">Não foram encontrados plugins no repositório</string>
+    <string name="no_repository_found_error">Repositório não encontrado, verifique o URL e tente a VPN</string>
+    <string name="already_voted">Você já votou</string>
 </resources>
diff --git a/app/src/main/res/values-qt/strings.xml b/app/src/main/res/values-qt/strings.xml
index f763d795..9c68c008 100644
--- a/app/src/main/res/values-qt/strings.xml
+++ b/app/src/main/res/values-qt/strings.xml
@@ -248,4 +248,5 @@
     <string name="clear_history">aoaaaaaoooghhh</string>
     <string name="sort_save">oooooh uuaagh</string>
     <string name="action_open_play">@string/home_play</string>
+    <string name="chromecast_subtitles_settings">oouuhhh ahhooo-ahah</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 294abcfd..b6971c37 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -29,7 +29,7 @@
     <string name="title_downloads">Descărcări</string>
     <string name="title_settings">Setări</string>
     <string name="search_hint">Căutare…</string>
-    <string name="search_hint_site" formatted="true">Căutați %s...</string>
+    <string name="search_hint_site" formatted="true">Căutați %s…</string>
     <string name="no_data">Fără date</string>
     <string name="episode_more_options_des">Mai multe opțiunii</string>
     <string name="next_episode">Episodul următor</string>
@@ -37,7 +37,7 @@
     <string name="result_share">Distribuie</string>
     <string name="result_open_in_browser">Deschide în browser</string>
     <string name="skip_loading">Săriți încărcarea</string>
-    <string name="loading">Se încarcă...</string>
+    <string name="loading">Se încarcă…</string>
     <string name="type_watching">În curs de vizualizare</string>
     <string name="type_on_hold">În așteptare</string>
     <string name="type_completed">Finalizat</string>
@@ -49,7 +49,7 @@
     <string name="play_torrent_button">Stream Torrent</string>
     <string name="pick_source">Surse</string>
     <string name="pick_subtitle">Subtitrare</string>
-    <string name="reload_error">Încercați să vă conectați din nou...</string>
+    <string name="reload_error">Încercați să vă conectați din nou…</string>
     <string name="go_back">Înapoi</string>
     <string name="play_episode">Redă episodul</string>
     <string name="download">Descărcare</string>
@@ -125,9 +125,9 @@
     <string name="eigengraumode_settings">Modul Eigengravy</string>
     <string name="eigengraumode_settings_des">Adăugați opțiunea de viteză în player</string>
     <string name="swipe_to_seek_settings">Derulați spre înainte/înapoi</string>
-    <string name="swipe_to_seek_settings_des">Glisați dintr-o parte în alta pentru a vă controla poziția într-un videoclip</string>
+    <string name="swipe_to_seek_settings_des">Derulați dintr-o parte în alta pentru a controla timpul de difuzare a videoclipului</string>
     <string name="swipe_to_change_settings">Derulați pentru a modifica setările</string>
-    <string name="swipe_to_change_settings_des">Glisați spre stânga sau spre dreapta pentru a schimba luminozitatea sau volumul</string>
+    <string name="swipe_to_change_settings_des">Glisați în sus sau în jos pe partea stângă sau dreaptă pentru a schimba luminozitatea sau volumul</string>
     <string name="double_tap_to_seek_settings">Atingeți de două ori pentru a merge înainte/înapoi</string>
     <string name="double_tap_to_pause_settings">Atingeți de două ori pentru a pune pauză</string>
     <string name="double_tap_to_seek_settings_des">Atingeți de două ori partea stângă sau dreaptă a ecranului pentru a derula rapid înainte sau înapoi videoclipul</string>
@@ -442,8 +442,7 @@
     <string name="extension_authors">Autori</string>
     <string name="crash_reporting_title">Raportarea accidentelor</string>
     <string name="add_repository">Adaugă depozit</string>
-    <string name="empty_library_no_accounts_message">Se pare că biblioteca ta este goală :(
-\nConectează-te la un cont de bibliotecă sau adaugă emisiuni în biblioteca ta locală</string>
+    <string name="empty_library_no_accounts_message">Se pare că biblioteca ta este goală :( Conectează-te la un cont de bibliotecă sau adaugă emisiuni în biblioteca ta locală.</string>
     <string name="subtitles_remove_captions">Eliminați subtitrările închise din subtitrări</string>
     <string name="setup_extensions_subtext">Descărcați lista de site-uri pe care doriți să le utilizați</string>
     <string name="sort_rating_desc">Evaluare (Ridicat la Scăzut)</string>
@@ -501,7 +500,7 @@
     <string name="extension_description">Descriere</string>
     <string name="plugin_downloaded">Plugin Descărcat</string>
     <string name="confirm_exit_dialog">Sunteți sigur că vreți să ieșiți\?</string>
-    <string name="empty_library_logged_in_message">Se pare că această listă este goală, încercați să treceți la o alta</string>
+    <string name="empty_library_logged_in_message">Se pare că această listă este goală, încercați să treceți la o alta.</string>
     <string name="sort_by">Sortați după</string>
     <string name="player_settings_play_in_app">Player intern</string>
     <string name="pref_category_defaults">Prestabile</string>
@@ -548,4 +547,28 @@
     <string name="player_pref">Player video preferat</string>
     <string name="pref_category_app_updates">Actualizări al aplicației</string>
     <string name="pref_category_subtitles">Subtitrări</string>
+    <string name="disable">Dezactivați</string>
+    <string name="quality_profile_help">Aici puteți schimba modul în care sunt ordonate sursele. Dacă un videoclip are o prioritate mai mare, acesta va apărea mai sus în selecția surselor. Suma dintre prioritatea sursei și prioritatea calității reprezintă prioritatea video.
+\n
+\nSursa A: 3
+\nCalitate B: 7
+\nVa avea o prioritate video combinată de 10.
+\n
+\nNOTĂ: Dacă suma este 10 sau mai mare, playerul va sări automat peste încărcare atunci când este încărcat link-ul respectiv!</string>
+    <string name="no_plugins_found_error">Nu s-a găsit plugin-uri în depozit</string>
+    <string name="no_repository_found_error">Nu s-a găsit depozitul, verificați URL-ul și încercați cu un VPN</string>
+    <string name="edit">Editați</string>
+    <string name="profiles">Profiluri</string>
+    <string name="help">Ajutor</string>
+    <string name="profile_number">Profilul %d</string>
+    <string name="wifi">Wi-FI</string>
+    <string name="mobile_data">Date mobile</string>
+    <string name="qualities">Calități</string>
+    <string name="profile_background_des">Profil de fundal</string>
+    <string name="set_default">Setați ca implicit</string>
+    <string name="use">Utilizați</string>
+    <string name="unable_to_inflate">UI nu a putut fi creată corect, acesta este un BUG MAJOR și trebuie raportat imediat %s</string>
+    <string name="automatic_plugin_download_mode_title">Selectați modul de filtrare a descărcării plugin-urilor</string>
+    <string name="default_account">@string/default_subtitles</string>
+    <string name="already_voted">Ați votat deja</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 168e23fa..397faa48 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -10,7 +10,7 @@
     <string name="title_downloads">Nerladdningar</string>
     <string name="title_settings">Instälningar</string>
     <string name="search_hint">Sök…</string>
-    <string name="search_poster_img_des">Poster</string>
+    <string name="search_poster_img_des">Affisch</string>
     <string name="no_data">Ingen Data</string>
     <string name="episode_more_options_des">Mer Instälningar</string>
     <string name="go_back_img_des">Gå tillbacka</string>
@@ -100,7 +100,7 @@
     <string name="bug_report_settings_off">Skickar endast data när appen kraschar</string>
     <string name="bug_report_settings_on">Skickar ingen data</string>
     <string name="updates_settings">Visa appuppdateringar</string>
-    <string name="updates_settings_des">Sök automatiskt efter nya uppdateringar vid start</string>
+    <string name="updates_settings_des">Sök automatiskt efter nya uppdateringar vid start.</string>
     <string name="uprereleases_settings">Uppdatera till beta-version</string>
     <string name="uprereleases_settings_des">Sök efter beta-version istället för fullständiga utgåvor av appen</string>
     <string name="github">Github</string>
@@ -175,7 +175,7 @@
     <string name="pause">Pausa</string>
     <string name="resume">Återuppta</string>
     <string name="storage_error">Ett nerladdningsfel uppstod, kolla om appen har lagringsbehörigheter</string>
-    <string name="watch_quality_pref">Föredragen videokvalitet</string>
+    <string name="watch_quality_pref">Föredragen videokvalitet (WiFi)</string>
     <string name="category_general">Allmänna Inställningar</string>
     <string name="subs_font_size">Textstorlek</string>
     <string name="use_system_brightness_settings">Använd system ljusstyrka</string>
@@ -216,7 +216,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="play_with_app_name">Spela med CloudStream</string>
     <string name="chromecast_subtitles_settings">Chromecast-undertexter</string>
-    <string name="double_tap_to_pause_settings_des">Tryck i mitten för att pausa</string>
+    <string name="double_tap_to_pause_settings_des">Dubbeltryck i mitten för att pausa</string>
     <string name="restore_settings">Återställ data från backup</string>
     <string name="category_account">Konton</string>
     <string name="category_updates">Uppdateringar och backup</string>
@@ -244,7 +244,7 @@
     <string name="resume_time_left" formatted="true">%dm
 \nåterstår</string>
     <string name="nsfw">NSFW</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="go_forward_30">+30</string>
@@ -273,7 +273,7 @@
     <string name="asian_drama">Asiatiska draman</string>
     <string name="others">Andra</string>
     <string name="cartoons_singular">Tecknade serier</string>
-    <string name="anime_singular">@string/anime</string>
+    <string name="anime_singular">Anime</string>
     <string name="documentaries_singular">Dokumentär</string>
     <string name="asian_drama_singular">Asiatisk drama</string>
     <string name="other_singular">Video</string>
@@ -368,4 +368,69 @@
     <string name="provider_languages_tip">Titta på videor på dessa språk</string>
     <string name="previous">Föregående</string>
     <string name="tracks">Spår</string>
+    <string name="update_started">Uppdaterar</string>
+    <string name="test_log">Logg</string>
+    <string name="double_tap_to_seek_amount_settings">Videospelarens hoppsträcka (Sekunder)</string>
+    <string name="action_add_to_bookmarks">Ändra status</string>
+    <string name="browser">Webbläsare</string>
+    <string name="nginx_url_pref">NGINX server URL</string>
+    <string name="emulator_layout">Emulator-layout</string>
+    <string name="confirm_exit_dialog">Är du säker på att du vill avsluta\?</string>
+    <string name="update_notification_downloading">Laddar ner uppdatering till appen…</string>
+    <string name="random_button_settings">Slumpknapp</string>
+    <string name="show_sub">Visa sub</string>
+    <string name="app_not_found_error">Kunde inte öppna appen</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
+    <string name="player_settings_play_in_browser">Webbläsarens videospelare</string>
+    <string name="update_notification_installing">Installerar uppdatering till appen…</string>
+    <string name="jsdelivr_enabled">Kunde inte nå GitHub, sätter på jsDelivr proxy…</string>
+    <string name="category_providers">Leverantörer</string>
+    <string name="example_site_name">MinTrevligaWebbsida</string>
+    <string name="subtitles_remove_bloat">Ta bort reklam från undertexter</string>
+    <string name="player_settings_play_in_vlc">VLC</string>
+    <string name="all_languages_preference">Alla språk</string>
+    <string name="clear_history">Rensa historik</string>
+    <string name="apk_installer_package_installer">PackageInstaller</string>
+    <string name="library">Bibliotek</string>
+    <string name="pref_category_defaults">Standardvärden</string>
+    <string name="delayed_update_notice">Appen kommer uppdateras efter avslut</string>
+    <string name="sort_by">Sortera efter</string>
+    <string name="sort_rating_asc">Betyg (Låg till Hög)</string>
+    <string name="sort_updated_new">Senast uppdaterad (Ny till Gammal)</string>
+    <string name="sort_updated_old">Senast uppdaterad (Gammal till Ny)</string>
+    <string name="sort_alphabetical_a">Alfabetisk (A till Z)</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="test_passed">Lyckades</string>
+    <string name="restart">Starta om</string>
+    <string name="category_provider_test">Testa leverantörer</string>
+    <string name="watch_quality_pref_data">Föredragen videokvalitet (Mobildata)</string>
+    <string name="random_button_settings_desc">Visa en slumpknapp på förstasidan</string>
+    <string name="is_adult">18+</string>
+    <string name="audio_tracks">Ljudspår</string>
+    <string name="livestreams">Direktsändningar</string>
+    <string name="category_player">Videospelare</string>
+    <string name="open_with">Öppna med</string>
+    <string name="subtitle_offset">Synkronisera undertexter</string>
+    <string name="player_settings_play_in_mpv">MPV</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="test_failed">Misslyckades</string>
+    <string name="yes">Ja</string>
+    <string name="video_tracks">Videospår</string>
+    <string name="show_dub">Visa dub</string>
+    <string name="apk_installer_legacy">Gammal version</string>
+    <string name="uppercase_all_subtitles">Undertexter skrivs med versaler</string>
+    <string name="no">Nej</string>
+    <string name="profile_number">Profil %d</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="mobile_data">Mobildata</string>
+    <string name="use">Använd</string>
+    <string name="edit">Ändra</string>
+    <string name="recommended">Rekommenderade</string>
+    <string name="sort">Sortera</string>
+    <string name="update_notification_failed">Kunde inte installera den nya uppdateringen</string>
+    <string name="sort_rating_desc">Betyg (Hög till Låg)</string>
+    <string name="sort_alphabetical_z">Alfabetisk (Z till A)</string>
+    <string name="profiles">Profiler</string>
+    <string name="help">Hjälp</string>
+    <string name="qualities">Kvalitet</string>
 </resources>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index affb04bf..3f4134e5 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -6,12 +6,12 @@
     <string name="title_home">முகப்பு</string>
     <string name="title_search">தேடு</string>
     <string name="title_downloads">பதிவிறக்கம்</string>
-    <string name="no_data">தகவல் எதுவும் இல்லை</string>
+    <string name="no_data">தரவு இல்லை</string>
     <string name="episode_more_options_des">மேலும் விருப்பங்கள்</string>
-    <string name="next_episode">அடுத்த எபிசோட்</string>
+    <string name="next_episode">அடுத்த அத்தியாயம்</string>
     <string name="result_tags">வகைகள்</string>
     <string name="result_share">பகிர்</string>
-    <string name="result_open_in_browser">Browser இல் திற</string>
+    <string name="result_open_in_browser">உலாவியில் திற</string>
     <string name="skip_loading">ஏற்றுவதைத் தவிர்</string>
     <string name="type_watching">பார்த்து கொண்டிருப்பது</string>
     <string name="type_on_hold">நிறுத்தி வைக்கப்பட்டுள்ளது</string>
@@ -21,9 +21,9 @@
     <string name="play_torrent_button">ஸ்ட்ரீம் டோரண்ட்</string>
     <string name="pick_subtitle">வசன வரிகள்</string>
     <string name="go_back">பின் செல்</string>
-    <string name="play_episode">எபிசோடை இயக்கு</string>
+    <string name="play_episode">அத்தியாயத்தை இயக்கு</string>
     <string name="download">எபிசோட் பதிவிற்கான அனுமதி கொடுக்கவும்</string>
-    <string name="downloaded">பதிவிறக்கம் செய்யப்பட்டது</string>
+    <string name="downloaded">பதிவிறக்கப்பட்டது</string>
     <string name="downloading">பதிவிறக்குகிறது</string>
     <string name="download_paused">பதிவிறக்கம் இடைநிறுத்தப்பட்டது</string>
     <string name="download_started">பதிவிறக்கம் தொடங்கியது</string>
@@ -67,10 +67,10 @@
     <string name="loading">ஏற்றுகிறது…</string>
     <string name="type_dropped">கைவிடப்பட்டது</string>
     <string name="download_done">பதிவிறக்கம் முடிந்தது</string>
-    <string name="reload_error">இணைப்பை மீண்டும் முயற்சிக்கவும்…</string>
+    <string name="reload_error">இணைப்பை மீண்டும் முயலவும்…</string>
     <string name="play_movie_button">திரைப்படத்தை இயக்கு</string>
     <string name="play_livestream_button">லைவ்ஸ்ட்ரீம் இயக்கு</string>
-    <string name="play_trailer_button">டிரெய்லரை இயக்கவும்</string>
+    <string name="play_trailer_button">டிரெய்லரை இயக்கு</string>
     <string name="pick_source">மூலம்</string>
     <string name="error_loading_links_toast">இணைப்புகளை ஏற்றுவதில் பிழை</string>
     <string name="home_play">இயக்கு</string>
@@ -107,4 +107,14 @@
     <string name="double_tap_to_pause_settings">இடைநிறுத்துவதற்கு இருமுறை தட்டவும்</string>
     <string name="chromecast_subtitles_settings_des">Chromecast வசன அமைப்புகள்</string>
     <string name="use_system_brightness_settings_des">இருண்ட மேலடுக்குக்குப் பதிலாக ஆப் பிளேயரில் சிஸ்டம் பிரகாசத்தைப் பயன்படுத்தவும்</string>
+    <string name="next_episode_format" formatted="true">அத்தியாயம் %d-இன் வெளியீட்டு நேரம்</string>
+    <string name="next_episode_time_hour_format" formatted="true">%dம %dநி</string>
+    <string name="next_episode_time_min_format" formatted="true">%dநி</string>
+    <string name="home_next_random_img_des">அடுத்து ஏதாவது</string>
+    <string name="browser">உலாவி</string>
+    <string name="duration_format" formatted="true">%d நிமி</string>
+    <string name="play_with_app_name">CloudStream-உடன் இயக்கு</string>
+    <string name="new_update_format" formatted="true">புதிய புதுப்பிப்பு உள்ளது
+\n%s-&gt;%s</string>
+    <string name="filler" formatted="true">நிரப்பி</string>
 </resources>
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
new file mode 100644
index 00000000..a9079ed5
--- /dev/null
+++ b/app/src/main/res/values-ti/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s ክፋል %d</string>
+    <string name="next_episode_format" formatted="true">ክፋል %d በ ላይ ይወጣል</string>
+    <string name="cast_format" formatted="true">ተዋሳእቲ፡ %s</string>
+</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 170c3679..eef9bc95 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -551,13 +551,13 @@
     <string name="sort_alphabetical_z">Alfabetik (Z - A)</string>
     <string name="select_library">Kütüphane Seçin</string>
     <string name="open_with">Şununla aç</string>
-    <string name="empty_library_logged_in_message">Görünüşe göre bu liste boş, başka bir listeye geçmeyi deneyin</string>
+    <string name="empty_library_logged_in_message">Görünüşe göre bu liste boş, başka bir listeye geçmeyi deneyin.</string>
     <string name="sort_rating_desc">Derecelendirme (Yüksekten Düşüğe)</string>
     <string name="sort_rating_asc">Derecelendirme (Düşükten Yükseğe)</string>
     <string name="restart">Yeniden başlat</string>
     <string name="android_tv_interface_off_seek_settings">Oynatıcı gizlenmişken atlanacak süre</string>
     <string name="pref_category_bypass">İSS Kısıtlamaları</string>
-    <string name="jsdelivr_enabled">GitHub\'a ulaşılamadı, jsdelivr vekil sunucusu etkinleştiriliyor.</string>
+    <string name="jsdelivr_enabled">GitHub\'a ulaşılamadı. jsDelivr vekil sunucusu etkinleştiriliyor…</string>
     <string name="start">Başlat</string>
     <string name="test_passed">Başarılı oldu</string>
     <string name="jsdelivr_proxy">raw.githubusercontent.com vekil sunucusu (proxy)</string>
@@ -577,4 +577,21 @@
     <string name="subscription_deleted">%s kanalı aboneliğinden çıkıldı</string>
     <string name="test_log">Günlük</string>
     <string name="android_tv_interface_on_seek_settings_summary">Oynatıcı görünür durumdayken atlanacak süre miktarı</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="profiles">Profiller</string>
+    <string name="help">Yardım</string>
+    <string name="profile_number">Profil %d</string>
+    <string name="use">Kullan</string>
+    <string name="mobile_data">Mobil veri</string>
+    <string name="set_default">Varsayılanı ayarla</string>
+    <string name="edit">Düzenle</string>
+    <string name="quality_profile_help">Burada kaynakların nasıl sıralandığını değiştirebilirsiniz. Bir video daha yüksek bir önceliğe sahipse, kaynak seçiminde daha yüksek görünecektir. Kaynak önceliği ve kalite önceliğinin toplamı video önceliğidir.
+\n
+\nKaynak A: 3
+\nKalite B: 7
+\nBirleştirilmiş video önceliği 10 olacaktır.
+\n
+\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>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 82527c95..f9dccfc4 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -18,7 +18,7 @@
     <string name="preview_background_img_des">Попередній перегляд фону</string>
     <string name="player_speed_text_format" formatted="true">Швидкість (%.2fx)</string>
     <string name="new_update_format" formatted="true">Знайдено нове оновлення!
-\n%s -&gt; %s</string>
+\n%s –&gt; %s</string>
     <string name="title_search">Пошук</string>
     <string name="title_downloads">Завантаження</string>
     <string name="duration_format" formatted="true">%d хв</string>
@@ -37,7 +37,7 @@
     <string name="type_dropped">Покинуто</string>
     <string name="play_movie_button">Переглянути фільм</string>
     <string name="play_trailer_button">Переглянути трейлер</string>
-    <string name="play_torrent_button">Трансляція через торрент</string>
+    <string name="play_torrent_button">Трансляція через торент</string>
     <string name="reload_error">Повторити підключення…</string>
     <string name="go_back">Назад</string>
     <string name="play_episode">Переглянути епізод</string>
@@ -59,7 +59,7 @@
     <string name="sort_copy">Скопіювати</string>
     <string name="sort_close">Закрити</string>
     <string name="sort_save">Зберегти</string>
-    <string name="player_speed">Швидкість програвача</string>
+    <string name="player_speed">Швидкість плеєра</string>
     <string name="subs_window_color">Колір вікна</string>
     <string name="subs_edge_type">Тип контуру</string>
     <string name="subs_font">Шрифт</string>
@@ -75,20 +75,20 @@
     <string name="continue_watching">Продовжити перегляд</string>
     <string name="action_remove_watching">Вилучити</string>
     <string name="action_open_watching">Детальніше</string>
-    <string name="vpn_torrent">Цей постачальник є торрентом, рекомендується VPN</string>
+    <string name="vpn_torrent">Цей постачальник є торентом, рекомендується використовувати VPN</string>
     <string name="torrent_plot">Опис</string>
     <string name="normal_no_plot">Сюжет не знайдено</string>
     <string name="torrent_no_plot">Опис не знайдено</string>
     <string name="show_log_cat">Показати Logcat 🐈</string>
-    <string name="picture_in_picture_des">Продовження відтворення в мініатюрному плеєрі поверх інших програм</string>
+    <string name="picture_in_picture_des">Продовжує відтворення в мініатюрному плеєрі поверх інших застосунків</string>
     <string name="player_size_settings_des">Прибирає чорні рамки</string>
     <string name="player_subtitles_settings">Субтитри</string>
     <string name="chromecast_subtitles_settings">Субтитри Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Налаштування субтитрів Chromecast</string>
     <string name="eigengraumode_settings">Режим Eigengravy</string>
-    <string name="swipe_to_change_settings">Проведіть пальцем, щоб змінити налаштування</string>
-    <string name="swipe_to_change_settings_des">Проведіть пальцем вгору або вниз ліворуч або праворуч, щоб змінити яскравість або гучність</string>
-    <string name="autoplay_next_settings_des">Відтворення наступного епізоду після закінчення поточного</string>
+    <string name="swipe_to_change_settings">Проведіть, щоб змінити налаштування</string>
+    <string name="swipe_to_change_settings_des">Проведіть вгору або вниз з лівого або правого боку, щоб змінити яскравість чи гучність</string>
+    <string name="autoplay_next_settings_des">Відтворює наступний епізод після закінчення поточного</string>
     <string name="title_home">Головна</string>
     <string name="app_name">CloudStream</string>
     <string name="filler" formatted="true">Філер</string>
@@ -121,20 +121,20 @@
     <string name="subs_text_color">Колір тексту</string>
     <string name="subs_outline_color">Колір контуру</string>
     <string name="autoplay_next_settings">Автовідтворення наступного епізоду</string>
-    <string name="swipe_to_seek_settings_des">Проведіть пальцем з боку в бік, щоб керувати своїм положенням у відео</string>
-    <string name="benene_count_text">%d Бананів для розробників</string>
+    <string name="swipe_to_seek_settings_des">Проведіть з боку в бік, щоб керувати своїм положенням у відео</string>
+    <string name="benene_count_text">%d бананів для розробників</string>
     <string name="player_size_settings">Кнопка зміни розміру плеєра</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Для коректної роботи цього постачальника може знадобитися VPN</string>
     <string name="provider_info_meta">Метадані не надаються сайтом, завантаження відео не відбудеться, якщо їх немає на сайті.</string>
     <string name="picture_in_picture">Картинка в картинці</string>
     <string name="player_subtitles_settings_des">Налаштування субтитрів плеєра</string>
-    <string name="eigengraumode_settings_des">Додає опцію швидкості в плеєрі</string>
-    <string name="swipe_to_seek_settings">Проведіть пальцем, щоб перемотати</string>
+    <string name="eigengraumode_settings_des">Додає опцію керування швидкістю в плеєрі</string>
+    <string name="swipe_to_seek_settings">Проведіть, щоб перемотати</string>
     <string name="double_tap_to_seek_settings">Двічі торкніться, щоб перемотати</string>
     <string name="double_tap_to_pause_settings">Двічі торкніться для паузи</string>
-    <string name="double_tap_to_seek_amount_settings">Крок перемотки (Секунди)</string>
-    <string name="double_tap_to_pause_settings_des">Натисніть двічі посередині, щоб призупинити</string>
+    <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="restore_settings">Відновлення даних з резервної копії</string>
@@ -150,11 +150,11 @@
     <string name="advanced_search_des">Надає результати пошуку, розділені за постачальниками</string>
     <string name="bug_report_settings_off">Надсилає дані лише про збої</string>
     <string name="bug_report_settings_on">Не надсилає даних</string>
-    <string name="show_fillers_settings">Показати заповнюючий епізод для аніме</string>
-    <string name="show_trailers_settings">Показати трейлери</string>
+    <string name="show_fillers_settings">Показувати філери до аніме</string>
+    <string name="show_trailers_settings">Показувати трейлери</string>
     <string name="pref_filter_search_quality">Приховати вибрану якість відео в результатах пошуку</string>
     <string name="automatic_plugin_download">Автоматичне завантаження плагінів</string>
-    <string name="updates_settings">Показати оновлення програми</string>
+    <string name="updates_settings">Показувати оновлення застосунку</string>
     <string name="redo_setup_process">Повторний процес налаштування</string>
     <string name="uprereleases_settings_des">Пошук лише попередніх оновлень, а не повних релізів</string>
     <string name="apk_installer_settings">Встановлювач APK</string>
@@ -162,7 +162,7 @@
     <string name="lightnovel">Застосунок для легких новел від тих же розробників</string>
     <string name="anim">Застосунок для аніме від тих же розробників</string>
     <string name="benene">Дайте бананів розробникам</string>
-    <string name="app_language">Мова програми</string>
+    <string name="app_language">Мова застосунку</string>
     <string name="no_chromecast_support_toast">Цей постачальник не має підтримки Chromecast</string>
     <string name="no_links_found_toast">Посилань не знайдено</string>
     <string name="play_episode_toast">Переглянути епізод</string>
@@ -189,7 +189,7 @@
     <string name="default_subtitles">За замовчуванням</string>
     <string name="free_storage">Вільно</string>
     <string name="used_storage">Зайнято</string>
-    <string name="app_storage">Програма</string>
+    <string name="app_storage">Застосунок</string>
     <string name="tv_series">Телесеріали</string>
     <string name="cartoons">Мультфільми</string>
     <string name="anime">Аніме</string>
@@ -208,29 +208,29 @@
     <string name="remote_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_app">Переглянути в застосунку</string>
     <string name="episode_action_play_in_format">Переглянути в %s</string>
     <string name="episode_action_auto_download">Автозавантаження</string>
     <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">Пропускати OP</string>
     <string name="dont_show_again">Не показувати знову</string>
     <string name="update">Оновити</string>
     <string name="watch_quality_pref">Бажана якість перегляду (WiFi)</string>
     <string name="show_title">Заголовок</string>
-    <string name="poster_ui_settings">Перемикання елементів інтерфейсу на плакаті</string>
+    <string name="poster_ui_settings">Перемикання елементів інтерфейсу на постері</string>
     <string name="no_update_found">Оновлення не знайдено</string>
-    <string name="double_tap_to_seek_settings_des">Двічі торкніться праворуч або ліворуч, щоб перейти вперед або назад</string>
+    <string name="double_tap_to_seek_settings_des">Двічі торкніться праворуч або ліворуч, щоб перемотати відео вперед або назад</string>
     <string name="use_system_brightness_settings_des">Використовуйте системну яскравість у плеєрі замість темної накладки</string>
     <string name="restore_success">Завантажено файл резервної копії</string>
-    <string name="torrent">Торренти</string>
+    <string name="torrent">Торенти</string>
     <string name="episode_sync_settings_des">Автоматична синхронізація прогресу поточного епізоду</string>
     <string name="backup_failed">Відсутні дозволи на зберігання. Будь ласка, спробуйте ще раз.</string>
-    <string name="kitsu_settings">Показати постери від Kitsu</string>
+    <string name="kitsu_settings">Показувати постери від Kitsu</string>
     <string name="automatic_plugin_updates">Автоматичне оновлення плагінів</string>
     <string name="automatic_plugin_download_summary">Автоматично встановлювати всі ще не встановлені плагіни з доданих репозиторіїв.</string>
-    <string name="updates_settings_des">Автоматично шукати нові оновлення після запуску застосунку.</string>
+    <string name="updates_settings_des">Автоматично шукає нові оновлення після запуску застосунку.</string>
     <string name="uprereleases_settings">Оновлення до бета-версій</string>
     <string name="copy_link_toast">Посилання скопійовано в буфер обміну</string>
     <string name="apk_installer_settings_des">Деякі телефони не підтримують новий інсталятор пакетів. Спробуйте стару версію, якщо оновлення не встановлюються.</string>
@@ -256,7 +256,7 @@
     <string name="nsfw">NSFW</string>
     <string name="movies_singular">Фільм</string>
     <string name="ova_singular">OVA</string>
-    <string name="torrent_singular">Торрент</string>
+    <string name="torrent_singular">Торент</string>
     <string name="show_hd">Мітка якості</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="episode_action_play_in_browser">Переглянути в браузері</string>
@@ -273,7 +273,7 @@
     <string name="resize_fill">Заповнити</string>
     <string name="resize_zoom">Збільшити</string>
     <string name="tracks">Доріжки</string>
-    <string name="pref_category_app_updates">Оновлення програми</string>
+    <string name="pref_category_app_updates">Оновлення застосунку</string>
     <string name="pref_category_cache">Кеш</string>
     <string name="pref_category_gestures">Жести</string>
     <string name="pref_category_player_features">Особливості плеєра</string>
@@ -283,20 +283,20 @@
     <string name="pref_category_ui_features">Особливості</string>
     <string name="category_general">Загальне</string>
     <string name="random_button_settings">Випадкова кнопка</string>
-    <string name="random_button_settings_desc">Показати випадкову кнопку на Головній сторінці</string>
+    <string name="random_button_settings_desc">Показувати кнопку на Головній сторінці, яка вибирає випадковий фільм чи серіал</string>
     <string name="provider_lang_settings">Мови постачальника</string>
-    <string name="app_layout">Макет програми</string>
+    <string name="app_layout">Макет застосунку</string>
     <string name="preferred_media_settings">Бажані медіа</string>
     <string name="automatic">Авто</string>
     <string name="tv_layout">Макет телевізора</string>
     <string name="phone_layout">Макет телефону</string>
     <string name="emulator_layout">Макет емулятора</string>
     <string name="primary_color_settings">Основний колір</string>
-    <string name="app_theme_settings">Тема програми</string>
+    <string name="app_theme_settings">Тема застосунку</string>
     <string name="bottom_title_settings">Розташування назви постера</string>
-    <string name="bottom_title_settings_des">Розмістіть назву під постером</string>
-    <string name="example_password">пароль123</string>
-    <string name="example_username">Моє круте ім\'я</string>
+    <string name="bottom_title_settings_des">Розмістити назву під постером</string>
+    <string name="example_password">Пароль123</string>
+    <string name="example_username">Моє круте ім’я</string>
     <string name="example_email">hello@world.com</string>
     <string name="example_site_name">Мій крутий сайт</string>
     <string name="example_lang_name">Код мови (uk)</string>
@@ -348,13 +348,13 @@
     <string name="limit_title_rez">Роздільна здатність відеоплеєра</string>
     <string name="video_buffer_length_settings">Довжина буфера відео</string>
     <string name="video_buffer_clear_settings">Очистити кеш відео та зображень</string>
-    <string name="video_ram_description">Спричиняє збої, якщо встановлено занадто високе значення на пристроях із малим об\'ємом пам\'яті, наприклад Android TV.</string>
+    <string name="video_ram_description">Спричиняє збої, якщо встановлено занадто високе значення на пристроях із малим об’ємом пам’яті, наприклад Android TV.</string>
     <string name="dns_pref_summary">Корисно для обходу блокувань провайдера</string>
-    <string name="video_disk_description">Спричиняє збої, якщо встановлено занадто високе значення на пристроях із малим об\'ємом вільної пам\'яті, наприклад Android TV.</string>
+    <string name="video_disk_description">Спричиняє збої, якщо встановлено занадто високе значення на пристроях із малим об’ємом вільної пам’яті, наприклад Android TV.</string>
     <string name="dns_pref">DNS через HTTPS</string>
     <string name="download_path_pref">Шлях завантаження</string>
     <string name="add_site_summary">Додайте клон існуючого сайту, з іншою URL-адресою</string>
-    <string name="display_subbed_dubbed_settings">Відображати Дубляж/Субтитри аніме</string>
+    <string name="display_subbed_dubbed_settings">Відображати мітку Дубляж/Субтитри до аніме</string>
     <string name="legal_notice">Застереження</string>
     <string name="pref_category_extensions">Розширення</string>
     <string name="pref_category_actions">Дії</string>
@@ -368,21 +368,21 @@
     <string name="login_format" formatted="true">%s %s</string>
     <string name="subtitles_depressed">Депресивний</string>
     <string name="account">обліковий запис</string>
-    <string name="create_account">Створити обліковий запис</string>
+    <string name="create_account">Створити</string>
     <string name="added_sync_format" formatted="true">Додано %s</string>
     <string name="sync_total_episodes_none">/\?\?</string>
     <string name="sync_score">Оцінений</string>
     <string name="player_load_subtitles">Завантажити з файлу</string>
     <string name="max">Макс.</string>
-    <string name="subtitles_example_text">Щастям б\'єш жук їх глицю в фон й ґедзь пріч</string>
+    <string name="subtitles_example_text">Щастям б’єш жук їх глицю в фон й ґедзь пріч</string>
     <string name="subtitle_offset_hint">1000 мс</string>
-    <string name="subtitle_offset_extra_hint_later_format">Використовуйте цей параметр, якщо субтитри з\'являються на %d мс занадто рано</string>
-    <string name="subtitle_offset_extra_hint_before_format">Використовуйте це, якщо субтитри з\'являються із запізненням на %d мс</string>
+    <string name="subtitle_offset_extra_hint_later_format">Використовуйте цей параметр, якщо субтитри з’являються на %d мс занадто рано</string>
+    <string name="subtitle_offset_extra_hint_before_format">Використовуйте це, якщо субтитри з’являються із запізненням на %d мс</string>
     <string name="player_loaded_subtitles" formatted="true">Завантажено %s</string>
     <string name="actor_supporting">Підтримка</string>
     <string name="actor_background">Фон</string>
     <string name="quality_blueray">Blu-ray</string>
-    <string name="subtitles_remove_captions">Видалити закриті титри з субтитрів</string>
+    <string name="subtitles_remove_captions">Видаляти закриті титри з субтитрів</string>
     <string name="quality_dvd">DVD</string>
     <string name="error_invalid_data">Недійсні дані</string>
     <string name="subtitles_filter_lang">Фільтрувати за бажаною мовою медіа</string>
@@ -400,8 +400,8 @@
     <string name="quality_hd">HD</string>
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
-    <string name="subtitles_remove_bloat">Видалити роздуття субтитрів</string>
-    <string name="referer">Реферер</string>
+    <string name="subtitles_remove_bloat">Видаляти роздуття субтитрів</string>
+    <string name="referer">Referer</string>
     <string name="next">Далі</string>
     <string name="provider_languages_tip">Дивіться відео на цих мовах</string>
     <string name="skip_setup">Пропустити налаштування</string>
@@ -418,7 +418,7 @@
     <string name="batch_download_start_format" formatted="true">Почалося завантаження %d %s…</string>
     <string name="batch_download_finish_format" formatted="true">Завантажено %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Всі %s вже завантажено</string>
-    <string name="batch_download">Пакетне завантаження</string>
+    <string name="batch_download">Завантажити пакети</string>
     <string name="plugin_singular">плагін</string>
     <string name="plugin">плагіни</string>
     <string name="delete_repository">Видалити репозиторій</string>
@@ -437,7 +437,7 @@
     <string name="uppercase_all_subtitles">Усі субтитри у верхньому регістрі</string>
     <string name="single_plugin_disabled" formatted="true">%s (Вимкнено)</string>
     <string name="video_tracks">Відео доріжки</string>
-    <string name="apply_on_restart">Застосувати при перезавантаженні</string>
+    <string name="apply_on_restart">Застосується при перезавантаженні</string>
     <string name="safe_mode_crash_info">Переглянути інформацію про збій</string>
     <string name="extension_rating" formatted="true">Рейтинг: %s</string>
     <string name="extension_description">Опис</string>
@@ -451,8 +451,8 @@
     <string name="player_settings_play_in_app">Вбудований плеєр</string>
     <string name="player_settings_play_in_vlc">VLC</string>
     <string name="player_settings_play_in_mpv">MPV</string>
-    <string name="player_settings_play_in_web">Відтворення веб-відео</string>
-    <string name="player_settings_play_in_browser">Веб-браузер</string>
+    <string name="player_settings_play_in_web">Web Video Cast</string>
+    <string name="player_settings_play_in_browser">Веббраузер</string>
     <string name="skip_type_ed">Ендінґ</string>
     <string name="skip_type_recap">Коротке повторення</string>
     <string name="skip_type_format" formatted="true">Пропустити %s</string>
@@ -462,17 +462,17 @@
     <string name="skip_type_intro">Вступ</string>
     <string name="clear_history">Очистити історію</string>
     <string name="history">Історія</string>
-    <string name="enable_skip_op_from_database_des">Показувати спливаючі вікна для опенінґу/кінця</string>
+    <string name="enable_skip_op_from_database_des">Показує спливаюче вікно для пропуску опенінґу/ендінґу</string>
     <string name="clipboard_too_large">Забагато тексту. Не вдалося зберегти в буфер обміну.</string>
     <string name="action_mark_as_watched">Позначити як переглянуте</string>
     <string name="confirm_exit_dialog">Ви впевнені що хочете вийти\?</string>
     <string name="yes">Так</string>
     <string name="no">Ні</string>
-    <string name="update_notification_installing">Встановлення оновлення програми…</string>
-    <string name="update_notification_failed">Не вдалося встановити нову версію програми</string>
-    <string name="apk_installer_legacy">Старий</string>
+    <string name="update_notification_installing">Встановлення оновлення застосунку…</string>
+    <string name="update_notification_failed">Не вдалося встановити нову версію застосунку</string>
+    <string name="apk_installer_legacy">Legacy</string>
     <string name="apk_installer_package_installer">Інсталятор пакетів</string>
-    <string name="delayed_update_notice">Програму буде оновлено після виходу</string>
+    <string name="delayed_update_notice">Застосунок буде оновлено після виходу</string>
     <string name="delete_repository_plugins">Це також призведе до видалення всіх плагінів репозиторію</string>
     <string name="all_languages_preference">Всі мови</string>
     <string name="previous">Назад</string>
@@ -484,44 +484,44 @@
     <string name="player_pref">Бажаний відеоплеєр</string>
     <string name="safe_mode_title">Увімкнено безпечний режим</string>
     <string name="extension_authors">Автори</string>
-    <string name="update_notification_downloading">Завантаження оновлення програми…</string>
+    <string name="update_notification_downloading">Завантаження оновлення застосунку…</string>
     <string name="safe_mode_description">Усі розширення були вимкнені через збій, щоб допомогти вам знайти те, що стало причиною проблеми.</string>
-    <string name="app_not_found_error">Програму не знайдено</string>
+    <string name="app_not_found_error">Застосунок не знайдено</string>
     <string name="skip_type_mixed_op">Змішаний опенінґ</string>
     <string name="action_remove_from_watched">Видалити з переглянутого</string>
-    <string name="sort_updated_old">За оновленням (від старого до нового)</string>
-    <string name="sort_updated_new">За оновленням (від нового до старого)</string>
+    <string name="sort_updated_old">Оновленням (від старого до нового)</string>
+    <string name="sort_updated_new">Оновленням (від нового до старого)</string>
     <string name="library">Бібліотека</string>
     <string name="sort">Сортувати</string>
-    <string name="sort_rating_desc">За рейтингом (від високого до низького)</string>
+    <string name="sort_rating_desc">Рейтингом (від високого до низького)</string>
     <string name="sort_by">Сортувати за</string>
-    <string name="sort_alphabetical_a">За алфавітом (від А до Я)</string>
-    <string name="sort_rating_asc">За рейтингом (від низького до високого)</string>
+    <string name="sort_alphabetical_a">Алфавітом (від А до Я)</string>
+    <string name="sort_rating_asc">Рейтингом (від низького до високого)</string>
     <string name="empty_library_no_accounts_message">Ваша бібліотека порожня :(
 \nУвійдіть в обліковий запис бібліотеки або додайте фільми до вашої локальної бібліотеки.</string>
-    <string name="sort_alphabetical_z">За алфавітом (від Я до А)</string>
+    <string name="sort_alphabetical_z">Алфавітом (від Я до А)</string>
     <string name="select_library">Виберіть бібліотеку</string>
-    <string name="open_with">Відкрити з</string>
+    <string name="open_with">Відкрити</string>
     <string name="browser">Браузер</string>
     <string name="empty_library_logged_in_message">Цей список порожній. Спробуйте перейти до іншого.</string>
     <string name="safe_mode_file">Файл безпечного режиму знайдено!
 \nРозширеня не завантажуються під час запуску, доки файл не буде видалено.</string>
     <string name="pref_category_android_tv">Android TV</string>
-    <string name="android_tv_interface_off_seek_settings">Плеєр сховано - обсяг пошуку</string>
-    <string name="android_tv_interface_on_seek_settings">Плеєр показано - обсяг пошуку</string>
-    <string name="android_tv_interface_on_seek_settings_summary">Обсяг пошуку, який використовується, коли плеєр видимий</string>
-    <string name="android_tv_interface_off_seek_settings_summary">Обсяг пошуку, який використовується, коли гравець прихований</string>
-    <string name="test_failed">Не вдалося</string>
-    <string name="test_passed">Пройдено</string>
+    <string name="android_tv_interface_off_seek_settings">Плеєр сховано – обсяг перемотки</string>
+    <string name="android_tv_interface_on_seek_settings">Плеєр показано – обсяг перемотки</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Обсяг перемотки, який використовується, коли плеєр видимий</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Обсяг перемотки, який використовується, коли плеєр прихований</string>
+    <string name="test_failed">Тест провалено</string>
+    <string name="test_passed">Тест пройдено</string>
     <string name="restart">Перезапуск</string>
     <string name="test_log">Журнал</string>
-    <string name="start">Старт</string>
-    <string name="stop">Стоп</string>
-    <string name="category_provider_test">Тест постачальника</string>
+    <string name="start">Почати</string>
+    <string name="stop">Зупинити</string>
+    <string name="category_provider_test">Тестування постачальників</string>
     <string name="subscription_in_progress_notification">Оновлення підписаних шоу</string>
     <string name="subscription_list_name">Підписано</string>
-    <string name="subscription_new">Підписано на %s</string>
-    <string name="subscription_deleted">Відписатися від %s</string>
+    <string name="subscription_new">Ви підписалися на %s</string>
+    <string name="subscription_deleted">Ви відписалися від %s</string>
     <string name="subscription_episode_released">Епізод %d випущено!</string>
     <string name="revert">Повернути</string>
     <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
@@ -529,4 +529,28 @@
     <string name="pref_category_bypass">Обходи ISP</string>
     <string name="jsdelivr_proxy_summary">Обхід блокування GitHub за допомогою jsDelivr. Можлива затримка оновлень на кілька днів.</string>
     <string name="watch_quality_pref_data">Бажана якість перегляду (Мобільні дані)</string>
+    <string name="set_default">Встановити за замовчуванням</string>
+    <string name="profiles">Профілі</string>
+    <string name="help">Допомога</string>
+    <string name="quality_profile_help">Тут ви можете змінити порядок джерел. Якщо відео має вищий пріоритет, воно з’явиться вище у списку джерел. Сума пріоритету джерела та пріоритету якості є пріоритетом відео.
+\n
+\nДжерело A: 3
+\nЯкість B: 7
+\nСумарний пріоритет відео дорівнюватиме 10.
+\n
+\nПРИМІТКА: Якщо сума пріоритетів дорівнює 10 або більше, плеєр автоматично пропустить завантаження при завантаженні цього посилання!</string>
+    <string name="profile_number">Профіль %d</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="mobile_data">Мобільні дані</string>
+    <string name="use">Використовувати</string>
+    <string name="edit">Редагувати</string>
+    <string name="qualities">Якості</string>
+    <string name="profile_background_des">Фон профілю</string>
+    <string name="unable_to_inflate">Не вдалося створити UI коректно, це ВАЖЛИВА ПОМИЛКА, про яку слід негайно повідомити %s</string>
+    <string name="automatic_plugin_download_mode_title">Виберіть режим для фільтрації завантаження плагінів</string>
+    <string name="disable">Вимкнути</string>
+    <string name="default_account">@string/default_subtitles</string>
+    <string name="no_repository_found_error">Репозиторій не знайдено, перевірте URL-адресу та спробуйте VPN</string>
+    <string name="no_plugins_found_error">Не знайдено жодних плагінів у репозиторії</string>
+    <string name="already_voted">Ви вже проголосували</string>
 </resources>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index df2e9a8b..48b73efa 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -165,9 +165,9 @@
     <string name="subs_hold_to_reset_to_default">ڈیفالٹ سیٹنگز پر ری سیٹ کرنے کے لیے دبائیں اور تھامیں</string>
     <string name="provider_info_meta">سائٹ کی طرف سے میٹا ڈیٹا فراہم نہیں کیا گیا ہے، اور اگر ویڈیو سائٹ میں موجود نہیں ہے تو وہ لوڈ ہونے میں ناکام ہو جائے گا.</string>
     <string name="player_subtitles_settings_des">پلیئر کے ترجمہ کی ترتیبات</string>
-    <string name="swipe_to_seek_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_amount_settings">کنٹرول کریں کہ پلیئر کتنا آگے ہے</string>
+    <string name="double_tap_to_seek_amount_settings">کنٹرول کریں کہ پلیئر کتنا آگے ہے(سیکنڈوں میں)</string>
     <string name="double_tap_to_pause_settings_des">توقف کرنے کے لیے درمیان میں دبائیں</string>
     <string name="backup_failed">سٹوریج کی اجازتیں غائب ہیں، براہ کرم دوبارہ کوشش کریں۔</string>
     <string name="kitsu_settings">کٹسو سے پوسٹر نمایش کریں</string>
@@ -263,7 +263,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">ترجیحی ویڈیو کا معیار(وائ فائ)</string>
     <string name="limit_title">ویڈیو پلیئر کے عنوان کے زیادہ سے زیادہ حروف</string>
     <string name="limit_title_rez">ویڈیو پلیئر ریزولوشن</string>
     <string name="video_buffer_size_settings">ویڈیو بفر سائز</string>
@@ -356,4 +356,175 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="subtitles_raised">اٹھایا</string>
     <string name="subtitle_offset_extra_hint_before_format">اگر سب ٹائٹلز %d ms بہت جلد دکھائے جائیں تو اسے استعمال کریں</string>
+    <string name="skip_type_creddits">کریڈٹس</string>
+    <string name="extras">اضافی</string>
+    <string name="actor_main">مرکزی</string>
+    <string name="sort">ترتیب</string>
+    <string name="resolution_and_title">قرارداد اور عنوان</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="subscription_deleted">%s سے ان سبسکرائب کیا گیا</string>
+    <string name="player_settings_play_in_web">ویب ویڈیو کاسٹ</string>
+    <string name="is_adult">18+</string>
+    <string name="test_log">لاگ</string>
+    <string name="network_adress_example">سلسلہ سے لنک کریں</string>
+    <string name="pref_category_android_tv">اینڈرائیڈ ٹی وی</string>
+    <string name="previous">پچھلا</string>
+    <string name="trailer">ٹریلر</string>
+    <string name="safe_mode_crash_info">حادثے کی معلومات دیکھیں</string>
+    <string name="delayed_update_notice">باہر نکلنے پر ایپ کو اپ ڈیٹ کر دیا جائے گا</string>
+    <string name="download_all_plugins_from_repo">اس ذخیرہ سے تمام پلگ ان ڈاؤن لوڈ کریں؟</string>
+    <string name="subscription_episode_released">قسط %d ریلیز ہو گئی!</string>
+    <string name="update_notification_failed">ایپ کا نیا ورژن انسٹال نہیں ہو سکا</string>
+    <string name="recommended">تجویز کردہ</string>
+    <string name="restart">دوبارہ شروع کریں</string>
+    <string name="player_loaded_subtitles" formatted="true">لوڈ %s</string>
+    <string name="player_load_subtitles_online">انٹرنیٹ سے لوڈ کریں</string>
+    <string name="downloaded_file">ڈاؤن لوڈڈ فائل</string>
+    <string name="actor_background">پس منظر</string>
+    <string name="home_source">ذریعہ</string>
+    <string name="quality_cam">کیم</string>
+    <string name="quality_cam_rip">کیم</string>
+    <string name="quality_cam_hd">کیم</string>
+    <string name="quality_hd">ایچ ڈی</string>
+    <string name="quality_ts">ٹی ایس</string>
+    <string name="quality_tc">ٹی سی</string>
+    <string name="quality_workprint">ڈبلیو پی</string>
+    <string name="quality_4k">4کے</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="category_player">پلیئر</string>
+    <string name="title">عنوان</string>
+    <string name="resolution">قرارداد</string>
+    <string name="error_invalid_data">غلط ڈیٹا</string>
+    <string name="error">خرابی</string>
+    <string name="subtitles_remove_bloat">سب ٹائٹلز سے بلوٹ کو ہٹا دیں</string>
+    <string name="subtitles_filter_lang">ترجیحی میڈیا زبان کے لحاظ سے فلٹر کریں</string>
+    <string name="referer">حوالہ دینے والا</string>
+    <string name="provider_languages_tip">ان زبانوں میں ویڈیوز دیکھیں</string>
+    <string name="skip_setup">سیٹ اپ کو چھوڑ دیں</string>
+    <string name="crash_reporting_title">کریش رپورٹنگ</string>
+    <string name="setup_done">ہو گیا</string>
+    <string name="extensions">ایکسٹینشنز</string>
+    <string name="repository_url_hint">ذخیرہ URL</string>
+    <string name="plugin_loaded">پلگ ان لوڈ ہو گیا</string>
+    <string name="plugin_load_fail" formatted="true">%s کو لوڈ نہیں کیا جا سکا</string>
+    <string name="batch_download_start_format" formatted="true">ڈاؤن لوڈ ہونا شروع ہو گیا %d %s…</string>
+    <string name="batch_download_finish_format" formatted="true">ڈاؤن لوڈ کیا گیا %d %s</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">سبھی %s پہلے ہی ڈاؤن لوڈ ہو چکے ہیں</string>
+    <string name="plugin_singular">رابطہ بحال کرو</string>
+    <string name="plugin">پلگ ان</string>
+    <string name="delete_repository">ذخیرہ کو حذف کریں</string>
+    <string name="setup_extensions_subtext">ان سائٹس کی فہرست ڈاؤن لوڈ کریں جنہیں آپ استعمال کرنا چاہتے ہیں</string>
+    <string name="plugins_downloaded" formatted="true">ڈاؤن لوڈڈ: %d</string>
+    <string name="plugins_disabled" formatted="true">غیر فعال: %d</string>
+    <string name="plugins_updated" formatted="true">اپ ڈیٹ کردہ %d پلگ ان</string>
+    <string name="uppercase_all_subtitles">تمام سب ٹائٹلز کو بڑے کریں</string>
+    <string name="single_plugin_disabled" formatted="true">%s (غیر فعال)</string>
+    <string name="tracks">ٹریکس</string>
+    <string name="audio_tracks">آڈیو ٹریکس</string>
+    <string name="apply_on_restart">ری اسٹارٹ پر اپلائی کریں</string>
+    <string name="safe_mode_title">سیف موڈ آن</string>
+    <string name="extension_rating" formatted="true">درجہ بندی: %s</string>
+    <string name="extension_description">تفصیل</string>
+    <string name="extension_version">ورژن</string>
+    <string name="extension_status">حالت</string>
+    <string name="extension_size">سائز</string>
+    <string name="extension_language">زبان</string>
+    <string name="player_settings_play_in_vlc">وی ایل سی</string>
+    <string name="player_pref">ترجیحی ویڈیو پلیئر</string>
+    <string name="player_settings_play_in_app">اندرونی پلیئر</string>
+    <string name="player_settings_play_in_mpv">ایم پی وی</string>
+    <string name="player_settings_play_in_browser">ویب براؤزر</string>
+    <string name="app_not_found_error">ایپ نہیں ملی</string>
+    <string name="skip_type_recap">Recap</string>
+    <string name="skip_type_mixed_ed">مخلوط اختتام</string>
+    <string name="skip_type_mixed_op">مخلوط افتتاحی</string>
+    <string name="enable_skip_op_from_database_des">کھولنے/ختم کرنے کے لیے سکپ پاپ اپ دکھائیں</string>
+    <string name="action_mark_as_watched">دیکھا گیا کے طور پر نشان زد کریں</string>
+    <string name="no">نہیں</string>
+    <string name="update_notification_downloading">ایپ اپ ڈیٹ ڈاؤن لوڈ ہو رہا ہے…</string>
+    <string name="apk_installer_legacy">میراث</string>
+    <string name="update_started">اپ ڈیٹ شروع ہو گیا</string>
+    <string name="plugin_downloaded">پلگ ان ڈاؤن لوڈ ہو گیا</string>
+    <string name="action_remove_from_watched">دیکھے گئے سے ہٹا دیں</string>
+    <string name="apk_installer_package_installer">پیکیج انسٹالر</string>
+    <string name="sort_rating_desc">درجہ بندی (اعلی سے کم)</string>
+    <string name="sort_rating_asc">درجہ بندی (کم سے زیادہ)</string>
+    <string name="sort_updated_old">اپ ڈیٹ کیا گیا (پرانا سے نیا)</string>
+    <string name="sort_alphabetical_a">حروف تہجی (A سے Z)</string>
+    <string name="sort_alphabetical_z">حروف تہجی (Z سے A)</string>
+    <string name="select_library">لائبریری کو منتخب کریں</string>
+    <string name="android_tv_interface_on_seek_settings">پلیئر دکھایا گیا - مقدار تلاش کریں</string>
+    <string name="android_tv_interface_on_seek_settings_summary">پلیئر کے نظر آنے پر استعمال کی جانے والی مقدار</string>
+    <string name="android_tv_interface_off_seek_settings_summary">پلیئر کے چھپنے پر استعمال ہونے والی تلاش کی مقدار</string>
+    <string name="safe_mode_file">سیف موڈ فائل مل گئی!
+\nفائل کو ہٹانے تک اسٹارٹ اپ پر کوئی ایکسٹینشن لوڈ نہیں کرنا۔</string>
+    <string name="start">شروع کریں</string>
+    <string name="test_failed">ناکام</string>
+    <string name="test_passed">کامیاب ہو گیا</string>
+    <string name="category_provider_test">فراہم کنندہ ٹیسٹ</string>
+    <string name="stop">رک جاؤ</string>
+    <string name="subscription_in_progress_notification">سبسکرائب شدہ شوز کو اپ ڈیٹ کرنا</string>
+    <string name="watch_quality_pref_data">دیکھنے کا ترجیحی معیار (موبائل ڈیٹا)</string>
+    <string name="jsdelivr_proxy">raw.githubusercontent.com پراکسی</string>
+    <string name="pref_category_bypass">آئی ایس پی بائی پاسز</string>
+    <string name="subscription_new">%s کو سبسکرائب کیا</string>
+    <string name="jsdelivr_proxy_summary">jsDelivr کا استعمال کرتے ہوئے GitHub کو بلاک کرنے کو نظرانداز کرتا ہے۔ اپ ڈیٹس میں کچھ دنوں کی تاخیر ہو سکتی ہے۔</string>
+    <string name="empty_library_no_accounts_message">آپ کی لائبریری خالی ہے:(
+\nلائبریری اکاؤنٹ میں لاگ ان کریں یا اپنی مقامی لائبریری میں شوز شامل کریں۔</string>
+    <string name="error_invalid_url">غلط URL</string>
+    <string name="browser">براؤزر</string>
+    <string name="quality_webrip">ویب</string>
+    <string name="actor_supporting">مددگار</string>
+    <string name="quality_hq">ایچ کیو</string>
+    <string name="extension_types">حمایت کی</string>
+    <string name="yes">ہاں</string>
+    <string name="subscription_list_name">سبسکرائب کیا ہوا</string>
+    <string name="sort_updated_new">تازہ کاری (نئے سے پرانے)</string>
+    <string name="quality_dvd">ڈی وی ڈی</string>
+    <string name="clear_history">ماضی مٹا دو</string>
+    <string name="skip_type_intro">تعارف</string>
+    <string name="history">تاریخ</string>
+    <string name="open_with">کے ساتھ کھولیں</string>
+    <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="confirm_exit_dialog">کیا آپ کو یقین ہے کہ آپ ہیاں سے نکلنا چاہتے ہیں؟</string>
+    <string name="quality_sd">ایس ڈی</string>
+    <string name="all_languages_preference">تمام زبانیں</string>
+    <string name="android_tv_interface_off_seek_settings">پلیئر پوشیدہ - مقدار تلاش کریں</string>
+    <string name="library">لائبریری</string>
+    <string name="quality_blueray">بلو رے</string>
+    <string name="revert">واپس لوٹنا</string>
+    <string name="add_repository">ذخیرہ شامل کریں</string>
+    <string name="preferred_media_subtext">آپ کیا دیکھنا چاہتے ہیں</string>
+    <string name="view_public_repositories_button">‪کمیونٹی ریپوزٹریز دیکھیں</string>
+    <string name="plugins_not_downloaded" formatted="true">ڈاؤن لوڈ نہیں ہوا: %d</string>
+    <string name="view_public_repositories_button_short">عوامی فہرست</string>
+    <string name="player_load_subtitles">فائل سے لوڈ کریں</string>
+    <string name="video_tracks">ویڈیو ٹریکس</string>
+    <string name="hls_playlist">HLS پلے لسٹ</string>
+    <string name="poster_image">پوسٹر کی تصویر</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="skip_type_format" formatted="true">%s کو چھوڑ دیں</string>
+    <string name="home_random">بے ترتیب</string>
+    <string name="sort_by">ترتیب دیں</string>
+    <string name="extension_authors">مصنفین</string>
+    <string name="delete_repository_plugins">اس سے تمام ریپوزٹری پلگ ان بھی حذف ہو جائیں گے</string>
+    <string name="plugin_deleted">پلگ ان کو حذف کر دیا گیا</string>
+    <string name="batch_download">بیچ ڈاؤن لوڈ</string>
+    <string name="jsdelivr_enabled">GitHub تک نہیں پہنچ سکا۔ jsDelivr پراکسی کو آن کیا جا رہا ہے…</string>
+    <string name="subtitles_example_text">تیز بھوری لومڑی سست کتے پر چھلانگ لگاتی ہے</string>
+    <string name="coming_soon">جلد آرہا ہے…</string>
+    <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="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>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index f896e5c1..217d2791 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -267,7 +267,7 @@
     <string name="update">Cập nhật</string>
     <string name="watch_quality_pref">Chất lượng xem ưu tiên (WiFi)</string>
     <string name="limit_title">Kí tự tối đa trên tiêu đề</string>
-    <string name="limit_title_rez">Độ phân giải trình phát video</string>
+    <string name="limit_title_rez">Nội dung trình phát video</string>
     <string name="video_buffer_size_settings">Kích thước bộ nhớ đệm video</string>
     <string name="video_buffer_length_settings">Thời lượng bộ nhớ đệm</string>
     <string name="video_buffer_disk_settings">Lưu bộ nhớ đệm video trên ổ cứng</string>
@@ -378,10 +378,10 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-    <string name="poster_image">Áp phích</string>
+    <string name="poster_image">Ảnh áp phích</string>
     <string name="category_player">Trình phát</string>
-    <string name="resolution_and_title">Độ phân giải và Tiêu đề</string>
-    <string name="title">Tiêu đề</string>
+    <string name="resolution_and_title">Độ phân giải và Tên nguồn</string>
+    <string name="title">Tên nguồn</string>
     <string name="resolution">Độ phân giải</string>
     <string name="error_invalid_id">Id không hợp lệ</string>
     <string name="error_invalid_data">Lỗi dữ liệu</string>
@@ -389,15 +389,15 @@
     <string name="error">Lỗi</string>
     <string name="subtitles_remove_captions">Xoá phụ đề đã dùng</string>
     <string name="subtitles_remove_bloat">Loại bỏ mã hoá phụ đề</string>
-    <string name="subtitles_filter_lang">Lọc theo ngôn ngữ</string>
+    <string name="subtitles_filter_lang">Lọc theo ngôn ngữ media được chuộng hơn</string>
     <string name="extras">Thêm</string>
     <string name="trailer">Xem trước</string>
     <string name="network_adress_example">Liên kết trực tiếp</string>
     <string name="referer">Đề xuất</string>
     <string name="next">Tiếp theo</string>
     <string name="provider_languages_tip">Xem video bằng các ngôn ngữ này</string>
-    <string name="previous">Trước</string>
-    <string name="skip_setup">Bỏ qua</string>
+    <string name="previous">Trước đó</string>
+    <string name="skip_setup">Bỏ qua cài đặt setup</string>
     <string name="app_layout_subtext">Chọn giao diện phù hợp với thiết bị của bạn</string>
     <string name="crash_reporting_title">Báo cáo sự cố</string>
     <string name="preferred_media_subtext">Bạn muốn xem gì</string>
@@ -407,7 +407,7 @@
     <string name="repository_name_hint">Tên kho lưu trữ</string>
     <string name="repository_url_hint">Đường dẫn kho lưu trữ</string>
     <string name="plugin_loaded">Đã tải plugin</string>
-    <string name="plugin_deleted">Đã xoá plugin</string>
+    <string name="plugin_deleted">Plugin đã xoá</string>
     <string name="plugin_load_fail" formatted="true">Không tải được %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">Bắt đầu tải %d %s…</string>
@@ -436,7 +436,7 @@
     <string name="audio_tracks">Âm thanh</string>
     <string name="video_tracks">Chất lượng Video</string>
     <string name="apply_on_restart">Áp dụng khi khởi động lại</string>
-    <string name="safe_mode_title">Bật chế độ an toàn</string>
+    <string name="safe_mode_title">Chế độ an toàn được bật</string>
     <string name="safe_mode_description">Đã xảy ra sự cố và chúng tôi đã tự động tắt tất cả các tiện ích mở rộng, hãy tìm và xóa tiện ích mở rộng đang gây ra sự cố.</string>
     <string name="safe_mode_crash_info">Xem thông tin sự cố</string>
     <string name="history">Lịch sử</string>
@@ -486,13 +486,13 @@
     <string name="skip_type_op">Mở đầu</string>
     <string name="skip_type_ed">Kết thúc</string>
     <string name="skip_type_recap">Tóm tắt</string>
-    <string name="skip_type_mixed_ed">Mở đầu tuỳ chọn</string>
-    <string name="skip_type_mixed_op">Kết thúc tuỳ chọn</string>
+    <string name="skip_type_mixed_ed">Các kết thúc hỗn hợp</string>
+    <string name="skip_type_mixed_op">Các mở đầu hỗn hợp</string>
     <string name="skip_type_creddits">Danh đề</string>
     <string name="skip_type_intro">Giới thiệu</string>
     <string name="clear_history">Xoá lịch sử</string>
     <string name="enable_skip_op_from_database_des">Hiển thị nút tua nhanh cho mở đầu/kết thúc</string>
-    <string name="clipboard_too_large">Văn bản quá dài. Không thể lưu vào bộ nhớ tạm.</string>
+    <string name="clipboard_too_large">Văn bản quá dài. Không thể lưu vào khay nhớ tạm.</string>
     <string name="action_remove_from_watched">Xoá khỏi đã xem</string>
     <string name="confirm_exit_dialog">Bạn có chắc muốn thoát\?</string>
     <string name="yes">Có</string>
@@ -503,11 +503,11 @@
     <string name="library">Thư viện</string>
     <string name="browser">Trình duyệt</string>
     <string name="plugin_downloaded">Plugin đã tải</string>
-    <string name="apk_installer_legacy">Mặc định</string>
-    <string name="sort_updated_new">Tải lên (Mới đến Cũ)</string>
-    <string name="sort_updated_old">Tải lên (Cũ đến Mới)</string>
+    <string name="apk_installer_legacy">Di sản</string>
+    <string name="sort_updated_new">Đã cập nhật (Mới đến Cũ)</string>
+    <string name="sort_updated_old">Đã cập nhật (Cũ đến Mới)</string>
     <string name="empty_library_no_accounts_message">Thư viện của bạn đang trống :(
-\nĐăng nhập vào tài khoản thư viện hoặc thêm phim vào thư viện cục bộ</string>
+\nĐăng nhập vào tài khoản thư viện hoặc thêm phim vào thư viện cục bộ.</string>
     <string name="open_with">Mở với</string>
     <string name="provider_info_meta">Siêu dữ liệu không có sẵn, video sẽ không được tải nếu nó không tồn tại trên trang web.</string>
     <string name="apk_installer_package_installer">PackageInstaller</string>
@@ -515,7 +515,7 @@
     <string name="sort_rating_desc">Xếp hạng (Cao đến Thấp)</string>
     <string name="sort_rating_asc">Xếp hạng (Thấp đến Cao)</string>
     <string name="sort_alphabetical_z">Chữ cái (Z đến A)</string>
-    <string name="sort_by">Sắp xếp</string>
+    <string name="sort_by">Sắp xếp theo</string>
     <string name="empty_library_logged_in_message">Danh sách này trống, hãy thử chuyển sang danh sách khác.</string>
     <string name="sort_alphabetical_a">Chữ cái (A đến Z)</string>
     <string name="select_library">Chọn Thư viện</string>
@@ -532,16 +532,40 @@
     <string name="subscription_new">Đã đăng kí %s</string>
     <string name="subscription_episode_released">Tập %d đã ra mắt!</string>
     <string name="subscription_list_name">Đã đăng kí</string>
-    <string name="stop">Dừng</string>
+    <string name="stop">Dừng lại</string>
     <string name="pref_category_bypass">Bỏ qua ISP</string>
     <string name="subscription_deleted">Đã bỏ đăng ký %s</string>
     <string name="safe_mode_file">Tìm thấy tệp Safe mode!
-\nKhông tải bất cứ tiện ích nào khi khởi dộng cho đến khi tệp bị xoá</string>
-    <string name="revert">Trở lại</string>
+\nKhông tải bất cứ tiện ích mở rộng nào khi khởi động cho đến khi loại bỏ tệp.</string>
+    <string name="revert">Đảo ngược lại</string>
     <string name="subscription_in_progress_notification">Đang cập nhật các phim đã đăng kí</string>
-    <string name="jsdelivr_proxy_summary">Bỏ qua chặn GitHub bằng cách dùng jsDelivr. Có thể gây ra việc cập nhật bị chậm vài ngày</string>
+    <string name="jsdelivr_proxy_summary">Bỏ qua chặn GitHub bằng cách dùng jsDelivr. Có thể gây ra việc cập nhật bị chậm vài ngày.</string>
     <string name="android_tv_interface_off_seek_settings_summary">Lượng tua thêm được sử dụng khi trình phát ẩn</string>
     <string name="android_tv_interface_off_seek_settings">Lượng tua thêm</string>
     <string name="android_tv_interface_on_seek_settings_summary">Lượng tua thêm được sử dụng khi trình phát hiện lên</string>
     <string name="android_tv_interface_on_seek_settings">Lượng tua thêm</string>
+    <string name="profile_number">Hồ sơ %d</string>
+    <string name="mobile_data">Dữ liệu di động</string>
+    <string name="set_default">Đặt mặc định</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="use">Sử dụng</string>
+    <string name="edit">Điều chỉnh</string>
+    <string name="profiles">Hồ sơ</string>
+    <string name="help">Trợ giúp</string>
+    <string name="profile_background_des">Nền hồ sơ</string>
+    <string name="quality_profile_help">Tại đây bạn có thể thay đổi cách sắp xếp các nguồn. Nếu video có mức độ ưu tiên cao hơn thì video đó sẽ xuất hiện cao hơn trong lựa chọn nguồn. Tổng ưu tiên nguồn và ưu tiên chất lượng là ưu tiên video.
+\n
+\nNguồn A: 3
+\nChất lượng B: 7
+\nSẽ có mức độ ưu tiên video kết hợp là 10.
+\n
+\nLƯU Ý: Nếu tổng là 10 hoặc nhiều hơn, trình phát sẽ tự động bỏ tải khi liên kết đó được tải!</string>
+    <string name="qualities">Các phẩm chất</string>
+    <string name="already_voted">Bạn đã bình chọn</string>
+    <string name="disable">Vô hiệu hoá</string>
+    <string name="no_repository_found_error">Không tìm thấy tiện ích, hãy kiểm tra URL và thử VPN</string>
+    <string name="no_plugins_found_error">Không tìm thấy plugin</string>
+    <string name="unable_to_inflate">Không thể khởi tạo UI, đây là một LỖI LỚN và cần được báo cáo ngay lập tức tới %s</string>
+    <string name="automatic_plugin_download_mode_title">Chọn chế độ để lọc plugin tải xuống</string>
+    <string name="default_account">@string/default_subtitles</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index dbd96827..033a5f50 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -577,4 +577,21 @@
     <string name="pref_category_bypass">ISP 绕过</string>
     <string name="revert">还原</string>
     <string name="watch_quality_pref_data">首选播放画质（移动数据）</string>
+    <string name="profile_number">简介 %d</string>
+    <string name="wifi">无线网络</string>
+    <string name="set_default">设为默认</string>
+    <string name="use">使用</string>
+    <string name="edit">编辑</string>
+    <string name="profiles">配置文件</string>
+    <string name="help">帮助</string>
+    <string name="mobile_data">移动流量</string>
+    <string name="quality_profile_help">在这里，您可以更改源的排序方式。如果视频具有更高的优先级，它将在源选择中显示得更高。源优先级和质量优先级的总和就是视频优先级。
+\n
+\n来源 A：3
+\n质量 B： 7
+\n组合视频优先级为 10。
+\n
+\n注意：如果总和为 10 或更多，则加载该链接时播放器将自动跳过加载！</string>
+    <string name="qualities">质量</string>
+    <string name="profile_background_des">个人资料背景</string>
 </resources>
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index 6aff7a59..1df7b9d6 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -41,7 +41,14 @@
         <item>0</item>
         <item>1</item>
     </array>
-
+    
+    <!-- MainAPI enum: AutoDownloadMode -->
+    <array name="auto_download_plugin">
+        <item>@string/disable</item>
+        <item>@string/subtitles_filter_lang</item>
+        <item>@string/all</item>
+        <item>@string/nsfw</item>
+    </array>
 
     <array name="player_pref_names">
         <item>@string/player_settings_play_in_app</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 95094311..7b90beb0 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -17,6 +17,39 @@
         <attr name="header_text" format="string" />
     </declare-styleable>
 
+    <declare-styleable name="PieFetchButton">
+        <attr name="download_layout" format="reference" />
+        <attr name="download_background_progress" format="reference" />
+        <attr name="download_outline_active" format="reference" />
+        <attr name="download_outline_non_active" format="reference" />
+        <attr name="download_waiting_animation" format="reference" />
+        <attr name="download_progress_drawable" format="reference" />
+        <attr name="download_animate_waiting" format="boolean" />
+        <attr name="download_fill_color" format="color" />
+        <attr name="download_outline_color" format="color" />
+        <attr name="download_icon_color" format="color" />
+        <attr name="download_icon_scale" format="float" />
+
+        <attr name="download_fill" format="enum">
+            <enum name="clockwise" value="0" />
+            <enum name="counter_clockwise" value="1" />
+            <enum name="small_to_large" value="2" />
+            <!--<enum name="top_to_bottom" value="3" />-->
+        </attr>
+
+        <attr name="download_fill_override" format="reference" />
+
+        <attr name="download_hide_when_icon" format="boolean" />
+
+        <attr name="download_icon_init" format="reference" />
+        <attr name="download_icon_error" format="reference" />
+        <attr name="download_icon_complete" format="reference" />
+        <attr name="download_icon_active" format="reference" />
+        <attr name="download_icon_waiting" format="reference" />
+        <attr name="download_icon_removed" format="reference" />
+        <attr name="download_icon_paused" format="reference" />
+    </declare-styleable>
+
     <declare-styleable name="MainColors">
         <attr name="colorPrimary" format="color" />
         <attr name="colorSearch" format="color" />
@@ -32,5 +65,6 @@
         <attr name="grayTextColor" format="color" />
         <attr name="iconColor" format="color" />
         <attr name="white" format="color" />
+        <attr name="black" format="color" />
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7dd4c989..d9258c40 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,7 +13,6 @@
     <color name="boxItemBackground">#161616</color> <!-- 17171B 1B1B20-->
 
     <color name="textColor">#e9eaee</color> <!--FFF-->
-    <color name="semiWhite">#1AFFFFFF</color> <!--FFF-->
     <color name="grayTextColor">#9ba0a4</color> <!-- 5e5f62-->
     <color name="grayShimmer">#DCDCDC</color> <!-- 5e5f62-->
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 567b6d35..b44706c1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -17,4 +17,7 @@
 
     <dimen name="storage_radius">3dp</dimen>
     <dimen name="navbar_width">62dp</dimen>
+
+    <dimen name="download_size">50dp</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 4dad8702..73e4ba2f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,7 +6,7 @@
     <string name="search_types_list_key" translatable="false">search_type_list</string>
     <string name="auto_update_key" translatable="false">auto_update</string>
     <string name="auto_update_plugins_key" translatable="false">auto_update_plugins</string>
-    <string name="auto_download_plugins_key" translatable="false">auto_download_plugins_key</string>
+    <string name="auto_download_plugins_key" translatable="false">auto_download_plugins_key2</string>
     <string name="skip_update_key" translatable="false">skip_update_key</string>
     <string name="prerelease_update_key" translatable="false">prerelease_update</string>
     <string name="manual_check_update_key" translatable="false">manual_check_update</string>
@@ -249,6 +249,7 @@
     <string name="pref_filter_search_quality">Hide selected video quality in search results</string>
     <string name="automatic_plugin_updates">Automatic plugin updates</string>
     <string name="automatic_plugin_download">Automatically download plugins</string>
+    <string name="automatic_plugin_download_mode_title">Select mode to filter plugins download</string>
     <string name="automatic_plugin_download_summary">Automatically install all not yet installed plugins from added repositories.</string>
     <string name="updates_settings">Show app updates</string>
     <string name="updates_settings_des">Automatically search for new updates after starting the app.</string>
@@ -305,6 +306,7 @@
     <string name="queued">queued</string>
     <string name="no_subtitles">No Subtitles</string>
     <string name="default_subtitles">Default</string>
+    <string name="default_account">@string/default_subtitles</string>
     <string name="free_storage">Free</string>
     <string name="used_storage">Used</string>
     <string name="app_storage">App</string>
@@ -449,6 +451,7 @@
     <string name="settings_category_plugins">Plugins</string>
     <string name="settings_category_remote_sync">Remote Sync</string>
     <string name="anilist_key" translatable="false">anilist_key</string>
+    <string name="simkl_key" translatable="false">simkl_key</string>
     <string name="mal_key" translatable="false">mal_key</string>
     <string name="opensubtitles_key" translatable="false">opensubtitles_key</string>
     <string name="gdrive_key" translatable="false">gdrive_key</string>
@@ -488,6 +491,7 @@
     <string name="authenticated_user" formatted="true">%s authenticated</string>
     <string name="authenticated_user_fail" formatted="true">Could not log in at %s</string>
     <!-- ============ -->
+    <string name="disable">Disable</string>
     <string name="none">None</string>
     <string name="normal">Normal</string>
     <string name="all">All</string>
@@ -574,6 +578,8 @@
     <string name="batch_download_start_format" formatted="true">Started downloading %d %s…</string>
     <string name="batch_download_finish_format" formatted="true">Downloaded %d %s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">All %s already downloaded</string>
+    <string name="no_plugins_found_error">No plugins found in repository</string>
+    <string name="no_repository_found_error">Repository not found, check the URL and try VPN</string>
     <string name="batch_download">Batch download</string>
     <string name="plugin_singular">plugin</string>
     <string name="plugin">plugins</string>
@@ -683,8 +689,12 @@
     </string>
     <string name="qualities">Qualities</string>
     <string name="profile_background_des">Profile background</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="tv_no_focus_tag" translatable="false">tv_no_focus_tag</string>
+    <string name="already_voted">You have already voted</string>
     <string name="example_login_file_name_full">Sync file name (optional)</string>
     <string name="example_login_redirect_url_full">Oauth redirect url (optional)</string>
     <string name="example_redirect_url" translatable="false">https://recloudstream.github.io/cloudstream-sync/google-drive</string>
     <string name="info_button">Info</string>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b9648162..e2f11221 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -62,14 +62,21 @@
         <item name="iconGrayBackground">@color/iconGrayBackground</item>
         <item name="boxItemBackground">@color/boxItemBackground</item>
         <item name="iconColor">@color/iconColor</item>
-        <item name="white">#FFF</item>
+        <item name="white">@color/white</item>
+        <item name="black">@color/black</item>
 
         <item name="preferenceTheme">@style/CustomPreferenceThemeOverlay</item>
+
+
+        <item name="download_icon_color">?attr/white</item>
+        <item name="download_fill_color">?attr/white</item>
+        <item name="download_outline_color">?attr/white</item>
+        <item name="download_icon_scale">1.0</item>
     </style>
 
     <style name="ListViewStyle" parent="Widget.AppCompat.ListView">
         <item name="android:divider">@null</item>
-        <item name="android:listSelector">@drawable/outline_drawable_less</item>
+        <item name="android:listSelector">@drawable/outline_drawable_forced</item>
         <item name="android:drawSelectorOnTop">false</item>
     </style>
 
@@ -79,7 +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/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>
@@ -92,12 +100,12 @@
 
     <style name="ChipFilledSemiTransparent" parent="@style/ChipFilled">
         <item name="chipBackgroundColor">@color/transparent</item>
-        <item name="chipSurfaceColor">@color/semiWhite</item>
+        <item name="chipSurfaceColor">@color/white_attr_20</item>
         <item name="backgroundColor">@color/transparent</item>
     </style>
 
     <style name="ChipParent">
-        <item name="chipSpacingVertical">5dp</item>
+        <item name="chipSpacingVertical">-5dp</item>
         <item name="chipSpacingHorizontal">5dp</item>
         <item name="textColor">?attr/textColor</item>
     </style>
@@ -110,6 +118,7 @@
         <item name="textColor">@color/textColor</item>
         <item name="grayTextColor">@color/grayTextColor</item>
         <item name="white">@color/white</item>
+        <item name="black">@color/black</item>
         <item name="colorOnPrimary">@color/whiteText</item>
     </style>
 
@@ -125,8 +134,13 @@
         <item name="android:textColor">@color/subColorText</item>
     </style>
 
+    <!--<style name="RatingButton" parent="@style/SearchBox">
+        <item name="android:background">@drawable/rating_bg_color</item>
+        <item name="android:textColor">@color/ratingColor</item>
+    </style>-->
+
     <style name="RatingButton" parent="@style/SearchBox">
-        <item name="android:minWidth">30dp</item>
+        <item name="android:minWidth">40dp</item>
         <item name="android:background">@drawable/rating_bg_color</item>
         <item name="drawableTint">@color/ratingColor</item>
         <item name="android:textColor">@color/ratingColor</item>
@@ -146,7 +160,9 @@
         <item name="boxItemBackground">@color/lightItemBackground</item>
         <item name="textColor">@color/lightTextColor</item>
         <item name="grayTextColor">@color/lightGrayTextColor</item>
-        <item name="white">#000</item>
+        <item name="white">@color/black</item>
+        <item name="black">@color/white</item>
+
         <item name="colorOnPrimary">@color/blackText</item>
     </style>
 
@@ -158,6 +174,7 @@
         <item name="textColor">@color/material_dynamic_neutral90</item>
         <item name="grayTextColor">@color/material_dynamic_neutral60</item>
         <item name="white">@color/material_dynamic_neutral90</item>
+        <item name="black">@color/material_dynamic_neutral10</item>
         <item name="colorOnPrimary">@color/material_on_primary_emphasis_medium</item>
     </style>
 
@@ -483,9 +500,10 @@
         <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:background">@drawable/outline_drawable_less</item>
+               <item name="android:foreground">?attr/selectableItemBackgroundBorderless</item>
+       -->
         <item name="android:textColor">?attr/textColor</item>
-        <item name="android:foreground">?attr/selectableItemBackgroundBorderless</item>
         <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>
         <item name="drawableEndCompat">@drawable/ic_baseline_keyboard_arrow_right_24</item>
     </style>
@@ -535,6 +553,7 @@
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:foreground">@drawable/outline_drawable_less</item>
+        <item name="android:tag">@string/tv_no_focus_tag</item>
     </style>
 
     <style name="WhiteButton" parent="NiceButton">
@@ -558,6 +577,7 @@
         <item name="drawableStartCompat">@drawable/ic_baseline_check_24_listview</item>
     </style>
 
+
     <style name="NoCheckLabel" parent="@style/AppTextViewStyle">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -595,6 +615,19 @@
         <item name="android:minWidth">0dp</item>
     </style>
 
+    <style name="SmallWhiteButton" parent="WhiteButton">
+        <item name="android:layout_height">24dp</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:stateListAnimator">@null</item>
+        <item name="iconPadding">0dp</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:minWidth">0dp</item>
+    </style>
+
     <style name="RoundedSelectableButtonIcon" parent="RoundedSelectableButton">
         <item name="minWidth">0dp</item>
         <item name="iconTint">?attr/textColor</item>
@@ -699,7 +732,50 @@
         <item name="strokeColor">@color/tag_stroke_color</item>
     </style>
 
+    <style name="ResultButtonTV" parent="@style/RegularButtonTV">
+        <item name="android:tag">@string/tv_no_focus_tag</item>
+        <item name="iconGravity">start</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:layout_width">250dp</item>
+        <item name="android:layout_marginBottom">5dp</item>
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+    </style>
+
+    <style name="SelectableButtonTV" parent="RegularButtonTV">
+        <item name="icon">@drawable/ic_baseline_check_24_listview</item>
+        <item name="iconTint">@color/button_selector_color</item>
+    </style>
+
+    <style name="RegularButtonTV">
+        <item name="android:tag">@string/tv_no_focus_tag</item>
+        <item name="android:stateListAnimator">@null</item>
+        <item name="strokeColor">@color/transparent</item>
+        <item name="backgroundTint">@null</item>
+        <item name="android:background">@drawable/player_button_tv_attr</item>
+        <item name="rippleColor">@color/white</item>
+        <item name="android:shadowColor">@color/transparent</item>
+
+        <item name="iconTint">@color/player_on_button_tv_attr</item>
+        <item name="textColor">@color/player_on_button_tv_attr</item>
+        <item name="android:textColor">@color/player_on_button_tv_attr</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="iconSize">16dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:baselineAligned">false</item>
+        <item name="textAllCaps">false</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:layout_marginStart">4dp</item>
+        <item name="android:layout_marginEnd">4dp</item>
+        <item name="android:insetBottom">0dp</item>
+        <item name="android:insetTop">0dp</item>
+    </style>
+
     <style name="VideoButtonTV">
+        <item name="android:tag">@string/tv_no_focus_tag</item>
         <item name="android:stateListAnimator">@null</item>
         <item name="strokeColor">@color/transparent</item>
         <item name="backgroundTint">@null</item>
@@ -773,4 +849,4 @@
             @drawable/cast_ic_mini_controller_closed_caption
         </item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/xml/settings_account.xml b/app/src/main/res/xml/settings_account.xml
index e7414573..e7a45f75 100644
--- a/app/src/main/res/xml/settings_account.xml
+++ b/app/src/main/res/xml/settings_account.xml
@@ -22,13 +22,13 @@
 <!--            android:key="@string/nginx_key"-->
 <!--            android:icon="@drawable/nginx" />-->
 
-<!--    <Preference-->
-<!--            android:title="@string/nginx_info_title"-->
-<!--            android:icon="@drawable/nginx_question"-->
-<!--            android:summary="@string/nginx_info_summary">-->
-<!--        <intent-->
-<!--                android:action="android.intent.action.VIEW"-->
-<!--                android:data="https://www.sarlays.com/use-nginx-with-cloudstream/" />-->
-<!--    </Preference>-->
+    <!--    <Preference-->
+    <!--            android:title="@string/nginx_info_title"-->
+    <!--            android:icon="@drawable/nginx_question"-->
+    <!--            android:summary="@string/nginx_info_summary">-->
+    <!--        <intent-->
+    <!--                android:action="android.intent.action.VIEW"-->
+    <!--                android:data="https://www.sarlays.com/use-nginx-with-cloudstream/" />-->
+    <!--    </Preference>-->
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings_updates.xml b/app/src/main/res/xml/settings_updates.xml
index f2ec6747..9989e47b 100644
--- a/app/src/main/res/xml/settings_updates.xml
+++ b/app/src/main/res/xml/settings_updates.xml
@@ -58,8 +58,7 @@
             android:key="@string/auto_update_plugins_key"
             android:title="@string/automatic_plugin_updates" />
         
-        <SwitchPreference
-            android:defaultValue="false"
+        <Preference
             android:icon="@drawable/ic_baseline_extension_24"
             android:key="@string/auto_download_plugins_key"
             android:title="@string/automatic_plugin_download"
@@ -77,4 +76,4 @@
             android:title="@string/redo_setup_process"
             app:key="@string/redo_setup_key" />
     </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/build.gradle.kts b/build.gradle.kts
index 6e2a24f3..762e4588 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,8 +5,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
+        // we stay on low ver because prerelease build gradle is fucked
         classpath("com.android.tools.build:gradle:7.3.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/fastlane/metadata/android/ar-SA/changelogs/2.txt b/fastlane/metadata/android/ar-SA/changelogs/2.txt
new file mode 100644
index 00000000..cc43acf1
--- /dev/null
+++ b/fastlane/metadata/android/ar-SA/changelogs/2.txt
@@ -0,0 +1 @@
+تمت إضافة سجل التغيير!
diff --git a/fastlane/metadata/android/ar-SA/full_description.txt b/fastlane/metadata/android/ar-SA/full_description.txt
new file mode 100644
index 00000000..9668a9b1
--- /dev/null
+++ b/fastlane/metadata/android/ar-SA/full_description.txt
@@ -0,0 +1,10 @@
+يسمح لك كلاود ستريم -3 ببث وتنزيل الأفلام, المسلسلات التلفزيونية, والأنيمي. 
+
+يأتي التطبيق بدون أي إعلانات وتحليلات و
+ يدعم العديد من مواقع البث الاولي(التريلر) ,والأفلام, والمزيد.
+
+إشارات مرجعية
+
+تنزيلات الترجمة
+
+دعم كروم كاست
diff --git a/fastlane/metadata/android/ar-SA/short_description.txt b/fastlane/metadata/android/ar-SA/short_description.txt
new file mode 100644
index 00000000..7ccd9743
--- /dev/null
+++ b/fastlane/metadata/android/ar-SA/short_description.txt
@@ -0,0 +1 @@
+بث وتحميل الأفلام, الأنمي, والمسلسلات التلفزيونية.
diff --git a/fastlane/metadata/android/ar-SA/title.txt b/fastlane/metadata/android/ar-SA/title.txt
new file mode 100644
index 00000000..7977b290
--- /dev/null
+++ b/fastlane/metadata/android/ar-SA/title.txt
@@ -0,0 +1 @@
+كلاودستريم
diff --git a/fastlane/metadata/android/ar/changelogs/2.txt b/fastlane/metadata/android/ar/changelogs/2.txt
new file mode 100644
index 00000000..911b9b32
--- /dev/null
+++ b/fastlane/metadata/android/ar/changelogs/2.txt
@@ -0,0 +1 @@
+- تمت إضافة سجل التغيير!
diff --git a/fastlane/metadata/android/ar/full_description.txt b/fastlane/metadata/android/ar/full_description.txt
new file mode 100644
index 00000000..9bbe01ef
--- /dev/null
+++ b/fastlane/metadata/android/ar/full_description.txt
@@ -0,0 +1,12 @@
+يتيح لك كلاود ستريم -3 بث وتنزيل الأفلام والمسلسلات التلفزيونية والأنيمي.
+
+يأتي التطبيق بدون أي إعلانات وتحليلات.
+و يدعم العديد من مواقع البث الاولي(التريلر) والأفلام والمزيد. وتشمل الميزات:
+
+إشارات مرجعية
+
+قم بتنزيل ودفق الأفلام والبرامج التلفزيونية والأنيمي
+
+تنزيلات الترجمة
+
+دعم كروم كاست
diff --git a/fastlane/metadata/android/ar/short_description.txt b/fastlane/metadata/android/ar/short_description.txt
new file mode 100644
index 00000000..f396ff81
--- /dev/null
+++ b/fastlane/metadata/android/ar/short_description.txt
@@ -0,0 +1 @@
+بث وتحميل الأفلام والأنمي والمسلسلات التلفزيونية.
diff --git a/fastlane/metadata/android/ar/title.txt b/fastlane/metadata/android/ar/title.txt
new file mode 100644
index 00000000..635e1390
--- /dev/null
+++ b/fastlane/metadata/android/ar/title.txt
@@ -0,0 +1 @@
+كلاود ستريم
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/2.txt b/fastlane/metadata/android/cs-CZ/changelogs/2.txt
new file mode 100644
index 00000000..c100e834
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/2.txt
@@ -0,0 +1 @@
+- Přidán seznam změn!
diff --git a/fastlane/metadata/android/cs-CZ/full_description.txt b/fastlane/metadata/android/cs-CZ/full_description.txt
new file mode 100644
index 00000000..3e2d8308
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 umožňuje streamovat a stahovat filmy, televizní seriály a anime.
+
+Aplikace je bez reklam a analytik a podporuje
+spoustu stránek s trailery a filmy a další, např.
+
+Záložky
+
+Stahování titulků
+
+Podpora Chromecastu
diff --git a/fastlane/metadata/android/cs-CZ/short_description.txt b/fastlane/metadata/android/cs-CZ/short_description.txt
new file mode 100644
index 00000000..d934429d
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/short_description.txt
@@ -0,0 +1 @@
+Streamování a stahování filmů, TV seriálů a anime.
diff --git a/fastlane/metadata/android/cs-CZ/title.txt b/fastlane/metadata/android/cs-CZ/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/de-DE/changelogs/2.txt b/fastlane/metadata/android/de-DE/changelogs/2.txt
new file mode 100644
index 00000000..fc9e0cb9
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/2.txt
@@ -0,0 +1 @@
+- Änderungsprotokoll hinzugefügt!
diff --git a/fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt
index 20fa580c..ea2a8750 100644
--- a/fastlane/metadata/android/de-DE/full_description.txt
+++ b/fastlane/metadata/android/de-DE/full_description.txt
@@ -1,14 +1,12 @@
-Mit CloudStream-3 kannst du Filme, TV-Serien und Anime streamen und herunterladen. Die App kommt ganz ohne Werbung und Analytik aus. Sie unterstützt mehrere Trailer-, Filmseiten und vieles mehr. Integrierte Features:
-
+Mit CloudStream-3 kannst du Filme, TV-Serien und Anime streamen und herunterladen.
 
+Die App kommt ganz ohne Werbung und Analytik aus.
+Sie unterstützt zahlreiche Trailer, Filmseiten und vieles mehr, unter anderem:
 
 Lesezeichen
 
-
-Herunterladen und Streamen von Filmen, Fernsehsendungen und Animes
-
+Herunterladen und Streaming von Filmen, Fernsehsendungen und Animes
 
 Downloads von Untertiteln
 
-
 Chromecast-Unterstützung
diff --git a/fastlane/metadata/android/de-DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt
index 90f289be..d03eaf7d 100644
--- a/fastlane/metadata/android/de-DE/short_description.txt
+++ b/fastlane/metadata/android/de-DE/short_description.txt
@@ -1 +1 @@
-Streame und downloade Filme, TV-Serien und Animes.
+Filme, Fernsehserien und Animes streamen und herunterladen.
diff --git a/fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/el-GR/changelogs/2.txt b/fastlane/metadata/android/el-GR/changelogs/2.txt
new file mode 100644
index 00000000..63b5f9cc
--- /dev/null
+++ b/fastlane/metadata/android/el-GR/changelogs/2.txt
@@ -0,0 +1 @@
+- Προστέθηκε ο κατάλογος αλλαγών!
diff --git a/fastlane/metadata/android/el-GR/full_description.txt b/fastlane/metadata/android/el-GR/full_description.txt
new file mode 100644
index 00000000..8062d1c1
--- /dev/null
+++ b/fastlane/metadata/android/el-GR/full_description.txt
@@ -0,0 +1,10 @@
+Το CloudStream-3 σάς επιτρέπει να μεταδώσετε και να κατεβάζετε Ταινίες, Τηλεοπτικές σειρές και Anime.
+
+Η εφαρμογή έρχεται χωρίς διαφημίσεις και αναλυτικά στοιχεία και
+υποστηρίζει πολλούς ιστότοπους με τρέιλερ ταινιών και πολλά άλλα, π.χ.
+
+Σελιδοδείκτες
+
+Λήψεις υποτίτλων
+
+Υποστήριξη Chromecast
diff --git a/fastlane/metadata/android/el-GR/short_description.txt b/fastlane/metadata/android/el-GR/short_description.txt
new file mode 100644
index 00000000..b868574a
--- /dev/null
+++ b/fastlane/metadata/android/el-GR/short_description.txt
@@ -0,0 +1 @@
+Μετάδοση και λήψη ταινιών, σειρών και anime.
diff --git a/fastlane/metadata/android/el-GR/title.txt b/fastlane/metadata/android/el-GR/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/el-GR/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index e01b7d03..07c5f3ae 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,14 +1,10 @@
-CloudStream-3 lets you stream and download Movies, TV-Series and Anime. The app comes without any ads and analytics. It supports multiple trailer & movie sites, and more. Features include:
-
+CloudStream-3 lets you stream and download Movies, TV-Series and Anime.
 
+The app comes without any ads and analytics and
+supports multiple trailer & movie sites, and more, e.g.
 
 Bookmarks
 
-
-Download and stream movies, tv-shows and anime
-
-
-subtitle downloads
-
+Subtitle downloads
 
 Chromecast support
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
index 83ee1066..73078f8d 100644
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-Stream and download Movies, TV-Series and Anime.
+Stream and download movies, TV-series and anime.
diff --git a/fastlane/metadata/android/it-IT/changelogs/2.txt b/fastlane/metadata/android/it-IT/changelogs/2.txt
new file mode 100644
index 00000000..04112af3
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/2.txt
@@ -0,0 +1 @@
+- Aggiunto registro delle modifiche!
diff --git a/fastlane/metadata/android/it-IT/full_description.txt b/fastlane/metadata/android/it-IT/full_description.txt
index cc7dd597..fe80c88e 100644
--- a/fastlane/metadata/android/it-IT/full_description.txt
+++ b/fastlane/metadata/android/it-IT/full_description.txt
@@ -1,14 +1,10 @@
-CloudStream-3 ti consente di riprodurre in streaming e scaricare film, serie TV e anime. L'app viene fornita senza pubblicità e tracking. Supporta più siti di trailer e film e altro ancora. Le caratteristiche includono:
-
+CloudStream-3 ti consente di riprodurre in streaming e scaricare film, serie TV e anime.
 
+L'app viene fornita senza pubblicità e tracking.
+Supporta più siti di trailer e film e altro ancora, ad esempio:
 
 Preferiti
 
-
-Scarica e riproduci in streaming film, serie TV e anime
-
-
-scarica sottotitoli
-
+Download di sottotitoli
 
 Supporto a Chromecast
diff --git a/fastlane/metadata/android/it-IT/short_description.txt b/fastlane/metadata/android/it-IT/short_description.txt
index 64c8e0d0..693131d5 100644
--- a/fastlane/metadata/android/it-IT/short_description.txt
+++ b/fastlane/metadata/android/it-IT/short_description.txt
@@ -1 +1 @@
-Scarica e riproduci in streaming film, serie TV e anime
+Scarica e riproduci in streaming film, serie TV e anime.
diff --git a/fastlane/metadata/android/it-IT/title.txt b/fastlane/metadata/android/it-IT/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/no-NO/changelogs/2.txt b/fastlane/metadata/android/no-NO/changelogs/2.txt
new file mode 100644
index 00000000..6d66f546
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/changelogs/2.txt
@@ -0,0 +1 @@
+- Endringslogg tillagt.
diff --git a/fastlane/metadata/android/no-NO/full_description.txt b/fastlane/metadata/android/no-NO/full_description.txt
new file mode 100644
index 00000000..ac0c64c3
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/full_description.txt
@@ -0,0 +1,8 @@
+CloudStream-3 lar deg strømme og laste ned filmer, TV-serier, og anime. Programmet er reklamefritt, og det utføres ingen analyse. Flere førfilmer og filmsteder støttes, med mer.
+Noen av funksjonene.
+
+Bokmerker
+
+Nedlasting av undertekster
+
+Chromecast-støtte
diff --git a/fastlane/metadata/android/no-NO/short_description.txt b/fastlane/metadata/android/no-NO/short_description.txt
new file mode 100644
index 00000000..80290325
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/short_description.txt
@@ -0,0 +1 @@
+Se filmer, TV-serier og anime direkte eller last ned
diff --git a/fastlane/metadata/android/no-NO/title.txt b/fastlane/metadata/android/no-NO/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/or/changelogs/2.txt b/fastlane/metadata/android/or/changelogs/2.txt
new file mode 100644
index 00000000..e8b23e5f
--- /dev/null
+++ b/fastlane/metadata/android/or/changelogs/2.txt
@@ -0,0 +1 @@
+- ପରିବର୍ତ୍ତନ ପୋଥି ଯୋଡ଼ାଗଲା!
diff --git a/fastlane/metadata/android/pl-PL/short_description.txt b/fastlane/metadata/android/pl-PL/short_description.txt
new file mode 100644
index 00000000..1c561b6e
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/short_description.txt
@@ -0,0 +1 @@
+Streamuj i pobieraj filmy, seriale telewizyjne i anime.
diff --git a/fastlane/metadata/android/pl-PL/title.txt b/fastlane/metadata/android/pl-PL/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/pt/changelogs/2.txt b/fastlane/metadata/android/pt/changelogs/2.txt
new file mode 100644
index 00000000..1153e632
--- /dev/null
+++ b/fastlane/metadata/android/pt/changelogs/2.txt
@@ -0,0 +1 @@
+- Adicionado o registo de alterações!
diff --git a/fastlane/metadata/android/pt/full_description.txt b/fastlane/metadata/android/pt/full_description.txt
new file mode 100644
index 00000000..48bf36ce
--- /dev/null
+++ b/fastlane/metadata/android/pt/full_description.txt
@@ -0,0 +1,10 @@
+O CloudStream-3 permite-lhe transmitir e descarregar filmes, séries de TV e anime.
+
+A aplicação é fornecida sem quaisquer anúncios e análises e
+suporta vários sites de trailers e filmes, e muito mais, por exemplo
+
+Marcadores
+
+Downloads de legendas
+
+Suporte para Chromecast
diff --git a/fastlane/metadata/android/pt/short_description.txt b/fastlane/metadata/android/pt/short_description.txt
new file mode 100644
index 00000000..d0392f34
--- /dev/null
+++ b/fastlane/metadata/android/pt/short_description.txt
@@ -0,0 +1 @@
+Transmita e transfira filmes, séries de TV e anime.
diff --git a/fastlane/metadata/android/pt/title.txt b/fastlane/metadata/android/pt/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/pt/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/ro/changelogs/2.txt b/fastlane/metadata/android/ro/changelogs/2.txt
new file mode 100644
index 00000000..cc15b07a
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/2.txt
@@ -0,0 +1 @@
+- Changelog adăugat!
diff --git a/fastlane/metadata/android/ro/full_description.txt b/fastlane/metadata/android/ro/full_description.txt
new file mode 100644
index 00000000..deb77fb6
--- /dev/null
+++ b/fastlane/metadata/android/ro/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 vă permite să difuzați și să descărcați filme, seriale TV și anime.
+
+Aplicația vine fără reclame și analize și
+suportă mai multe site-uri de rulare și filme, și nu numai, de ex.
+
+Marcaje
+
+Descărcări de subtitrări
+
+Suport pentru Chromecast
diff --git a/fastlane/metadata/android/ro/short_description.txt b/fastlane/metadata/android/ro/short_description.txt
new file mode 100644
index 00000000..1d8b97a1
--- /dev/null
+++ b/fastlane/metadata/android/ro/short_description.txt
@@ -0,0 +1 @@
+Transmiteți și descărcați filme, seriale TV și anime.
diff --git a/fastlane/metadata/android/ro/title.txt b/fastlane/metadata/android/ro/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/ro/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/uk/changelogs/2.txt b/fastlane/metadata/android/uk/changelogs/2.txt
new file mode 100644
index 00000000..97e84fa8
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/2.txt
@@ -0,0 +1 @@
+– Додано журнал змін!
diff --git a/fastlane/metadata/android/uk/full_description.txt b/fastlane/metadata/android/uk/full_description.txt
new file mode 100644
index 00000000..31770635
--- /dev/null
+++ b/fastlane/metadata/android/uk/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 дозволяє транслювати та завантажувати фільми, серіали та аніме.
+
+Застосунок не містить реклами та аналітики й
+підтримує безліч сайтів з трейлерами, фільмами тощо, а також багато іншого, наприклад:
+
+Закладки
+
+Завантаження субтитрів
+
+Підтримка Chromecast
diff --git a/fastlane/metadata/android/uk/short_description.txt b/fastlane/metadata/android/uk/short_description.txt
new file mode 100644
index 00000000..b54cc950
--- /dev/null
+++ b/fastlane/metadata/android/uk/short_description.txt
@@ -0,0 +1 @@
+Трансляція та завантаження фільмів, серіалів та аніме.
diff --git a/fastlane/metadata/android/uk/title.txt b/fastlane/metadata/android/uk/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/uk/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/vi/changelogs/2.txt b/fastlane/metadata/android/vi/changelogs/2.txt
new file mode 100644
index 00000000..e03e458e
--- /dev/null
+++ b/fastlane/metadata/android/vi/changelogs/2.txt
@@ -0,0 +1 @@
+- Đã thêm Nhật ký thay đổi!
diff --git a/fastlane/metadata/android/vi/full_description.txt b/fastlane/metadata/android/vi/full_description.txt
new file mode 100644
index 00000000..90ea7ab7
--- /dev/null
+++ b/fastlane/metadata/android/vi/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 cho phép bạn xem và tải xuống phim lẻ, phim bộ và anime.
+
+Ứng dụng không có quảng cáo hay và phân tích nào,
+đồng thời hỗ trợ nhiều trang web xem phim, v.v.
+
+Đánh dấu
+
+Tải phụ đề
+
+Hỗ trợ Chromecast
diff --git a/fastlane/metadata/android/vi/short_description.txt b/fastlane/metadata/android/vi/short_description.txt
new file mode 100644
index 00000000..e4e20bd5
--- /dev/null
+++ b/fastlane/metadata/android/vi/short_description.txt
@@ -0,0 +1 @@
+Xem và tải xuống phim lẻ, phim bộ và anime.
diff --git a/fastlane/metadata/android/vi/title.txt b/fastlane/metadata/android/vi/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/vi/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/zh-CN/changelogs/2.txt b/fastlane/metadata/android/zh-CN/changelogs/2.txt
new file mode 100644
index 00000000..5512f16c
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/2.txt
@@ -0,0 +1 @@
+- 添加了更新日志！
diff --git a/fastlane/metadata/android/zh-CN/full_description.txt b/fastlane/metadata/android/zh-CN/full_description.txt
index 1f437a99..56519df6 100644
--- a/fastlane/metadata/android/zh-CN/full_description.txt
+++ b/fastlane/metadata/android/zh-CN/full_description.txt
@@ -1,14 +1,9 @@
 CloudStream-3可以让你串流和下载电影、剧集和动漫。这款应用没有任何广告和分析。它支持多个预告片和电影网站等。特点包括：
 
-
-
 书签
 
-
 下载和串流电影、电视节目和动漫
 
-
 下载字幕
 
-
 支持投屏
diff --git a/fastlane/metadata/android/zh-CN/title.txt b/fastlane/metadata/android/zh-CN/title.txt
new file mode 100644
index 00000000..dde89d58
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/gradle.properties b/gradle.properties
index 98bed167..b8aa1f91 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,9 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+# android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file